merged with master branch

buidler.config.ts

@@ -90,6 +90,16 @@ const buidlerConfig: any = {
         balance,
       })),
     },
+    buidlerevm_docker: {
+      hardfork: 'istanbul',
+      blockGasLimit: 9500000,
+      gas: 9500000,
+      gasPrice: 8000000000,
+      chainId: BUIDLEREVM_CHAINID,
+      throwOnTransactionFailures: true,
+      throwOnCallFailures: true,
+      url: 'http://localhost:8545',
+    },
     ganache: {
       url: 'http://ganache:8545',
       accounts: {

config/aave.ts

@@ -270,7 +270,7 @@ export const AaveConfig: IAaveConfiguration = {
       MKR: '0x61e4CAE3DA7FD189e52a4879C7B8067D7C2Cc0FA',
       LINK: '0xAD5ce863aE3E4E9394Ab43d4ba0D80f419F61789',
       KNC: '0x3F80c39c0b96A0945f9F0E9f55d8A8891c5671A8',
-      WBTC: '0x3b92f58feD223E2cB1bCe4c286BD97e42f2A12EA',
+      WBTC: '0xD1B98B6607330172f1D991521145A22BCe793277',
       MANA: '0x738Dc6380157429e957d223e6333Dc385c85Fec7',
       ZRX: '0xD0d76886cF8D952ca26177EB7CfDf83bad08C00C',
       SNX: '0x7FDb81B0b8a010dd4FFc57C3fecbf145BA8Bd947',

contracts/interfaces/ILendingPool.sol

@@ -121,21 +121,19 @@ interface ILendingPool {
   /**
    * @dev emitted when a borrower is liquidated
    * @param collateral the address of the collateral being liquidated
-   * @param reserve the address of the reserve
+   * @param principal the address of the reserve
    * @param user the address of the user being liquidated
    * @param purchaseAmount the total amount liquidated
    * @param liquidatedCollateralAmount the amount of collateral being liquidated
-   * @param accruedBorrowInterest the amount of interest accrued by the borrower since the last action
    * @param liquidator the address of the liquidator
    * @param receiveAToken true if the liquidator wants to receive aTokens, false otherwise
    **/
   event LiquidationCall(
     address indexed collateral,
-    address indexed reserve,
+    address indexed principal,
     address indexed user,
     uint256 purchaseAmount,
     uint256 liquidatedCollateralAmount,
-    uint256 accruedBorrowInterest,
     address liquidator,
     bool receiveAToken
   );

deployed-contracts.json

@@ -3,6 +3,244 @@
     "buidlerevm": {
       "address": "0x58F132FBB86E21545A4Bace3C19f1C05d86d7A22",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "localhost": {
+      "address": "0x58F132FBB86E21545A4Bace3C19f1C05d86d7A22",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "coverage": {
+      "address": "0x58F132FBB86E21545A4Bace3C19f1C05d86d7A22",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    }
+  },
+  "LendingPoolAddressesProvider": {
+    "buidlerevm": {
+      "address": "0xa4bcDF64Cdd5451b6ac3743B414124A6299B65FF",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "localhost": {
+      "address": "0xa4bcDF64Cdd5451b6ac3743B414124A6299B65FF",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "coverage": {
+      "address": "0xa4bcDF64Cdd5451b6ac3743B414124A6299B65FF",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "kovan": {
+      "address": "0x20e080B395341B3b617E893c281c7E999C942276",
+      "deployer": "0x85e4A467343c0dc4aDAB74Af84448D9c45D8ae6F"
+    }
+  },
+  "LendingPoolAddressesProviderRegistry": {
+    "buidlerevm": {
+      "address": "0x5A0773Ff307Bf7C71a832dBB5312237fD3437f9F",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "localhost": {
+      "address": "0x5A0773Ff307Bf7C71a832dBB5312237fD3437f9F",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "coverage": {
+      "address": "0x5A0773Ff307Bf7C71a832dBB5312237fD3437f9F",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "kovan": {
+      "address": "0x00219a2958f758122106Bb8A801AFc1B70897663",
+      "deployer": "0x85e4A467343c0dc4aDAB74Af84448D9c45D8ae6F"
+    }
+  },
+  "FeeProvider": {
+    "buidlerevm": {
+      "address": "0xFAe0fd738dAbc8a0426F47437322b6d026A9FD95",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "localhost": {
+      "address": "0xD9273d497eDBC967F39d419461CfcF382a0A822e"
+    }
+  },
+  "LendingPoolParametersProvider": {
+    "buidlerevm": {
+      "address": "0x2C4603396dE2F08642354A3A102760827FfFe113"
+    }
+  },
+  "LendingPoolCore": {
+    "buidlerevm": {
+      "address": "0xA10958a24032283FbE2D23cedf264d6eC9411CBA"
+    }
+  },
+  "LendingPoolConfigurator": {
+    "buidlerevm": {
+      "address": "0x6642B57e4265BAD868C17Fc1d1F4F88DBBA04Aa8"
+    },
+    "localhost": {
+      "address": "0x65e0Cd5B8904A02f2e00BC6f58bf881998D54BDe"
+    },
+    "kovan": {
+      "address": "0x50C9d3aD9399c1EEf6DDeadF8e57fF69994F552e"
+    }
+  },
+  "LendingPoolDataProvider": {
+    "buidlerevm": {
+      "address": "0x612719Ace03A8281188d61612A9f40D1da3ca420"
+    }
+  },
+  "LendingPool": {
+    "buidlerevm": {
+      "address": "0xD9273d497eDBC967F39d419461CfcF382a0A822e"
+    },
+    "localhost": {
+      "address": "0x5d12dDe3286D94E0d85F9D3B01B7099cfA0aBCf1"
+    },
+    "kovan": {
+      "address": "0x6d1e69bB0578699dd955Eefbf23aAC65c0DA5cE7"
+    }
+  },
+  "PriceOracle": {
+    "buidlerevm": {
+      "address": "0x1750499D05Ed1674d822430FB960d5F6731fDf64",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "localhost": {
+      "address": "0x1750499D05Ed1674d822430FB960d5F6731fDf64",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "coverage": {
+      "address": "0x1750499D05Ed1674d822430FB960d5F6731fDf64",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    }
+  },
+  "MockAggregator": {
+    "buidlerevm": {
+      "address": "0xEC1C93A9f6a9e18E97784c76aC52053587FcDB89",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "localhost": {
+      "address": "0xEC1C93A9f6a9e18E97784c76aC52053587FcDB89",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "coverage": {
+      "address": "0xEC1C93A9f6a9e18E97784c76aC52053587FcDB89",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    }
+  },
+  "ChainlinkProxyPriceProvider": {
+    "buidlerevm": {
+      "address": "0x7B6C3e5486D9e6959441ab554A889099eed76290",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "localhost": {
+      "address": "0x7B6C3e5486D9e6959441ab554A889099eed76290",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "coverage": {
+      "address": "0x7B6C3e5486D9e6959441ab554A889099eed76290",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "kovan": {
+      "address": "0x18a107d4fa249Efefd4DAf9A76EEE3b6366701AA",
+      "deployer": "0x85e4A467343c0dc4aDAB74Af84448D9c45D8ae6F"
+    }
+  },
+  "LendingRateOracle": {
+    "buidlerevm": {
+      "address": "0xD83D2773a7873ae2b5f8Fb92097e20a8C64F691E",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "localhost": {
+      "address": "0xD83D2773a7873ae2b5f8Fb92097e20a8C64F691E",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "coverage": {
+      "address": "0xD83D2773a7873ae2b5f8Fb92097e20a8C64F691E",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "kovan": {
+      "address": "0xac6Eb7B1083D39eC695a3898C2f782E7c7C64973",
+      "deployer": "0x85e4A467343c0dc4aDAB74Af84448D9c45D8ae6F"
+    }
+  },
+  "DefaultReserveInterestRateStrategy": {
+    "buidlerevm": {
+      "address": "0xB660Fdd109a95718cB9d20E3A89EE6cE342aDcB6",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "localhost": {
+      "address": "0x626FdE749F9d499d3777320CAf29484B624ab84a",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "coverage": {
+      "address": "0x626FdE749F9d499d3777320CAf29484B624ab84a",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    }
+  },
+  "LendingPoolLiquidationManager": {
+    "buidlerevm": {
+      "address": "0xFe230c227D3724015d0dE3dBEc831825f1ed1f59",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    }
+  },
+  "MockOneSplit": {
+    "buidlerevm": {
+      "address": "0x4b2c297ba5be42610994974b9543D56B864CA011",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "localhost": {
+      "address": "0x4b2c297ba5be42610994974b9543D56B864CA011",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    }
+  },
+  "OneSplitAdapter": {
+    "buidlerevm": {
+      "address": "0x24E420B42971372F060a93129846761F354Bc50B",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "localhost": {
+      "address": "0x24E420B42971372F060a93129846761F354Bc50B",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    }
+  },
+  "TokenDistributor": {
+    "buidlerevm": {
+      "address": "0x2cfcA5785261fbC88EFFDd46fCFc04c22525F9e4",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "localhost": {
+      "address": "0x2cfcA5785261fbC88EFFDd46fCFc04c22525F9e4"
+    }
+  },
+  "InitializableAdminUpgradeabilityProxy": {
+    "buidlerevm": {
+      "address": "0xC6bA6049F86d528698B5924B8fC2FE7289D38578",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "localhost": {
+      "address": "0x2cfcA5785261fbC88EFFDd46fCFc04c22525F9e4",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    }
+  },
+  "MockFlashLoanReceiver": {
+    "buidlerevm": {
+      "address": "0xBEF0d4b9c089a5883741fC14cbA352055f35DDA2"
+    },
+    "localhost": {
+      "address": "0x2B681757d757fbB80cc51c6094cEF5eE75bF55aA"
+    },
+    "coverage": {
+      "address": "0x2B681757d757fbB80cc51c6094cEF5eE75bF55aA"
+    }
+  },
+  "WalletBalanceProvider": {
+    "buidlerevm": {
+      "address": "0xC6bA6049F86d528698B5924B8fC2FE7289D38578",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "localhost": {
+      "address": "0xDf73fC454FA018051D4a1509e63D11530A59DE10",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "coverage": {
+      "address": "0xDf73fC454FA018051D4a1509e63D11530A59DE10",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
   "DAI": {
@@ -208,7 +446,15 @@
   },
   "StableDebtToken": {
     "buidlerevm": {
-      "address": "0xE91bBe8ee03560E3dda2786f95335F5399813Ca0",
+      "address": "0x3b050AFb4ac4ACE646b31fF3639C1CD43aC31460",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "localhost": {
+      "address": "0xa89E20284Bd638F31b0011D0fC754Fc9d2fa73e3",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "coverage": {
+      "address": "0x392E5355a0e88Bd394F717227c752670fb3a8020",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
@@ -220,13 +466,30 @@
   },
   "AToken": {
     "buidlerevm": {
-      "address": "0x4977FC58783ceBCC310311C800B786EcAf45F98f",
+      "address": "0xEBAB67ee3ef604D5c250A53b4b8fcbBC6ec3007C",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "localhost": {
+      "address": "0xaA935993065F2dDB1d13623B1941C7AEE3A60F23",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "coverage": {
+      "address": "0x3b050AFb4ac4ACE646b31fF3639C1CD43aC31460",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
   "MockFlashLoanReceiver": {
     "buidlerevm": {
-      "address": "0xC6bA6049F86d528698B5924B8fC2FE7289D38578"
+      "address": "0xBE36BE5680244Ae1A6F983E4A6f6E1c142cdAbe3",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "localhost": {
+      "address": "0x35A2624888e207e4B3434E9a9E250bF6Ee68FeA3",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
+    },
+    "coverage": {
+      "address": "0xEBAB67ee3ef604D5c250A53b4b8fcbBC6ec3007C",
+      "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
   },
   "WalletBalanceProvider": {
@@ -234,5 +497,15 @@
       "address": "0xde9595927B00361Ed7987a181Fb09EC6f31b451c",
       "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
     }
+  },
+  "MockFlashRepayAdapter": {
+    "buidlerevm": {
+      "address": "0xDf73fC454FA018051D4a1509e63D11530A59DE10"
+    }
+  },
+  "MockFlashLiquiditySwapAdapter": {
+    "buidlerevm": {
+      "address": "0x2cfcA5785261fbC88EFFDd46fCFc04c22525F9e4"
+    }
   }
 }

tasks/migrations/aave.full.ts

@@ -24,10 +24,7 @@ task('aave:full', 'Deploy development enviroment')
     console.log('2. Deploy lending pool');
     await localBRE.run('full:deploy-lending-pool', {verify});
 
-    console.log('3. Deploy oracles');
+    console.log('3. Initialize lending pool');
-    await localBRE.run('full:deploy-oracles', {verify, pool: POOL_NAME});
-
-    console.log('4. Initialize lending pool');
     await localBRE.run('full:initialize-lending-pool', {verify, pool: POOL_NAME});
 
     console.log('\nFinished migrations');