Init pool index

Author: k1rill-fedoseev

script/scripts/DeployZkBobPoolModules.s.sol

@@ -9,6 +9,7 @@ import "../../src/zkbob/ZkBobPool.sol";
 import "../../src/zkbob/utils/ZkBobAccounting.sol";
 import "../../src/proxy/EIP1967Proxy.sol";
 import "../../src/zkbob/ZkBobPoolBOB.sol";
+import "../../src/zkbob/ZkBobPoolUSDC.sol";
 
 contract DummyDelegateCall {
     function delegate(address to, bytes calldata data) external {
@@ -30,6 +31,7 @@ contract Migrator {
         uint56 maxWeeklyAvgTvl = uint56(_load(dump, 25, 7));
         uint72 tvl = uint72(_load(dump, 55, 9));
 
+        ZkBobPool(_target).initializePoolIndex(txCount * 128);
         ZkBobPool(_target).setAccounting(IZkBobAccounting(_accounting));
         ZkBobAccounting(_accounting).initialize(txCount + 1, tvl, cumTvl, maxWeeklyTxCount, maxWeeklyAvgTvl);
         ZkBobAccounting(_accounting).setKycProvidersManager(IKycProvidersManager(kycManager));
@@ -53,15 +55,16 @@ contract Migrator {
 
 contract DeployZkBobPoolModules is Script, Test {
     function run() external {
-        ZkBobPoolBOB pool = ZkBobPoolBOB(address(zkBobPool));
+        ZkBobPoolUSDC pool = ZkBobPoolUSDC(address(zkBobPool));
         address owner = pool.owner();
         vm.etch(owner, type(DummyDelegateCall).runtimeCode);
 
         address tokenSeller = address(pool.tokenSeller());
+        uint256 poolIndex = uint256(pool.pool_index());
 
         vm.startBroadcast();
 
-        ZkBobPoolBOB impl = new ZkBobPoolBOB(
+        ZkBobPoolUSDC impl = new ZkBobPoolUSDC(
             pool.pool_id(), pool.token(), pool.transfer_verifier(), pool.tree_verifier(),
             pool.batch_deposit_verifier(), address(pool.direct_deposit_queue())
         );
@@ -78,5 +81,6 @@ contract DeployZkBobPoolModules is Script, Test {
         acc.slot1();
 
         assertEq(address(pool.tokenSeller()), tokenSeller);
+        assertEq(uint256(pool.pool_index()), poolIndex);
     }
 }

src/zkbob/ZkBobPool.sol

@@ -109,6 +109,15 @@ abstract contract ZkBobPool is IZkBobPool, EIP1967Admin, Ownable, Parameters, Ex
         roots[0] = _root;
     }
 
+    /**
+     * @dev Initializes pool index after contract upgrade.
+     * @param _poolIndex current pool index.
+     */
+    function initializePoolIndex(uint96 _poolIndex) external {
+        require(pool_index == 0 && roots[_poolIndex] > 0 && roots[_poolIndex + 128] == 0, "ZkBobPool: invalid index");
+        pool_index = _poolIndex;
+    }
+
     /**
      * @dev Updates used operator manager contract.
      * Callable only by the contract owner / proxy admin.

src/zkbob/utils/ZkBobAccounting.sol

@@ -206,7 +206,6 @@ contract ZkBobAccounting is IZkBobAccounting, Ownable {
         onlyOwner
     {
         require(_tier < 255, "ZkBobAccounting: invalid limit tier");
-        require(_depositCap > 0, "ZkBobAccounting: zero deposit cap");
         require(_tvlCap <= type(uint56).max * PRECISION, "ZkBobAccounting: tvl cap too large");
         require(_dailyDepositCap <= type(uint32).max * PRECISION, "ZkBobAccounting: daily deposit cap too large");
         require(_dailyWithdrawalCap <= type(uint32).max * PRECISION, "ZkBobAccounting: daily withdrawal cap too large");