Merge branch 'feat/188-avalanche-market' of github.com:aave/protocol-v2 into feat/188-avalanche-market

markets/avalanche/commons.ts

@@ -18,7 +18,7 @@ export const CommonsConfig: ICommonConfiguration = {
   ATokenNamePrefix: 'Aave Avalanche Market',
   StableDebtTokenNamePrefix: 'Aave Avalanche Market stable debt',
   VariableDebtTokenNamePrefix: 'Aave Avalanche Market variable debt',
-  SymbolPrefix: '', // TODO: add a symbol?
+  SymbolPrefix: 'ava',
   ProviderId: 0, // Overriden in index.ts
   OracleQuoteCurrency: 'USD',
   OracleQuoteUnit: oneUsd.toString(),
@@ -81,31 +81,31 @@ export const CommonsConfig: ICommonConfiguration = {
   },
   ProviderRegistry: {
     [eAvalancheNetwork.avalanche]: '',
-    [eAvalancheNetwork.fuji]: '0x2e4c88B23A52Af210619E9FFA4371708E3Bfc286'
+    [eAvalancheNetwork.fuji]: '0x06eC0BDC3997EE32Cb5B66a1B9C11d92e2C27Aab'
   },
   ProviderRegistryOwner: {
     [eAvalancheNetwork.avalanche]: '',
-    [eAvalancheNetwork.fuji]: '0xA68E2f643e0fa7062A78DFB6C629577aE21ad829'
+    [eAvalancheNetwork.fuji]: '0x1128d177BdaA74Ae68EB06e693f4CbA6BF427a5e'
   },
   LendingRateOracle: {
     [eAvalancheNetwork.avalanche]: '',
-    [eAvalancheNetwork.fuji]: '0x0BA6fa6D6800dc900dB82d58D135fD0e0DA1a77A'
+    [eAvalancheNetwork.fuji]: '0xEbBD998B7Dc2a8E675F0859d907c8Fa6027aBc7b'
   },
   LendingPoolCollateralManager: {
     [eAvalancheNetwork.avalanche]: '',
-    [eAvalancheNetwork.fuji]: '0x102035669D37a48689859A9F1cf03F294c8b7f56'
+    [eAvalancheNetwork.fuji]: '0x6242bE2fB5591FA1e81a99e6DD55Ff667fa82a71'
   },
   LendingPoolConfigurator: {
     [eAvalancheNetwork.avalanche]: '',
-    [eAvalancheNetwork.fuji]: '0x4de9ee3d1F33676e505CA3747993929c29802293'
+    [eAvalancheNetwork.fuji]: ''
   },
   LendingPool: {
     [eAvalancheNetwork.avalanche]: '',
-    [eAvalancheNetwork.fuji]: ''
+    [eAvalancheNetwork.fuji]: '0x5f3968A2E41C95A95329333d44AB989de6c43f8E'
   },
   WethGateway: {
     [eAvalancheNetwork.avalanche]: '',
-    [eAvalancheNetwork.fuji]: '0xd00ae08403B9bbb9124bB305C09058E32C39A48c'
+    [eAvalancheNetwork.fuji]: '0x62AF6258d26838f33BADFbb33cf1De8FaB8EB19f'
   },
   TokenDistributor: {
     [eAvalancheNetwork.avalanche]: '',
@@ -113,7 +113,7 @@ export const CommonsConfig: ICommonConfiguration = {
   },
   AaveOracle: {
     [eAvalancheNetwork.avalanche]: '',
-    [eAvalancheNetwork.fuji]: '0x7cb1a6663D864eBD5cB0cDA6063FBf5e3A9285eC'
+    [eAvalancheNetwork.fuji]: '0xD217DdD9f0Af84644dEFe84a0b634621D4617a29'
   },
   FallbackOracle: {
     [eAvalancheNetwork.avalanche]: ZERO_ADDRESS,
@@ -136,7 +136,7 @@ export const CommonsConfig: ICommonConfiguration = {
       USDT: '0x7898AcCC83587C3C55116c5230C17a6Cd9C71bad',
       // AAVE: '',
       WBTC: '0x31CF013A08c6Ac228C94551d535d5BAfE19c602a',
-      // AVAX: '0x5498BB86BC934c8D34FDA08E81D444153d0D06aD',
+      AVAX: '0x5498BB86BC934c8D34FDA08E81D444153d0D06aD',
       USD: '0x86d67c3D38D2bCeE722E601025C25a575021c6EA'
     },
   },
@@ -158,11 +158,11 @@ export const CommonsConfig: ICommonConfiguration = {
     [eAvalancheNetwork.fuji]: '0xd00ae08403B9bbb9124bB305C09058E32C39A48c' // Official WAVAX
   },
   ReserveFactorTreasuryAddress: {
-    [eAvalancheNetwork.avalanche]: '0x652e2Ac6b072Ba8bF7BEF2B11B092447dBc40bde', // TODO: Deploy Treasury
-    [eAvalancheNetwork.fuji]: '0x652e2Ac6b072Ba8bF7BEF2B11B092447dBc40bde'
+    [eAvalancheNetwork.avalanche]: '',
+    [eAvalancheNetwork.fuji]: '0xB45F5C501A22288dfdb897e5f73E189597e09288' // Self-controlled EOA
   },
   IncentivesController: {
     [eAvalancheNetwork.avalanche]: ZERO_ADDRESS,
-    [eAvalancheNetwork.fuji]: ZERO_ADDRESS
+    [eAvalancheNetwork.fuji]: '0xa1EF206fb9a8D8186157FC817fCddcC47727ED55' // AVAX Incentives Controller
   },
 };

markets/avalanche/index.ts

@@ -9,7 +9,7 @@ import {
   strategyUSDT,
   strategyAAVE,
   strategyWBTC,
-  strategyAVAX
+  strategyAVAX,
 } from './reservesConfigs';
 
 // ----------------
@@ -19,7 +19,7 @@ import {
 export const AvalancheConfig: IAvalancheConfiguration = {
   ...CommonsConfig,
   MarketId: 'Avalanche market',
-  ProviderId: 5, // TODO: What is this? 
+  ProviderId: 4,
   ReservesConfig: {
     WETH: strategyWETH,
     DAI: strategyDAI,
@@ -39,14 +39,14 @@ export const AvalancheConfig: IAvalancheConfiguration = {
       WBTC: '0x408D4cD0ADb7ceBd1F1A1C33A0Ba2098E1295bAB',
       // AVAX: '' // TODO: Use WAVAX?
     },
-    [eAvalancheNetwork.fuji]: { // MintableERC20 tokens
-      WETH: '0x3b8b3fc85ccA720809Af2dA4B58cF4ce84bcbdd0',
+    [eAvalancheNetwork.fuji]: {
+      WETH: '0x9668f5f55f2712Dd2dfa316256609b516292D554', // MintableERC20 token
       // DAI: '0x51BC2DfB9D12d9dB50C855A5330fBA0faF761D15',
       // USDC: '0x7804D7f48f6E5749AF5c8Fa87b20702C34a7f5c2',
-      USDT: '0x533AE347203DD2aa2bc710E93cafE7650E1bC4e2',
+      USDT: '0x02823f9B469960Bb3b1de0B3746D4b95B7E35543', // MintableERC20 token
       // AAVE: '0x47183584aCbc1C45608d7B61cce1C562Ee180E7e',
-      WBTC: '0xDc880858bFE85F41deadBbB1CA1e6fFCe25f5B66',
-      // AVAX: '0x28575C264f7bf17e8C91f80585765D92d4B9d113'
+      WBTC: '0x9C1DCacB57ADa1E9e2D3a8280B7cfC7EB936186F', // MintableERC20 token
+      AVAX: '0xd00ae08403B9bbb9124bB305C09058E32C39A48c'  // Official WAVAX
     },
   },
 };

package.json

@@ -32,7 +32,7 @@
     "aave:kovan:full:migration": "npm run compile && npm run hardhat:kovan -- aave:mainnet --skip-registry",
     "matic:mumbai:full:migration": "npm run compile && npm run hardhat:mumbai sidechain:mainnet -- --pool Matic --skip-registry",
     "matic:matic:full:migration": "npm run compile && npm run hardhat:matic sidechain:mainnet -- --pool Matic --skip-registry",
-    "avalanche:fuji:full:migration": "npm run compile && npm run hardhat:fuji avalanche:mainnet -- --pool Avalanche --skip-registry",
+    "avalanche:fuji:full:migration": "npm run compile && npm run hardhat:fuji avalanche:mainnet -- --pool Avalanche",
     "amm:kovan:full:migration": "npm run compile && npm run hardhat:kovan -- amm:mainnet --skip-registry",
     "aave:docker:full:migration:add-registry": "npm run compile && npm run hardhat:docker -- aave:mainnet",
     "aave:kovan:full:migration:add-registry": "npm run compile && npm run hardhat:kovan -- aave:mainnet",