diff --git a/hardhat.config.ts b/hardhat.config.ts
index 7f293569..d518905a 100644
--- a/hardhat.config.ts
+++ b/hardhat.config.ts
@@ -19,10 +19,7 @@ import '@tenderly/hardhat-tenderly';
const SKIP_LOAD = process.env.SKIP_LOAD === 'true';
const DEFAULT_BLOCK_GAS_LIMIT = 12450000;
const DEFAULT_GAS_MUL = 5;
-const DEFAULT_GAS_PRICE = 65 * 1000 * 1000 * 1000;
const HARDFORK = 'istanbul';
-const INFURA_KEY = process.env.INFURA_KEY || '';
-const ALCHEMY_KEY = process.env.ALCHEMY_KEY || '';
const ETHERSCAN_KEY = process.env.ETHERSCAN_KEY || '';
const MNEMONIC_PATH = "m/44'/60'/0'/0";
const MNEMONIC = process.env.MNEMONIC || '';
diff --git a/helper-hardhat-config.ts b/helper-hardhat-config.ts
index 8c78656d..159418e9 100644
--- a/helper-hardhat-config.ts
+++ b/helper-hardhat-config.ts
@@ -26,6 +26,7 @@ export const NETWORKS_RPC_URL: iParamsPerNetwork<string> = {
: `https://mainnet.infura.io/v3/${INFURA_KEY}`,
[eEthereumNetwork.mumbai]: 'https://rpc-mumbai.maticvigil.com',
[eEthereumNetwork.matic]: 'https://rpc-mainnet.matic.network',
+ [eEthereumNetwork.xdai]: 'https://rpc.xdaichain.com/',
}
export const NETWORKS_DEFAULT_GAS: iParamsPerNetwork<number> = {
@@ -37,5 +38,6 @@ export const NETWORKS_DEFAULT_GAS: iParamsPerNetwork<number> = {
[eEthereumNetwork.buidlerevm]: 65 * GWEI ,
[eEthereumNetwork.tenderlyMain]: 65 * GWEI ,
[eEthereumNetwork.mumbai]: 1 * GWEI ,
- [eEthereumNetwork.matic]: 65 * GWEI ,
+ [eEthereumNetwork.matic]: 2 * GWEI ,
+ [eEthereumNetwork.xdai]: 1 * GWEI,
}
\ No newline at end of file
diff --git a/helpers/types.ts b/helpers/types.ts
index d8e17fcf..8b6b442d 100644
--- a/helpers/types.ts
+++ b/helpers/types.ts
@@ -12,8 +12,15 @@ export enum eEthereumNetwork {
coverage = 'coverage',
hardhat = 'hardhat',
tenderlyMain = 'tenderlyMain',
+}
+
+export enum ePolygonNetwork {
matic = 'matic',
- mumbai = 'mumbai',
+ mumbai = 'mumbail',
+}
+
+export enum eXDaiNetwork {
+ xdai = 'xdai',
}
export enum EthereumNetworkNames {
@@ -22,6 +29,7 @@ export enum EthereumNetworkNames {
main = 'main',
matic = 'matic',
mumbai = 'mumbai',
+ xdai = 'xdai',
}
export enum AavePools {
@@ -378,7 +386,12 @@ export interface IMarketRates {
borrowRate: string;
}
-export interface iParamsPerNetwork<T> {
+export type iParamsPerNetwork<T> =
+ | iEthereumParamsPerNetwork<T>
+ | iPolygonParamsPerNetwork<T>
+ | iXDaiParamsPerNetwork<T>;
+
+export interface iEthereumParamsPerNetwork<T> {
[eEthereumNetwork.coverage]: T;
[eEthereumNetwork.buidlerevm]: T;
[eEthereumNetwork.kovan]: T;
@@ -386,8 +399,15 @@ export interface iParamsPerNetwork<T> {
[eEthereumNetwork.main]: T;
[eEthereumNetwork.hardhat]: T;
[eEthereumNetwork.tenderlyMain]: T;
- [eEthereumNetwork.mumbai]: T;
- [eEthereumNetwork.matic]: T;
+}
+
+export interface iPolygonParamsPerNetwork<T> {
+ [ePolygonNetwork.matic]: T;
+ [ePolygonNetwork.mumbai]: T;
+}
+
+export interface iXDaiParamsPerNetwork<T> {
+ [eXDaiNetwork.xdai]: T;
}
export interface iParamsPerPool<T> {
@@ -411,17 +431,6 @@ export interface ObjectString {
[key: string]: string;
}
-export enum EthereumNetwork {
- kovan = 'kovan',
- ropsten = 'ropsten',
- development = 'development',
- main = 'main',
- coverage = 'soliditycoverage',
- tenderlyMain = 'tenderlyMain',
- matic = 'matic',
- mumbai = 'mumbai',
-}
-
export interface IProtocolGlobalConfig {
TokenDistributorPercentageBase: string;
MockUsdPriceInWei: string;
diff --git a/markets/aave/commons.ts b/markets/aave/commons.ts
index 39be628b..da91442d 100644
--- a/markets/aave/commons.ts
+++ b/markets/aave/commons.ts
@@ -1,6 +1,6 @@
import BigNumber from 'bignumber.js';
import { oneEther, oneRay, RAY, ZERO_ADDRESS, MOCK_CHAINLINK_AGGREGATORS_PRICES } from '../../helpers/constants';
-import { ICommonConfiguration, EthereumNetwork, eEthereumNetwork } from '../../helpers/types';
+import { ICommonConfiguration, eEthereumNetwork } from '../../helpers/types';
// ----------------
// PROTOCOL GLOBAL PARAMS
@@ -105,8 +105,6 @@ export const CommonsConfig: ICommonConfiguration = {
[eEthereumNetwork.ropsten]: undefined,
[eEthereumNetwork.main]: undefined,
[eEthereumNetwork.tenderlyMain]: undefined,
- [eEthereumNetwork.mumbai]: undefined,
- [eEthereumNetwork.matic]: undefined,
},
PoolAdminIndex: 0,
EmergencyAdmin: {
@@ -117,8 +115,6 @@ export const CommonsConfig: ICommonConfiguration = {
[eEthereumNetwork.ropsten]: undefined,
[eEthereumNetwork.main]: undefined,
[eEthereumNetwork.tenderlyMain]: undefined,
- [eEthereumNetwork.mumbai]: undefined,
- [eEthereumNetwork.matic]: undefined,
},
EmergencyAdminIndex: 1,
ProviderRegistry: {
@@ -129,8 +125,6 @@ export const CommonsConfig: ICommonConfiguration = {
[eEthereumNetwork.hardhat]: '',
[eEthereumNetwork.buidlerevm]: '',
[eEthereumNetwork.tenderlyMain]: '0x52D306e36E3B6B02c153d0266ff0f85d18BCD413',
- [eEthereumNetwork.mumbai]: '',
- [eEthereumNetwork.matic]: '',
},
ProviderRegistryOwner: {
[eEthereumNetwork.kovan]: '0x85e4A467343c0dc4aDAB74Af84448D9c45D8ae6F',
@@ -140,8 +134,6 @@ export const CommonsConfig: ICommonConfiguration = {
[eEthereumNetwork.hardhat]: '',
[eEthereumNetwork.buidlerevm]: '',
[eEthereumNetwork.tenderlyMain]: '0xbd723fc4f1d737dcfc48a07fe7336766d34cad5f',
- [eEthereumNetwork.mumbai]: '',
- [eEthereumNetwork.matic]: '',
},
LendingRateOracle: {
[eEthereumNetwork.coverage]: '',
@@ -151,8 +143,6 @@ export const CommonsConfig: ICommonConfiguration = {
[eEthereumNetwork.ropsten]: '0x05dcca805a6562c1bdd0423768754acb6993241b',
[eEthereumNetwork.main]: '',//'0x8A32f49FFbA88aba6EFF96F45D8BD1D4b3f35c7D',
[eEthereumNetwork.tenderlyMain]: '0x8A32f49FFbA88aba6EFF96F45D8BD1D4b3f35c7D',
- [eEthereumNetwork.mumbai]: '',
- [eEthereumNetwork.matic]: '',
},
LendingPoolCollateralManager: {
[eEthereumNetwork.coverage]: '',
@@ -162,8 +152,6 @@ export const CommonsConfig: ICommonConfiguration = {
[eEthereumNetwork.ropsten]: '',
[eEthereumNetwork.main]: '0xbd4765210d4167CE2A5b87280D9E8Ee316D5EC7C',
[eEthereumNetwork.tenderlyMain]: '0xbd4765210d4167CE2A5b87280D9E8Ee316D5EC7C',
- [eEthereumNetwork.mumbai]: '',
- [eEthereumNetwork.matic]: '',
},
WethGateway: {
[eEthereumNetwork.coverage]: '',
@@ -178,42 +166,34 @@ export const CommonsConfig: ICommonConfiguration = {
[eEthereumNetwork.coverage]: '',
[eEthereumNetwork.buidlerevm]: '',
[eEthereumNetwork.hardhat]: '',
- [EthereumNetwork.kovan]: '0x971efe90088f21dc6a36f610ffed77fc19710708',
- [EthereumNetwork.ropsten]: '0xeba2ea67942b8250d870b12750b594696d02fc9c',
- [EthereumNetwork.main]: '0xe3d9988f676457123c5fd01297605efdd0cba1ae',
- [EthereumNetwork.tenderlyMain]: '0xe3d9988f676457123c5fd01297605efdd0cba1ae',
- [eEthereumNetwork.mumbai]: '',
- [eEthereumNetwork.matic]: '',
+ [eEthereumNetwork.kovan]: '0x971efe90088f21dc6a36f610ffed77fc19710708',
+ [eEthereumNetwork.ropsten]: '0xeba2ea67942b8250d870b12750b594696d02fc9c',
+ [eEthereumNetwork.main]: '0xe3d9988f676457123c5fd01297605efdd0cba1ae',
+ [eEthereumNetwork.tenderlyMain]: '0xe3d9988f676457123c5fd01297605efdd0cba1ae',
},
AaveOracle: {
[eEthereumNetwork.coverage]: '',
[eEthereumNetwork.hardhat]: '',
[eEthereumNetwork.buidlerevm]: '',
- [EthereumNetwork.kovan]: '',//'0xB8bE51E6563BB312Cbb2aa26e352516c25c26ac1',
- [EthereumNetwork.ropsten]: ZERO_ADDRESS,
- [EthereumNetwork.main]: '',//'0xA50ba011c48153De246E5192C8f9258A2ba79Ca9',
- [EthereumNetwork.tenderlyMain]: '0xA50ba011c48153De246E5192C8f9258A2ba79Ca9',
- [eEthereumNetwork.mumbai]: '',
- [eEthereumNetwork.matic]: '',
+ [eEthereumNetwork.kovan]: '',//'0xB8bE51E6563BB312Cbb2aa26e352516c25c26ac1',
+ [eEthereumNetwork.ropsten]: ZERO_ADDRESS,
+ [eEthereumNetwork.main]: '',//'0xA50ba011c48153De246E5192C8f9258A2ba79Ca9',
+ [eEthereumNetwork.tenderlyMain]: '0xA50ba011c48153De246E5192C8f9258A2ba79Ca9',
},
FallbackOracle: {
[eEthereumNetwork.coverage]: '',
[eEthereumNetwork.hardhat]: '',
[eEthereumNetwork.buidlerevm]: '',
- [EthereumNetwork.kovan]: '0x50913E8E1c650E790F8a1E741FF9B1B1bB251dfe',
- [EthereumNetwork.ropsten]: '0xAD1a978cdbb8175b2eaeC47B01404f8AEC5f4F0d',
- [EthereumNetwork.main]: ZERO_ADDRESS,
- [EthereumNetwork.tenderlyMain]: ZERO_ADDRESS,
- [eEthereumNetwork.mumbai]: ZERO_ADDRESS,
- [eEthereumNetwork.matic]: ZERO_ADDRESS,
+ [eEthereumNetwork.kovan]: '0x50913E8E1c650E790F8a1E741FF9B1B1bB251dfe',
+ [eEthereumNetwork.ropsten]: '0xAD1a978cdbb8175b2eaeC47B01404f8AEC5f4F0d',
+ [eEthereumNetwork.main]: ZERO_ADDRESS,
+ [eEthereumNetwork.tenderlyMain]: ZERO_ADDRESS,
},
ChainlinkAggregator: {
[eEthereumNetwork.coverage]: {},
[eEthereumNetwork.hardhat]: {},
[eEthereumNetwork.buidlerevm]: {},
- [eEthereumNetwork.matic]: {},
- [eEthereumNetwork.mumbai]: {},
- [EthereumNetwork.kovan]: {
+ [eEthereumNetwork.kovan]: {
AAVE: '0xd04647B7CB523bb9f26730E9B6dE1174db7591Ad',
BAT: '0x0e4fcEC26c9f85c3D714370c98f43C4E02Fc35Ae',
BUSD: '0xbF7A18ea5DE0501f7559144e702b29c55b055CcB',
@@ -235,7 +215,7 @@ export const CommonsConfig: ICommonConfiguration = {
ZRX: '0xBc3f28Ccc21E9b5856E81E6372aFf57307E2E883',
USD: '0x9326BFA02ADD2366b30bacB125260Af641031331',
},
- [EthereumNetwork.ropsten]: {
+ [eEthereumNetwork.ropsten]: {
AAVE: ZERO_ADDRESS,
BAT: '0xafd8186c962daf599f171b8600f3e19af7b52c92',
BUSD: '0x0A32D96Ff131cd5c3E0E5AAB645BF009Eda61564',
@@ -257,7 +237,7 @@ export const CommonsConfig: ICommonConfiguration = {
ZRX: '0x1d0052e4ae5b4ae4563cbac50edc3627ca0460d7',
USD: '0x8468b2bDCE073A157E560AA4D9CcF6dB1DB98507',
},
- [EthereumNetwork.main]: {
+ [eEthereumNetwork.main]: {
AAVE: '0x6Df09E975c830ECae5bd4eD9d90f3A95a4f88012',
BAT: '0x0d16d4528239e9ee52fa531af613AcdB23D88c94',
BUSD: '0x614715d2Af89E6EC99A233818275142cE88d1Cfd',
@@ -279,7 +259,7 @@ export const CommonsConfig: ICommonConfiguration = {
ZRX: '0x2Da4983a622a8498bb1a21FaE9D8F6C664939962',
USD: '0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419',
},
- [EthereumNetwork.tenderlyMain]: {
+ [eEthereumNetwork.tenderlyMain]: {
AAVE: '0x6Df09E975c830ECae5bd4eD9d90f3A95a4f88012',
BAT: '0x0d16d4528239e9ee52fa531af613AcdB23D88c94',
BUSD: '0x614715d2Af89E6EC99A233818275142cE88d1Cfd',
@@ -306,12 +286,10 @@ export const CommonsConfig: ICommonConfiguration = {
[eEthereumNetwork.coverage]: {},
[eEthereumNetwork.hardhat]: {},
[eEthereumNetwork.buidlerevm]: {},
- [EthereumNetwork.main]: {},
- [EthereumNetwork.kovan]: {},
- [EthereumNetwork.ropsten]: {},
- [EthereumNetwork.tenderlyMain]: {},
- [eEthereumNetwork.matic]: {},
- [eEthereumNetwork.mumbai]: {},
+ [eEthereumNetwork.main]: {},
+ [eEthereumNetwork.kovan]: {},
+ [eEthereumNetwork.ropsten]: {},
+ [eEthereumNetwork.tenderlyMain]: {},
},
ReservesConfig: {},
ATokenDomainSeparator: {
@@ -325,8 +303,6 @@ export const CommonsConfig: ICommonConfiguration = {
[eEthereumNetwork.ropsten]: '',
[eEthereumNetwork.main]: '',
[eEthereumNetwork.tenderlyMain]: '',
- [EthereumNetwork.mumbai]: '',
- [EthereumNetwork.matic]: '',
},
WETH: {
[eEthereumNetwork.coverage]: '', // deployed in local evm
@@ -336,8 +312,6 @@ export const CommonsConfig: ICommonConfiguration = {
[eEthereumNetwork.ropsten]: '0xc778417e063141139fce010982780140aa0cd5ab',
[eEthereumNetwork.main]: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
[eEthereumNetwork.tenderlyMain]: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
- [EthereumNetwork.mumbai]: '',
- [EthereumNetwork.matic]: '',
},
ReserveFactorTreasuryAddress: {
[eEthereumNetwork.coverage]: '0x464c71f6c2f760dda6093dcb91c24c39e5d6e18c',
@@ -347,7 +321,5 @@ export const CommonsConfig: ICommonConfiguration = {
[eEthereumNetwork.ropsten]: '0x464c71f6c2f760dda6093dcb91c24c39e5d6e18c',
[eEthereumNetwork.main]: '0x464c71f6c2f760dda6093dcb91c24c39e5d6e18c',
[eEthereumNetwork.tenderlyMain]: '0x464c71f6c2f760dda6093dcb91c24c39e5d6e18c',
- [EthereumNetwork.mumbai]: '',
- [EthereumNetwork.matic]: '',
},
};
diff --git a/markets/aave/index.ts b/markets/aave/index.ts
index 0f4d56c8..88e55a83 100644
--- a/markets/aave/index.ts
+++ b/markets/aave/index.ts
@@ -1,5 +1,5 @@
import { oneRay, ZERO_ADDRESS } from '../../helpers/constants';
-import { IAaveConfiguration, EthereumNetwork, eEthereumNetwork } from '../../helpers/types';
+import { IAaveConfiguration, eEthereumNetwork } from '../../helpers/types';
import { CommonsConfig } from './commons';
import {
@@ -58,9 +58,7 @@ export const AaveConfig: IAaveConfiguration = {
[eEthereumNetwork.buidlerevm]: {},
[eEthereumNetwork.hardhat]: {},
[eEthereumNetwork.coverage]: {},
- [eEthereumNetwork.matic]: {},
- [eEthereumNetwork.mumbai]: {},
- [EthereumNetwork.kovan]: {
+ [eEthereumNetwork.kovan]: {
AAVE: '0xB597cd8D3217ea6477232F9217fa70837ff667Af',
BAT: '0x2d12186Fbb9f9a8C28B3FfdD4c42920f8539D738',
BUSD: '0x4c6E1EFC12FDfD568186b7BAEc0A43fFfb4bCcCf',
@@ -82,7 +80,7 @@ export const AaveConfig: IAaveConfiguration = {
YFI: '0xb7c325266ec274fEb1354021D27FA3E3379D840d',
ZRX: '0xD0d76886cF8D952ca26177EB7CfDf83bad08C00C',
},
- [EthereumNetwork.ropsten]: {
+ [eEthereumNetwork.ropsten]: {
AAVE: '',
BAT: '0x85B24b3517E3aC7bf72a14516160541A60cFF19d',
BUSD: '0xFA6adcFf6A90c11f31Bc9bb59eC0a6efB38381C6',
@@ -104,7 +102,7 @@ export const AaveConfig: IAaveConfiguration = {
YFI: ZERO_ADDRESS,
ZRX: '0x02d7055704EfF050323A2E5ee4ba05DB2A588959',
},
- [EthereumNetwork.main]: {
+ [eEthereumNetwork.main]: {
AAVE: '0x7Fc66500c84A76Ad7e9c93437bFc5Ac33E2DDaE9',
BAT: '0x0d8775f648430679a709e98d2b0cb6250d2887ef',
BUSD: '0x4Fabb145d64652a948d72533023f6E7A623C7C53',
@@ -126,7 +124,7 @@ export const AaveConfig: IAaveConfiguration = {
YFI: '0x0bc529c00C6401aEF6D220BE8C6Ea1667F6Ad93e',
ZRX: '0xE41d2489571d322189246DaFA5ebDe1F4699F498',
},
- [EthereumNetwork.tenderlyMain]: {
+ [eEthereumNetwork.tenderlyMain]: {
AAVE: '0x7Fc66500c84A76Ad7e9c93437bFc5Ac33E2DDaE9',
BAT: '0x0d8775f648430679a709e98d2b0cb6250d2887ef',
BUSD: '0x4Fabb145d64652a948d72533023f6E7A623C7C53',
diff --git a/markets/matic/commons.ts b/markets/matic/commons.ts
index 2029fd54..7dfed41f 100644
--- a/markets/matic/commons.ts
+++ b/markets/matic/commons.ts
@@ -1,6 +1,6 @@
import BigNumber from 'bignumber.js';
import { oneEther, oneRay, RAY, ZERO_ADDRESS, MOCK_CHAINLINK_AGGREGATORS_PRICES } from '../../helpers/constants';
-import { ICommonConfiguration, EthereumNetwork, eEthereumNetwork } from '../../helpers/types';
+import { ICommonConfiguration, ePolygonNetwork } from '../../helpers/types';
// ----------------
// PROTOCOL GLOBAL PARAMS
@@ -58,112 +58,45 @@ export const CommonsConfig: ICommonConfiguration = {
// If PoolAdmin/emergencyAdmin is set, will take priority over PoolAdminIndex/emergencyAdminIndex
PoolAdmin: {
- [eEthereumNetwork.coverage]: undefined,
- [eEthereumNetwork.buidlerevm]: undefined,
- [eEthereumNetwork.coverage]: undefined,
- [eEthereumNetwork.hardhat]: undefined,
- [eEthereumNetwork.kovan]: undefined,
- [eEthereumNetwork.ropsten]: undefined,
- [eEthereumNetwork.main]: undefined,
- [eEthereumNetwork.tenderlyMain]: undefined,
- [eEthereumNetwork.mumbai]: undefined,
- [eEthereumNetwork.matic]: undefined,
+ [ePolygonNetwork.mumbai]: undefined,
+ [ePolygonNetwork.matic]: undefined,
},
PoolAdminIndex: 0,
EmergencyAdmin: {
- [eEthereumNetwork.hardhat]: undefined,
- [eEthereumNetwork.coverage]: undefined,
- [eEthereumNetwork.buidlerevm]: undefined,
- [eEthereumNetwork.kovan]: undefined,
- [eEthereumNetwork.ropsten]: undefined,
- [eEthereumNetwork.main]: undefined,
- [eEthereumNetwork.tenderlyMain]: undefined,
- [eEthereumNetwork.mumbai]: undefined,
- [eEthereumNetwork.matic]: undefined,
+ [ePolygonNetwork.mumbai]: undefined,
+ [ePolygonNetwork.matic]: undefined,
},
EmergencyAdminIndex: 1,
ProviderRegistry: {
- [eEthereumNetwork.kovan]: '0x1E40B561EC587036f9789aF83236f057D1ed2A90',
- [eEthereumNetwork.ropsten]: '',
- [eEthereumNetwork.main]: '0x52D306e36E3B6B02c153d0266ff0f85d18BCD413',
- [eEthereumNetwork.coverage]: '',
- [eEthereumNetwork.hardhat]: '',
- [eEthereumNetwork.buidlerevm]: '',
- [eEthereumNetwork.tenderlyMain]: '0x52D306e36E3B6B02c153d0266ff0f85d18BCD413',
- [eEthereumNetwork.mumbai]: '0x569859d41499B4dDC28bfaA43915051FF0A38a6F', // TEMP
- [eEthereumNetwork.matic]: '0x28334e4791860a0c1eCF89a62B973ba04a5d643F', // TEMP
+ [ePolygonNetwork.mumbai]: '0x569859d41499B4dDC28bfaA43915051FF0A38a6F', // TEMP
+ [ePolygonNetwork.matic]: '0x28334e4791860a0c1eCF89a62B973ba04a5d643F', // TEMP
},
ProviderRegistryOwner: {
- [eEthereumNetwork.kovan]: '0x85e4A467343c0dc4aDAB74Af84448D9c45D8ae6F',
- [eEthereumNetwork.ropsten]: '',
- [eEthereumNetwork.main]: '0xbd723fc4f1d737dcfc48a07fe7336766d34cad5f',
- [eEthereumNetwork.coverage]: '',
- [eEthereumNetwork.hardhat]: '',
- [eEthereumNetwork.buidlerevm]: '',
- [eEthereumNetwork.tenderlyMain]: '0xbd723fc4f1d737dcfc48a07fe7336766d34cad5f',
- [eEthereumNetwork.mumbai]: '0x18d9bA2baEfBdE0FF137C4ad031427EF205f1Fd9', // TEMP
- [eEthereumNetwork.matic]: '0x85e4A467343c0dc4aDAB74Af84448D9c45D8ae6F', // TEMP
+ [ePolygonNetwork.mumbai]: '0x18d9bA2baEfBdE0FF137C4ad031427EF205f1Fd9', // TEMP
+ [ePolygonNetwork.matic]: '0x85e4A467343c0dc4aDAB74Af84448D9c45D8ae6F', // TEMP
},
LendingRateOracle: {
- [eEthereumNetwork.coverage]: '',
- [eEthereumNetwork.hardhat]: '',
- [eEthereumNetwork.buidlerevm]: '',
- [eEthereumNetwork.kovan]: '',//'0xdCde9Bb6a49e37fA433990832AB541AE2d4FEB4a',
- [eEthereumNetwork.ropsten]: '0x05dcca805a6562c1bdd0423768754acb6993241b',
- [eEthereumNetwork.main]: '',//'0x8A32f49FFbA88aba6EFF96F45D8BD1D4b3f35c7D',
- [eEthereumNetwork.tenderlyMain]: '0x8A32f49FFbA88aba6EFF96F45D8BD1D4b3f35c7D',
- [eEthereumNetwork.mumbai]: '',
- [eEthereumNetwork.matic]: '',
+ [ePolygonNetwork.mumbai]: '',
+ [ePolygonNetwork.matic]: '',
},
LendingPoolCollateralManager: {
- [eEthereumNetwork.coverage]: '',
- [eEthereumNetwork.hardhat]: '',
- [eEthereumNetwork.buidlerevm]: '',
- [eEthereumNetwork.kovan]: '0x9269b6453d0d75370c4c85e5a42977a53efdb72a',
- [eEthereumNetwork.ropsten]: '',
- [eEthereumNetwork.main]: '0xbd4765210d4167CE2A5b87280D9E8Ee316D5EC7C',
- [eEthereumNetwork.tenderlyMain]: '0xbd4765210d4167CE2A5b87280D9E8Ee316D5EC7C',
- [eEthereumNetwork.mumbai]: '',
- [eEthereumNetwork.matic]: '',
+ [ePolygonNetwork.mumbai]: '',
+ [ePolygonNetwork.matic]: '',
},
TokenDistributor: {
- [eEthereumNetwork.coverage]: '',
- [eEthereumNetwork.buidlerevm]: '',
- [eEthereumNetwork.hardhat]: '',
- [EthereumNetwork.kovan]: '0x971efe90088f21dc6a36f610ffed77fc19710708',
- [EthereumNetwork.ropsten]: '0xeba2ea67942b8250d870b12750b594696d02fc9c',
- [EthereumNetwork.main]: '0xe3d9988f676457123c5fd01297605efdd0cba1ae',
- [EthereumNetwork.tenderlyMain]: '0xe3d9988f676457123c5fd01297605efdd0cba1ae',
- [eEthereumNetwork.mumbai]: '',
- [eEthereumNetwork.matic]: '',
+ [ePolygonNetwork.mumbai]: '',
+ [ePolygonNetwork.matic]: '',
},
AaveOracle: {
- [eEthereumNetwork.coverage]: '',
- [eEthereumNetwork.hardhat]: '',
- [eEthereumNetwork.buidlerevm]: '',
- [EthereumNetwork.kovan]: '',//'0xB8bE51E6563BB312Cbb2aa26e352516c25c26ac1',
- [EthereumNetwork.ropsten]: ZERO_ADDRESS,
- [EthereumNetwork.main]: '',//'0xA50ba011c48153De246E5192C8f9258A2ba79Ca9',
- [EthereumNetwork.tenderlyMain]: '0xA50ba011c48153De246E5192C8f9258A2ba79Ca9',
- [eEthereumNetwork.mumbai]: '',
- [eEthereumNetwork.matic]: '',
+ [ePolygonNetwork.mumbai]: '',
+ [ePolygonNetwork.matic]: '',
},
FallbackOracle: {
- [eEthereumNetwork.coverage]: '',
- [eEthereumNetwork.hardhat]: '',
- [eEthereumNetwork.buidlerevm]: '',
- [EthereumNetwork.kovan]: '0x50913E8E1c650E790F8a1E741FF9B1B1bB251dfe',
- [EthereumNetwork.ropsten]: '0xAD1a978cdbb8175b2eaeC47B01404f8AEC5f4F0d',
- [EthereumNetwork.main]: ZERO_ADDRESS,
- [EthereumNetwork.tenderlyMain]: ZERO_ADDRESS,
- [eEthereumNetwork.mumbai]: ZERO_ADDRESS,
- [eEthereumNetwork.matic]: ZERO_ADDRESS,
+ [ePolygonNetwork.mumbai]: ZERO_ADDRESS,
+ [ePolygonNetwork.matic]: ZERO_ADDRESS,
},
ChainlinkAggregator: {
- [eEthereumNetwork.coverage]: {},
- [eEthereumNetwork.hardhat]: {},
- [eEthereumNetwork.buidlerevm]: {},
- [eEthereumNetwork.matic]: {
+ [ePolygonNetwork.matic]: {
DAI: '0x4746DeC9e833A82EC7C2C1356372CcF2cfcD2F3D',
USDC: '0xfE4A8cc5b5B2366C1B58Bea3858e81843581b2F7',
USDT: '0x0A6513e40db6EB1b165753AD52E80663aeA50545',
@@ -171,76 +104,29 @@ export const CommonsConfig: ICommonConfiguration = {
WETH: '0xF9680D99D6C9589e2a93a78A04A279e509205945',
WMATIC: '0xAB594600376Ec9fD91F8e885dADF0CE036862dE0',
},
- [eEthereumNetwork.mumbai]: {
+ [ePolygonNetwork.mumbai]: {
DAI: ZERO_ADDRESS,
USDC: ZERO_ADDRESS,
USDT: ZERO_ADDRESS,
WBTC: ZERO_ADDRESS,
WMATIC: ZERO_ADDRESS,
},
- [EthereumNetwork.kovan]: {},
- [EthereumNetwork.ropsten]: {},
- [EthereumNetwork.main]: {
- DAI: '0x773616E4d11A78F511299002da57A0a94577F1f4',
- USDC: '0x986b5E1e1755e3C2440e960477f25201B0a8bbD4',
- USDT: '0xEe9F2375b4bdF6387aa8265dD4FB8F16512A1d46',
- WBTC: '0xdeb288F737066589598e9214E782fa5A8eD689e8',
- WMATIC: ZERO_ADDRESS,
- },
- [EthereumNetwork.tenderlyMain]: {
- DAI: '0x773616E4d11A78F511299002da57A0a94577F1f4',
- USDC: '0x986b5E1e1755e3C2440e960477f25201B0a8bbD4',
- USDT: '0xEe9F2375b4bdF6387aa8265dD4FB8F16512A1d46',
- WBTC: '0xdeb288F737066589598e9214E782fa5A8eD689e8',
- WMATIC: ZERO_ADDRESS,
- },
},
ReserveAssets: {
- [eEthereumNetwork.coverage]: {},
- [eEthereumNetwork.hardhat]: {},
- [eEthereumNetwork.buidlerevm]: {},
- [EthereumNetwork.main]: {},
- [EthereumNetwork.kovan]: {},
- [EthereumNetwork.ropsten]: {},
- [EthereumNetwork.tenderlyMain]: {},
- [eEthereumNetwork.matic]: {},
- [eEthereumNetwork.mumbai]: {},
+ [ePolygonNetwork.matic]: {},
+ [ePolygonNetwork.mumbai]: {},
},
ReservesConfig: {},
ATokenDomainSeparator: {
- [eEthereumNetwork.coverage]:
- '0x95b73a72c6ecf4ccbbba5178800023260bad8e75cdccdb8e4827a2977a37c820',
- [eEthereumNetwork.hardhat]:
- '0xbae024d959c6a022dc5ed37294cd39c141034b2ae5f02a955cce75c930a81bf5',
- [eEthereumNetwork.buidlerevm]:
- '0xbae024d959c6a022dc5ed37294cd39c141034b2ae5f02a955cce75c930a81bf5',
- [eEthereumNetwork.kovan]: '',
- [eEthereumNetwork.ropsten]: '',
- [eEthereumNetwork.main]: '',
- [eEthereumNetwork.tenderlyMain]: '',
- [EthereumNetwork.mumbai]: '',
- [EthereumNetwork.matic]: '',
+ [ePolygonNetwork.mumbai]: '',
+ [ePolygonNetwork.matic]: '',
},
WETH: {
- [eEthereumNetwork.coverage]: '', // deployed in local evm
- [eEthereumNetwork.hardhat]: '', // deployed in local evm
- [eEthereumNetwork.buidlerevm]: '', // deployed in local evm
- [eEthereumNetwork.kovan]: '0xd0a1e359811322d97991e03f863a0c30c2cf029c',
- [eEthereumNetwork.ropsten]: '0xc778417e063141139fce010982780140aa0cd5ab',
- [eEthereumNetwork.main]: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
- [eEthereumNetwork.tenderlyMain]: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
- [EthereumNetwork.mumbai]: '0x9c3C9283D3e44854697Cd22D3Faa240Cfb032889', // WMATIC address (untested)
- [EthereumNetwork.matic]: '0x0d500B1d8E8eF31E21C99d1Db9A6444d3ADf1270', // WMATIC address
+ [ePolygonNetwork.mumbai]: '0x9c3C9283D3e44854697Cd22D3Faa240Cfb032889', // WMATIC address (untested)
+ [ePolygonNetwork.matic]: '0x0d500B1d8E8eF31E21C99d1Db9A6444d3ADf1270', // WMATIC address
},
ReserveFactorTreasuryAddress: {
- [eEthereumNetwork.coverage]: '0x464c71f6c2f760dda6093dcb91c24c39e5d6e18c',
- [eEthereumNetwork.hardhat]: '0x464c71f6c2f760dda6093dcb91c24c39e5d6e18c',
- [eEthereumNetwork.buidlerevm]: '0x464c71f6c2f760dda6093dcb91c24c39e5d6e18c',
- [eEthereumNetwork.kovan]: '0x464c71f6c2f760dda6093dcb91c24c39e5d6e18c',
- [eEthereumNetwork.ropsten]: '0x464c71f6c2f760dda6093dcb91c24c39e5d6e18c',
- [eEthereumNetwork.main]: '0x464c71f6c2f760dda6093dcb91c24c39e5d6e18c',
- [eEthereumNetwork.tenderlyMain]: '0x464c71f6c2f760dda6093dcb91c24c39e5d6e18c',
- [EthereumNetwork.mumbai]: '0x464c71f6c2f760dda6093dcb91c24c39e5d6e18c', // TEMP
- [EthereumNetwork.matic]: '0x464c71f6c2f760dda6093dcb91c24c39e5d6e18c', // TEMP
+ [ePolygonNetwork.mumbai]: '0x464c71f6c2f760dda6093dcb91c24c39e5d6e18c', // TEMP
+ [ePolygonNetwork.matic]: '0x464c71f6c2f760dda6093dcb91c24c39e5d6e18c', // TEMP
},
};
diff --git a/markets/matic/index.ts b/markets/matic/index.ts
index ae935313..cc1484ae 100644
--- a/markets/matic/index.ts
+++ b/markets/matic/index.ts
@@ -1,5 +1,5 @@
import { oneRay, ZERO_ADDRESS } from '../../helpers/constants';
-import { IMaticConfiguration, EthereumNetwork, eEthereumNetwork } from '../../helpers/types';
+import { IMaticConfiguration, ePolygonNetwork } from '../../helpers/types';
import { CommonsConfig } from './commons';
import {
@@ -28,10 +28,7 @@ export const MaticConfig: IMaticConfiguration = {
WMATIC: strategyMATIC,
},
ReserveAssets: {
- [eEthereumNetwork.buidlerevm]: {},
- [eEthereumNetwork.hardhat]: {},
- [eEthereumNetwork.coverage]: {},
- [eEthereumNetwork.matic]: {
+ [ePolygonNetwork.matic]: {
DAI: '0x8f3Cf7ad23Cd3CaDbD9735AFf958023239c6A063',
USDC: '0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174',
USDT: '0xc2132D05D31c914a87C6611C10748AEb04B58e8F',
@@ -39,7 +36,7 @@ export const MaticConfig: IMaticConfiguration = {
WETH: '0x7ceB23fD6bC0adD59E62ac25578270cFf1b9f619',
WMATIC: '0x0d500B1d8E8eF31E21C99d1Db9A6444d3ADf1270',
},
- [eEthereumNetwork.mumbai]: { // Mock tokens with a simple "mint" external function, except wmatic
+ [ePolygonNetwork.mumbai]: { // Mock tokens with a simple "mint" external function, except wmatic
DAI: '0x13b3fda609C1eeb23b4F4b69257840760dCa6C4a',
USDC: '0x52b63223994433FdE2F1350Ba69Dfd2779f06ABA',
USDT: '0xB3abd1912F586fDFFa13606882c28E27913853d2',
@@ -47,26 +44,6 @@ export const MaticConfig: IMaticConfiguration = {
WETH: '0x53CDb16B8C031B779e996406546614E5F05BC4Bf',
WMATIC: '0x9c3C9283D3e44854697Cd22D3Faa240Cfb032889',
},
- [EthereumNetwork.kovan]: {},
- [EthereumNetwork.ropsten]: {},
- [EthereumNetwork.main]: {
- // WMATIC DOES NOT EXIST ON MAIN
- DAI: '0x6B175474E89094C44Da98b954EedeAC495271d0F',
- USDC: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
- USDT: '0xdAC17F958D2ee523a2206206994597C13D831ec7',
- WBTC: '0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599',
- WETH: '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2',
- WMATIC: '0x7D1AfA7B718fb893dB30A3aBc0Cfc608AaCfeBB0',
- },
- [EthereumNetwork.tenderlyMain]: {
- // WMATIC DOES NOT EXIST ON MAIN
- DAI: '0x6B175474E89094C44Da98b954EedeAC495271d0F',
- USDC: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
- USDT: '0xdAC17F958D2ee523a2206206994597C13D831ec7',
- WBTC: '0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599',
- WETH: '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2',
- WMATIC: '0x7D1AfA7B718fb893dB30A3aBc0Cfc608AaCfeBB0',
- },
},
};