From 9fdafd27654ad1f7035e43b90427fecd2f85118e Mon Sep 17 00:00:00 2001
From: poma <semenov.roma@gmail.com>
Date: Fri, 12 Feb 2021 03:51:03 +0300
Subject: [PATCH] rename search params, remove proposal

---
 contracts/Proposal.sol                   | 66 ------------------------
 contracts/TornadoTrees.sol               | 16 +++---
 contracts/interfaces/ITornadoProxyV1.sol |  7 ---
 test/proposal.test.js                    | 15 ------
 4 files changed, 8 insertions(+), 96 deletions(-)
 delete mode 100644 contracts/Proposal.sol
 delete mode 100644 contracts/interfaces/ITornadoProxyV1.sol
 delete mode 100644 test/proposal.test.js

diff --git a/contracts/Proposal.sol b/contracts/Proposal.sol
deleted file mode 100644
index 48bbfdc..0000000
--- a/contracts/Proposal.sol
+++ /dev/null
@@ -1,66 +0,0 @@
-//SPDX-License-Identifier: MIT
-pragma solidity ^0.6.0;
-pragma experimental ABIEncoderV2;
-
-import "./interfaces/ITornadoTreesV1.sol";
-import "./interfaces/ITornadoProxyV1.sol";
-import "./verifiers/BatchTreeUpdateVerifier.sol";
-import "./interfaces/IBatchTreeUpdateVerifier.sol";
-import "./TornadoTrees.sol";
-
-// import tornadoProxy from anonymity mining repo branch v2
-
-contract Proposal {
-  ITornadoTreesV1 public immutable tornadoTreesV1 = ITornadoTreesV1(0x43a3bE4Ae954d9869836702AFd10393D3a7Ea417);
-  ITornadoProxyV1 public immutable tornadoProxyV1 = ITornadoProxyV1(0x905b63Fff465B9fFBF41DeA908CEb12478ec7601);
-  address[] public instances = [
-    0x12D66f87A04A9E220743712cE6d9bB1B5616B8Fc,
-    0x47CE0C6eD5B0Ce3d3A51fdb1C52DC66a7c3c2936,
-    0x910Cbd523D972eb0a6f4cAe4618aD62622b39DbF,
-    0xA160cdAB225685dA1d56aa342Ad8841c3b53f291
-  ];
-
-  // define erc20 instances
-
-  function executeProposal() public {
-    BatchTreeUpdateVerifier verifier = new BatchTreeUpdateVerifier();
-
-    TornadoTrees.SearchParams memory searchParams = TornadoTrees.SearchParams({
-      unprocessedDeposits: 8000,
-      unprocessedWithdrawals: 8000,
-      depositsPerDay: 50,
-      withdrawalsPerDay: 50
-    });
-    address tornadoProxyAddress = computeAddress(address(this), 1);
-    TornadoTrees tornadoTrees = new TornadoTrees(
-      address(this),
-      tornadoProxyAddress,
-      tornadoTreesV1,
-      IBatchTreeUpdateVerifier(address(verifier)),
-      searchParams
-    );
-
-    for (uint256 i = 0; i < instances.length; i++) {
-      tornadoProxyV1.updateInstance(instances[i], false);
-    }
-
-    // deploy new tornadoProxy
-    // make sure you passed erc20 instances as well
-    // require(address(tornadoProxy) == tornadoProxyAddress, "tornadoProxy deployed to an unexpected address");
-
-    // set new trees contract on miner.sol
-    // reduce quorum?
-  }
-
-  function computeAddress(address _origin, uint256 _nonce) public pure returns (address) {
-    bytes memory data;
-    if (_nonce == 0x00) data = abi.encodePacked(bytes1(0xd6), bytes1(0x94), _origin, bytes1(0x80));
-    else if (_nonce <= 0x7f) data = abi.encodePacked(bytes1(0xd6), bytes1(0x94), _origin, bytes1(uint8(_nonce)));
-    else if (_nonce <= 0xff) data = abi.encodePacked(bytes1(0xd7), bytes1(0x94), _origin, bytes1(0x81), uint8(_nonce));
-    else if (_nonce <= 0xffff) data = abi.encodePacked(bytes1(0xd8), bytes1(0x94), _origin, bytes1(0x82), uint16(_nonce));
-    else if (_nonce <= 0xffffff) data = abi.encodePacked(bytes1(0xd9), bytes1(0x94), _origin, bytes1(0x83), uint24(_nonce));
-    else data = abi.encodePacked(bytes1(0xda), bytes1(0x94), _origin, bytes1(0x84), uint32(_nonce));
-    bytes32 hash = keccak256(data);
-    return address(uint160(uint256(hash)));
-  }
-}
diff --git a/contracts/TornadoTrees.sol b/contracts/TornadoTrees.sol
index 4619879..7b81556 100644
--- a/contracts/TornadoTrees.sol
+++ b/contracts/TornadoTrees.sol
@@ -60,10 +60,10 @@ contract TornadoTrees {
   }
 
   struct SearchParams {
-    uint256 unprocessedDeposits;
-    uint256 unprocessedWithdrawals;
-    uint256 depositsPerDay;
-    uint256 withdrawalsPerDay;
+    uint256 depositsFrom;
+    uint256 depositsStep;
+    uint256 withdrawalsFrom;
+    uint256 withdrawalsStep;
   }
 
   constructor(
@@ -85,8 +85,8 @@ contract TornadoTrees {
     depositsLength = depositV1Length = findArrayLength(
       _tornadoTreesV1,
       "deposits(uint256)",
-      _searchParams.unprocessedDeposits,
-      _searchParams.depositsPerDay
+      _searchParams.depositsFrom,
+      _searchParams.depositsStep
     );
 
     withdrawalRoot = _tornadoTreesV1.withdrawalRoot();
@@ -96,8 +96,8 @@ contract TornadoTrees {
     withdrawalsLength = withdrawalsV1Length = findArrayLength(
       _tornadoTreesV1,
       "withdrawals(uint256)",
-      _searchParams.unprocessedWithdrawals,
-      _searchParams.withdrawalsPerDay
+      _searchParams.withdrawalsFrom,
+      _searchParams.withdrawalsStep
     );
   }
 
diff --git a/contracts/interfaces/ITornadoProxyV1.sol b/contracts/interfaces/ITornadoProxyV1.sol
deleted file mode 100644
index 737af12..0000000
--- a/contracts/interfaces/ITornadoProxyV1.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-// SPDX-License-Identifier: MIT
-
-pragma solidity ^0.6.0;
-
-interface ITornadoProxyV1 {
-  function updateInstance(address _instance, bool _update) external;
-}
diff --git a/test/proposal.test.js b/test/proposal.test.js
deleted file mode 100644
index ec3607f..0000000
--- a/test/proposal.test.js
+++ /dev/null
@@ -1,15 +0,0 @@
-/* global ethers */
-
-const { expect } = require('chai')
-
-describe('Proposal', () => {
-  beforeEach(async function () {
-    const Proposal = await ethers.getContractFactory('Proposal')
-    const proposal = await Proposal.deploy()
-    console.log('proposal', proposal)
-  })
-
-  it('should work for even array', () => {
-    expect(2 + 2).to.be.equal(4)
-  })
-})