- Misc config updates.

- Added Mainnet deployed addresses.
- Fixed testnet-deployment to use onlyProxy.

Author: eboadom

README.md

@@ -102,10 +102,17 @@ The Solidity code in this repository has undergone 2 traditional smart contracts
 - [Certik](audits/AaveTokenReport_CertiK.pdf)
 - [Certora](audits/AaveTokenVerification_by_Certora.pdf)
 
+## Current Mainnet contracts (25/09/2020)
+
+- **AaveToken proxy**: [0x7fc66500c84a76ad7e9c93437bfc5ac33e2ddae9](https://etherscan.io/address/0x7fc66500c84a76ad7e9c93437bfc5ac33e2ddae9)
+- **AaveToken implementation**: [0xea86074fdac85e6a605cd418668c63d2716cdfbc](https://etherscan.io/address/0xea86074fdac85e6a605cd418668c63d2716cdfbc)
+- **LendToAaveMigrator proxy**: [0x317625234562b1526ea2fac4030ea499c5291de4](https://etherscan.io/address/0x317625234562b1526ea2fac4030ea499c5291de4)
+- **LendToAaveMigrator implementation**: [0x86241b6c526998582556f7c0342d8863b604b17b](https://etherscan.io/address/0x86241b6c526998582556f7c0342d8863b604b17b)
+
 ## Credits
 
 For the proxy-related contracts, we have used the implementation of our friend from [OpenZeppelin](https://github.com/OpenZeppelin/openzeppelin-sdk/).
 
 ## License
 
-The contents of this repository are under the AGPLv3 license.
+The contents of this repository are under the AGPLv3 license.

buidler.config.ts

@@ -19,27 +19,28 @@ usePlugin("solidity-coverage");
 });
 
 const DEFAULT_BLOCK_GAS_LIMIT = 12500000;
-const DEFAULT_GAS_PRICE = 1;
+const DEFAULT_GAS_PRICE = 50000000000; // 50 gwei
 const HARDFORK = "istanbul";
 const INFURA_KEY = process.env.INFURA_KEY || "";
 const ETHERSCAN_KEY = process.env.ETHERSCAN_KEY || "";
 const MNEMONIC_PATH = "m/44'/60'/0'/0";
 const MNEMONICS: { [network: string]: string } = {
-  [eEthereumNetwork.kovan]: process.env.MNEMONIC_KOVAN || "",
-  [eEthereumNetwork.ropsten]: process.env.MNEMONIC_ROPSTEN || "",
-  [eEthereumNetwork.main]: process.env.MNEMONIC_MAIN || "",
+  [eEthereumNetwork.kovan]: process.env.MNEMONIC || "",
+  [eEthereumNetwork.ropsten]: process.env.MNEMONIC || "",
+  [eEthereumNetwork.main]: process.env.MNEMONIC || "",
 };
 
 const getCommonNetworkConfig = (
   networkName: eEthereumNetwork,
   networkId: number
 ) => {
   return {
-    url: `https://${networkName}.infura.io/v3/${INFURA_KEY}`,
+    url: `https://${
+      networkName == "main" ? `${networkName}net` : networkName
+    }.infura.io/v3/${INFURA_KEY}`,
     hardfork: HARDFORK,
     blockGasLimit: DEFAULT_BLOCK_GAS_LIMIT,
     gasPrice: 4000000000,
-    gasMultiplier: DEFAULT_GAS_PRICE,
     chainId: networkId,
     accounts: {
       mnemonic: MNEMONICS[networkName],
@@ -75,7 +76,7 @@ const config: BuidlerConfig = {
       hardfork: "istanbul",
       blockGasLimit: DEFAULT_BLOCK_GAS_LIMIT,
       gas: DEFAULT_BLOCK_GAS_LIMIT,
-      gasPrice: 8000000000,
+      gasPrice: DEFAULT_GAS_PRICE,
       chainId: BUIDLEREVM_CHAINID,
       throwOnTransactionFailures: true,
       throwOnCallFailures: true,

docker-compose.yml

@@ -10,6 +10,11 @@ services:
       - ganache
     volumes:
       - ./:/src
+    environment:
+      MNEMONIC: ${MNEMONIC}
+      ETHERSCAN_KEY: ${ETHERSCAN_KEY}
+      INFURA_KEY: ${INFURA_KEY}
+      ETHERSCAN_NETWORK: ${ETHERSCAN_NETWORK}
 
   ganache:
     image: trufflesuite/ganache-cli:latest

helpers/constants.ts

@@ -38,9 +38,9 @@ export const getAaveAdminPerNetwork = (
     {
       [eEthereumNetwork.coverage]: ZERO_ADDRESS,
       [eEthereumNetwork.buidlerevm]: ZERO_ADDRESS,
-      [eEthereumNetwork.kovan]: "0x374d0940dc9a980219e0aA6566C3067159d2F442",
+      [eEthereumNetwork.kovan]: "0x6940B44a8eFBc625e1309d79F8dea34f155D4330",
       [eEthereumNetwork.ropsten]: "0xEd93e49A2d75beA505fD4D1A0Dff745f69F2E997",
-      [eEthereumNetwork.main]: "0xda8ad436e1dfe962091d86a341e957c6a5168a9d",
+      [eEthereumNetwork.main]: "0x8a2Efd9A790199F4c94c6effE210fce0B4724f52",
     },
     network
   );

tasks/migrations/testnet-deployment.ts

@@ -40,12 +40,12 @@ task("testnet-deployment", "Deployment in mainnet network")
 
     await BRE.run(`initialize-${eContractid.AaveToken}`, {
       admin: aaveAdmin,
-      onlyProxy: false,
+      onlyProxy: true,
     });
 
     await BRE.run(`initialize-${eContractid.LendToAaveMigrator}`, {
       admin: aaveAdmin,
-      onlyProxy: false,
+      onlyProxy: true,
     });
 
     console.log(