merge conflicts resolved

zkBob · Sep 11, 2023 · 7deed0e · 7deed0e
1 parent 50004e2
commit 7deed0e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 14 deletions.
diff --git a/script/scripts/CompoundingMigration.s.sol b/script/scripts/CompoundingMigration.s.sol
@@ -18,10 +18,9 @@ import "../../src/zkbob/ZkBobDirectDepositQueue.sol";
 import "../../src/infra/UniswapV3Seller.sol";
 import "../../src/zkbob/ZkBobPoolUSDC.sol";
 import "@aave/aave-vault/src/ATokenVault.sol";
-import "../../src/zkbob/ZkBobPoolUSDCMigrated.sol";
 
 contract BOBPoolMigration is Script, StdCheats {
-    ZkBobPoolUSDCMigrated pool = ZkBobPoolUSDCMigrated(0x72e6B59D4a90ab232e55D4BB7ed2dD17494D62fB);
+    ZkBobPoolUSDC pool = ZkBobPoolUSDC(0x72e6B59D4a90ab232e55D4BB7ed2dD17494D62fB);
     ZkBobDirectDepositQueue queue_proxy = ZkBobDirectDepositQueue(0x668c5286eAD26fAC5fa944887F9D2F20f7DDF289);
     address usdc_addr = address(0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174);
     address relayer_addr = address(0xc2c4AD59B78F4A0aFD0CDB8133E640Db08Fa5b90);
@@ -46,7 +45,7 @@ contract BOBPoolMigration is Script, StdCheats {
         require(queue_proxy == pool.direct_deposit_queue(), "Incorrect Direct Deposit queue proxy");
 
         vm.startPrank(deployer);
-        ZkBobPoolUSDCMigrated poolImpl = new ZkBobPoolUSDCMigrated(
+        ZkBobPoolUSDC poolImpl = new ZkBobPoolUSDC(
             pool_id, usdc_addr,
             transferVerifier, treeVerifier, batchDepositVerifier,
             address(queue_proxy)

diff --git a/src/zkbob/ZkBobPool.sol b/src/zkbob/ZkBobPool.sol
@@ -163,17 +163,6 @@ abstract contract ZkBobPool is IZkBobPool, EIP1967Admin, Ownable, Parameters, Ex
         emit UpdateAccounting(address(_accounting));
     }
 
-    /**
-     * @dev Updates used energy redemption module.
-     * Callable only by the contract owner / proxy admin.
-     * @param _redeemer new energy redeemer implementation.
-     */
-    function setEnergyRedeemer(IEnergyRedeemer _redeemer) external onlyOwner {
-        require(address(_redeemer) == address(0) || Address.isContract(address(_redeemer)), "ZkBobPool: not a contract");
-        redeemer = _redeemer;
-        emit UpdateRedeemer(address(_redeemer));
-    }
-
     function _root() internal view override returns (uint256) {
         return roots[_transfer_index()];
     }

diff --git a/src/zkbob/ZkBobPoolUSDCMigrated.sol b/src/zkbob/ZkBobPoolUSDCMigrated.sol
@@ -0,0 +1 @@
+