From 516cbc7349065bcea1f9d9e68810b12428ed3b36 Mon Sep 17 00:00:00 2001
From: sendra <polsendra@gmail.com>
Date: Tue, 30 Mar 2021 13:17:08 +0200
Subject: [PATCH] updated deployment scripts

---
 helpers/contracts-deployments.ts              | 26 +++++++++++++-
 package.json                                  |  4 ++-
 .../deployments/deploy-UiPoolDataProvider.ts  | 36 +++++++++++++------
 3 files changed, 53 insertions(+), 13 deletions(-)

diff --git a/helpers/contracts-deployments.ts b/helpers/contracts-deployments.ts
index 07f34a91..68024d2a 100644
--- a/helpers/contracts-deployments.ts
+++ b/helpers/contracts-deployments.ts
@@ -55,12 +55,28 @@ import {
   registerContractInJsonDb,
   linkBytecode,
   insertContractAddressInDb,
+  deployContract,
 } from './contracts-helpers';
 import { StableAndVariableTokensHelperFactory } from '../types/StableAndVariableTokensHelperFactory';
 import { MintableDelegationERC20 } from '../types/MintableDelegationERC20';
 import { readArtifact as buidlerReadArtifact } from '@nomiclabs/buidler/plugins';
 import { HardhatRuntimeEnvironment } from 'hardhat/types';
 import { LendingPoolLibraryAddresses } from '../types/LendingPoolFactory';
+import { UiPoolDataProvider } from '../types';
+import { verifyContract } from './etherscan-verification';
+
+export const deployUiPoolDataProvider = async (
+  [incentivesController, aaveOracle]: [tEthereumAddress, tEthereumAddress],
+  verify?: boolean
+) => {
+  const id = eContractid.UiPoolDataProvider;
+  const args: string[] = [incentivesController, aaveOracle];
+  const instance = await deployContract<UiPoolDataProvider>(id, args);
+  if (verify) {
+    await verifyContract(instance.address, args);
+  }
+  return instance;
+};
 
 const readArtifact = async (id: string) => {
   if (DRE.network.name === eEthereumNetwork.buidlerevm) {
@@ -546,7 +562,15 @@ export const deployMockVariableDebtToken = async (
 };
 
 export const deployMockAToken = async (
-  args: [tEthereumAddress, tEthereumAddress, tEthereumAddress, tEthereumAddress, string, string, string],
+  args: [
+    tEthereumAddress,
+    tEthereumAddress,
+    tEthereumAddress,
+    tEthereumAddress,
+    string,
+    string,
+    string
+  ],
   verify?: boolean
 ) => {
   const instance = await withSaveAndVerify(
diff --git a/package.json b/package.json
index 4532f6fa..dce53f5d 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,9 @@
     "print-contracts:kovan": "npm run hardhat:kovan -- print-contracts",
     "print-contracts:main": "npm run hardhat:main -- print-contracts",
     "print-contracts:ropsten": "npm run hardhat:main -- print-contracts",
-    "dev:deployUIProvider": "npm run hardhat:kovan deploy-UiPoolDataProvider",
+    "dev:deployUIProvider": "hardhat --network kovan deploy-UiPoolDataProvider",
+    "main:deployUIProvider": "hardhat --network main deploy-UiPoolDataProvider",
+    "matic:deployUIProvider": "hardhat --network matic deploy-UiPoolDataProvider",
     "dev:deployUniswapRepayAdapter": "hardhat --network kovan deploy-UniswapRepayAdapter --provider 0x88757f2f99175387aB4C6a4b3067c77A695b0349 --router 0xfcd87315f0e4067070ade8682fcdbc3006631441 --weth 0xd0a1e359811322d97991e03f863a0c30c2cf029c",
     "dev:UniswapLiquiditySwapAdapter": "hardhat --network kovan deploy-UniswapLiquiditySwapAdapter --provider 0x88757f2f99175387aB4C6a4b3067c77A695b0349 --router 0xfcd87315f0e4067070ade8682fcdbc3006631441 --weth 0xd0a1e359811322d97991e03f863a0c30c2cf029c",
     "main:deployUniswapRepayAdapter": "hardhat --network main deploy-UniswapRepayAdapter --provider 0xB53C1a33016B2DC2fF3653530bfF1848a515c8c5 --router 0x7a250d5630B4cF539739dF2C5dAcb4c659F2488D --weth 0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
diff --git a/tasks/deployments/deploy-UiPoolDataProvider.ts b/tasks/deployments/deploy-UiPoolDataProvider.ts
index 2d696702..64a6dae4 100644
--- a/tasks/deployments/deploy-UiPoolDataProvider.ts
+++ b/tasks/deployments/deploy-UiPoolDataProvider.ts
@@ -1,8 +1,6 @@
 import { task } from 'hardhat/config';
-
-import { UiPoolDataProviderFactory } from '../../types';
-import { verifyContract } from '../../helpers/etherscan-verification';
-import { eContractid } from '../../helpers/types';
+import { eContractid, eEthereumNetwork, ePolygonNetwork } from '../../helpers/types';
+import { deployUiPoolDataProvider } from '../../helpers/contracts-deployments';
 
 task(`deploy-${eContractid.UiPoolDataProvider}`, `Deploys the UiPoolDataProvider contract`)
   .addFlag('verify', 'Verify UiPoolDataProvider contract via Etherscan API.')
@@ -13,15 +11,31 @@ task(`deploy-${eContractid.UiPoolDataProvider}`, `Deploys the UiPoolDataProvider
       throw new Error('INVALID_CHAIN_ID');
     }
 
+    const addressesByNetwork = {
+      // [eEthereumNetwork.kovan]: {
+      //   incentivesController: '',
+      //   aaveOracle: '',
+      // },
+      // [eEthereumNetwork.main]: {
+      //   incentivesController: '',
+      //   aaveOracle: '0xa50ba011c48153de246e5192c8f9258a2ba79ca9',
+      // },
+      [ePolygonNetwork.matic]: {
+        incentivesController: '0x357D51124f59836DeD84c8a1730D72B749d8BC23',
+        aaveOracle: '0x21451bD7b528896B4AB2b9764b521D6ed641708d',
+      },
+    };
+
     console.log(`\n- UiPoolDataProvider deployment`);
 
     console.log(`\tDeploying UiPoolDataProvider implementation ...`);
-    const uiPoolDataProvider = await new UiPoolDataProviderFactory(
-      await localBRE.ethers.provider.getSigner()
-    ).deploy();
-    await uiPoolDataProvider.deployTransaction.wait();
-    console.log('uiPoolDataProvider.address', uiPoolDataProvider.address);
-    await verifyContract(uiPoolDataProvider.address, []);
+    const UiPoolDataProvider = await deployUiPoolDataProvider(
+      [
+        addressesByNetwork[localBRE.network.name].incentivesController,
+        addressesByNetwork[localBRE.network.name].aaveOracle,
+      ],
+      verify
+    );
 
-    console.log(`\tFinished UiPoolDataProvider proxy and implementation deployment`);
+    console.log(`\tFinished UiPoolDataProvider deployment: ${UiPoolDataProvider.address}`);
   });