From d9f7cafed3c79b24f7cc34c6f5e25d0551e5271a Mon Sep 17 00:00:00 2001 From: miguelmtzinf Date: Tue, 17 Aug 2021 18:58:06 +0200 Subject: [PATCH 1/6] fix: Update avalanche market addreses --- markets/avalanche/commons.ts | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/markets/avalanche/commons.ts b/markets/avalanche/commons.ts index eeed73ce..71008b00 100644 --- a/markets/avalanche/commons.ts +++ b/markets/avalanche/commons.ts @@ -81,31 +81,31 @@ export const CommonsConfig: ICommonConfiguration = { }, ProviderRegistry: { [eAvalancheNetwork.avalanche]: '', - [eAvalancheNetwork.fuji]: '0x2e4c88B23A52Af210619E9FFA4371708E3Bfc286' + [eAvalancheNetwork.fuji]: '0xEDb9d071dA6c292656C4BC1ADCb70e13f0CdC3b1' }, ProviderRegistryOwner: { [eAvalancheNetwork.avalanche]: '', - [eAvalancheNetwork.fuji]: '0xA68E2f643e0fa7062A78DFB6C629577aE21ad829' + [eAvalancheNetwork.fuji]: '0x1128d177BdaA74Ae68EB06e693f4CbA6BF427a5e' }, LendingRateOracle: { [eAvalancheNetwork.avalanche]: '', - [eAvalancheNetwork.fuji]: '0x0BA6fa6D6800dc900dB82d58D135fD0e0DA1a77A' + [eAvalancheNetwork.fuji]: '0xa10cA0221BC857413eD0c792d1AFfCFB12381e22' }, LendingPoolCollateralManager: { [eAvalancheNetwork.avalanche]: '', - [eAvalancheNetwork.fuji]: '0x102035669D37a48689859A9F1cf03F294c8b7f56' + [eAvalancheNetwork.fuji]: '0x7a9f468bF0a9B781BB1fdB7D3B9D479aD4aFEA13' }, LendingPoolConfigurator: { [eAvalancheNetwork.avalanche]: '', - [eAvalancheNetwork.fuji]: '0x4de9ee3d1F33676e505CA3747993929c29802293' + [eAvalancheNetwork.fuji]: '0x257B5C93d0736be3abA7D297Aa4A62CB5a932352' }, LendingPool: { [eAvalancheNetwork.avalanche]: '', - [eAvalancheNetwork.fuji]: '' + [eAvalancheNetwork.fuji]: '0xaFb8283e2B34eD6C2E383337Fd92c3A47D00f2b4' }, WethGateway: { [eAvalancheNetwork.avalanche]: '', - [eAvalancheNetwork.fuji]: '0xd00ae08403B9bbb9124bB305C09058E32C39A48c' + [eAvalancheNetwork.fuji]: '0x4Dc3A7c0Aba87280a3dBdD947cda4D2C55b2c539' }, TokenDistributor: { [eAvalancheNetwork.avalanche]: '', @@ -113,7 +113,7 @@ export const CommonsConfig: ICommonConfiguration = { }, AaveOracle: { [eAvalancheNetwork.avalanche]: '', - [eAvalancheNetwork.fuji]: '0x7cb1a6663D864eBD5cB0cDA6063FBf5e3A9285eC' + [eAvalancheNetwork.fuji]: '0xf18C4eFEE87dBa5776F218De3f1e4672C6E07D70' }, FallbackOracle: { [eAvalancheNetwork.avalanche]: ZERO_ADDRESS, @@ -158,8 +158,8 @@ 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, From 90d51338f47fee56021ec5599a3ca7707eb3767a Mon Sep 17 00:00:00 2001 From: miguelmtzinf Date: Wed, 18 Aug 2021 08:42:45 +0200 Subject: [PATCH 2/6] fix: Fix package json script for market deployment --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 52260d55..5e963a7d 100644 --- a/package.json +++ b/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", From 6d7be2f559f729243d04cdf4a88589881fd2fb8e Mon Sep 17 00:00:00 2001 From: miguelmtzinf Date: Tue, 24 Aug 2021 10:38:24 +0200 Subject: [PATCH 3/6] fix: Fix Avalanche deployment params --- markets/avalanche/commons.ts | 2 +- markets/avalanche/index.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/markets/avalanche/commons.ts b/markets/avalanche/commons.ts index 71008b00..62581f94 100644 --- a/markets/avalanche/commons.ts +++ b/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(), diff --git a/markets/avalanche/index.ts b/markets/avalanche/index.ts index ec2105c9..a492589a 100644 --- a/markets/avalanche/index.ts +++ b/markets/avalanche/index.ts @@ -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, From e82ea5afed17c8fb59f403f323be3f3a66856d02 Mon Sep 17 00:00:00 2001 From: miguelmtzinf Date: Tue, 24 Aug 2021 10:39:11 +0200 Subject: [PATCH 4/6] feat: Add AVAX token to Fuji deployment --- markets/avalanche/commons.ts | 2 +- markets/avalanche/index.ts | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/markets/avalanche/commons.ts b/markets/avalanche/commons.ts index 62581f94..e6af12d4 100644 --- a/markets/avalanche/commons.ts +++ b/markets/avalanche/commons.ts @@ -136,7 +136,7 @@ export const CommonsConfig: ICommonConfiguration = { USDT: '0x7898AcCC83587C3C55116c5230C17a6Cd9C71bad', // AAVE: '', WBTC: '0x31CF013A08c6Ac228C94551d535d5BAfE19c602a', - // AVAX: '0x5498BB86BC934c8D34FDA08E81D444153d0D06aD', + AVAX: '0x5498BB86BC934c8D34FDA08E81D444153d0D06aD', USD: '0x86d67c3D38D2bCeE722E601025C25a575021c6EA' }, }, diff --git a/markets/avalanche/index.ts b/markets/avalanche/index.ts index a492589a..a0d4ab13 100644 --- a/markets/avalanche/index.ts +++ b/markets/avalanche/index.ts @@ -9,7 +9,7 @@ import { strategyUSDT, strategyAAVE, strategyWBTC, - strategyAVAX + strategyAVAX, } from './reservesConfigs'; // ---------------- @@ -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 }, }, }; From 8e3df61e6af3958e46bae6142c5d6b3d3e8a5504 Mon Sep 17 00:00:00 2001 From: miguelmtzinf Date: Tue, 24 Aug 2021 10:39:40 +0200 Subject: [PATCH 5/6] feat: Add FUJI Incentives Controller Address --- markets/avalanche/commons.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markets/avalanche/commons.ts b/markets/avalanche/commons.ts index e6af12d4..e4fe5a7c 100644 --- a/markets/avalanche/commons.ts +++ b/markets/avalanche/commons.ts @@ -163,6 +163,6 @@ export const CommonsConfig: ICommonConfiguration = { }, IncentivesController: { [eAvalancheNetwork.avalanche]: ZERO_ADDRESS, - [eAvalancheNetwork.fuji]: ZERO_ADDRESS + [eAvalancheNetwork.fuji]: '0xa1EF206fb9a8D8186157FC817fCddcC47727ED55' // AVAX Incentives Controller }, }; From df64cbef19556c176e34da6d65d3345c658f9af4 Mon Sep 17 00:00:00 2001 From: miguelmtzinf Date: Tue, 24 Aug 2021 10:40:22 +0200 Subject: [PATCH 6/6] feat: Add latest FUJI deployment addresses --- markets/avalanche/commons.ts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/markets/avalanche/commons.ts b/markets/avalanche/commons.ts index e4fe5a7c..84b482ec 100644 --- a/markets/avalanche/commons.ts +++ b/markets/avalanche/commons.ts @@ -81,7 +81,7 @@ export const CommonsConfig: ICommonConfiguration = { }, ProviderRegistry: { [eAvalancheNetwork.avalanche]: '', - [eAvalancheNetwork.fuji]: '0xEDb9d071dA6c292656C4BC1ADCb70e13f0CdC3b1' + [eAvalancheNetwork.fuji]: '0x06eC0BDC3997EE32Cb5B66a1B9C11d92e2C27Aab' }, ProviderRegistryOwner: { [eAvalancheNetwork.avalanche]: '', @@ -89,23 +89,23 @@ export const CommonsConfig: ICommonConfiguration = { }, LendingRateOracle: { [eAvalancheNetwork.avalanche]: '', - [eAvalancheNetwork.fuji]: '0xa10cA0221BC857413eD0c792d1AFfCFB12381e22' + [eAvalancheNetwork.fuji]: '0xEbBD998B7Dc2a8E675F0859d907c8Fa6027aBc7b' }, LendingPoolCollateralManager: { [eAvalancheNetwork.avalanche]: '', - [eAvalancheNetwork.fuji]: '0x7a9f468bF0a9B781BB1fdB7D3B9D479aD4aFEA13' + [eAvalancheNetwork.fuji]: '0x6242bE2fB5591FA1e81a99e6DD55Ff667fa82a71' }, LendingPoolConfigurator: { [eAvalancheNetwork.avalanche]: '', - [eAvalancheNetwork.fuji]: '0x257B5C93d0736be3abA7D297Aa4A62CB5a932352' + [eAvalancheNetwork.fuji]: '' }, LendingPool: { [eAvalancheNetwork.avalanche]: '', - [eAvalancheNetwork.fuji]: '0xaFb8283e2B34eD6C2E383337Fd92c3A47D00f2b4' + [eAvalancheNetwork.fuji]: '0x5f3968A2E41C95A95329333d44AB989de6c43f8E' }, WethGateway: { [eAvalancheNetwork.avalanche]: '', - [eAvalancheNetwork.fuji]: '0x4Dc3A7c0Aba87280a3dBdD947cda4D2C55b2c539' + [eAvalancheNetwork.fuji]: '0x62AF6258d26838f33BADFbb33cf1De8FaB8EB19f' }, TokenDistributor: { [eAvalancheNetwork.avalanche]: '', @@ -113,7 +113,7 @@ export const CommonsConfig: ICommonConfiguration = { }, AaveOracle: { [eAvalancheNetwork.avalanche]: '', - [eAvalancheNetwork.fuji]: '0xf18C4eFEE87dBa5776F218De3f1e4672C6E07D70' + [eAvalancheNetwork.fuji]: '0xD217DdD9f0Af84644dEFe84a0b634621D4617a29' }, FallbackOracle: { [eAvalancheNetwork.avalanche]: ZERO_ADDRESS,