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

.github/workflows/node.js.yml

@@ -40,10 +40,6 @@ jobs:
         run: npm run amm:fork:main
         env:
           ALCHEMY_KEY: ${{ secrets.ALCHEMY_KEY }}
-      - name: Aave deployment at Kovan fork
-        run: npm run aave:fork:kovan
-        env:
-          ALCHEMY_KEY: ${{ secrets.ALCHEMY_KEY }}
       # - name: Coverage
       #   run: npm run coverage
       # - uses: codecov/codecov-action@v1

markets/aave/reservesConfigs.ts

@@ -74,9 +74,9 @@ export const strategyUSDC: IReserveParams = {
 
 export const strategyUSDT: IReserveParams = {
   strategy: rateStrategyStableThree,
-  baseLTVAsCollateral: '8000',
-  liquidationThreshold: '8500',
-  liquidationBonus: '10500',
+  baseLTVAsCollateral: '0',
+  liquidationThreshold: '0',
+  liquidationBonus: '0',
   borrowingEnabled: true,
   stableBorrowRateEnabled: true,
   reserveDecimals: '6',

markets/matic/commons.ts

@@ -87,20 +87,20 @@ export const CommonsConfig: ICommonConfiguration = {
     [ePolygonNetwork.matic]: '',
   },
   ProviderRegistry: {
-    [ePolygonNetwork.mumbai]: ZERO_ADDRESS,
+    [ePolygonNetwork.mumbai]: '0xE6ef11C967898F9525D550014FDEdCFAB63536B5',
     [ePolygonNetwork.matic]: '0x3ac4e9aa29940770aeC38fe853a4bbabb2dA9C19',
   },
   ProviderRegistryOwner: {
-    [ePolygonNetwork.mumbai]: '',
+    [ePolygonNetwork.mumbai]: '0x943E44157dC0302a5CEb172374d1749018a00994',
     [ePolygonNetwork.matic]: '0xD7D86236d6c463521920fCC50A9CB56f8C8Bf008',
   },
   LendingRateOracle: {
-    [ePolygonNetwork.mumbai]: '',
+    [ePolygonNetwork.mumbai]: '0xC661e1445F9a8E5FD3C3dbCa0A0A2e8CBc79725D',
     [ePolygonNetwork.matic]: '0x17F73aEaD876CC4059089ff815EDA37052960dFB',
   },
   LendingPoolCollateralManager: {
-    [ePolygonNetwork.mumbai]: '',
-    [ePolygonNetwork.matic]: '',
+    [ePolygonNetwork.mumbai]: '0x2A7004B21c49253ca8DF923406Fed9a02AA86Ba0',
+    [ePolygonNetwork.matic]: '0xA39599424642D9fD35e475EF802EddF798dc555B',
   },
   TokenDistributor: {
     [ePolygonNetwork.mumbai]: '',
@@ -112,7 +112,7 @@ export const CommonsConfig: ICommonConfiguration = {
   },
   AaveOracle: {
     [ePolygonNetwork.mumbai]: '',
-    [ePolygonNetwork.matic]: '0x0229F777B0fAb107F9591a41d5F02E4e98dB6f2d',
+    [ePolygonNetwork.matic]: '',
   },
   FallbackOracle: {
     [ePolygonNetwork.mumbai]: ZERO_ADDRESS,
@@ -134,6 +134,7 @@ export const CommonsConfig: ICommonConfiguration = {
       USDT: ZERO_ADDRESS,
       WBTC: ZERO_ADDRESS,
       WMATIC: ZERO_ADDRESS,
+      USD: ZERO_ADDRESS,
     },
   },
   ReserveAssets: {
@@ -150,7 +151,7 @@ export const CommonsConfig: ICommonConfiguration = {
     [ePolygonNetwork.matic]: '0x7ceB23fD6bC0adD59E62ac25578270cFf1b9f619',
   },
   WrappedNativeToken: {
-    [ePolygonNetwork.mumbai]: ZERO_ADDRESS,
+    [ePolygonNetwork.mumbai]: '0x9c3C9283D3e44854697Cd22D3Faa240Cfb032889',
     [ePolygonNetwork.matic]: '0x0d500B1d8E8eF31E21C99d1Db9A6444d3ADf1270',
   },
   ReserveFactorTreasuryAddress: {
@@ -158,7 +159,7 @@ export const CommonsConfig: ICommonConfiguration = {
     [ePolygonNetwork.matic]: '0x7734280A4337F37Fbf4651073Db7c28C80B339e9',
   },
   IncentivesController: {
-    [ePolygonNetwork.mumbai]: ZERO_ADDRESS,
+    [ePolygonNetwork.mumbai]: '0xd41aE58e803Edf4304334acCE4DC4Ec34a63C644',
     [ePolygonNetwork.matic]: '0x357D51124f59836DeD84c8a1730D72B749d8BC23',
   },
 };

markets/matic/index.ts

@@ -18,7 +18,7 @@ import {
 export const MaticConfig: IMaticConfiguration = {
   ...CommonsConfig,
   MarketId: 'Matic Market',
-  ProviderId: 3, // Unknown?
+  ProviderId: 3,
   ReservesConfig: {
     DAI: strategyDAI,
     USDC: strategyUSDC,
@@ -40,11 +40,11 @@ export const MaticConfig: IMaticConfiguration = {
     },
     [ePolygonNetwork.mumbai]: {
       // Mock tokens with a simple "mint" external function, except wmatic
-      DAI: '0x13b3fda609C1eeb23b4F4b69257840760dCa6C4a',
-      USDC: '0x52b63223994433FdE2F1350Ba69Dfd2779f06ABA',
-      USDT: '0xB3abd1912F586fDFFa13606882c28E27913853d2',
-      WBTC: '0x393E3512d45a956A628124665672312ea86930Ba',
-      WETH: '0x53CDb16B8C031B779e996406546614E5F05BC4Bf',
+      DAI: '0x001B3B4d0F3714Ca98ba10F6042DaEbF0B1B7b6F',
+      USDC: '0x2058A9D7613eEE744279e3856Ef0eAda5FCbaA7e',
+      USDT: '0xBD21A10F619BE90d6066c941b04e340841F1F989',
+      WBTC: '0x0d787a4a1548f673ed375445535a6c7A1EE56180',
+      WETH: '0x3C68CE8504087f89c640D02d133646d98e64ddd9',
       WMATIC: '0x9c3C9283D3e44854697Cd22D3Faa240Cfb032889',
     },
   },