Merge pull request #228 from keep-network/deployment-scripts-improvements

Deployment scripts improvements

In this PR we improve the deployment scripts with:
- waitForConfirmations to ensure transaction is mined before executing next
  steps,
- Etherscan contracts verification.

Author: pdyraga

deploy/01_deploy_underwriter_token.ts

@@ -2,15 +2,20 @@ import { HardhatRuntimeEnvironment } from "hardhat/types"
 import { DeployFunction } from "hardhat-deploy/types"
 
 const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
-  const { getNamedAccounts, deployments } = hre
+  const { getNamedAccounts, deployments, helpers } = hre
   const { deployer } = await getNamedAccounts()
 
   const underwriterToken = await deployments.deploy("UnderwriterToken", {
     from: deployer,
     args: ["covT underwriter token", "covT"],
     log: true,
+    waitConfirmations: 1,
   })
 
+  if (hre.network.tags.etherscan) {
+    await helpers.etherscan.verify(underwriterToken)
+  }
+
   if (hre.network.tags.tenderly) {
     await hre.tenderly.verify({
       name: "UnderwriterToken",

deploy/02_deploy_asset_pool.ts

@@ -15,15 +15,9 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
     from: deployer,
     args: [T.address, UnderwriterToken.address, rewardManager],
     log: true,
+    waitConfirmations: 1,
   })
 
-  if (hre.network.tags.tenderly) {
-    await hre.tenderly.verify({
-      name: "AssetPool",
-      address: AssetPool.address,
-    })
-  }
-
   const rewardsPoolAddress = helpers.address.validate(
     await read("AssetPool", "rewardsPool")
   )
@@ -41,6 +35,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
       address: rewardsPoolAddress,
       receipt,
       transactionHash: AssetPool.transactionHash,
+      args: [T.address, AssetPool.address, rewardManager],
     },
     RewardsPool
   )
@@ -52,6 +47,29 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
     AssetPool.address,
     deployer
   )
+
+  if (hre.network.tags.etherscan) {
+    await helpers.etherscan.verify(
+      AssetPool,
+      // Provide contract name as a workaround for error returned by hardhat:
+      // "More than one contract was found to match the deployed bytecode."
+      "contracts/AssetPool.sol:AssetPool"
+    )
+
+    await helpers.etherscan.verify(rewardsPoolDeploymentArtifact)
+  }
+
+  if (hre.network.tags.tenderly) {
+    await hre.tenderly.verify({
+      name: "AssetPool",
+      address: AssetPool.address,
+    })
+
+    await hre.tenderly.verify({
+      name: "RewardsPool",
+      address: rewardsPoolAddress,
+    })
+  }
 }
 
 export default func

deploy/03_deploy_coverage_pool.ts

@@ -11,20 +11,25 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
     from: deployer,
     args: [AssetPool.address],
     log: true,
+    waitConfirmations: 1,
   })
 
+  await helpers.ownable.transferOwnership(
+    "AssetPool",
+    CoveragePool.address,
+    deployer
+  )
+
+  if (hre.network.tags.etherscan) {
+    await helpers.etherscan.verify(CoveragePool)
+  }
+
   if (hre.network.tags.tenderly) {
     await hre.tenderly.verify({
       name: "CoveragePool",
       address: CoveragePool.address,
     })
   }
-
-  await helpers.ownable.transferOwnership(
-    "AssetPool",
-    CoveragePool.address,
-    deployer
-  )
 }
 
 export default func

deploy/04_deploy_batched_phased_escrow.ts

@@ -2,7 +2,7 @@ import { HardhatRuntimeEnvironment } from "hardhat/types"
 import { DeployFunction } from "hardhat-deploy/types"
 
 const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
-  const { getNamedAccounts, deployments } = hre
+  const { getNamedAccounts, deployments, helpers } = hre
   const { deployer } = await getNamedAccounts()
 
   const T = await deployments.get("T")
@@ -12,8 +12,13 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
     from: deployer,
     args: [T.address],
     log: true,
+    waitConfirmations: 1,
   })
 
+  if (hre.network.tags.etherscan) {
+    await helpers.etherscan.verify(BatchedPhasedEscrow)
+  }
+
   if (hre.network.tags.tenderly) {
     await hre.tenderly.verify({
       name: "BatchedPhasedEscrow",

deploy/05_deploy_coverage_pool_beneficiary.ts

@@ -18,19 +18,13 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
       from: deployer,
       args: [T.address, RewardsPoolAddress],
       log: true,
+      waitConfirmations: 1,
     }
   )
 
-  if (hre.network.tags.tenderly) {
-    await hre.tenderly.verify({
-      name: "CoveragePoolBeneficiary",
-      address: CoveragePoolBeneficiary.address,
-    })
-  }
-
   await execute(
     "BatchedPhasedEscrow",
-    { from: deployer, log: true },
+    { from: deployer, log: true, waitConfirmations: 1 },
     "approveBeneficiary",
     CoveragePoolBeneficiary.address
   )
@@ -46,6 +40,17 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
     CoveragePoolBeneficiary.address,
     rewardManager
   )
+
+  if (hre.network.tags.etherscan) {
+    await helpers.etherscan.verify(CoveragePoolBeneficiary)
+  }
+
+  if (hre.network.tags.tenderly) {
+    await hre.tenderly.verify({
+      name: "CoveragePoolBeneficiary",
+      address: CoveragePoolBeneficiary.address,
+    })
+  }
 }
 
 export default func

deploy/06_approve_treasury_guild.ts

@@ -11,7 +11,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
 
   await execute(
     "CoveragePool",
-    { from: deployer, log: true },
+    { from: deployer, log: true, waitConfirmations: 1 },
     "approveFirstRiskManager",
     treasuryGuild
   )

deploy/07_transfer_ownership_to_t_council.ts

@@ -8,7 +8,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
 
   await execute(
     "BatchedPhasedEscrow",
-    { from: deployer, log: true },
+    { from: deployer, log: true, waitConfirmations: 1 },
     "setDrawee",
     thresholdCouncil
   )

hardhat.config.ts

@@ -7,6 +7,7 @@ import "hardhat-gas-reporter"
 import "hardhat-deploy"
 import "hardhat-dependency-compiler"
 import "solidity-coverage"
+import "@nomiclabs/hardhat-etherscan"
 import "@tenderly/hardhat-tenderly"
 
 const config: HardhatUserConfig = {
@@ -43,6 +44,14 @@ const config: HardhatUserConfig = {
       chainId: 1101,
       tags: ["local"],
     },
+    goerli: {
+      url: process.env.CHAIN_API_URL || "",
+      chainId: 5,
+      accounts: process.env.ACCOUNTS_PRIVATE_KEYS
+        ? process.env.ACCOUNTS_PRIVATE_KEYS.split(",")
+        : undefined,
+      tags: ["etherscan", "tenderly"],
+    },
     ropsten: {
       url: process.env.CHAIN_API_URL || "",
       chainId: 3,
@@ -102,15 +111,18 @@ const config: HardhatUserConfig = {
     },
     rewardManager: {
       default: 1,
+      goerli: 0, // use deployer account
       ropsten: 0, // use deployer account
       mainnet: 0, // use deployer account
     },
     thresholdCouncil: {
       default: 2,
+      goerli: 0, // use deployer account
       mainnet: "0x9f6e831c8f8939dc0c830c6e492e7cef4f9c2f5f",
     },
     treasuryGuild: {
       default: 3,
+      goerli: 0, // use deployer account
       mainnet: "0x71E47a4429d35827e0312AA13162197C23287546",
     },
   },

package.json

@@ -42,7 +42,7 @@
     "@threshold-network/solidity-contracts": "development"
   },
   "devDependencies": {
-    "@keep-network/hardhat-helpers": "^0.6.0-pre.15",
+    "@keep-network/hardhat-helpers": "^0.6.0-pre.17",
     "@keep-network/prettier-config-keep": "github:keep-network/prettier-config-keep#d6ec02e",
     "@nomiclabs/hardhat-ethers": "^2.0.6",
     "@nomiclabs/hardhat-etherscan": "^3.1.0",

yarn.lock

@@ -1341,7 +1341,7 @@
   resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz#87de7af9c231826fdd68ac7258f77c429e0e5fcf"
   integrity sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w==
 
-"@keep-network/hardhat-helpers@^0.6.0-pre.15":
+"@keep-network/hardhat-helpers@^0.6.0-pre.17":
   version "0.6.0-pre.17"
   resolved "https://registry.yarnpkg.com/@keep-network/hardhat-helpers/-/hardhat-helpers-0.6.0-pre.17.tgz#de085c8f5d684cc7e4ae793fdc6c104a09fd03ce"
   integrity sha512-G3Jp+I77po8e4moOrUY/wQCRYGt/g1aBoDjL2cbxMkAWFFrb9OBu1a5Vi5eOwO4ttWthN5c9vZKWJicR6kwOLg==