Instadapp/aave-protocol-v2
1
0
Fork 0
mirror of https://github.com/Instadapp/aave-protocol-v2.git synced 2024-07-29 21:47:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed MATIC WETHGateway adaptation, uses wMATIC

Browse Source
This commit is contained in:
Zer0dot 2021-02-21 20:05:11 -05:00
parent ec4df02f84
commit b3e14bc033
7 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
helpers/constants.ts
View File

@ -65,6 +65,6 @@ export const MOCK_CHAINLINK_AGGREGATORS_PRICES = {
UniWBTCUSDC: oneEther.multipliedBy('22.407436').toFixed(), UniWBTCUSDC: oneEther.multipliedBy('22.407436').toFixed(),
UniYFIWETH: oneEther.multipliedBy('22.407436').toFixed(), UniYFIWETH: oneEther.multipliedBy('22.407436').toFixed(),
BptWBTCWETH: oneEther.multipliedBy('22.407436').toFixed(), BptWBTCWETH: oneEther.multipliedBy('22.407436').toFixed(),
MATIC: oneEther.multipliedBy('0.003620948469').toFixed(), WMATIC: oneEther.multipliedBy('0.003620948469').toFixed(),
USD: '5848466240000000', USD: '5848466240000000',
}; };

6
helpers/types.ts
View File

@ -230,7 +230,7 @@ export interface iAssetBase<T> {
UniWBTCUSDC: T; UniWBTCUSDC: T;
UniYFIWETH: T; UniYFIWETH: T;
BptWBTCWETH: T; BptWBTCWETH: T;
MATIC: T; WMATIC: T;
} }
export type iAssetsWithoutETH<T> = Omit<iAssetBase<T>, 'ETH'>; export type iAssetsWithoutETH<T> = Omit<iAssetBase<T>, 'ETH'>;
@ -292,7 +292,7 @@ export type iMaticPoolAssets<T> = Pick<
| 'USDT' | 'USDT'
| 'WBTC' | 'WBTC'
| 'WETH' | 'WETH'
| 'MATIC' | 'WMATIC'
>; >;
export type iMultiPoolsAssets<T> = iAssetCommon<T> | iAavePoolAssets<T>; export type iMultiPoolsAssets<T> = iAssetCommon<T> | iAavePoolAssets<T>;
@ -343,7 +343,7 @@ export enum TokenContractId {
UniWBTCUSDC = 'UniWBTCUSDC', UniWBTCUSDC = 'UniWBTCUSDC',
UniYFIWETH = 'UniYFIWETH', UniYFIWETH = 'UniYFIWETH',
BptWBTCWETH = 'BptWBTCWETH', BptWBTCWETH = 'BptWBTCWETH',
MATIC = 'MATIC', WMATIC = 'WMATIC',
} }
export interface IReserveParams extends IReserveBorrowParams, IReserveCollateralParams { export interface IReserveParams extends IReserveBorrowParams, IReserveCollateralParams {

14
markets/matic/commons.ts
View File

@ -48,7 +48,7 @@ export const CommonsConfig: ICommonConfiguration = {
WBTC: { WBTC: {
borrowRate: oneRay.multipliedBy(0.03).toFixed(), borrowRate: oneRay.multipliedBy(0.03).toFixed(),
}, },
MATIC: { WMATIC: {
borrowRate: oneRay.multipliedBy(0.05).toFixed(), // TEMP borrowRate: oneRay.multipliedBy(0.05).toFixed(), // TEMP
}, },
}, },
@ -168,14 +168,14 @@ export const CommonsConfig: ICommonConfiguration = {
USDC: '0xfE4A8cc5b5B2366C1B58Bea3858e81843581b2F7', USDC: '0xfE4A8cc5b5B2366C1B58Bea3858e81843581b2F7',
USDT: '0x0A6513e40db6EB1b165753AD52E80663aeA50545', USDT: '0x0A6513e40db6EB1b165753AD52E80663aeA50545',
WBTC: '0xc907E116054Ad103354f2D350FD2514433D57F6f', WBTC: '0xc907E116054Ad103354f2D350FD2514433D57F6f',
MATIC: '0xAB594600376Ec9fD91F8e885dADF0CE036862dE0', WMATIC: '0xAB594600376Ec9fD91F8e885dADF0CE036862dE0',
}, },
[eEthereumNetwork.mumbai]: { [eEthereumNetwork.mumbai]: {
DAI: ZERO_ADDRESS, DAI: ZERO_ADDRESS,
USDC: ZERO_ADDRESS, USDC: ZERO_ADDRESS,
USDT: ZERO_ADDRESS, USDT: ZERO_ADDRESS,
WBTC: ZERO_ADDRESS, WBTC: ZERO_ADDRESS,
MATIC: ZERO_ADDRESS, WMATIC: ZERO_ADDRESS,
}, },
[EthereumNetwork.kovan]: {}, [EthereumNetwork.kovan]: {},
[EthereumNetwork.ropsten]: {}, [EthereumNetwork.ropsten]: {},
@ -184,14 +184,14 @@ export const CommonsConfig: ICommonConfiguration = {
USDC: '0x986b5E1e1755e3C2440e960477f25201B0a8bbD4', USDC: '0x986b5E1e1755e3C2440e960477f25201B0a8bbD4',
USDT: '0xEe9F2375b4bdF6387aa8265dD4FB8F16512A1d46', USDT: '0xEe9F2375b4bdF6387aa8265dD4FB8F16512A1d46',
WBTC: '0xdeb288F737066589598e9214E782fa5A8eD689e8', WBTC: '0xdeb288F737066589598e9214E782fa5A8eD689e8',
MATIC: ZERO_ADDRESS, WMATIC: ZERO_ADDRESS,
}, },
[EthereumNetwork.tenderlyMain]: { [EthereumNetwork.tenderlyMain]: {
DAI: '0x773616E4d11A78F511299002da57A0a94577F1f4', DAI: '0x773616E4d11A78F511299002da57A0a94577F1f4',
USDC: '0x986b5E1e1755e3C2440e960477f25201B0a8bbD4', USDC: '0x986b5E1e1755e3C2440e960477f25201B0a8bbD4',
USDT: '0xEe9F2375b4bdF6387aa8265dD4FB8F16512A1d46', USDT: '0xEe9F2375b4bdF6387aa8265dD4FB8F16512A1d46',
WBTC: '0xdeb288F737066589598e9214E782fa5A8eD689e8', WBTC: '0xdeb288F737066589598e9214E782fa5A8eD689e8',
MATIC: ZERO_ADDRESS, WMATIC: ZERO_ADDRESS,
}, },
}, },
ReserveAssets: { ReserveAssets: {
@ -228,8 +228,8 @@ export const CommonsConfig: ICommonConfiguration = {
[eEthereumNetwork.ropsten]: '0xc778417e063141139fce010982780140aa0cd5ab', [eEthereumNetwork.ropsten]: '0xc778417e063141139fce010982780140aa0cd5ab',
[eEthereumNetwork.main]: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2', [eEthereumNetwork.main]: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
[eEthereumNetwork.tenderlyMain]: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2', [eEthereumNetwork.tenderlyMain]: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
[EthereumNetwork.mumbai]: '0x53CDb16B8C031B779e996406546614E5F05BC4Bf', // No WETH gateway on L2 [EthereumNetwork.mumbai]: '0x9c3C9283D3e44854697Cd22D3Faa240Cfb032889', // WMATIC address (untested)
[EthereumNetwork.matic]: '', // No WETH gateway on L2 [EthereumNetwork.matic]: '0x0d500B1d8E8eF31E21C99d1Db9A6444d3ADf1270', // WMATIC address
}, },
ReserveFactorTreasuryAddress: { ReserveFactorTreasuryAddress: {
[eEthereumNetwork.coverage]: '0x464c71f6c2f760dda6093dcb91c24c39e5d6e18c', [eEthereumNetwork.coverage]: '0x464c71f6c2f760dda6093dcb91c24c39e5d6e18c',

16
markets/matic/index.ts
View File

@ -25,7 +25,7 @@ export const MaticConfig: IMaticConfiguration = {
USDT: strategyUSDT, USDT: strategyUSDT,
WBTC: strategyWBTC, WBTC: strategyWBTC,
WETH: strategyWETH, WETH: strategyWETH,
MATIC: strategyMATIC, WMATIC: strategyMATIC,
}, },
ReserveAssets: { ReserveAssets: {
[eEthereumNetwork.buidlerevm]: {}, [eEthereumNetwork.buidlerevm]: {},
@ -37,33 +37,35 @@ export const MaticConfig: IMaticConfiguration = {
USDT: '0xc2132D05D31c914a87C6611C10748AEb04B58e8F', USDT: '0xc2132D05D31c914a87C6611C10748AEb04B58e8F',
WBTC: '0x1BFD67037B42Cf73acF2047067bd4F2C47D9BfD6', WBTC: '0x1BFD67037B42Cf73acF2047067bd4F2C47D9BfD6',
WETH: '0x7ceB23fD6bC0adD59E62ac25578270cFf1b9f619', WETH: '0x7ceB23fD6bC0adD59E62ac25578270cFf1b9f619',
MATIC: '0x0000000000000000000000000000000000001010', WMATIC: '0x0d500B1d8E8eF31E21C99d1Db9A6444d3ADf1270',
}, },
[eEthereumNetwork.mumbai]: { // Mock tokens with a simple "mint" external function [eEthereumNetwork.mumbai]: { // Mock tokens with a simple "mint" external function, except wmatic
DAI: '0x13b3fda609C1eeb23b4F4b69257840760dCa6C4a', DAI: '0x13b3fda609C1eeb23b4F4b69257840760dCa6C4a',
USDC: '0x52b63223994433FdE2F1350Ba69Dfd2779f06ABA', USDC: '0x52b63223994433FdE2F1350Ba69Dfd2779f06ABA',
USDT: '0xB3abd1912F586fDFFa13606882c28E27913853d2', USDT: '0xB3abd1912F586fDFFa13606882c28E27913853d2',
WBTC: '0x393E3512d45a956A628124665672312ea86930Ba', WBTC: '0x393E3512d45a956A628124665672312ea86930Ba',
WETH: '0x53CDb16B8C031B779e996406546614E5F05BC4Bf', WETH: '0x53CDb16B8C031B779e996406546614E5F05BC4Bf',
MATIC: '0x0000000000000000000000000000000000001010', WMATIC: '0x9c3C9283D3e44854697Cd22D3Faa240Cfb032889',
}, },
[EthereumNetwork.kovan]: {}, [EthereumNetwork.kovan]: {},
[EthereumNetwork.ropsten]: {}, [EthereumNetwork.ropsten]: {},
[EthereumNetwork.main]: { [EthereumNetwork.main]: {
// WMATIC DOES NOT EXIST ON MAIN
DAI: '0x6B175474E89094C44Da98b954EedeAC495271d0F', DAI: '0x6B175474E89094C44Da98b954EedeAC495271d0F',
USDC: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48', USDC: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
USDT: '0xdAC17F958D2ee523a2206206994597C13D831ec7', USDT: '0xdAC17F958D2ee523a2206206994597C13D831ec7',
WBTC: '0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599', WBTC: '0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599',
WETH: '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2', WETH: '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2',
MATIC: '0x7D1AfA7B718fb893dB30A3aBc0Cfc608AaCfeBB0', WMATIC: '0x7D1AfA7B718fb893dB30A3aBc0Cfc608AaCfeBB0',
}, },
[EthereumNetwork.tenderlyMain]: { [EthereumNetwork.tenderlyMain]: {
// WMATIC DOES NOT EXIST ON MAIN
DAI: '0x6B175474E89094C44Da98b954EedeAC495271d0F', DAI: '0x6B175474E89094C44Da98b954EedeAC495271d0F',
USDC: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48', USDC: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
USDT: '0xdAC17F958D2ee523a2206206994597C13D831ec7', USDT: '0xdAC17F958D2ee523a2206206994597C13D831ec7',
WBTC: '0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599', WBTC: '0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599',
WETH: '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2', WETH: '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2',
MATIC: '0x7D1AfA7B718fb893dB30A3aBc0Cfc608AaCfeBB0', WMATIC: '0x7D1AfA7B718fb893dB30A3aBc0Cfc608AaCfeBB0',
}, },
}, },
}; };

6
tasks/full/5_initialize.ts
View File

@ -83,9 +83,9 @@ task('full:initialize-lending-pool', 'Initialize lending pool configuration.')
const wethAddress = await getWethAddress(poolConfig); const wethAddress = await getWethAddress(poolConfig);
const lendingPoolAddress = await addressesProvider.getLendingPool(); const lendingPoolAddress = await addressesProvider.getLendingPool();
if (network != 'mumbai' && network != 'matic') {
await deployWETHGateway([wethAddress, lendingPoolAddress]); await deployWETHGateway([wethAddress, lendingPoolAddress]);
}
} catch (err) { } catch (err) {
console.error(err); console.error(err);
exit(1); exit(1);

2
test-suites/test-aave/__setup.spec.ts
View File

@ -185,7 +185,7 @@ const buildTestEnv = async (deployer: Signer, secondaryWallet: Signer) => {
UniWBTCUSDC: mockTokens.UniWBTCUSDC.address, UniWBTCUSDC: mockTokens.UniWBTCUSDC.address,
UniYFIWETH: mockTokens.UniYFIWETH.address, UniYFIWETH: mockTokens.UniYFIWETH.address,
BptWBTCWETH: mockTokens.BptWBTCWETH.address, BptWBTCWETH: mockTokens.BptWBTCWETH.address,
MATIC: mockTokens.MATIC.address, WMATIC: mockTokens.WMATIC.address,
USD: USD_ADDRESS, USD: USD_ADDRESS,
}, },
fallbackOracle fallbackOracle

2
test-suites/test-lp/__setup.spec.ts
View File

@ -185,7 +185,7 @@ const buildTestEnv = async (deployer: Signer, secondaryWallet: Signer) => {
UniWBTCUSDC: mockTokens.UniWBTCUSDC.address, UniWBTCUSDC: mockTokens.UniWBTCUSDC.address,
UniYFIWETH: mockTokens.UniYFIWETH.address, UniYFIWETH: mockTokens.UniYFIWETH.address,
BptWBTCWETH: mockTokens.BptWBTCWETH.address, BptWBTCWETH: mockTokens.BptWBTCWETH.address,
MATIC: mockTokens.MATIC.address, WMATIC: mockTokens.WMATIC.address,
USD: USD_ADDRESS, USD: USD_ADDRESS,
}, },
fallbackOracle fallbackOracle