5 Commits

Author SHA1 Message Date
Alexey
592d3e112d bump version 2021-02-10 20:46:50 +03:00
Alexey
a4b98dd195 IVerifier ->IBatchTreeUpdateVerifier 2021-02-10 20:45:19 +03:00
Alexey
4d75035fab remove resolve mock 2021-02-10 20:22:54 +03:00
Alexey
f8c25c30ab bump version 2021-02-10 20:10:57 +03:00
Alexey
9506aa548e remove redundant imports 2021-02-10 20:10:02 +03:00
4 changed files with 9 additions and 16 deletions

View File

@@ -3,20 +3,17 @@
pragma solidity ^0.6.0;
pragma experimental ABIEncoderV2;
import "torn-token/contracts/ENS.sol";
import "./interfaces/ITornadoTreesV1.sol";
import "./interfaces/IVerifier.sol";
import "./interfaces/IBatchTreeUpdateVerifier.sol";
import "hardhat/console.sol";
contract TornadoTrees is EnsResolve {
contract TornadoTrees {
address public immutable governance;
bytes32 public depositRoot;
bytes32 public previousDepositRoot;
bytes32 public withdrawalRoot;
bytes32 public previousWithdrawalRoot;
address public tornadoProxy;
IVerifier public treeUpdateVerifier;
IBatchTreeUpdateVerifier public treeUpdateVerifier;
ITornadoTreesV1 public immutable tornadoTreesV1;
// make sure CHUNK_TREE_HEIGHT has the same value in BatchTreeUpdate.circom
@@ -73,7 +70,7 @@ contract TornadoTrees is EnsResolve {
address _governance,
address _tornadoProxy,
ITornadoTreesV1 _tornadoTreesV1,
IVerifier _treeUpdateVerifier,
IBatchTreeUpdateVerifier _treeUpdateVerifier,
SearchParams memory _searchParams
) public {
governance = _governance;
@@ -274,7 +271,7 @@ contract TornadoTrees is EnsResolve {
tornadoProxy = _tornadoProxy;
}
function setVerifierContract(IVerifier _treeUpdateVerifier) external onlyGovernance {
function setVerifierContract(IBatchTreeUpdateVerifier _treeUpdateVerifier) external onlyGovernance {
treeUpdateVerifier = _treeUpdateVerifier;
}

View File

@@ -2,6 +2,6 @@
pragma solidity ^0.6.0;
interface IVerifier {
interface IBatchTreeUpdateVerifier {
function verifyProof(bytes calldata proof, uint256[1] calldata input) external view returns (bool);
}

View File

@@ -5,7 +5,7 @@ pragma experimental ABIEncoderV2;
import "../TornadoTrees.sol";
import "../interfaces/ITornadoTreesV1.sol";
import "../interfaces/IVerifier.sol";
import "../interfaces/IBatchTreeUpdateVerifier.sol";
contract TornadoTreesMock is TornadoTrees {
uint256 public currentBlock;
@@ -14,14 +14,10 @@ contract TornadoTreesMock is TornadoTrees {
address _governance,
address _tornadoProxy,
ITornadoTreesV1 _tornadoTreesV1,
IVerifier _treeUpdateVerifier,
IBatchTreeUpdateVerifier _treeUpdateVerifier,
SearchParams memory _searchParams
) public TornadoTrees(_governance, _tornadoProxy, _tornadoTreesV1, _treeUpdateVerifier, _searchParams) {}
function resolve(bytes32 _addr) public view override returns (address) {
return address(uint160(uint256(_addr) >> (12 * 8)));
}
function setBlockNumber(uint256 _blockNumber) public {
currentBlock = _blockNumber;
}

View File

@@ -1,6 +1,6 @@
{
"name": "tornado-trees",
"version": "0.0.1",
"version": "0.0.3",
"main": "src/index.js",
"repository": "https://github.com/tornadocash/tornado-trees.git",
"author": "Tornadocash team <hello@tornado.cash>",