fix: Added missing fixes, and lib path updates

Author: sendra

.env.example

@@ -6,34 +6,38 @@ LEDGER_SENDER=
 PRIVATE_KEY=
 
 # Test rpc_endpoints
-RPC_MAINNET=https://eth.llamarpc.com
+RPC_MAINNET=https://rpc.flashbots.net
+RPC_MAINNET_TESTNET=https://ethereum-sepolia.publicnode.com
 RPC_AVALANCHE=https://api.avax.network/ext/bc/C/rpc
-RPC_OPTIMISM=https://optimism.llamarpc.com
-RPC_POLYGON=https://polygon.llamarpc.com
-RPC_ARBITRUM=https://arbitrum.llamarpc.com
+RPC_AVALANCHE_TESTNET=https://api.avax.network/ext/bc/C/rpc
+RPC_OPTIMISM=https://mainnet.optimism.io
+RPC_OPTIMISM_TESTNET=https://mainnet.optimism.io
+RPC_POLYGON=https://polygon-rpc.com
+RPC_POLYGON_TESTNET=https://polygon-rpc.com
+RPC_ARBITRUM=https://arb1.arbitrum.io/rpc
+RPC_ARBITRUM_TESTNET=https://arb1.arbitrum.io/rpc
 RPC_FANTOM=https://rpc.ftm.tools
+RPC_FANTOM_TESTNET=https://rpc.ftm.tools
 RPC_HARMONY=https://api.harmony.one
 RPC_METIS=https://andromeda.metis.io/?owner=1088
-RPC_BASE=https://base.llamarpc.com
-RPC_ZKEVM=https://zkevm-rpc.com
-RPC_GNOSIS=https://rpc.ankr.com/gnosis
-RPC_BNB=https://binance.llamarpc.com
-RPC_ZK_SYNC=https://mainnet.era.zksync.io
-RPC_ZK_SYNC_TESTNET=https://sepolia.era.zksync.dev
-RPC_LINEA=https://rpc.linea.build
-RPC_MANTLE=
-RPC_MANTLE_TESTNET=
+RPC_METIS_TESTNET=https://andromeda.metis.io/?owner=1088
+RPC_BINANCE=https://bsc-dataseed.binance.org/
+RPC_BINANCE_TESTNET=https://data-seed-prebsc-1-s1.binance.org:8545/
+RPC_BASE=https://developer-access-mainnet.base.org
+RPC_BASE_TESTNET=https://goerli.base.org
+RPC_GNOSIS=https://rpc.gnosischain.com
+RPC_GNOSIS_TESTNET=https://rpc.chiadochain.net
+RPC_ZKEVM=https://polygon-zkevm.drpc.org
+RPC_ZKEVM_TESTNET=https://rpc.public.zkevm-test.net
+RPC_SCROLL=https://rpc.scroll.io
+RPC_SCROLL_TESTNET=https://sepolia-rpc.scroll.io
+RPC_CELO=https://forno.celo.org
+RPC_CELO_ALFAJORES=https://alfajores-forno.celo-testnet.org
+RPC_ZK_SYNC=https://zksync.drpc.org
+RPC_LINEA=https://linea-rpc.publicnode.com
+RPC_SONEIUM=https://rpc.soneium.org
+RPC_INK=https://ink.drpc.org
+RPC_BOB=https://rpc.gobob.xyz
 
 # Etherscan api keys for verification & download utils
-ETHERSCAN_API_KEY_MAINNET=
-ETHERSCAN_API_KEY_POLYGON=
-ETHERSCAN_API_KEY_AVALANCHE=
-ETHERSCAN_API_KEY_FANTOM=
-ETHERSCAN_API_KEY_OPTIMISM=
-ETHERSCAN_API_KEY_ARBITRUM=
-ETHERSCAN_API_KEY_BASE=
-ETHERSCAN_API_KEY_ZKEVM=
-ETHERSCAN_API_KEY_GNOSIS=
-ETHERSCAN_API_KEY_BNB=
-ETHERSCAN_API_KEY_ZK_SYNC=
-ETHERSCAN_API_KEY_MANTLE=
+ETHERSCAN_API_KEY=

.gitmodules

@@ -1,6 +1,6 @@
 [submodule "lib/aave-delivery-infrastructure"]
 	path = lib/aave-delivery-infrastructure
-	url = https://github.com/bgd-labs/aave-delivery-infrastructure
+	url = https://github.com/aave-dao/aave-delivery-infrastructure
 [submodule "lib/aave-helpers"]
 	path = lib/aave-helpers
 	url = https://github.com/bgd-labs/aave-helpers

CONTRIBUTING.ms

@@ -0,0 +1,90 @@
+# Contributing
+
+Thanks for your interest in contributing to aDI Deploy! Please take a moment to review this document **before submitting a pull request.**
+
+## Rules
+
+1. Significant changes to the Protocol must be reviewed before a Pull Request is created. Create a [Feature Request](https://github.com/aave-dao/adi-deploy/issues) first to discuss your ideas.
+2. Contributors must be humans, not bots.
+3. First time contributions must not contain only spelling or grammatical fixes.
+
+## Basic guide
+
+This guide is intended to help you get started with contributing. By following these steps, you will understand the development process and workflow.
+
+1. [Forking the repository](#forking-the-repository)
+2. [Installing Foundry](#installing-foundry)
+4. [Installing dependencies](#installing-dependencies)
+5. [Running the test suite](#running-the-test-suite)
+7. [Submitting a pull request](#submitting-a-pull-request)
+
+---
+
+### Forking the repository
+
+To start contributing to the project, [fork it](https://github.com/aave-dao/adi-deploy) to your private github account.
+
+Once that is done, you can clone your forked repository to your local machine.
+```bash
+# https
+git clone https://github.com/<user>/adi-deploy.git
+# ssh
+git clone git@github.com:<user>/adi-deploy.git
+```
+
+To stay up to date with the main repository, you can add it as a remote.
+```bash
+# https
+git remote add upstream https://github.com/aave-dao/adi-deploy.git
+# ssh
+git remote add upstream git@github.com:aave-dao/adi-deploy.git
+```
+
+---
+
+### Installing foundry
+
+adi Deploy is a [Foundry](https://github.com/foundry-rs/foundry) project.
+
+Install foundry using the following command:
+
+```bash
+curl -L https://foundry.paradigm.xyz | bash
+```
+
+---
+
+### Installing dependencies
+
+For generating the changelog, linting and testing, we rely on some additional node packages. You can install them by running:
+
+```bash
+npm install
+```
+
+---
+
+### Running the test suite
+
+For running the default test suite you can use the following command:
+
+```bash
+forge test
+```
+
+---
+
+### Submitting a pull request
+
+When you're ready to submit a pull request, you can follow these naming conventions:
+
+- Pull request titles use the [Imperative Mood](https://en.wikipedia.org/wiki/Imperative_mood) (e.g., `Add something`, `Fix something`).
+- [Changesets](#versioning) use past tense verbs (e.g., `Added something`, `Fixed something`).
+
+When you submit a pull request, GitHub will automatically lint, build, and test your changes. If you see an ❌, it's most likely a bug in your code. Please, inspect the logs through the GitHub UI to find the cause.
+
+- Pull requests must always cover all the changes made with tests. If you're adding a new feature, you must also add a test for it. If you're fixing a bug, you must add a test that reproduces the bug. Pull requests that cause a regression in test coverage will not be accepted.
+- Pull requests that touch code functionality should always include updated gas snapshots. Running `forge test` will update the snapshots for you.
+- Make sure that your updates are fitting within the existing code margin. You can check by running `forge build --sizes`
+
+---

README.md

@@ -29,7 +29,7 @@ Here it can also be found some helper templates to use when creating payloads. F
 
 ## License
 
-Copyright © 2024, Aave DAO, represented by its governance smart contracts.
+Copyright © 2025, Aave DAO, represented by its governance smart contracts.
 
 Created by [BGD Labs](https://bgdlabs.com/).
 

foundry.toml

@@ -70,43 +70,43 @@ soneium="${RPC_SONEIUM}"
 bob="${RPC_BOB}"
 
 [etherscan]
-ethereum={key="${ETHERSCAN_API_KEY_MAINNET}", chain=1 }
-ethereum_testnet={key="${ETHERSCAN_API_KEY_MAINNET}",chain=11155111}
-optimism={key="${ETHERSCAN_API_KEY_OPTIMISM}",chain=10}
-optimism-testnet={key="${ETHERSCAN_API_KEY_OPTIMISM}",chain=10}
-avalanche={key="${ETHERSCAN_API_KEY_AVALANCHE}",chain=43114}
-avalanche-testnet={key="${ETHERSCAN_API_KEY_AVALANCHE}",chain=43113}
-polygon={key="${ETHERSCAN_API_KEY_POLYGON}",chain=137}
-polygon-testnet={key="${ETHERSCAN_API_KEY_POLYGON}",chain=80001}
-arbitrum={key="${ETHERSCAN_API_KEY_ARBITRUM}",chain=42161}
-arbitrum_sepolia={key="${ETHERSCAN_API_KEY_ARBITRUM}",chain=42161}
+ethereum={key="${ETHERSCAN_API_KEY}", chain=1 }
+ethereum_testnet={key="${ETHERSCAN_API_KEY}",chain=11155111}
+optimism={key="${ETHERSCAN_API_KEY}",chain=10}
+optimism-testnet={key="${ETHERSCAN_API_KEY}",chain=10}
+avalanche={key="${ETHERSCAN_API_KEY}",chain=43114}
+avalanche-testnet={key="${ETHERSCAN_API_KEY}",chain=43113}
+polygon={key="${ETHERSCAN_API_KEY}",chain=137}
+polygon-testnet={key="${ETHERSCAN_API_KEY}",chain=80001}
+arbitrum={key="${ETHERSCAN_API_KEY}",chain=42161}
+arbitrum_sepolia={key="${ETHERSCAN_API_KEY}",chain=42161}
 metis={ key="any", chain=1088, url='https://andromeda-explorer.metis.io/' }
 metis-testnet={ key="any", chain=599, url='https://goerli.explorer.metisdevops.link/' }
-fantom={key="${ETHERSCAN_API_KEY_FANTOM}",chain=250}
-fantom-testnet={key="${ETHERSCAN_API_KEY_FANTOM}",chain=250}
-binance={key="${ETHERSCAN_API_KEY_BNB}",chain=56}
-binance-testnet={key="${ETHERSCAN_API_KEY_BNB}",chain=97}
-base={key="${ETHERSCAN_API_KEY_BASE}",chain=8453, url='https://developer-access-mainnet.base.org'}
-base-testnet={key="${ETHERSCAN_API_KEY_BASE}",chain=8453, url='https://developer-access-mainnet.base.org'}
-gnosis={key="${ETHERSCAN_API_KEY_GNOSIS}",chain=100}
-gnosis-testnet={key="${ETHERSCAN_API_KEY_GNOSIS}",chain=10200, url='https://gnosis-chiado.blockscout.com/'}
-zkevm={key="${ETHERSCAN_API_KEY_ZKEVM}",chain=1101}
-zkevm-testnet={key="${ETHERSCAN_API_KEY_ZKEVM}",chain=1442}
-scroll={key="${ETHERSCAN_API_KEY_SCROLL}", chain=534352, utl='https://api.scrollscan.com/api/'}
-scroll-testnet={key="${ETHERSCAN_API_KEY_SCROLL}", chain=534351, url='https://api-sepolia.scrollscan.com/api/'}
-celo={key="${ETHERSCAN_API_KEY_CELO}", chain=42220, utl='https://api.celoscan.io/api'}
-celo-testnet={key="${ETHERSCAN_API_KEY_CELO}", chain=44787, url='https://api-alfajores.celoscan.io/api'}
-zksync={key="${ETHERSCAN_API_KEY_ZK_SYNC}", chain=324}
-zksync-testnet={key="${ETHERSCAN_API_KEY_ZK_SYNC}", chain=300, url='https://api-sepolia-era.zksync.network/api'}
-linea={key="${ETHERSCAN_API_KEY_LINEA}", chain=59144 }
-linea-testnet={key="${ETHERSCAN_API_KEY_LINEA}",chain=59141}
-sonic={key="${ETHERSCAN_API_KEY_SONIC}", chain=146, url='https://api.sonicscan.org/api'}
-sonic-testnet={key="${ETHERSCAN_API_KEY_SONIC}", chain=57054, url='https://api-testnet.sonicscan.org/api'}
-mantle={key="${ETHERSCAN_API_KEY_MANTLE}", chain=5000, url='https://api.mantlescan.xyz/api'}
-mantle-testnet={key="${ETHERSCAN_API_KEY_MANTLE}", chain=5003, url='https://explorer.testnet.mantle.xyz/api'}
-ink={key="${ETHERSCAN_API_KEY_INK}", chain=57073, url='https://api.routescan.io/v2/network/mainnet/evm/57073/etherscan'}
-soneium={key="${ETHERSCAN_API_KEY_SONEIUM}", chain=1868, url='https://soneium.blockscout.com/api/'}
-bob={key="${ETHERSCAN_API_KEY_BOB}", chain=60808, url='https://explorer.gobob.xyz/api/'}
+fantom={key="${ETHERSCAN_API_KEY}",chain=250}
+fantom-testnet={key="${ETHERSCAN_API_KEY}",chain=250}
+binance={key="${ETHERSCAN_API_KEY}",chain=56}
+binance-testnet={key="${ETHERSCAN_API_KEY}",chain=97}
+base={key="${ETHERSCAN_API_KEY}",chain=8453, url='https://developer-access-mainnet.base.org'}
+base-testnet={key="${ETHERSCAN_API_KEY}",chain=8453, url='https://developer-access-mainnet.base.org'}
+gnosis={key="${ETHERSCAN_API_KEY}",chain=100}
+gnosis-testnet={key="${ETHERSCAN_API_KEY}",chain=10200, url='https://gnosis-chiado.blockscout.com/'}
+zkevm={key="${ETHERSCAN_API_KEY}",chain=1101}
+zkevm-testnet={key="${ETHERSCAN_API_KEY}",chain=1442}
+scroll={key="${ETHERSCAN_API_KEY}", chain=534352, utl='https://api.scrollscan.com/api/'}
+scroll-testnet={key="${ETHERSCAN_API_KEY}", chain=534351, url='https://api-sepolia.scrollscan.com/api/'}
+celo={key="${ETHERSCAN_API_KEY}", chain=42220, utl='https://api.celoscan.io/api'}
+celo-testnet={key="${ETHERSCAN_API_KEY}", chain=44787, url='https://api-alfajores.celoscan.io/api'}
+zksync={key="${ETHERSCAN_API_KEY}", chain=324}
+zksync-testnet={key="${ETHERSCAN_API_KEY}", chain=300, url='https://api-sepolia-era.zksync.network/api'}
+linea={key="${ETHERSCAN_API_KEY}", chain=59144 }
+linea-testnet={key="${ETHERSCAN_API_KEY}",chain=59141}
+sonic={key="${ETHERSCAN_API_KEY}", chain=146, url='https://api.sonicscan.org/api'}
+sonic-testnet={key="${ETHERSCAN_API_KEY}", chain=57054, url='https://api-testnet.sonicscan.org/api'}
+mantle={key="${ETHERSCAN_API_KEY}", chain=5000, url='https://api.mantlescan.xyz/api'}
+mantle-testnet={key="${ETHERSCAN_API_KEY}", chain=5003, url='https://explorer.testnet.mantle.xyz/api'}
+ink={key="${ETHERSCAN_API_KEY}", chain=57073, url='https://api.routescan.io/v2/network/mainnet/evm/57073/etherscan'}
+soneium={key="${ETHERSCAN_API_KEY}", chain=1868, url='https://soneium.blockscout.com/api/'}
+bob={key="${ETHERSCAN_API_KEY}", chain=60808, url='https://explorer.gobob.xyz/api/'}
 
 # See more config options https://github.com/gakonst/foundry/tree/master/config
 [fuzz]

lib/aave-delivery-infrastructure

@@ -45,7 +45,7 @@ library DeployerHelpers {
 
   function getPathByChainId(uint256 chainId) internal pure returns (string memory) {
     string memory path = string.concat(
-      './deployments/cc/mainnet/',
+      './deployments/cc/mainnet/', // @dev important to maintain this folder structure as governance uses this path to get the adi addresses
       ChainHelpers.getNetworkNameFromId(chainId)
     );
     return string.concat(path, '.json');