Merge branch 'main' into feat/peapods-cleanup

Popcorn-Limited · Jun 25, 2024 · aa1e4e2 · aa1e4e2
2 parents abfd676 + fe1996a
commit aa1e4e2
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 13 deletions.
diff --git a/script/deploy/DeployMultiStrategyVault.s.sol b/script/deploy/DeployMultiStrategyVault.s.sol
@@ -18,11 +18,11 @@ contract DeployMultiStrategyVault is Script {
         console.log("msg.sender:", msg.sender);
 
         // @dev edit this values below
-        asset = IERC20(0x4c9EDD5852cd905f086C759E8383e09bff1E68B3);
+        asset = IERC20(0x9D39A5DE30e57443BfF2A8307A4256c8797A3497);
 
         strategies = [
-            IERC4626(0x658a94eF990c5307707a428C927ADcB65B89BD8F),
-            IERC4626(0x1C9432248C5437C52A6cdff701259c247f870f88)
+            IERC4626(0xF82316c0cd110dB4c4a6c15F85dFaD7266551854),
+            IERC4626(0x377DFCC7B9ce9aDD96347f34b2303C9bD8067e01)
         ];
 
         defaultDepositIndex = uint256(0);

diff --git a/script/deploy/pendle/PendleBalancerCompounderDeployConfig.json b/script/deploy/pendle/PendleBalancerCompounderDeployConfig.json
@@ -1,11 +1,11 @@
 {
   "baseInit": {
-    "asset": "0x4c9edd5852cd905f086c759e8383e09bff1e68b3",
+    "asset": "0x9d39a5de30e57443bff2a8307a4256c8797a3497",
     "owner": "0x2C3B135cd7dc6C673b358BEF214843DAb3464278",
     "autoHarvest": false
   },
   "strategyInit": {
-    "pendleMarket": "0x19588f29f9402bb508007feadd415c875ee3f19f",
+    "pendleMarket": "0xd1d7d99764f8a52aff007b7831cc02748b2013b5",
     "pendleRouter": "0x888888888889758F76e7103c6CbF23ABbF58F946",
     "pendleRouterStat": "0x263833d47eA3fA4a30f269323aba6a107f9eB14C"
   },
@@ -18,9 +18,11 @@
           "assets": [
             "0x808507121B80c02388fAd14726482e061B8da827",
             "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
-            "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48"
+            "0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0",
+            "0x9D39A5DE30e57443BfF2A8307A4256c8797A3497"
           ],
           "limits": [
+            57896044618658097711785492504343953926634992332820282019728792003956564819967,
             57896044618658097711785492504343953926634992332820282019728792003956564819967,
             57896044618658097711785492504343953926634992332820282019728792003956564819967,
             57896044618658097711785492504343953926634992332820282019728792003956564819967
@@ -34,11 +36,18 @@
               "e-userData": ""
             },
             {
-              "a-poolId": "0x96646936b91d6b9d7d0c47c496afbf3d6ec7b6f8000200000000000000000019",
+              "a-poolId": "0x93d199263632a4ef4bb438f1feb99e57b4b5f0bd0000000000000000000005c2",
               "b-assetInIndex": 1,
               "c-assetOutIndex": 2,
               "d-amount": 0,
               "e-userData": ""
+            },
+            {
+              "a-poolId": "0xa8210885430aaa333c9f0d66ab5d0c312bed5e43000200000000000000000692",
+              "b-assetInIndex": 2,
+              "c-assetOutIndex": 3,
+              "d-amount": 0,
+              "e-userData": ""
             }
           ]
         }

diff --git a/test/strategies/pendle/PendleBalancerCompounder.t.sol b/test/strategies/pendle/PendleBalancerCompounder.t.sol
@@ -137,8 +137,8 @@ contract PendleBalancerCompounderTest is BaseStrategyTest {
         strategy.deposit(amount, bob);
         vm.stopPrank();
 
-        vm.roll(block.number + 1_000_000);
-        vm.warp(block.timestamp + 15_000_000);
+        vm.roll(block.number + 1_000_00);
+        vm.warp(block.timestamp + 1_500_000);
 
         uint256 totAssetsBefore = strategy.totalAssets();
 

diff --git a/test/strategies/pendle/PendleBalancerCompounderTestConfig.json b/test/strategies/pendle/PendleBalancerCompounderTestConfig.json
@@ -3,8 +3,8 @@
   "configs": [
     {
       "base": {
-        "asset": "0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0",
-        "blockNumber": 19823003,
+        "asset": "0x9d39a5de30e57443bff2a8307a4256c8797a3497",
+        "blockNumber": 20162000,
         "defaultAmount": 1000000000000000000,
         "delta": 10000000000000000,
         "maxDeposit": 1000000000000000000000,
@@ -16,7 +16,7 @@
       },
       "specific": {
         "init": {
-          "pendleMarket": "0xD0354D4e7bCf345fB117cabe41aCaDb724eccCa2",
+          "pendleMarket": "0x107a2e3cd2bb9a32b9ee2e4d51143149f8367eba",
           "pendleRouter": "0x888888888889758F76e7103c6CbF23ABbF58F946",
           "pendleRouterStat": "0x263833d47eA3fA4a30f269323aba6a107f9eB14C"
         },
@@ -29,9 +29,11 @@
                 "assets": [
                   "0x808507121B80c02388fAd14726482e061B8da827",
                   "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
-                  "0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0"
+                  "0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0",
+                  "0x9D39A5DE30e57443BfF2A8307A4256c8797A3497"
                 ],
                 "limits": [
+                  57896044618658097711785492504343953926634992332820282019728792003956564819967,
                   57896044618658097711785492504343953926634992332820282019728792003956564819967,
                   57896044618658097711785492504343953926634992332820282019728792003956564819967,
                   57896044618658097711785492504343953926634992332820282019728792003956564819967
@@ -50,6 +52,13 @@
                     "c-assetOutIndex": 2,
                     "d-amount": 0,
                     "e-userData": ""
+                  },
+                  {
+                    "a-poolId": "0xa8210885430aaa333c9f0d66ab5d0c312bed5e43000200000000000000000692",
+                    "b-assetInIndex": 2,
+                    "c-assetOutIndex": 3,
+                    "d-amount": 0,
+                    "e-userData": ""
                   }
                 ]
               }