From 03c525314cf1c21a8855f0daab4fd6358eaf3055 Mon Sep 17 00:00:00 2001 From: miguelmtzinf Date: Wed, 29 Sep 2021 17:36:36 +0200 Subject: [PATCH 1/5] fix: Fix error at mumbai config --- markets/matic/commons.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/markets/matic/commons.ts b/markets/matic/commons.ts index 8a0274a0..5b261303 100644 --- a/markets/matic/commons.ts +++ b/markets/matic/commons.ts @@ -132,6 +132,7 @@ export const CommonsConfig: ICommonConfiguration = { USDT: ZERO_ADDRESS, WBTC: ZERO_ADDRESS, WMATIC: ZERO_ADDRESS, + USD: ZERO_ADDRESS, }, }, ReserveAssets: { From 69c826ba48d387ba245ad9e250f514561daf36e3 Mon Sep 17 00:00:00 2001 From: miguelmtzinf Date: Wed, 29 Sep 2021 17:52:44 +0200 Subject: [PATCH 2/5] fix: Add addresses to mumbai market config --- markets/matic/commons.ts | 18 +++++++++--------- markets/matic/index.ts | 10 +++++----- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/markets/matic/commons.ts b/markets/matic/commons.ts index 5b261303..49d2e0b1 100644 --- a/markets/matic/commons.ts +++ b/markets/matic/commons.ts @@ -77,27 +77,27 @@ export const CommonsConfig: ICommonConfiguration = { [ePolygonNetwork.matic]: undefined, }, LendingPool: { - [ePolygonNetwork.mumbai]: '', + [ePolygonNetwork.mumbai]: '0x9198F13B08E299d85E096929fA9781A1E3d5d827', [ePolygonNetwork.matic]: '', }, LendingPoolConfigurator: { - [ePolygonNetwork.mumbai]: '', + [ePolygonNetwork.mumbai]: '0xc3c37E2aA3dc66464fa3C29ce2a6EC85beFC45e1', [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.mumbai]: '0x2A7004B21c49253ca8DF923406Fed9a02AA86Ba0', [ePolygonNetwork.matic]: '', }, TokenDistributor: { @@ -105,11 +105,11 @@ export const CommonsConfig: ICommonConfiguration = { [ePolygonNetwork.matic]: '', }, WethGateway: { - [ePolygonNetwork.mumbai]: '', + [ePolygonNetwork.mumbai]: '0xee9eE614Ad26963bEc1Bec0D2c92879ae1F209fA', [ePolygonNetwork.matic]: '', }, AaveOracle: { - [ePolygonNetwork.mumbai]: '', + [ePolygonNetwork.mumbai]: '0xC365C653f7229894F93994CD0b30947Ab69Ff1D5', [ePolygonNetwork.matic]: '0x0229F777B0fAb107F9591a41d5F02E4e98dB6f2d', }, FallbackOracle: { @@ -157,7 +157,7 @@ export const CommonsConfig: ICommonConfiguration = { [ePolygonNetwork.matic]: '0x7734280A4337F37Fbf4651073Db7c28C80B339e9', }, IncentivesController: { - [ePolygonNetwork.mumbai]: ZERO_ADDRESS, + [ePolygonNetwork.mumbai]: '0xd41aE58e803Edf4304334acCE4DC4Ec34a63C644', [ePolygonNetwork.matic]: '0x357D51124f59836DeD84c8a1730D72B749d8BC23', }, }; diff --git a/markets/matic/index.ts b/markets/matic/index.ts index e5bb55bf..ba89c313 100644 --- a/markets/matic/index.ts +++ b/markets/matic/index.ts @@ -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', }, }, From 8238da70950c2a3adb8fbd4cb6cc2365c98e85b8 Mon Sep 17 00:00:00 2001 From: miguelmtzinf Date: Wed, 29 Sep 2021 17:53:07 +0200 Subject: [PATCH 3/5] fix: Fix matic market config details --- markets/aave/reservesConfigs.ts | 6 +++--- markets/matic/commons.ts | 8 ++++---- markets/matic/index.ts | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/markets/aave/reservesConfigs.ts b/markets/aave/reservesConfigs.ts index a29e16d7..501d9e46 100644 --- a/markets/aave/reservesConfigs.ts +++ b/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', diff --git a/markets/matic/commons.ts b/markets/matic/commons.ts index 49d2e0b1..23173af5 100644 --- a/markets/matic/commons.ts +++ b/markets/matic/commons.ts @@ -78,11 +78,11 @@ export const CommonsConfig: ICommonConfiguration = { }, LendingPool: { [ePolygonNetwork.mumbai]: '0x9198F13B08E299d85E096929fA9781A1E3d5d827', - [ePolygonNetwork.matic]: '', + [ePolygonNetwork.matic]: '0x8dFf5E27EA6b7AC08EbFdf9eB090F32ee9a30fcf', }, LendingPoolConfigurator: { [ePolygonNetwork.mumbai]: '0xc3c37E2aA3dc66464fa3C29ce2a6EC85beFC45e1', - [ePolygonNetwork.matic]: '', + [ePolygonNetwork.matic]: '0x26db2B833021583566323E3b8985999981b9F1F3', }, ProviderRegistry: { [ePolygonNetwork.mumbai]: '0xE6ef11C967898F9525D550014FDEdCFAB63536B5', @@ -98,7 +98,7 @@ export const CommonsConfig: ICommonConfiguration = { }, LendingPoolCollateralManager: { [ePolygonNetwork.mumbai]: '0x2A7004B21c49253ca8DF923406Fed9a02AA86Ba0', - [ePolygonNetwork.matic]: '', + [ePolygonNetwork.matic]: '0xA39599424642D9fD35e475EF802EddF798dc555B', }, TokenDistributor: { [ePolygonNetwork.mumbai]: '', @@ -106,7 +106,7 @@ export const CommonsConfig: ICommonConfiguration = { }, WethGateway: { [ePolygonNetwork.mumbai]: '0xee9eE614Ad26963bEc1Bec0D2c92879ae1F209fA', - [ePolygonNetwork.matic]: '', + [ePolygonNetwork.matic]: '0xbEadf48d62aCC944a06EEaE0A9054A90E5A7dc97', }, AaveOracle: { [ePolygonNetwork.mumbai]: '0xC365C653f7229894F93994CD0b30947Ab69Ff1D5', diff --git a/markets/matic/index.ts b/markets/matic/index.ts index ba89c313..d29564d9 100644 --- a/markets/matic/index.ts +++ b/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, From b026a93552081efd316631b89bd2ce63285e3dfc Mon Sep 17 00:00:00 2001 From: miguelmtzinf Date: Thu, 30 Sep 2021 17:43:06 +0200 Subject: [PATCH 4/5] fix: Fix mtic market config details --- markets/matic/commons.ts | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/markets/matic/commons.ts b/markets/matic/commons.ts index 23173af5..c3e15404 100644 --- a/markets/matic/commons.ts +++ b/markets/matic/commons.ts @@ -77,12 +77,12 @@ export const CommonsConfig: ICommonConfiguration = { [ePolygonNetwork.matic]: undefined, }, LendingPool: { - [ePolygonNetwork.mumbai]: '0x9198F13B08E299d85E096929fA9781A1E3d5d827', - [ePolygonNetwork.matic]: '0x8dFf5E27EA6b7AC08EbFdf9eB090F32ee9a30fcf', + [ePolygonNetwork.mumbai]: '', + [ePolygonNetwork.matic]: '', }, LendingPoolConfigurator: { - [ePolygonNetwork.mumbai]: '0xc3c37E2aA3dc66464fa3C29ce2a6EC85beFC45e1', - [ePolygonNetwork.matic]: '0x26db2B833021583566323E3b8985999981b9F1F3', + [ePolygonNetwork.mumbai]: '', + [ePolygonNetwork.matic]: '', }, ProviderRegistry: { [ePolygonNetwork.mumbai]: '0xE6ef11C967898F9525D550014FDEdCFAB63536B5', @@ -105,12 +105,12 @@ export const CommonsConfig: ICommonConfiguration = { [ePolygonNetwork.matic]: '', }, WethGateway: { - [ePolygonNetwork.mumbai]: '0xee9eE614Ad26963bEc1Bec0D2c92879ae1F209fA', - [ePolygonNetwork.matic]: '0xbEadf48d62aCC944a06EEaE0A9054A90E5A7dc97', + [ePolygonNetwork.mumbai]: '', + [ePolygonNetwork.matic]: '', }, AaveOracle: { - [ePolygonNetwork.mumbai]: '0xC365C653f7229894F93994CD0b30947Ab69Ff1D5', - [ePolygonNetwork.matic]: '0x0229F777B0fAb107F9591a41d5F02E4e98dB6f2d', + [ePolygonNetwork.mumbai]: '', + [ePolygonNetwork.matic]: '', }, FallbackOracle: { [ePolygonNetwork.mumbai]: ZERO_ADDRESS, @@ -149,7 +149,7 @@ export const CommonsConfig: ICommonConfiguration = { [ePolygonNetwork.matic]: '0x7ceB23fD6bC0adD59E62ac25578270cFf1b9f619', }, WrappedNativeToken: { - [ePolygonNetwork.mumbai]: ZERO_ADDRESS, + [ePolygonNetwork.mumbai]: '0x9c3C9283D3e44854697Cd22D3Faa240Cfb032889', [ePolygonNetwork.matic]: '0x0d500B1d8E8eF31E21C99d1Db9A6444d3ADf1270', }, ReserveFactorTreasuryAddress: { From a129c65dd3ac6f57959d88d972621ef298e311b4 Mon Sep 17 00:00:00 2001 From: kartojal Date: Wed, 6 Oct 2021 13:21:35 +0200 Subject: [PATCH 5/5] ci: remove kovan step due doesnt support tx type 2 --- .github/workflows/node.js.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 68a54d05..bc4f0e70 100644 --- a/.github/workflows/node.js.yml +++ b/.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