Merge branch 'bgd-labs:main' into main

.env.example

@@ -19,6 +19,7 @@ RPC_ZKEVM=https://zkevm-rpc.com
 RPC_GNOSIS=https://rpc.ankr.com/gnosis
 RPC_BNB=https://binance.llamarpc.com
 RPC_SCROLL=https://rpc.scroll.io
+RPC_ZKSYNC=https://mainnet.era.zksync.io
 
 # Etherscan api keys for verification & download utils
 ETHERSCAN_API_KEY_MAINNET=
@@ -32,6 +33,7 @@ ETHERSCAN_API_KEY_ZKEVM=
 ETHERSCAN_API_KEY_GNOSIS=
 ETHERSCAN_API_KEY_BNB=
 ETHERSCAN_API_KEY_SCROLL=
+ETHERESCAN_API_KEY_ZKSYNC=
 
 # Simulation/fork creation
 TENDERLY_ACCESS_TOKEN=

.gitignore

@@ -4,6 +4,7 @@
 # build and cache
 cache/
 out/
+zkout/
 
 # general
 .env
@@ -22,4 +23,6 @@ broadcast/
 reports/
 
 # tooling download folder
-etherscan
+etherscan
+
+verify.json

.gitmodules

@@ -1,9 +1,3 @@
 [submodule "lib/aave-helpers"]
 	path = lib/aave-helpers
 	url = https://github.com/bgd-labs/aave-helpers
-[submodule "lib/ccip"]
-	path = lib/ccip
-	url = https://github.com/aave/ccip
-[submodule "lib/gho-core"]
-	path = lib/gho-core
-	url = https://github.com/aave/gho-core

Makefile

@@ -12,9 +12,8 @@ test   :; forge test -vvv
 test-contract :; forge test --match-contract ${filter} -vv
 
 # Deploy
-deploy-ledger :; FOUNDRY_PROFILE=${chain} forge script ${contract} --rpc-url ${chain} $(if ${dry},--sender 0x25F2226B597E8F9514B3F68F00f494cF4f286491 -vvvv, --ledger --mnemonic-indexes ${MNEMONIC_INDEX} --sender ${LEDGER_SENDER} --verify -vvvv --slow --broadcast)
-deploy-pk :; FOUNDRY_PROFILE=${chain} forge script ${contract} --rpc-url ${chain} $(if ${dry},--sender 0x25F2226B597E8F9514B3F68F00f494cF4f286491 -vvvv, --private-key ${PRIVATE_KEY} --verify -vvvv --slow --broadcast)
-
+deploy-ledger :; FOUNDRY_PROFILE=${chain} forge script $(if $(filter zksync,${chain}),--zksync) ${contract} --rpc-url ${chain} $(if ${dry},--sender 0x25F2226B597E8F9514B3F68F00f494cF4f286491 -vvvv, --ledger --mnemonic-indexes ${MNEMONIC_INDEX} --sender ${LEDGER_SENDER} --verify -vvvv --slow --broadcast)
+deploy-pk :; FOUNDRY_PROFILE=${chain} forge script $(if $(filter zksync,${chain}),--zksync) ${contract} --rpc-url ${chain} $(if ${dry},--sender 0x25F2226B597E8F9514B3F68F00f494cF4f286491 -vvvv, --private-key ${PRIVATE_KEY} --verify -vvvv --slow --broadcast)
 
 # Utilities
 download :; cast etherscan-source --chain ${chain} -d src/etherscan/${chain}_${address} ${address}

README.md

@@ -101,3 +101,14 @@ This repository will manage the upload to ipfs automatically once a pr is merged
 The proposal requires at least one `payload` and the `encodedHash`.
 
 :tada:
+
+## Troubleshooting Verification
+
+If for whatever reason verification fails, there's a good chance the error is on the foundry side, not in our tooling.
+To retry a specific verification you can follow the following steps:
+
+1. copy verify.example.json to verify.json
+2. replace the `chain` with the appropriate chainId
+3. replace the `hash` with the transaction hash of the deployment transaction (make sure it's the deployment transaction, not the one registering the payload on the payloadscontroller)
+4. run `FOUNDRY_PROFILE=<chainAlias> forge build --force`
+5. run `FOUNDRY_PROFILE=<chainAlias> npx catapulta-verify -b verify.json`

diffs/AaveV2Avalanche_RenewalOfAaveGuardian2024_20240708_before_AaveV2Avalanche_RenewalOfAaveGuardian2024_20240708_after.md

@@ -0,0 +1,5 @@
+## Raw diff
+
+```json
+{}
+```

diffs/AaveV2Avalanche_ReserveFactorUpdatesAugust_20240726_before_AaveV2Avalanche_ReserveFactorUpdatesAugust_20240726_after.md

@@ -0,0 +1,90 @@
+## Reserve changes
+
+### Reserve altered
+
+#### WETH.e ([0x49D5c2BdFfac6CE2BFdB6640F4F80f226bc10bAB](https://snowscan.xyz/address/0x49D5c2BdFfac6CE2BFdB6640F4F80f226bc10bAB))
+
+| description | value before | value after |
+| --- | --- | --- |
+| reserveFactor | 60 % [6000] | 65 % [6500] |
+
+
+#### WBTC.e ([0x50b7545627a5162F82A992c33b87aDc75187B218](https://snowscan.xyz/address/0x50b7545627a5162F82A992c33b87aDc75187B218))
+
+| description | value before | value after |
+| --- | --- | --- |
+| reserveFactor | 65 % [6500] | 70 % [7000] |
+
+
+#### USDC.e ([0xA7D7079b0FEaD91F3e65f86E8915Cb59c1a4C664](https://snowscan.xyz/address/0xA7D7079b0FEaD91F3e65f86E8915Cb59c1a4C664))
+
+| description | value before | value after |
+| --- | --- | --- |
+| reserveFactor | 60 % [6000] | 65 % [6500] |
+
+
+#### WAVAX ([0xB31f66AA3C1e785363F0875A1B74E27b85FD66c7](https://snowscan.xyz/address/0xB31f66AA3C1e785363F0875A1B74E27b85FD66c7))
+
+| description | value before | value after |
+| --- | --- | --- |
+| reserveFactor | 60 % [6000] | 65 % [6500] |
+
+
+#### USDT.e ([0xc7198437980c041c805A1EDcbA50c1Ce5db95118](https://snowscan.xyz/address/0xc7198437980c041c805A1EDcbA50c1Ce5db95118))
+
+| description | value before | value after |
+| --- | --- | --- |
+| reserveFactor | 60 % [6000] | 65 % [6500] |
+
+
+#### DAI.e ([0xd586E7F844cEa2F87f50152665BCbc2C279D8d70](https://snowscan.xyz/address/0xd586E7F844cEa2F87f50152665BCbc2C279D8d70))
+
+| description | value before | value after |
+| --- | --- | --- |
+| reserveFactor | 60 % [6000] | 65 % [6500] |
+
+
+## Raw diff
+
+```json
+{
+  "reserves": {
+    "0x49D5c2BdFfac6CE2BFdB6640F4F80f226bc10bAB": {
+      "reserveFactor": {
+        "from": 6000,
+        "to": 6500
+      }
+    },
+    "0x50b7545627a5162F82A992c33b87aDc75187B218": {
+      "reserveFactor": {
+        "from": 6500,
+        "to": 7000
+      }
+    },
+    "0xA7D7079b0FEaD91F3e65f86E8915Cb59c1a4C664": {
+      "reserveFactor": {
+        "from": 6000,
+        "to": 6500
+      }
+    },
+    "0xB31f66AA3C1e785363F0875A1B74E27b85FD66c7": {
+      "reserveFactor": {
+        "from": 6000,
+        "to": 6500
+      }
+    },
+    "0xc7198437980c041c805A1EDcbA50c1Ce5db95118": {
+      "reserveFactor": {
+        "from": 6000,
+        "to": 6500
+      }
+    },
+    "0xd586E7F844cEa2F87f50152665BCbc2C279D8d70": {
+      "reserveFactor": {
+        "from": 6000,
+        "to": 6500
+      }
+    }
+  }
+}
+```