Print addresses after migration. Fix minor migration issues.

contracts/configuration/LendingPoolAddressesProvider.sol

@@ -2,9 +2,10 @@
 pragma solidity ^0.6.8;
 
 import {Ownable} from '../dependencies/openzeppelin/contracts/Ownable.sol';
-import {
-  InitializableImmutableAdminUpgradeabilityProxy
-} from '../libraries/aave-upgradeability/InitializableImmutableAdminUpgradeabilityProxy.sol';
+
+// Prettier ignore to prevent buidler flatter bug
+// prettier-ignore
+import {InitializableImmutableAdminUpgradeabilityProxy} from '../libraries/aave-upgradeability/InitializableImmutableAdminUpgradeabilityProxy.sol';
 
 import {ILendingPoolAddressesProvider} from '../interfaces/ILendingPoolAddressesProvider.sol';
 

deployed-contracts.json

@@ -153,52 +153,87 @@
     "buidlerevm": {
       "address": "0xa4bcDF64Cdd5451b6ac3743B414124A6299B65FF",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "kovan": {
+      "address": "0x93503511f3dA00Bf39449ad3d21EdDc235dad44b",
+      "deployer": "0x85e4A467343c0dc4aDAB74Af84448D9c45D8ae6F"
     }
   },
   "LendingPoolAddressesProviderRegistry": {
     "buidlerevm": {
       "address": "0x5A0773Ff307Bf7C71a832dBB5312237fD3437f9F",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "kovan": {
+      "address": "0x181ac33E6845DE403b11e6d74aa31709bfF2453d",
+      "deployer": "0x85e4A467343c0dc4aDAB74Af84448D9c45D8ae6F"
     }
   },
   "ReserveLogic": {
     "buidlerevm": {
-      "address": "0xFAe0fd738dAbc8a0426F47437322b6d026A9FD95",
+      "address": "0x78Ee8Fb9fE5abD5e347Fc94c2fb85596d1f60e3c",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "kovan": {
+      "address": "0x8768B04B74B7469B8d2A0C353Ce33EDe702f04A2",
+      "deployer": "0x85e4A467343c0dc4aDAB74Af84448D9c45D8ae6F"
     }
   },
   "GenericLogic": {
     "buidlerevm": {
-      "address": "0x6082731fdAba4761277Fb31299ebC782AD3bCf24",
+      "address": "0x920d847fE49E54C19047ba8bc236C45A8068Bca7",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "kovan": {
+      "address": "0xA27e5AD016Ae1cDAdC468cB065948Af571605C3D",
+      "deployer": "0x85e4A467343c0dc4aDAB74Af84448D9c45D8ae6F"
     }
   },
   "ValidationLogic": {
     "buidlerevm": {
-      "address": "0x8456161947DFc1fC159A0B26c025cD2b4bba0c3e",
+      "address": "0xA4765Ff72A9F3CfE73089bb2c3a41B838DF71574",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "kovan": {
+      "address": "0x03B07749992f723C7A12803283a961202E9D0037",
+      "deployer": "0x85e4A467343c0dc4aDAB74Af84448D9c45D8ae6F"
     }
   },
   "LendingPool": {
     "buidlerevm": {
-      "address": "0xD9273d497eDBC967F39d419461CfcF382a0A822e"
+      "address": "0x35c1419Da7cf0Ff885B8Ef8EA9242FEF6800c99b",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "kovan": {
+      "address": "0x0135203da2217cc272D001a0a5b44455789dEdA1"
     }
   },
   "LendingPoolConfigurator": {
     "buidlerevm": {
       "address": "0x6642B57e4265BAD868C17Fc1d1F4F88DBBA04Aa8"
+    },
+    "kovan": {
+      "address": "0xa3cE4D195041471a61d90a6CAcfb4cc0A69B87d5"
     }
   },
   "StableAndVariableTokensHelper": {
     "buidlerevm": {
       "address": "0x0C6c3C47A1f650809B0D1048FDf9603e09473D7E",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "kovan": {
+      "address": "0xDF1a93a18C19CE8b6AEB4fc784361d29C9552634",
+      "deployer": "0x85e4A467343c0dc4aDAB74Af84448D9c45D8ae6F"
     }
   },
   "ATokensAndRatesHelper": {
     "buidlerevm": {
-      "address": "0x06bA8d8af0dF898D0712DffFb0f862cC51AF45c2",
+      "address": "0x920d847fE49E54C19047ba8bc236C45A8068Bca7",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "kovan": {
+      "address": "0xFb60263fBb9327edA69B316F2e4542BC046a2E2F",
+      "deployer": "0x85e4A467343c0dc4aDAB74Af84448D9c45D8ae6F"
     }
   },
   "PriceOracle": {
@@ -228,12 +263,20 @@
   "AaveProtocolTestHelpers": {
     "buidlerevm": {
       "address": "0xf4830d6b1D70C8595d3BD8A63f9ed9F636DB9ef2"
+    },
+    "kovan": {
+      "address": "0xA36229958Ef76a170ff5BE9130ec14b153b82396",
+      "deployer": "0x85e4A467343c0dc4aDAB74Af84448D9c45D8ae6F"
     }
   },
   "LendingPoolCollateralManager": {
     "buidlerevm": {
       "address": "0x8D0206fEBEB380486729b64bB4cfEDC5b354a6D6",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "kovan": {
+      "address": "0x59Bf9cA362C7917Eea9f60315C457e0A29b742B8",
+      "deployer": "0x85e4A467343c0dc4aDAB74Af84448D9c45D8ae6F"
     }
   },
   "MockFlashLoanReceiver": {
@@ -245,6 +288,10 @@
     "buidlerevm": {
       "address": "0x1256eBA4d0a7A38D10BaF4F61775ba491Ce7EE25",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "kovan": {
+      "address": "0x954A3122B52BF00B7B99466b2A2fe1aF305d98E3",
+      "deployer": "0x85e4A467343c0dc4aDAB74Af84448D9c45D8ae6F"
     }
   },
   "MockAToken": {

helpers/contracts-deployments.ts

@@ -385,7 +385,7 @@ export const deployMockStableDebtToken = async (
 ) =>
   withSaveAndVerify(
     await new MockStableDebtTokenFactory(await getFirstSigner()).deploy(...args),
-    eContractid.ATokensAndRatesHelper,
+    eContractid.MockStableDebtToken,
     args,
     verify
   );
@@ -396,7 +396,7 @@ export const deployMockVariableDebtToken = async (
 ) =>
   withSaveAndVerify(
     await new MockVariableDebtTokenFactory(await getFirstSigner()).deploy(...args),
-    eContractid.ATokensAndRatesHelper,
+    eContractid.MockVariableDebtToken,
     args,
     verify
   );
@@ -407,7 +407,7 @@ export const deployMockAToken = async (
 ) =>
   withSaveAndVerify(
     await new MockATokenFactory(await getFirstSigner()).deploy(...args),
-    eContractid.ATokensAndRatesHelper,
+    eContractid.MockAToken,
     args,
     verify
   );

helpers/etherscan-verification.ts

@@ -52,7 +52,7 @@ export const verifyContract = async (
       '[ETHERSCAN][WARNING] Delaying Etherscan verification due their API can not find newly deployed contracts'
     );
     const msDelay = 3000;
-    const times = 60;
+    const times = 15;
     // Write a temporal file to host complex parameters for buidler-etherscan https://github.com/nomiclabs/buidler/tree/development/packages/buidler-etherscan#complex-arguments
     const {fd, path, cleanup} = await file({
       prefix: 'verify-params-',

helpers/misc-utils.ts

@@ -5,8 +5,7 @@ import FileSync from 'lowdb/adapters/FileSync';
 import {WAD} from './constants';
 import {Wallet, ContractTransaction} from 'ethers';
 import {BuidlerRuntimeEnvironment} from '@nomiclabs/buidler/types';
-import path from 'path';
-import fs from 'fs';
+import {createBrotliCompress} from 'zlib';
 
 export const toWad = (value: string | number) => new BigNumber(value).times(WAD).toFixed();
 
@@ -62,3 +61,26 @@ export const chunk = <T>(arr: Array<T>, chunkSize: number): Array<Array<T>> => {
     []
   );
 };
+
+interface DbEntry {
+  [network: string]: {
+    deployer: string;
+    address: string;
+  };
+}
+
+export const printContracts = () => {
+  const network = BRE.network.name;
+  const db = getDb();
+  console.log('Contracts deployed at', network);
+  console.log('---------------------------------');
+
+  const entries = Object.entries<DbEntry>(db.getState()).filter(([_k, value]) => !!value[network]);
+
+  const contractsPrint = entries.map(
+    ([key, value]: [string, DbEntry]) => `${key}: ${value[network].address}`
+  );
+
+  console.log('N# Contracts:', entries.length);
+  console.log(contractsPrint.join('\n'), '\n');
+};

package.json

@@ -48,7 +48,10 @@
     "dev:deployExample": "buidler deploy-Example",
     "dev:prettier": "prettier --write .",
     "ci:test": "npm run compile && npm run types-gen && npm run test",
-    "ci:clean": "rm -rf ./artifacts ./cache ./types"
+    "ci:clean": "rm -rf ./artifacts ./cache ./types",
+    "print-contracts:kovan": "npm run buidler:kovan -- print-contracts",
+    "print-contracts:main": "npm run buidler:main -- print-contracts",
+    "print-contracts:ropsten": "npm run buidler:main -- print-contracts"
   },
   "devDependencies": {
     "@nomiclabs/buidler": "^1.4.7",

tasks/dev/1_mock_tokens.ts

@@ -1,7 +1,7 @@
 import {task} from '@nomiclabs/buidler/config';
 import {deployAllMockTokens} from '../../helpers/contracts-deployments';
 task('dev:deploy-mock-tokens', 'Deploy mock tokens for dev enviroment')
-  .addOptionalParam('verify', 'Verify contracts at Etherscan')
+  .addFlag('verify', 'Verify contracts at Etherscan')
   .setAction(async ({verify}, localBRE) => {
     await localBRE.run('set-bre');
     await deployAllMockTokens(verify);

tasks/dev/2_address_provider_registry.ts

@@ -9,7 +9,7 @@ task(
   'dev:deploy-address-provider',
   'Deploy address provider, registry and fee provider for dev enviroment'
 )
-  .addOptionalParam('verify', 'Verify contracts at Etherscan')
+  .addFlag('verify', 'Verify contracts at Etherscan')
   .setAction(async ({verify}, localBRE) => {
     await localBRE.run('set-bre');
 

tasks/dev/3_lending_pool.ts

@@ -15,7 +15,7 @@ import {
 import {insertContractAddressInDb} from '../../helpers/contracts-helpers';
 
 task('dev:deploy-lending-pool', 'Deploy lending pool for dev enviroment')
-  .addOptionalParam('verify', 'Verify contracts at Etherscan')
+  .addFlag('verify', 'Verify contracts at Etherscan')
   .setAction(async ({verify}, localBRE) => {
     await localBRE.run('set-bre');
 

tasks/dev/4_oracles.ts

@@ -21,7 +21,7 @@ import {
 } from '../../helpers/contracts-getters';
 
 task('dev:deploy-oracles', 'Deploy oracles for dev enviroment')
-  .addOptionalParam('verify', 'Verify contracts at Etherscan')
+  .addFlag('verify', 'Verify contracts at Etherscan')
   .addParam('pool', `Pool name to retrieve configuration, supported: ${Object.values(ConfigNames)}`)
   .setAction(async ({verify, pool}, localBRE) => {
     await localBRE.run('set-bre');

tasks/dev/5_initialize.ts

@@ -25,7 +25,7 @@ import {
 import {insertContractAddressInDb} from '../../helpers/contracts-helpers';
 
 task('dev:initialize-lending-pool', 'Initialize lending pool configuration.')
-  .addOptionalParam('verify', 'Verify contracts at Etherscan')
+  .addFlag('verify', 'Verify contracts at Etherscan')
   .setAction(async ({verify}, localBRE) => {
     await localBRE.run('set-bre');
 

tasks/dev/6_wallet_balance_provider.ts

@@ -0,0 +1,13 @@
+import {task} from '@nomiclabs/buidler/config';
+import {deployWalletBalancerProvider} from '../../helpers/contracts-deployments';
+
+import {getLendingPoolAddressesProvider} from '../../helpers/contracts-getters';
+
+task('dev:wallet-balance-provider', 'Initialize lending pool configuration.')
+  .addFlag('verify', 'Verify contracts at Etherscan')
+  .setAction(async ({verify}, localBRE) => {
+    await localBRE.run('set-bre');
+
+    const addressesProvider = await getLendingPoolAddressesProvider();
+    await deployWalletBalancerProvider(addressesProvider.address, verify);
+  });

tasks/migrations/aave.dev.ts

@@ -1,6 +1,7 @@
 import {task} from '@nomiclabs/buidler/config';
 import {checkVerification} from '../../helpers/etherscan-verification';
 import {ConfigNames} from '../../helpers/configuration';
+import {printContracts} from '../../helpers/misc-utils';
 
 task('aave:dev', 'Deploy development enviroment')
   .addOptionalParam('verify', 'Verify contracts at Etherscan')
@@ -32,4 +33,5 @@ task('aave:dev', 'Deploy development enviroment')
     await localBRE.run('dev:initialize-lending-pool', {verify});
 
     console.log('\nFinished migration');
+    printContracts();
   });

tasks/migrations/aave.full.ts

@@ -2,6 +2,7 @@ import {task} from '@nomiclabs/buidler/config';
 import {checkVerification} from '../../helpers/etherscan-verification';
 import {ConfigNames} from '../../helpers/configuration';
 import {EthereumNetworkNames} from '../../helpers/types';
+import {printContracts} from '../../helpers/misc-utils';
 
 task('aave:full', 'Deploy development enviroment')
   .addFlag('verify', 'Verify contracts at Etherscan')
@@ -28,4 +29,5 @@ task('aave:full', 'Deploy development enviroment')
     await localBRE.run('full:initialize-lending-pool', {verify, pool: POOL_NAME});
 
     console.log('\nFinished migrations');
+    printContracts();
   });

tasks/misc/print-contracts.ts

@@ -0,0 +1,9 @@
+import {task} from '@nomiclabs/buidler/config';
+import {printContracts} from '../../helpers/misc-utils';
+
+task('print-contracts', 'Inits the BRE, to have access to all the plugins').setAction(
+  async ({}, localBRE) => {
+    await localBRE.run('set-bre');
+    printContracts();
+  }
+);