Merge branch 'master' into gho-ccip-bridge

bgd-labs · Feb 28, 2025 · 6a2508d · 6a2508d
2 parents 1dc7894 + 1ad3ea1
commit 6a2508d
Show file tree

Hide file tree

Showing 24 changed files with 725 additions and 336 deletions.
diff --git a/.github/workflows/merge-main.yml b/.github/workflows/merge-main.yml
@@ -15,5 +15,9 @@ jobs:
     uses: bgd-labs/github-workflows/.github/workflows/foundry-lint-prettier.yml@main
   test:
     uses: bgd-labs/github-workflows/.github/workflows/foundry-test.yml@main
+    secrets:
+      ALCHEMY_API_KEY: ${{ secrets.ALCHEMY_API_KEY }}
   test-zk:
     uses: bgd-labs/github-workflows/.github/workflows/foundry-test-zk.yml@main
+    secrets:
+      ALCHEMY_API_KEY: ${{ secrets.ALCHEMY_API_KEY }}
diff --git a/.gitignore b/.gitignore
@@ -12,3 +12,5 @@ yarn-error.log
 
 # snapshot artifacts
 reports/
+
+.vscode/
diff --git a/diffs/AMMTEST_before_AMMTEST_after.md b/diffs/AMMTEST_before_AMMTEST_after.md
@@ -2,4 +2,4 @@
 
 ```json
 {}
-```
+```
diff --git a/diffs/default_before_default_after.md b/diffs/default_before_default_after.md
@@ -3,33 +3,20 @@
 ```json
 {
   "raw": {
-    "from": null,
-    "to": {
-      "0x5300a1a15135ea4dc7ad5a167152c01efc9b192a": {
-        "label": null,
-        "balanceDiff": null,
-        "stateDiff": {}
-      },
-      "0x7222182cb9c5320587b5148bf03eee107ad64578": {
-        "label": null,
-        "balanceDiff": null,
-        "stateDiff": {
-          "0x2eaf8b7f7a84b89daf9bbcdc5eedc2697106baf3e76b29404b2bef5909c34a72": {
-            "previousValue": "0x0067765726000000000002000000000000000000000000000000000000000000",
-            "newValue": "0x0067765726000000000003000000000000000000000000000000000000000000"
-          },
-          "0x2eaf8b7f7a84b89daf9bbcdc5eedc2697106baf3e76b29404b2bef5909c34a73": {
-            "previousValue": "0x000000000000000000093a8000000000000067a47ba700000000000000000000",
-            "newValue": "0x000000000000000000093a8000000000000067a47ba700000000000067765727"
-          }
+    "0xdabad81af85554e9ae636395611c58f7ec1aaec5": {
+      "label": null,
+      "balanceDiff": null,
+      "stateDiff": {
+        "0x2eaf8b7f7a84b89daf9bbcdc5eedc2697106baf3e76b29404b2bef5909c34a72": {
+          "previousValue": "0x0067765726000000000002000000000000000000000000000000000000000000",
+          "newValue": "0x0067765726000000000003000000000000000000000000000000000000000000"
+        },
+        "0x2eaf8b7f7a84b89daf9bbcdc5eedc2697106baf3e76b29404b2bef5909c34a73": {
+          "previousValue": "0x000000000000000000093a8000000000000067a47ba700000000000000000000",
+          "newValue": "0x000000000000000000093a8000000000000067a47ba700000000000067765727"
         }
-      },
-      "0xdabad81af85554e9ae636395611c58f7ec1aaec5": {
-        "label": null,
-        "balanceDiff": null,
-        "stateDiff": {}
       }
     }
   }
 }
-```
+```
diff --git a/diffs/preTestV2RatesUpdates_postTestV2RatesUpdates.md b/diffs/preTestV2RatesUpdates_postTestV2RatesUpdates.md
@@ -4,14 +4,14 @@
 
 #### USDC ([0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48](https://etherscan.io/address/0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48))
 
-| description          | value before                                                                                                                                                                                                                                       | value after                                                                                                                                                                                                                                       |
-| -------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| 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](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) |
+| description | value before | value after |
+| --- | --- | --- |
+| 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](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
 
@@ -50,4 +50,4 @@
     }
   }
 }
-```
+```
diff --git a/lib/aave-address-book b/lib/aave-address-book
diff --git a/lib/forge-std b/lib/forge-std
Original file line number	Diff line number	Diff line change
Expand Up		@@ -12,3 +12,5 @@ yarn-error.log

		# snapshot artifacts
		reports/

		.vscode/
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,4 +2,4 @@ @@
     ```json
     {}
-    ```
+    ```
+1 −1		README.md
+1 −1		foundry.toml
+1 −3		src/StdChains.sol
+1 −1		src/interfaces/IERC1155.sol
+1 −1		src/interfaces/IERC4626.sol
+1 −1		src/interfaces/IERC721.sol
+150 −0		src/interfaces/IERC7540.sol
+241 −0		src/interfaces/IERC7575.sol
+2 −2		test/StdChains.t.sol
+45 −24		test/StdCheats.t.sol
+1 −1		test/compilation/CompilationScript.sol
+1 −1		test/compilation/CompilationScriptBase.sol
+1 −1		test/compilation/CompilationTest.sol
+1 −1		test/compilation/CompilationTestBase.sol