fix: upgrade to use new utils

bgd-labs · Jan 29, 2025 · 138a751 · 138a751
1 parent 509e0b8
commit 138a751
Show file tree

Hide file tree

Showing 42 changed files with 99 additions and 2,329 deletions.
diff --git a/.prettierignore b/.prettierignore
@@ -0,0 +1 @@
+lib
diff --git a/diffs/preTestV2RatesUpdates_postTestV2RatesUpdates.md b/diffs/preTestV2RatesUpdates_postTestV2RatesUpdates.md
@@ -6,12 +6,12 @@
 
 | description | value before | value after |
 | --- | --- | --- |
-| interestRateStrategy | [0xF1722FBCAc1C49bA57a77c3F4373A4bb86a46e60](https://etherscan.io/address/0xF1722FBCAc1C49bA57a77c3F4373A4bb86a46e60) | [0x3c7eb05B1C910542EC236c541f183B07787cC3ff](https://etherscan.io/address/0x3c7eb05B1C910542EC236c541f183B07787cC3ff) |
-| variableRateSlope1 | 6.5 % | 42 % |
+| interestRateStrategy | [0x4e1494475048fa155F1D837B6bD51458bD170f48](https://etherscan.io/address/0x4e1494475048fa155F1D837B6bD51458bD170f48) | [0x8821c6B6cd3C45Ad8b5EF43168BBbD094b63a03c](https://etherscan.io/address/0x8821c6B6cd3C45Ad8b5EF43168BBbD094b63a03c) |
+| variableRateSlope1 | 12.5 % | 42 % |
 | stableRateSlope1 | 2 % | 69 % |
 | optimalUsageRatio | 90 % | 69 % |
 | maxExcessUsageRatio | 10 % | 31 % |
-| interestRate | ![before](/.assets/23e67c7d46dd80f36d580b243c5716c84080a34f.svg) | ![after](/.assets/64fd6acec636adec0e975e8031f8e3f7fb87bb7d.svg) |
+| interestRate | ![before](https://dash.onaave.com/api/static?variableRateSlope1=125000000000000000000000000&variableRateSlope2=600000000000000000000000000&optimalUsageRatio=900000000000000000000000000&baseVariableBorrowRate=0&maxVariableBorrowRate=undefined) | ![after](https://dash.onaave.com/api/static?variableRateSlope1=420000000000000000000000000&variableRateSlope2=600000000000000000000000000&optimalUsageRatio=690000000000000000000000000&baseVariableBorrowRate=0&maxVariableBorrowRate=undefined) |
 
 ## Raw diff
 
@@ -20,16 +20,16 @@
   "reserves": {
     "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48": {
       "interestRateStrategy": {
-        "from": "0xF1722FBCAc1C49bA57a77c3F4373A4bb86a46e60",
-        "to": "0x3c7eb05B1C910542EC236c541f183B07787cC3ff"
+        "from": "0x4e1494475048fa155F1D837B6bD51458bD170f48",
+        "to": "0x8821c6B6cd3C45Ad8b5EF43168BBbD094b63a03c"
       }
     }
   },
   "strategies": {
     "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48": {
       "address": {
-        "from": "0xF1722FBCAc1C49bA57a77c3F4373A4bb86a46e60",
-        "to": "0x3c7eb05B1C910542EC236c541f183B07787cC3ff"
+        "from": "0x4e1494475048fa155F1D837B6bD51458bD170f48",
+        "to": "0x8821c6B6cd3C45Ad8b5EF43168BBbD094b63a03c"
       },
       "maxExcessUsageRatio": {
         "from": "100000000000000000000000000",
@@ -44,7 +44,7 @@
         "to": "690000000000000000000000000"
       },
       "variableRateSlope1": {
-        "from": "65000000000000000000000000",
+        "from": "125000000000000000000000000",
         "to": "420000000000000000000000000"
       }
     }

diff --git a/lib/forge-std b/lib/forge-std
diff --git a/package.json b/package.json
@@ -7,8 +7,7 @@
     "test": "tests"
   },
   "scripts": {
-    "lint:fix": "prettier --write 'src/**/*.sol'",
-    "prettier:tests": "prettier --write 'tests/**/*.sol'"
+    "lint:fix": "prettier --write '**/*.sol'"
   },
   "repository": {
     "type": "git",

diff --git a/scripts/AaveSwapperDeployment.s.sol b/scripts/AaveSwapperDeployment.s.sol
@@ -17,7 +17,7 @@ contract DeployAaveSwapper is Script {
     ITransparentProxyFactory(MiscEthereum.TRANSPARENT_PROXY_FACTORY).create(
       aaveSwapper,
       GovernanceV3Ethereum.EXECUTOR_LVL_1,
-      abi.encodeWithSelector(AaveSwapper.initialize.selector)
+      abi.encodeWithSelector(AaveSwapper.initialize.selector, GovernanceV3Ethereum.EXECUTOR_LVL_1)
     );
 
     vm.stopBroadcast();

diff --git a/scripts/AaveWstethWithdrawerDeployment.s.sol b/scripts/AaveWstethWithdrawerDeployment.s.sol
diff --git a/src/CommonTestBase.sol b/src/CommonTestBase.sol
@@ -102,7 +102,7 @@ contract CommonTestBase is Test {
         return true;
       }
     }
-    if(block.chainid == ChainIds.AVALANCHE) {
+    if (block.chainid == ChainIds.AVALANCHE) {
       // AUSD
       if (asset == 0x00000000eFE302BEAA2b3e6e1b18d08D69a9012a) {
         vm.prank(0x2CD78aD719a8c74898c5283f5Bc70920D8A061fd);

diff --git a/src/ScriptUtils.sol b/src/ScriptUtils.sol
diff --git a/src/asset-manager/AaveWstethWithdrawer.sol b/src/asset-manager/AaveWstethWithdrawer.sol
diff --git a/src/asset-manager/Common.sol b/src/asset-manager/Common.sol
diff --git a/src/asset-manager/LSDLiquidityGaugeManager.sol b/src/asset-manager/LSDLiquidityGaugeManager.sol
+2 −0		foundry.toml
+24 −0		src/StdChains.sol
+3 −3		test/StdChains.t.sol