From ced0bc3dfe480129ddf06e95c063fb51a8dbf2de Mon Sep 17 00:00:00 2001
From: Zer0dot <Zer0dot.dev@gmail.com>
Date: Thu, 7 Jan 2021 20:27:39 -0500
Subject: [PATCH] Setup testing on Kovan. Error on oracle deployment

---
 markets/uniswap/commons.ts       |  6 ++++--
 markets/uniswap/index.ts         |  4 ++--
 package.json                     |  1 +
 tasks/full/1_address_provider.ts | 14 ++++++++------
 tasks/migrations/aave.dev.ts     |  4 ++--
 5 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/markets/uniswap/commons.ts b/markets/uniswap/commons.ts
index 660a210a..889b15e3 100644
--- a/markets/uniswap/commons.ts
+++ b/markets/uniswap/commons.ts
@@ -111,8 +111,8 @@ export const CommonsConfig: ICommonConfiguration = {
     [eEthereumNetwork.buidlerevm]: '',
     [eEthereumNetwork.tenderlyMain]: '0x52D306e36E3B6B02c153d0266ff0f85d18BCD413',
   },
-  ProviderRegistryOwner: {
-    [eEthereumNetwork.kovan]: '0x85e4A467343c0dc4aDAB74Af84448D9c45D8ae6F',
+  ProviderRegistryOwner: { // TEMPORARILY USING MY DEPLOYER
+    [eEthereumNetwork.kovan]: '0x18d9bA2baEfBdE0FF137C4ad031427EF205f1Fd9',//'0x85e4A467343c0dc4aDAB74Af84448D9c45D8ae6F',
     [eEthereumNetwork.ropsten]: '',
     [eEthereumNetwork.main]: '0xbd723fc4f1d737dcfc48a07fe7336766d34cad5f',
     [eEthereumNetwork.coverage]: '',
@@ -181,6 +181,8 @@ export const CommonsConfig: ICommonConfiguration = {
       YFI: '0xC5d1B1DEb2992738C0273408ac43e1e906086B6C',
       ZRX: '0xBc3f28Ccc21E9b5856E81E6372aFf57307E2E883',
       USD: '0x9326BFA02ADD2366b30bacB125260Af641031331',
+      WETHDAI: '0x90B86B501BF4d800a7F76E551952E214Cc58Fba3',
+      WETHWBTC: '0x90B86B501BF4d800a7F76E551952E214Cc58Fba3',
     },
     [EthereumNetwork.ropsten]: {
       AAVE: ZERO_ADDRESS,
diff --git a/markets/uniswap/index.ts b/markets/uniswap/index.ts
index 37daa4af..e210c630 100644
--- a/markets/uniswap/index.ts
+++ b/markets/uniswap/index.ts
@@ -39,8 +39,8 @@ export const UniswapConfig: IUniswapConfiguration = {
       USDT: '0x13512979ADE267AB5100878E2e0f485B568328a4',
       WBTC: '0xD1B98B6607330172f1D991521145A22BCe793277',
       WETH: '0xd0a1e359811322d97991e03f863a0c30c2cf029c',
-      WETHDAI: '',
-      WETHWBTC: '',
+      WETHDAI: '0x7d3A67ab574abD3F9849e5fcDa48c19939d032b4',
+      WETHWBTC: '0x342e78bf229Cd2a750E80D7D7c2C185455979b91',
     },
     [EthereumNetwork.ropsten]: {
       // AAVE: '',
diff --git a/package.json b/package.json
index cd9c9e3e..56c6378e 100644
--- a/package.json
+++ b/package.json
@@ -31,6 +31,7 @@
     "aave:evm:dev:migration": "npm run compile && hardhat aave:dev",
     "aave:docker:full:migration": "npm run compile && npm run hardhat:docker -- aave:mainnet",
     "aave:kovan:full:migration": "npm run compile && npm run hardhat:kovan -- aave:mainnet --verify",
+    "uniswap:kovan:full:migration": "npm run compile && npm run hardhat:kovan -- uniswap:mainnet --verify",
     "aave:kovan:full:initialize": "npm run hardhat:kovan -- full:initialize-lending-pool --verify --pool Aave",
     "aave:ropsten:full:migration": "npm run compile && npm run hardhat:ropsten -- aave:mainnet --verify",
     "aave:fork:main:tenderly": "npm run compile && npm run hardhat:tenderly-main -- aave:mainnet",
diff --git a/tasks/full/1_address_provider.ts b/tasks/full/1_address_provider.ts
index eddc17f8..94506c27 100644
--- a/tasks/full/1_address_provider.ts
+++ b/tasks/full/1_address_provider.ts
@@ -80,14 +80,16 @@ task(
 
     // 2. Deploy address provider and set genesis manager
     const addressesProvider = await deployLendingPoolAddressesProvider(MarketId, verify);
+    
+    // TEMPORARILY DISABLING SEC. 3 FOR KOVAN DEPLOYMENT
 
     // 3. Set the provider at the Registry
-    await waitForTx(
-      await addressesProviderRegistry.registerAddressesProvider(
-        addressesProvider.address,
-        ProviderId
-      )
-    );
+    // await waitForTx(
+    //   await addressesProviderRegistry.registerAddressesProvider(
+    //     addressesProvider.address,
+    //     ProviderId
+    //   )
+    // );
 
     // 4. Set pool admins
 
diff --git a/tasks/migrations/aave.dev.ts b/tasks/migrations/aave.dev.ts
index e92d894d..1fe841fe 100644
--- a/tasks/migrations/aave.dev.ts
+++ b/tasks/migrations/aave.dev.ts
@@ -29,8 +29,8 @@ task('aave:dev', 'Deploy development enviroment')
     console.log('4. Deploy oracles');
     await localBRE.run('dev:deploy-oracles', {verify, pool: POOL_NAME});
 
-    // console.log('6. Deploy Uniswap market oracles');
-    // await localBRE.run('dev:deploy-oracles', {verify, pool: "Uniswap"});
+    console.log('6. Deploy Uniswap market oracles');
+    await localBRE.run('dev:deploy-oracles', {verify, pool: "Uniswap"});
 
     console.log('5. Initialize lending pool');
     await localBRE.run('dev:initialize-lending-pool', {verify, pool: POOL_NAME});