feat: more verbose and efficient

aave · Dec 23, 2024 · c95c114 · c95c114
1 parent acbf6e5
commit c95c114
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/src/20241209_Multi_GHOCCIP151Upgrade/AaveV3Arbitrum_GHOCCIP151Upgrade_20241209.sol b/src/20241209_Multi_GHOCCIP151Upgrade/AaveV3Arbitrum_GHOCCIP151Upgrade_20241209.sol
@@ -99,7 +99,10 @@ contract AaveV3Arbitrum_GHOCCIP151Upgrade_20241209 is IProposalGenericExecutor {
     });
 
     // setup new pool
-    NEW_TOKEN_POOL.applyChainUpdates(new uint64[](0), chains);
+    NEW_TOKEN_POOL.applyChainUpdates({
+      remoteChainSelectorsToRemove: new uint64[](0),
+      chainsToAdd: chains
+    });
     NEW_TOKEN_POOL.setRateLimitAdmin(NEW_GHO_CCIP_STEWARD);
 
     // register new pool

diff --git a/src/20241209_Multi_GHOCCIP151Upgrade/AaveV3E2E_GHOCCIP151Upgrade_20241209.t.sol b/src/20241209_Multi_GHOCCIP151Upgrade/AaveV3E2E_GHOCCIP151Upgrade_20241209.t.sol
@@ -475,9 +475,11 @@ contract AaveV3E2E_GHOCCIP151Upgrade_20241209_PostUpgrade is
 
   function test_E2E_FromEth(uint256 amount) public {
     vm.selectFork(l1.c.forkId);
-    uint256 currentBridgedAmount = l1.newTokenPool.getCurrentBridgedAmount();
-
-    amount = bound(amount, 1, currentBridgedAmount);
+    amount = bound(
+      amount,
+      1,
+      l1.newTokenPool.getBridgeLimit() - l1.newTokenPool.getCurrentBridgedAmount()
+    );
     deal(address(l1.c.token), alice, amount);
 
     _runEthToArb(alice, amount);

diff --git a/src/20241209_Multi_GHOCCIP151Upgrade/AaveV3Ethereum_GHOCCIP151Upgrade_20241209.sol b/src/20241209_Multi_GHOCCIP151Upgrade/AaveV3Ethereum_GHOCCIP151Upgrade_20241209.sol
@@ -82,7 +82,10 @@ contract AaveV3Ethereum_GHOCCIP151Upgrade_20241209 is IProposalGenericExecutor {
     });
 
     // setup new pool
-    NEW_TOKEN_POOL.applyChainUpdates(new uint64[](0), chains);
+    NEW_TOKEN_POOL.applyChainUpdates({
+      remoteChainSelectorsToRemove: new uint64[](0),
+      chainsToAdd: chains
+    });
     NEW_TOKEN_POOL.setRateLimitAdmin(NEW_GHO_CCIP_STEWARD);
     NEW_TOKEN_POOL.setBridgeLimitAdmin(NEW_GHO_CCIP_STEWARD);