Merge branch 'feat/118-kovan-configs' into 'master'

Added kovan configs Closes #118 See merge request aave-tech/protocol-v2!135
2024-07-29 21:47:30 +00:00 · 2020-11-09 09:09:47 +00:00 · 2020-11-09 09:09:47 +00:00 · ef98aadd66
commit ef98aadd66
parent 33057d3e61 f46bef2b00
5 changed files with 315 additions and 312 deletions
--- a/config/aave.ts
+++ b/config/aave.ts
@ -34,100 +34,100 @@ export const AaveConfig: IAaveConfiguration = {
  ConfigName: 'Aave',
  ProviderId: 1,
  ReservesConfig: {
-    DAI: stablecoinStrategyDAI,
-    TUSD: stablecoinStrategyTUSD,
-    USDC: stablecoinStrategyUSDC,
-    USDT: stablecoinStrategyUSDT,
-    SUSD: stablecoinStrategySUSD,
    AAVE: strategyAAVE,
    BAT: strategyBase,
-    WETH: strategyWETH,
-    LINK: strategyLINK,
-    WBTC: strategyWBTC,
-    KNC: strategyKNC,
-    REP: strategyREP,
-    MKR: strategyMKR,
-    MANA: strategyMANA,
-    ZRX: strategyBase,
-    SNX: strategySNX,
-    YFI: strategyYFI,
-    UNI: strategyUNI,
    BUSD: stablecoinStrategyBUSD,
-    REN: strategyREN,
+    DAI: stablecoinStrategyDAI,
    ENJ: strategyREN,
+    KNC: strategyKNC,
+    LINK: strategyLINK,
+    MANA: strategyMANA,
+    MKR: strategyMKR,
+    REN: strategyREN,
+    REP: strategyREP,
+    SNX: strategySNX,
+    SUSD: stablecoinStrategySUSD,
+    TUSD: stablecoinStrategyTUSD,
+    UNI: strategyUNI,
+    USDC: stablecoinStrategyUSDC,
+    USDT: stablecoinStrategyUSDT,
+    WBTC: strategyWBTC,
+    WETH: strategyWETH,
+    YFI: strategyYFI,
+    ZRX: strategyBase,
  },
  ReserveAssets: {
    [eEthereumNetwork.buidlerevm]: {},
    [eEthereumNetwork.hardhat]: {},
    [eEthereumNetwork.coverage]: {},
    [EthereumNetwork.kovan]: {
-      WETH: '0xd0a1e359811322d97991e03f863a0c30c2cf029c',
-      DAI: '0xFf795577d9AC8bD7D90Ee22b6C1703490b6512FD',
-      TUSD: '0x016750AC630F711882812f24Dba6c95b9D35856d',
-      USDC: '0xe22da380ee6B445bb8273C81944ADEB6E8450422',
-      USDT: '0x13512979ADE267AB5100878E2e0f485B568328a4',
-      SUSD: '0xD868790F57B39C9B2B51b12de046975f986675f9',
      AAVE: '0xB597cd8D3217ea6477232F9217fa70837ff667Af',
      BAT: '0x2d12186Fbb9f9a8C28B3FfdD4c42920f8539D738',
-      REP: '0x260071C8D61DAf730758f8BD0d6370353956AE0E',
-      MKR: '0x61e4CAE3DA7FD189e52a4879C7B8067D7C2Cc0FA',
-      LINK: '0xAD5ce863aE3E4E9394Ab43d4ba0D80f419F61789',
-      KNC: '0x3F80c39c0b96A0945f9F0E9f55d8A8891c5671A8',
-      WBTC: '0xD1B98B6607330172f1D991521145A22BCe793277',
-      MANA: '0x738Dc6380157429e957d223e6333Dc385c85Fec7',
-      ZRX: '0xD0d76886cF8D952ca26177EB7CfDf83bad08C00C',
-      SNX: '0x7FDb81B0b8a010dd4FFc57C3fecbf145BA8Bd947',
      BUSD: '0x4c6E1EFC12FDfD568186b7BAEc0A43fFfb4bCcCf',
-      REN: '0x5eebf65A6746eed38042353Ba84c8e37eD58Ac6f',
-      YFI: '0xb7c325266ec274fEb1354021D27FA3E3379D840d',
-      UNI: '0x075A36BA8846C6B6F53644fDd3bf17E5151789DC',
+      DAI: '0xFf795577d9AC8bD7D90Ee22b6C1703490b6512FD',
      ENJ: '0xC64f90Cd7B564D3ab580eb20a102A8238E218be2',
+      KNC: '0x3F80c39c0b96A0945f9F0E9f55d8A8891c5671A8',
+      LINK: '0xAD5ce863aE3E4E9394Ab43d4ba0D80f419F61789',
+      MANA: '0x738Dc6380157429e957d223e6333Dc385c85Fec7',
+      MKR: '0x61e4CAE3DA7FD189e52a4879C7B8067D7C2Cc0FA',
+      REN: '0x5eebf65A6746eed38042353Ba84c8e37eD58Ac6f',
+      REP: '0x260071C8D61DAf730758f8BD0d6370353956AE0E',
+      SNX: '0x7FDb81B0b8a010dd4FFc57C3fecbf145BA8Bd947',
+      SUSD: '0xD868790F57B39C9B2B51b12de046975f986675f9',
+      TUSD: '0x016750AC630F711882812f24Dba6c95b9D35856d',
+      UNI: '0x075A36BA8846C6B6F53644fDd3bf17E5151789DC',
+      USDC: '0xe22da380ee6B445bb8273C81944ADEB6E8450422',
+      USDT: '0x13512979ADE267AB5100878E2e0f485B568328a4',
+      WBTC: '0xD1B98B6607330172f1D991521145A22BCe793277',
+      WETH: '0xd0a1e359811322d97991e03f863a0c30c2cf029c',
+      YFI: '0xb7c325266ec274fEb1354021D27FA3E3379D840d',
+      ZRX: '0xD0d76886cF8D952ca26177EB7CfDf83bad08C00C',
    },
    [EthereumNetwork.ropsten]: {
-      WETH: '0xc778417e063141139fce010982780140aa0cd5ab',
-      DAI: '0xf80A32A835F79D7787E8a8ee5721D0fEaFd78108',
-      TUSD: '0xa2EA00Df6d8594DBc76b79beFe22db9043b8896F',
-      USDC: '0x851dEf71f0e6A903375C1e536Bd9ff1684BAD802',
-      USDT: '0xB404c51BBC10dcBE948077F18a4B8E553D160084',
-      SUSD: '0xc374eB17f665914c714Ac4cdC8AF3a3474228cc5',
      AAVE: '',
      BAT: '0x85B24b3517E3aC7bf72a14516160541A60cFF19d',
-      REP: '0xBeb13523503d35F9b3708ca577CdCCAdbFB236bD',
-      MKR: '0x2eA9df3bABe04451c9C3B06a2c844587c59d9C37',
-      LINK: '0x1a906E71FF9e28d8E01460639EB8CF0a6f0e2486',
-      KNC: '0xCe4aA1dE3091033Ba74FA2Ad951f6adc5E5cF361',
-      WBTC: '0xa0E54Ab6AA5f0bf1D62EC3526436F3c05b3348A0',
-      MANA: '0x78b1F763857C8645E46eAdD9540882905ff32Db7',
-      ZRX: '0x02d7055704EfF050323A2E5ee4ba05DB2A588959',
-      SNX: '0xF80Aa7e2Fda4DA065C55B8061767F729dA1476c7',
      BUSD: '0xFA6adcFf6A90c11f31Bc9bb59eC0a6efB38381C6',
-      REN: ZERO_ADDRESS,
-      YFI: ZERO_ADDRESS,
-      UNI: ZERO_ADDRESS,
+      DAI: '0xf80A32A835F79D7787E8a8ee5721D0fEaFd78108',
      ENJ: ZERO_ADDRESS,
+      KNC: '0xCe4aA1dE3091033Ba74FA2Ad951f6adc5E5cF361',
+      LINK: '0x1a906E71FF9e28d8E01460639EB8CF0a6f0e2486',
+      MANA: '0x78b1F763857C8645E46eAdD9540882905ff32Db7',
+      MKR: '0x2eA9df3bABe04451c9C3B06a2c844587c59d9C37',
+      REN: ZERO_ADDRESS,
+      REP: '0xBeb13523503d35F9b3708ca577CdCCAdbFB236bD',
+      SNX: '0xF80Aa7e2Fda4DA065C55B8061767F729dA1476c7',
+      SUSD: '0xc374eB17f665914c714Ac4cdC8AF3a3474228cc5',
+      TUSD: '0xa2EA00Df6d8594DBc76b79beFe22db9043b8896F',
+      UNI: ZERO_ADDRESS,
+      USDC: '0x851dEf71f0e6A903375C1e536Bd9ff1684BAD802',
+      USDT: '0xB404c51BBC10dcBE948077F18a4B8E553D160084',
+      WBTC: '0xa0E54Ab6AA5f0bf1D62EC3526436F3c05b3348A0',
+      WETH: '0xc778417e063141139fce010982780140aa0cd5ab',
+      YFI: ZERO_ADDRESS,
+      ZRX: '0x02d7055704EfF050323A2E5ee4ba05DB2A588959',
    },
    [EthereumNetwork.main]: {
-      WETH: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
-      DAI: '0x6b175474e89094c44da98b954eedeac495271d0f',
-      TUSD: '0x0000000000085d4780B73119b644AE5ecd22b376',
-      USDC: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
-      USDT: '0xdac17f958d2ee523a2206206994597c13d831ec7',
-      SUSD: '0x57ab1ec28d129707052df4df418d58a2d46d5f51',
      AAVE: '0x7Fc66500c84A76Ad7e9c93437bFc5Ac33E2DDaE9',
      BAT: '0x0d8775f648430679a709e98d2b0cb6250d2887ef',
-      REP: '0x1985365e9f78359a9B6AD760e32412f4a445E862',
-      MKR: '0x9f8f72aa9304c8b593d555f12ef6589cc3a579a2',
-      LINK: '0x514910771af9ca656af840dff83e8264ecf986ca',
-      KNC: '0xdd974d5c2e2928dea5f71b9825b8b646686bd200',
-      WBTC: '0x2260fac5e5542a773aa44fbcfedf7c193bc2c599',
-      MANA: '0x0f5d2fb29fb7d3cfee444a200298f468908cc942',
-      ZRX: '0xe41d2489571d322189246dafa5ebde1f4699f498',
-      SNX: '0xC011a73ee8576Fb46F5E1c5751cA3B9Fe0af2a6F',
      BUSD: '0x4Fabb145d64652a948d72533023f6E7A623C7C53',
-      REN: '0x408e41876cCCDC0F92210600ef50372656052a38',
-      YFI: '0x0bc529c00C6401aEF6D220BE8C6Ea1667F6Ad93e',
-      UNI: '0x1f9840a85d5aF5bf1D1762F925BDADdC4201F984',
+      DAI: '0x6b175474e89094c44da98b954eedeac495271d0f',
      ENJ: '0xF629cBd94d3791C9250152BD8dfBDF380E2a3B9c',
+      KNC: '0xdd974d5c2e2928dea5f71b9825b8b646686bd200',
+      LINK: '0x514910771af9ca656af840dff83e8264ecf986ca',
+      MANA: '0x0f5d2fb29fb7d3cfee444a200298f468908cc942',
+      MKR: '0x9f8f72aa9304c8b593d555f12ef6589cc3a579a2',
+      REN: '0x408e41876cCCDC0F92210600ef50372656052a38',
+      REP: '0x1985365e9f78359a9B6AD760e32412f4a445E862',
+      SNX: '0xC011a73ee8576Fb46F5E1c5751cA3B9Fe0af2a6F',
+      SUSD: '0x57ab1ec28d129707052df4df418d58a2d46d5f51',
+      TUSD: '0x0000000000085d4780B73119b644AE5ecd22b376',
+      UNI: '0x1f9840a85d5aF5bf1D1762F925BDADdC4201F984',
+      USDC: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+      USDT: '0xdac17f958d2ee523a2206206994597c13d831ec7',
+      WBTC: '0x2260fac5e5542a773aa44fbcfedf7c193bc2c599',
+      WETH: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+      YFI: '0x0bc529c00C6401aEF6D220BE8C6Ea1667F6Ad93e',
+      ZRX: '0xe41d2489571d322189246dafa5ebde1f4699f498',
    },
  },
 };
--- a/config/commons.ts
+++ b/config/commons.ts
@ -4,28 +4,28 @@ import {oneEther, oneRay, RAY, ZERO_ADDRESS} from '../helpers/constants';
 import {ICommonConfiguration, EthereumNetwork, eEthereumNetwork} from '../helpers/types';

 const MOCK_CHAINLINK_AGGREGATORS_PRICES = {
-  DAI: oneEther.multipliedBy('0.00369068412860').toFixed(),
-  TUSD: oneEther.multipliedBy('0.00364714136416').toFixed(),
-  USDC: oneEther.multipliedBy('0.00367714136416').toFixed(),
  AAVE: oneEther.multipliedBy('0.003620948469').toFixed(),
  BAT: oneEther.multipliedBy('0.00137893825230').toFixed(),
-  USDT: oneEther.multipliedBy('0.00369068412860').toFixed(),
-  SUSD: oneEther.multipliedBy('0.00364714136416').toFixed(),
-  MKR: oneEther.multipliedBy('2.508581').toFixed(),
-  REP: oneEther.multipliedBy('0.048235').toFixed(),
-  ZRX: oneEther.multipliedBy('0.001151').toFixed(),
-  WBTC: oneEther.multipliedBy('47.332685').toFixed(),
-  LINK: oneEther.multipliedBy('0.009955').toFixed(),
-  KNC: oneEther.multipliedBy('0.001072').toFixed(),
-  MANA: oneEther.multipliedBy('0.000158').toFixed(),
-  SNX: oneEther.multipliedBy('0.00442616').toFixed(),
  BUSD: oneEther.multipliedBy('0.00736484').toFixed(),
-  WETH: oneEther.toFixed(),
-  USD: '5848466240000000',
-  YFI: oneEther.multipliedBy('22.407436').toFixed(),
-  REN: oneEther.multipliedBy('0.00065133').toFixed(),
-  UNI: oneEther.multipliedBy('0.00536479').toFixed(),
+  DAI: oneEther.multipliedBy('0.00369068412860').toFixed(),
  ENJ: oneEther.multipliedBy('0.00029560').toFixed(),
+  KNC: oneEther.multipliedBy('0.001072').toFixed(),
+  LINK: oneEther.multipliedBy('0.009955').toFixed(),
+  MANA: oneEther.multipliedBy('0.000158').toFixed(),
+  MKR: oneEther.multipliedBy('2.508581').toFixed(),
+  REN: oneEther.multipliedBy('0.00065133').toFixed(),
+  REP: oneEther.multipliedBy('0.048235').toFixed(),
+  SNX: oneEther.multipliedBy('0.00442616').toFixed(),
+  SUSD: oneEther.multipliedBy('0.00364714136416').toFixed(),
+  TUSD: oneEther.multipliedBy('0.00364714136416').toFixed(),
+  UNI: oneEther.multipliedBy('0.00536479').toFixed(),
+  USDC: oneEther.multipliedBy('0.00367714136416').toFixed(),
+  USDT: oneEther.multipliedBy('0.00369068412860').toFixed(),
+  WETH: oneEther.toFixed(),
+  WBTC: oneEther.multipliedBy('47.332685').toFixed(),
+  YFI: oneEther.multipliedBy('22.407436').toFixed(),
+  ZRX: oneEther.multipliedBy('0.001151').toFixed(),
+  USD: '5848466240000000',
  UNI_DAI_ETH: oneEther.multipliedBy('2.1').toFixed(),
  UNI_USDC_ETH: oneEther.multipliedBy('2.1').toFixed(),
  UNI_SETH_ETH: oneEther.multipliedBy('2.1').toFixed(),
@ -65,6 +65,7 @@ export const CommonsConfig: ICommonConfiguration = {
      ...MOCK_CHAINLINK_AGGREGATORS_PRICES,
    },
  },
+  // TODO: reorg alphabetically, checking the reason of tests failing
  LendingRateOracleRatesCommon: {
    WETH: {
      borrowRate: oneRay.multipliedBy(0.03).toFixed(),
@ -196,91 +197,91 @@ export const CommonsConfig: ICommonConfiguration = {
    [eEthereumNetwork.hardhat]: {},
    [eEthereumNetwork.buidlerevm]: {},
    [EthereumNetwork.kovan]: {
-      DAI: '0x6F47077D3B6645Cb6fb7A29D280277EC1e5fFD90',
-      TUSD: '0x02424c54D78D48179Fd12ebFfB11c16f9CA984Ad',
-      USDC: '0x672c1C0d1130912D83664011E7960a42E8cA05D5',
-      USDT: '0xCC833A6522721B3252e7578c5BCAF65738B75Fc3',
-      SUSD: '0xa353F8b083F7575cfec443b5ad585D42f652E9F7',
      AAVE: '0xd04647B7CB523bb9f26730E9B6dE1174db7591Ad',
-      BAT: '0x2c8d01771CCDca47c103194C5860dbEA2fE61626',
-      REP: '0x09F4A94F44c29d4967C761bBdB89f5bD3E2c09E6',
-      MKR: '0x14D7714eC44F44ECD0098B39e642b246fB2c38D0',
-      LINK: '0xf1e71Afd1459C05A2F898502C4025be755aa844A',
-      KNC: '0x0893AaF58f62279909F9F6FF2E5642f53342e77F',
-      WBTC: '0x33E5085E92f5b53E9A193E28ad2f76bF210550BB',
-      MANA: '0x3c30c5c415B2410326297F0f65f5Cbb32f3aefCc',
-      ZRX: '0x2636cfdDB457a6C7A7D60A439F1E5a5a0C3d9c65',
-      SNX: '0x775E76cca1B5bc903c9a8C6f77416A35E5744664',
-      BUSD: '0x63294A05C9a81b1A40CAD3f2ff30617111630393',
-      USD: '0xD21912D8762078598283B14cbA40Cb4bFCb87581',
-      YFI: '0xe45f3ed2218E7e411bf8DFdE66069e57F46b26eF',
-      REN: '0xF1939BECE7708382b5fb5e559f630CB8B39a10ee',
-      UNI: '0x17756515f112429471F86f98D5052aCB6C47f6ee',
+      BAT: '0x0e4fcEC26c9f85c3D714370c98f43C4E02Fc35Ae',
+      BUSD: '0xbF7A18ea5DE0501f7559144e702b29c55b055CcB',
+      DAI: '0x22B58f1EbEDfCA50feF632bD73368b2FdA96D541',
      ENJ: '0xfaDbe2ee798889F02d1d39eDaD98Eff4c7fe95D4',
+      KNC: '0xb8E8130d244CFd13a75D6B9Aee029B1C33c808A7',
+      LINK: '0x3Af8C569ab77af5230596Acf0E8c2F9351d24C38',
+      MANA: '0x1b93D8E109cfeDcBb3Cc74eD761DE286d5771511',
+      MKR: '0x0B156192e04bAD92B6C1C13cf8739d14D78D5701',
+      REN: '0xF1939BECE7708382b5fb5e559f630CB8B39a10ee',
+      REP: '0x3A7e6117F2979EFf81855de32819FBba48a63e9e',
+      SNX: '0xF9A76ae7a1075Fe7d646b06fF05Bd48b9FA5582e',
+      SUSD: '0xb343e7a1aF578FA35632435243D814e7497622f7',
+      TUSD: '0x7aeCF1c19661d12E962b69eBC8f6b2E63a55C660',
+      UNI: '0x17756515f112429471F86f98D5052aCB6C47f6ee',
+      USDC: '0x64EaC61A2DFda2c3Fa04eED49AA33D021AeC8838',
+      USDT: '0x0bF499444525a23E7Bb61997539725cA2e928138',
+      WBTC: '0xF7904a295A029a3aBDFFB6F12755974a958C7C25',
+      YFI: '0xC5d1B1DEb2992738C0273408ac43e1e906086B6C',
+      ZRX: '0xBc3f28Ccc21E9b5856E81E6372aFf57307E2E883',
+      USD: '0x9326BFA02ADD2366b30bacB125260Af641031331',
      UNI_DAI_ETH: '0x0338C40020Bf886c11406115fD1ba205Ef1D9Ff9',
-      UNI_USDC_ETH: '0x7f5E5D34591e9a70D187BBA94260C30B92aC0961',
-      UNI_SETH_ETH: '0xc5F1eA001c1570783b3af418fa775237Eb129EDC',
      UNI_LEND_ETH: '0xB996b1a11BA0aACc4deA57f7f92d1722428f2E90',
      UNI_LINK_ETH: '0x267490eE9Ad21dfE839aE73A8B1c8C9A36F60d33',
      UNI_MKR_ETH: '0x6eBF25AB0A18B8F6243619f1AE6b94373169A069',
+      UNI_SETH_ETH: '0xc5F1eA001c1570783b3af418fa775237Eb129EDC',
+      UNI_USDC_ETH: '0x7f5E5D34591e9a70D187BBA94260C30B92aC0961',
    },
    [EthereumNetwork.ropsten]: {
+      AAVE: ZERO_ADDRESS,
+      BAT: '0xafd8186c962daf599f171b8600f3e19af7b52c92',
+      BUSD: '0x0A32D96Ff131cd5c3E0E5AAB645BF009Eda61564',
      DAI: '0x64b8e49baded7bfb2fd5a9235b2440c0ee02971b',
+      ENJ: ZERO_ADDRESS,
+      KNC: '0x19d97ceb36624a31d827032d8216dd2eb15e9845',
+      LINK: '0xb8c99b98913bE2ca4899CdcaF33a3e519C20EeEc',
+      MANA: '0xDab909dedB72573c626481fC98CEE1152b81DEC2',
+      MKR: '0x811B1f727F8F4aE899774B568d2e72916D91F392',
+      REN: ZERO_ADDRESS,
+      REP: '0xa949ee9ba80c0f381481f2eab538bc5547a5ac67',
+      SNX: '0xA95674a8Ed9aa9D2E445eb0024a9aa05ab44f6bf',
+      SUSD: '0xe054b4aee7ac7645642dd52f1c892ff0128c98f0',
      TUSD: '0x523ac85618df56e940534443125ef16daf785620',
+      UNI: ZERO_ADDRESS,
      USDC: '0xe1480303dde539e2c241bdc527649f37c9cbef7d',
      USDT: '0xc08fe0c4d97ccda6b40649c6da621761b628c288',
-      SUSD: '0xe054b4aee7ac7645642dd52f1c892ff0128c98f0',
-      AAVE: '',
-      BAT: '0xafd8186c962daf599f171b8600f3e19af7b52c92',
-      REP: '0xa949ee9ba80c0f381481f2eab538bc5547a5ac67',
-      MKR: '0x811B1f727F8F4aE899774B568d2e72916D91F392',
-      LINK: '0xb8c99b98913bE2ca4899CdcaF33a3e519C20EeEc',
-      KNC: '0x19d97ceb36624a31d827032d8216dd2eb15e9845',
      WBTC: '0x5b8B87A0abA4be247e660B0e0143bB30Cdf566AF',
-      MANA: '0xDab909dedB72573c626481fC98CEE1152b81DEC2',
-      ZRX: '0x1d0052e4ae5b4ae4563cbac50edc3627ca0460d7',
-      SNX: '0xA95674a8Ed9aa9D2E445eb0024a9aa05ab44f6bf',
-      BUSD: '0x0A32D96Ff131cd5c3E0E5AAB645BF009Eda61564',
-      USD: '0x8468b2bDCE073A157E560AA4D9CcF6dB1DB98507',
      YFI: ZERO_ADDRESS,
-      REN: ZERO_ADDRESS,
-      UNI: ZERO_ADDRESS,
-      ENJ: ZERO_ADDRESS,
+      ZRX: '0x1d0052e4ae5b4ae4563cbac50edc3627ca0460d7',
      UNI_DAI_ETH: '0x16048819e3f77b7112eB033624A0bA9d33743028',
-      UNI_USDC_ETH: '0x6952A2678D574073DB97963886c2F38CD09C8Ba3',
-      UNI_SETH_ETH: '0x23Ee5188806BD2D31103368B0EA0259bc6706Af1',
      UNI_LEND_ETH: '0x43c44B27376Afedee06Bae2A003e979FC3B3Da6C',
      UNI_LINK_ETH: '0xb60c29714146EA3539261f599Eb30f62904108Fa',
      UNI_MKR_ETH: '0x594ae5421f378b8B4AF9e758C461d2A1FF990BC5',
+      UNI_SETH_ETH: '0x23Ee5188806BD2D31103368B0EA0259bc6706Af1',
+      UNI_USDC_ETH: '0x6952A2678D574073DB97963886c2F38CD09C8Ba3',
+      USD: '0x8468b2bDCE073A157E560AA4D9CcF6dB1DB98507',
    },
    [EthereumNetwork.main]: {
-      DAI: '0x037E8F2125bF532F3e228991e051c8A7253B642c',
-      TUSD: '0x73ead35fd6A572EF763B13Be65a9db96f7643577',
-      USDC: '0xdE54467873c3BCAA76421061036053e371721708',
-      USDT: '0xa874fe207DF445ff19E7482C746C4D3fD0CB9AcE',
-      SUSD: '0x6d626Ff97f0E89F6f983dE425dc5B24A18DE26Ea',
      AAVE: '0x6Df09E975c830ECae5bd4eD9d90f3A95a4f88012',
      BAT: '0x9b4e2579895efa2b4765063310Dc4109a7641129',
-      REP: '0xb8b513d9cf440C1b6f5C7142120d611C94fC220c',
-      MKR: '0xda3d675d50ff6c555973c4f0424964e1f6a4e7d3',
-      LINK: '0xeCfA53A8bdA4F0c4dd39c55CC8deF3757aCFDD07',
-      KNC: '0xd0e785973390fF8E77a83961efDb4F271E6B8152',
-      WBTC: '0x0133Aa47B6197D0BA090Bf2CD96626Eb71fFd13c',
-      MANA: '0xc89c4ed8f52Bb17314022f6c0dCB26210C905C97',
-      ZRX: '0xA0F9D94f060836756FFC84Db4C78d097cA8C23E8',
-      SNX: '0xE23d1142dE4E83C08bb048bcab54d50907390828',
      BUSD: '0x5d4BB541EED49D0290730b4aB332aA46bd27d888',
-      USD: '0x59b826c214aBa7125bFA52970d97736c105Cc375',
-      YFI: '0x7c5d4F8345e66f68099581Db340cd65B078C41f4',
-      REN: '0x3147D7203354Dc06D9fd350c7a2437bcA92387a4',
-      UNI: '0xD6aA3D25116d8dA79Ea0246c4826EB951872e02e',
+      DAI: '0x037E8F2125bF532F3e228991e051c8A7253B642c',
      ENJ: '0x24D9aB51950F3d62E9144fdC2f3135DAA6Ce8D1B',
+      KNC: '0xd0e785973390fF8E77a83961efDb4F271E6B8152',
+      LINK: '0xeCfA53A8bdA4F0c4dd39c55CC8deF3757aCFDD07',
+      MANA: '0xc89c4ed8f52Bb17314022f6c0dCB26210C905C97',
+      MKR: '0xda3d675d50ff6c555973c4f0424964e1f6a4e7d3',
+      REN: '0x3147D7203354Dc06D9fd350c7a2437bcA92387a4',
+      REP: '0xb8b513d9cf440C1b6f5C7142120d611C94fC220c',
+      SNX: '0xE23d1142dE4E83C08bb048bcab54d50907390828',
+      SUSD: '0x6d626Ff97f0E89F6f983dE425dc5B24A18DE26Ea',
+      TUSD: '0x73ead35fd6A572EF763B13Be65a9db96f7643577',
+      UNI: '0xD6aA3D25116d8dA79Ea0246c4826EB951872e02e',
+      USDC: '0xdE54467873c3BCAA76421061036053e371721708',
+      USDT: '0xa874fe207DF445ff19E7482C746C4D3fD0CB9AcE',
+      WBTC: '0x0133Aa47B6197D0BA090Bf2CD96626Eb71fFd13c',
+      YFI: '0x7c5d4F8345e66f68099581Db340cd65B078C41f4',
+      ZRX: '0xA0F9D94f060836756FFC84Db4C78d097cA8C23E8',
      UNI_DAI_ETH: '0x1bAB293850289Bf161C5DA79ff3d1F02A950555b',
-      UNI_USDC_ETH: '0x444315Ee92F2bb3579293C17B07194227fA99bF0',
-      UNI_SETH_ETH: '0x517D40E49660c7705b2e99eEFA6d7B0E9Ba5BF10',
      UNI_LEND_ETH: '0xF4C8Db2d999b024bBB6c6022566503eD41f2AC1E',
      UNI_LINK_ETH: '0xE2A639Beb647d7F709ca805ABa760bBEfdbE37e3',
      UNI_MKR_ETH: '0xEe40a5E8F3732bE6ECDb5A90e23D0b7bF0D4a73c',
+      UNI_SETH_ETH: '0x517D40E49660c7705b2e99eEFA6d7B0E9Ba5BF10',
+      UNI_USDC_ETH: '0x444315Ee92F2bb3579293C17B07194227fA99bF0',
+      USD: '0x59b826c214aBa7125bFA52970d97736c105Cc375',
    },
  },
  ReserveAssets: {
@ -296,9 +297,9 @@ export const CommonsConfig: ICommonConfiguration = {
    [eEthereumNetwork.coverage]:
      '0x95b73a72c6ecf4ccbbba5178800023260bad8e75cdccdb8e4827a2977a37c820',
    [eEthereumNetwork.hardhat]:
-      '0x92d0d54f437b6e70937ecba8ac80fc3b6767cf26bc725820e937d5a78427c2d1',
+      '0xa14895ab432a9d0712a041fdcea77f7f65826945dc90bf29ea819c2a01e7c5f9',
    [eEthereumNetwork.buidlerevm]:
-      '0x92d0d54f437b6e70937ecba8ac80fc3b6767cf26bc725820e937d5a78427c2d1',
+      '0xa14895ab432a9d0712a041fdcea77f7f65826945dc90bf29ea819c2a01e7c5f9',
    [eEthereumNetwork.kovan]: '',
    [eEthereumNetwork.ropsten]: '',
    [eEthereumNetwork.main]: '',
--- a/config/reservesConfigs.ts
+++ b/config/reservesConfigs.ts
@ -16,6 +16,20 @@ export const strategyBase: IReserveParams = {
  reserveDecimals: '18',
 };

+export const stablecoinStrategyBase: IReserveParams = {
+  baseVariableBorrowRate: new BigNumber(0.01).multipliedBy(oneRay).toFixed(),
+  variableRateSlope1: new BigNumber(0.07).multipliedBy(oneRay).toFixed(),
+  variableRateSlope2: new BigNumber(1.5).multipliedBy(oneRay).toFixed(),
+  stableRateSlope1: new BigNumber(0.06).multipliedBy(oneRay).toFixed(),
+  stableRateSlope2: new BigNumber(1.5).multipliedBy(oneRay).toFixed(),
+  baseLTVAsCollateral: '7500',
+  liquidationThreshold: '8000',
+  liquidationBonus: '10500',
+  borrowingEnabled: true,
+  stableBorrowRateEnabled: true,
+  reserveDecimals: '18',
+};
+
 export const stablecoinStrategyCentralized: IReserveParams = {
  baseVariableBorrowRate: new BigNumber(0.01).multipliedBy(oneRay).toFixed(),
  variableRateSlope1: new BigNumber(0.07).multipliedBy(oneRay).toFixed(),
@ -30,34 +44,10 @@ export const stablecoinStrategyCentralized: IReserveParams = {
  reserveDecimals: '6',
 };

-export const stablecoinStrategyBase: IReserveParams = {
-  baseVariableBorrowRate: new BigNumber(0.01).multipliedBy(oneRay).toFixed(),
-  variableRateSlope1: new BigNumber(0.07).multipliedBy(oneRay).toFixed(),
-  variableRateSlope2: new BigNumber(1.5).multipliedBy(oneRay).toFixed(),
-  stableRateSlope1: new BigNumber(0.06).multipliedBy(oneRay).toFixed(),
-  stableRateSlope2: new BigNumber(1.5).multipliedBy(oneRay).toFixed(),
-  baseLTVAsCollateral: '7500',
-  liquidationThreshold: '8000',
-  liquidationBonus: '10500',
-  borrowingEnabled: true,
-  stableBorrowRateEnabled: true,
-  reserveDecimals: '18',
-};
-
-export const stablecoinStrategyDAI: IReserveParams = {
-  ...stablecoinStrategyBase,
-};
-
-export const stablecoinStrategyTUSD: IReserveParams = {
-  ...stablecoinStrategyCentralized,
-  baseVariableBorrowRate: new BigNumber(0.01).multipliedBy(oneRay).toFixed(),
-  variableRateSlope1: new BigNumber(0.04).multipliedBy(oneRay).toFixed(),
-  variableRateSlope2: new BigNumber(1.5).multipliedBy(oneRay).toFixed(),
-  stableRateSlope1: new BigNumber(0.14).multipliedBy(oneRay).toFixed(),
-  stableRateSlope2: new BigNumber(0.6).multipliedBy(oneRay).toFixed(),
-  borrowingEnabled: true,
-  stableBorrowRateEnabled: false,
-  reserveDecimals: '18',
+export const strategyGovernanceTokens: IReserveParams = {
+  ...strategyBase,
+  baseLTVAsCollateral: '4000',
+  liquidationBonus: '11500',
 };

 export const stablecoinStrategyBUSD: IReserveParams = {
@ -73,20 +63,65 @@ export const stablecoinStrategyBUSD: IReserveParams = {
  stableRateSlope1: new BigNumber(0.14).multipliedBy(oneRay).toFixed(),
  stableRateSlope2: new BigNumber(0.6).multipliedBy(oneRay).toFixed(),
 };
-export const stablecoinStrategyUSDC: IReserveParams = {
-  ...stablecoinStrategyBase,
-  variableRateSlope2: new BigNumber(0.6).multipliedBy(oneRay).toFixed(),
-  reserveDecimals: '6',
+
+export const strategyAAVE: IReserveParams = {
+  ...strategyBase,
+  baseLTVAsCollateral: '5000',
+  liquidationThreshold: '6500',
+  liquidationBonus: '11000',
+  borrowingEnabled: false,
+  stableBorrowRateEnabled: false,
+  reserveDecimals: '18',
 };

-export const stablecoinStrategyUSDT: IReserveParams = {
+export const stablecoinStrategyDAI: IReserveParams = {
  ...stablecoinStrategyBase,
-  baseLTVAsCollateral: '-1',
+};
+
+export const strategyENJ: IReserveParams = {
+  ...strategyBase,
+  baseLTVAsCollateral: '5500',
+  stableBorrowRateEnabled: false,
+};
+
+export const strategyKNC: IReserveParams = {
+  ...strategyBase,
+  variableRateSlope1: new BigNumber(0.08).multipliedBy(oneRay).toFixed(),
+};
+
+export const strategyLINK: IReserveParams = {
+  ...strategyBase,
+  baseLTVAsCollateral: '6500',
  liquidationThreshold: '7000',
-  liquidationBonus: '0',
+};
+
+export const strategyMANA: IReserveParams = {
+  ...strategyBase,
+  variableRateSlope1: new BigNumber(0.08).multipliedBy(oneRay).toFixed(),
+  variableRateSlope2: new BigNumber(0.5).multipliedBy(oneRay).toFixed(),
+  stableRateSlope2: new BigNumber(0.6).multipliedBy(oneRay).toFixed(),
+};
+
+export const strategyMKR: IReserveParams = {
+  ...strategyBase,
+  baseLTVAsCollateral: '3500',
+};
+
+export const strategyREN: IReserveParams = {
+  ...strategyBase,
+  baseLTVAsCollateral: '5000',
+  liquidationThreshold: '6500',
+  liquidationBonus: '11000',
+  borrowingEnabled: true,
+  stableBorrowRateEnabled: false,
+};
+
+export const strategyREP: IReserveParams = {
+  ...strategyBase,
+  baseLTVAsCollateral: '3500',
+  variableRateSlope1: new BigNumber(0.07).multipliedBy(oneRay).toFixed(),
+  variableRateSlope2: new BigNumber(3).multipliedBy(oneRay).toFixed(),
  borrowingEnabled: false,
-  stableBorrowRateEnabled: true,
-  reserveDecimals: '6',
 };

 export const stablecoinStrategySUSD: IReserveParams = {
@ -103,34 +138,47 @@ export const stablecoinStrategySUSD: IReserveParams = {
  reserveDecimals: '18',
 };

-export const strategyAAVE: IReserveParams = {
+export const strategySNX: IReserveParams = {
  ...strategyBase,
-  baseLTVAsCollateral: '5000',
-  liquidationThreshold: '6500',
-  liquidationBonus: '11000',
-  borrowingEnabled: false,
+  baseLTVAsCollateral: '1500',
+  liquidationThreshold: '4000',
+  baseVariableBorrowRate: new BigNumber(0.03).multipliedBy(oneRay).toFixed(),
+  variableRateSlope1: new BigNumber(0.12).multipliedBy(oneRay).toFixed(),
+  variableRateSlope2: new BigNumber(1).multipliedBy(oneRay).toFixed(),
+  stableBorrowRateEnabled: false,
+};
+
+export const stablecoinStrategyTUSD: IReserveParams = {
+  ...stablecoinStrategyCentralized,
+  baseVariableBorrowRate: new BigNumber(0.01).multipliedBy(oneRay).toFixed(),
+  variableRateSlope1: new BigNumber(0.04).multipliedBy(oneRay).toFixed(),
+  variableRateSlope2: new BigNumber(1.5).multipliedBy(oneRay).toFixed(),
+  stableRateSlope1: new BigNumber(0.14).multipliedBy(oneRay).toFixed(),
+  stableRateSlope2: new BigNumber(0.6).multipliedBy(oneRay).toFixed(),
+  borrowingEnabled: true,
  stableBorrowRateEnabled: false,
  reserveDecimals: '18',
 };

-export const strategyWETH: IReserveParams = {
-  baseVariableBorrowRate: new BigNumber(0).multipliedBy(oneRay).toFixed(),
-  variableRateSlope1: new BigNumber(0.08).multipliedBy(oneRay).toFixed(),
-  variableRateSlope2: new BigNumber(1).multipliedBy(oneRay).toFixed(),
-  stableRateSlope1: new BigNumber(0.1).multipliedBy(oneRay).toFixed(),
-  stableRateSlope2: new BigNumber(1).multipliedBy(oneRay).toFixed(),
-  baseLTVAsCollateral: '7500',
-  liquidationThreshold: '8000',
-  liquidationBonus: '10500',
-  borrowingEnabled: true,
-  stableBorrowRateEnabled: true,
-  reserveDecimals: '18',
+export const strategyUNI: IReserveParams = {
+  ...strategyGovernanceTokens,
+  stableBorrowRateEnabled: false,
 };

-export const strategyLINK: IReserveParams = {
-  ...strategyBase,
-  baseLTVAsCollateral: '6500',
+export const stablecoinStrategyUSDC: IReserveParams = {
+  ...stablecoinStrategyBase,
+  variableRateSlope2: new BigNumber(0.6).multipliedBy(oneRay).toFixed(),
+  reserveDecimals: '6',
+};
+
+export const stablecoinStrategyUSDT: IReserveParams = {
+  ...stablecoinStrategyBase,
+  baseLTVAsCollateral: '-1',
  liquidationThreshold: '7000',
+  liquidationBonus: '0',
+  borrowingEnabled: false,
+  stableBorrowRateEnabled: true,
+  reserveDecimals: '6',
 };

 export const strategyWBTC: IReserveParams = {
@ -147,66 +195,20 @@ export const strategyWBTC: IReserveParams = {
  reserveDecimals: '8',
 };

-export const strategyKNC: IReserveParams = {
-  ...strategyBase,
+export const strategyWETH: IReserveParams = {
+  baseVariableBorrowRate: new BigNumber(0).multipliedBy(oneRay).toFixed(),
  variableRateSlope1: new BigNumber(0.08).multipliedBy(oneRay).toFixed(),
-};
-
-export const strategyREP: IReserveParams = {
-  ...strategyBase,
-  baseLTVAsCollateral: '3500',
-  variableRateSlope1: new BigNumber(0.07).multipliedBy(oneRay).toFixed(),
-  variableRateSlope2: new BigNumber(3).multipliedBy(oneRay).toFixed(),
-  borrowingEnabled: false,
-};
-
-export const strategyMKR: IReserveParams = {
-  ...strategyBase,
-  baseLTVAsCollateral: '3500',
-};
-
-export const strategyMANA: IReserveParams = {
-  ...strategyBase,
-  variableRateSlope1: new BigNumber(0.08).multipliedBy(oneRay).toFixed(),
-  variableRateSlope2: new BigNumber(0.5).multipliedBy(oneRay).toFixed(),
-  stableRateSlope2: new BigNumber(0.6).multipliedBy(oneRay).toFixed(),
-};
-
-export const strategySNX: IReserveParams = {
-  ...strategyBase,
-  baseLTVAsCollateral: '1500',
-  liquidationThreshold: '4000',
-  baseVariableBorrowRate: new BigNumber(0.03).multipliedBy(oneRay).toFixed(),
-  variableRateSlope1: new BigNumber(0.12).multipliedBy(oneRay).toFixed(),
  variableRateSlope2: new BigNumber(1).multipliedBy(oneRay).toFixed(),
-  stableBorrowRateEnabled: false,
-};
-
-export const strategyENJ: IReserveParams = {
-  ...strategyBase,
-  baseLTVAsCollateral: '5500',
-  stableBorrowRateEnabled: false,
-};
-
-export const strategyREN: IReserveParams = {
-  ...strategyBase,
-  baseLTVAsCollateral: '5000',
-  liquidationThreshold: '6500',
-  liquidationBonus: '11000',
+  stableRateSlope1: new BigNumber(0.1).multipliedBy(oneRay).toFixed(),
+  stableRateSlope2: new BigNumber(1).multipliedBy(oneRay).toFixed(),
+  baseLTVAsCollateral: '7500',
+  liquidationThreshold: '8000',
+  liquidationBonus: '10500',
  borrowingEnabled: true,
-  stableBorrowRateEnabled: false,
+  stableBorrowRateEnabled: true,
+  reserveDecimals: '18',
 };

-export const strategyGovernanceTokens: IReserveParams = {
-  ...strategyBase,
-  baseLTVAsCollateral: '4000',
-  liquidationBonus: '11500',
-};
 export const strategyYFI: IReserveParams = {
  ...strategyGovernanceTokens,
 };
-
-export const strategyUNI: IReserveParams = {
-  ...strategyGovernanceTokens,
-  stableBorrowRateEnabled: false,
-};
--- a/config/uniswap.ts
+++ b/config/uniswap.ts
@ -13,19 +13,6 @@ export const UniswapConfig: IUniswapConfiguration = {
  ConfigName: 'Uniswap',
  ProviderId: 2,
  ReservesConfig: {
-    WETH: {
-      baseVariableBorrowRate: new BigNumber(0).multipliedBy(oneRay).toFixed(),
-      variableRateSlope1: new BigNumber(0.08).multipliedBy(oneRay).toFixed(),
-      variableRateSlope2: new BigNumber(0.5).multipliedBy(oneRay).toFixed(),
-      stableRateSlope1: new BigNumber(0.1).multipliedBy(oneRay).toFixed(),
-      stableRateSlope2: new BigNumber(0.6).multipliedBy(oneRay).toFixed(),
-      baseLTVAsCollateral: '-1',
-      liquidationThreshold: '8000',
-      liquidationBonus: '10500',
-      borrowingEnabled: true,
-      stableBorrowRateEnabled: false,
-      reserveDecimals: '18',
-    },
    DAI: {
      baseVariableBorrowRate: new BigNumber(0.01).multipliedBy(oneRay).toFixed(),
      variableRateSlope1: new BigNumber(0.07).multipliedBy(oneRay).toFixed(),
@ -65,6 +52,19 @@ export const UniswapConfig: IUniswapConfiguration = {
      stableBorrowRateEnabled: false,
      reserveDecimals: '6',
    },
+    WETH: {
+      baseVariableBorrowRate: new BigNumber(0).multipliedBy(oneRay).toFixed(),
+      variableRateSlope1: new BigNumber(0.08).multipliedBy(oneRay).toFixed(),
+      variableRateSlope2: new BigNumber(0.5).multipliedBy(oneRay).toFixed(),
+      stableRateSlope1: new BigNumber(0.1).multipliedBy(oneRay).toFixed(),
+      stableRateSlope2: new BigNumber(0.6).multipliedBy(oneRay).toFixed(),
+      baseLTVAsCollateral: '-1',
+      liquidationThreshold: '8000',
+      liquidationBonus: '10500',
+      borrowingEnabled: true,
+      stableBorrowRateEnabled: false,
+      reserveDecimals: '18',
+    },
    UNI_DAI_ETH: {
      baseVariableBorrowRate: new BigNumber(0.01).multipliedBy(oneRay).toFixed(),
      variableRateSlope1: new BigNumber(0.04).multipliedBy(oneRay).toFixed(),
@ -78,32 +78,6 @@ export const UniswapConfig: IUniswapConfiguration = {
      stableBorrowRateEnabled: false,
      reserveDecimals: '18',
    },
-    UNI_USDC_ETH: {
-      baseVariableBorrowRate: new BigNumber(0.01).multipliedBy(oneRay).toFixed(),
-      variableRateSlope1: new BigNumber(0.04).multipliedBy(oneRay).toFixed(),
-      variableRateSlope2: new BigNumber(0.5).multipliedBy(oneRay).toFixed(),
-      stableRateSlope1: new BigNumber(0.16).multipliedBy(oneRay).toFixed(),
-      stableRateSlope2: new BigNumber(0.6).multipliedBy(oneRay).toFixed(),
-      baseLTVAsCollateral: '6800',
-      liquidationThreshold: '7300',
-      liquidationBonus: '11000',
-      borrowingEnabled: false,
-      stableBorrowRateEnabled: false,
-      reserveDecimals: '18',
-    },
-    UNI_SETH_ETH: {
-      baseVariableBorrowRate: new BigNumber(0.01).multipliedBy(oneRay).toFixed(),
-      variableRateSlope1: new BigNumber(0.04).multipliedBy(oneRay).toFixed(),
-      variableRateSlope2: new BigNumber(0.5).multipliedBy(oneRay).toFixed(),
-      stableRateSlope1: new BigNumber(0.16).multipliedBy(oneRay).toFixed(),
-      stableRateSlope2: new BigNumber(0.6).multipliedBy(oneRay).toFixed(),
-      baseLTVAsCollateral: '4800',
-      liquidationThreshold: '6600',
-      liquidationBonus: '11000',
-      borrowingEnabled: false,
-      stableBorrowRateEnabled: false,
-      reserveDecimals: '18',
-    },
    UNI_LEND_ETH: {
      baseVariableBorrowRate: new BigNumber(0.01).multipliedBy(oneRay).toFixed(),
      variableRateSlope1: new BigNumber(0.04).multipliedBy(oneRay).toFixed(),
@ -143,6 +117,32 @@ export const UniswapConfig: IUniswapConfiguration = {
      stableBorrowRateEnabled: false,
      reserveDecimals: '18',
    },
+    UNI_SETH_ETH: {
+      baseVariableBorrowRate: new BigNumber(0.01).multipliedBy(oneRay).toFixed(),
+      variableRateSlope1: new BigNumber(0.04).multipliedBy(oneRay).toFixed(),
+      variableRateSlope2: new BigNumber(0.5).multipliedBy(oneRay).toFixed(),
+      stableRateSlope1: new BigNumber(0.16).multipliedBy(oneRay).toFixed(),
+      stableRateSlope2: new BigNumber(0.6).multipliedBy(oneRay).toFixed(),
+      baseLTVAsCollateral: '4800',
+      liquidationThreshold: '6600',
+      liquidationBonus: '11000',
+      borrowingEnabled: false,
+      stableBorrowRateEnabled: false,
+      reserveDecimals: '18',
+    },
+    UNI_USDC_ETH: {
+      baseVariableBorrowRate: new BigNumber(0.01).multipliedBy(oneRay).toFixed(),
+      variableRateSlope1: new BigNumber(0.04).multipliedBy(oneRay).toFixed(),
+      variableRateSlope2: new BigNumber(0.5).multipliedBy(oneRay).toFixed(),
+      stableRateSlope1: new BigNumber(0.16).multipliedBy(oneRay).toFixed(),
+      stableRateSlope2: new BigNumber(0.6).multipliedBy(oneRay).toFixed(),
+      baseLTVAsCollateral: '6800',
+      liquidationThreshold: '7300',
+      liquidationBonus: '11000',
+      borrowingEnabled: false,
+      stableBorrowRateEnabled: false,
+      reserveDecimals: '18',
+    },
  },
  ChainlinkAggregator: {
    [eEthereumNetwork.buidlerevm]: {},
@ -153,33 +153,33 @@ export const UniswapConfig: IUniswapConfiguration = {
      USDC: '0x672c1C0d1130912D83664011E7960a42E8cA05D5',
      USDT: '0xCC833A6522721B3252e7578c5BCAF65738B75Fc3',
      UNI_DAI_ETH: '0x0338C40020Bf886c11406115fD1ba205Ef1D9Ff9',
-      UNI_USDC_ETH: '0x7f5E5D34591e9a70D187BBA94260C30B92aC0961',
-      UNI_SETH_ETH: '0xc5F1eA001c1570783b3af418fa775237Eb129EDC',
      UNI_LEND_ETH: '0xB996b1a11BA0aACc4deA57f7f92d1722428f2E90',
      UNI_LINK_ETH: '0x267490eE9Ad21dfE839aE73A8B1c8C9A36F60d33',
      UNI_MKR_ETH: '0x6eBF25AB0A18B8F6243619f1AE6b94373169A069',
+      UNI_SETH_ETH: '0xc5F1eA001c1570783b3af418fa775237Eb129EDC',
+      UNI_USDC_ETH: '0x7f5E5D34591e9a70D187BBA94260C30B92aC0961',
    },
    [EthereumNetwork.ropsten]: {
      DAI: '0x64b8e49baded7bfb2fd5a9235b2440c0ee02971b',
      USDC: '0xe1480303dde539e2c241bdc527649f37c9cbef7d',
      USDT: '0xc08fe0c4d97ccda6b40649c6da621761b628c288',
      UNI_DAI_ETH: '0x16048819e3f77b7112eB033624A0bA9d33743028',
-      UNI_USDC_ETH: '0x6952A2678D574073DB97963886c2F38CD09C8Ba3',
-      UNI_SETH_ETH: '0x23Ee5188806BD2D31103368B0EA0259bc6706Af1',
      UNI_LEND_ETH: '0x43c44B27376Afedee06Bae2A003e979FC3B3Da6C',
      UNI_LINK_ETH: '0xb60c29714146EA3539261f599Eb30f62904108Fa',
      UNI_MKR_ETH: '0x594ae5421f378b8B4AF9e758C461d2A1FF990BC5',
+      UNI_SETH_ETH: '0x23Ee5188806BD2D31103368B0EA0259bc6706Af1',
+      UNI_USDC_ETH: '0x6952A2678D574073DB97963886c2F38CD09C8Ba3',
    },
    [EthereumNetwork.main]: {
      DAI: '0x037E8F2125bF532F3e228991e051c8A7253B642c',
      USDC: '0xdE54467873c3BCAA76421061036053e371721708',
      USDT: '0xa874fe207DF445ff19E7482C746C4D3fD0CB9AcE',
      UNI_DAI_ETH: '0x1bAB293850289Bf161C5DA79ff3d1F02A950555b',
-      UNI_USDC_ETH: '0x444315Ee92F2bb3579293C17B07194227fA99bF0',
-      UNI_SETH_ETH: '0x517D40E49660c7705b2e99eEFA6d7B0E9Ba5BF10',
      UNI_LEND_ETH: '0xF4C8Db2d999b024bBB6c6022566503eD41f2AC1E',
      UNI_LINK_ETH: '0xE2A639Beb647d7F709ca805ABa760bBEfdbE37e3',
      UNI_MKR_ETH: '0xEe40a5E8F3732bE6ECDb5A90e23D0b7bF0D4a73c',
+      UNI_SETH_ETH: '0x517D40E49660c7705b2e99eEFA6d7B0E9Ba5BF10',
+      UNI_USDC_ETH: '0x444315Ee92F2bb3579293C17B07194227fA99bF0',
    },
  },
  ReserveAssets: {
@ -187,40 +187,40 @@ export const UniswapConfig: IUniswapConfiguration = {
    [eEthereumNetwork.buidlerevm]: {},
    [eEthereumNetwork.coverage]: {},
    [EthereumNetwork.kovan]: {
-      WETH: '0xd0a1e359811322d97991e03f863a0c30c2cf029c',
      DAI: '0xFf795577d9AC8bD7D90Ee22b6C1703490b6512FD',
      USDC: '0xe22da380ee6B445bb8273C81944ADEB6E8450422',
      USDT: '0x13512979ADE267AB5100878E2e0f485B568328a4',
+      WETH: '0xd0a1e359811322d97991e03f863a0c30c2cf029c',
      UNI_DAI_ETH: '0x2e0086b5343101203ADeE40160ca1BD91E29fF75',
-      UNI_USDC_ETH: '0x34eA1aB2a43ee696914fc3C0d3e517fA666B9e8D',
-      UNI_SETH_ETH: '0xCF457d8Bb8D8f54Af1ea1B3710231e89bd6CFbfe',
      UNI_LEND_ETH: '0x7615cd666F867406C64E558B9CCC3883e7EC9BA8',
      UNI_LINK_ETH: '0xFb9AAc184e79025f936E9C4EF3047Ad4889Df4a8',
      UNI_MKR_ETH: '0xB31a1c30f38cD68e8177566Ef950d7bc3C81DaCF',
+      UNI_SETH_ETH: '0xCF457d8Bb8D8f54Af1ea1B3710231e89bd6CFbfe',
+      UNI_USDC_ETH: '0x34eA1aB2a43ee696914fc3C0d3e517fA666B9e8D',
    },
    [EthereumNetwork.ropsten]: {
-      WETH: '0xc778417e063141139fce010982780140aa0cd5ab',
      DAI: '0xf80A32A835F79D7787E8a8ee5721D0fEaFd78108',
      USDC: '0x851dEf71f0e6A903375C1e536Bd9ff1684BAD802',
      USDT: '0xB404c51BBC10dcBE948077F18a4B8E553D160084',
+      WETH: '0xc778417e063141139fce010982780140aa0cd5ab',
      UNI_DAI_ETH: '0xC245A7d35E652Cae438A1FdB13E474DF53DBB81D',
-      UNI_USDC_ETH: '0x2BD65323955D08eb600074291305881d1295c4D2',
-      UNI_SETH_ETH: '0xed4597DCd234867d7A260AD24bAb8253F64940a5',
      UNI_LEND_ETH: '0xcD5DE1EDD40aBBD6efE2C306276FF56f81Bc3151',
      UNI_LINK_ETH: '0x8dcf3c8d4d69ca7C188c0A4cf219A1dcE1e510d7',
      UNI_MKR_ETH: '0xd8b7B99a9205FD0D0abFB6D7a2c13Db2681bff43',
+      UNI_SETH_ETH: '0xed4597DCd234867d7A260AD24bAb8253F64940a5',
+      UNI_USDC_ETH: '0x2BD65323955D08eb600074291305881d1295c4D2',
    },
    [EthereumNetwork.main]: {
-      WETH: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
      DAI: '0x6b175474e89094c44da98b954eedeac495271d0f',
      USDC: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
      USDT: '0xdac17f958d2ee523a2206206994597c13d831ec7',
+      WETH: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
      UNI_DAI_ETH: '0x2a1530c4c41db0b0b2bb646cb5eb1a67b7158667',
-      UNI_USDC_ETH: '0x97dec872013f6b5fb443861090ad931542878126',
-      UNI_SETH_ETH: '0xe9cf7887b93150d4f2da7dfc6d502b216438f244',
      UNI_LEND_ETH: '0xcaa7e4656f6a2b59f5f99c745f91ab26d1210dce',
      UNI_LINK_ETH: '0xf173214c720f58e03e194085b1db28b50acdeead',
      UNI_MKR_ETH: '0x2c4bd064b998838076fa341a83d007fc2fa50957',
+      UNI_SETH_ETH: '0xe9cf7887b93150d4f2da7dfc6d502b216438f244',
+      UNI_USDC_ETH: '0x97dec872013f6b5fb443861090ad931542878126',
    },
  },
 };
--- a/test/atoken-permit.spec.ts
+++ b/test/atoken-permit.spec.ts
@ -20,7 +20,7 @@ makeSuite('AToken: Permit', (testEnv: TestEnv) => {

  it('Checks the domain separator', async () => {
    const DOMAIN_SEPARATOR_ENCODED = getATokenDomainSeparatorPerNetwork(
-      eEthereumNetwork.buidlerevm,
+      eEthereumNetwork.hardhat,
      poolConfig
    );