Use different method to wait between deploying and Etherscan verification

In one of the previous commits we introduced a 5 confirmations wait between
executing deploy of contracts and verifying them on Etherscan, using
`hre.ethers.provider.waitForTransaction`. Now we're switching to using
`waitConfirmations` option of hardhat deploy function for that. This will be in
line with how we wait after the deploy in other projects (e.g. `random-beacon`).
During the testing, we tried to limit the wait period to 1 confirmation, but
this proved to be not enough. We're sticking then with the advised 5
confirmations waiting period.

Author: michalinacienciala

deploy/01_deploy_t.ts

@@ -8,10 +8,10 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   const T = await deployments.deploy("T", {
     from: deployer,
     log: true,
+    waitConfirmations: 5,
   })
 
   if (hre.network.tags.etherscan) {
-    await hre.ethers.provider.waitForTransaction(T.transactionHash, 5, 300000)
     await helpers.etherscan.verify(T)
   }
 

deploy/03_deploy_vending_machine_keep.ts

@@ -27,14 +27,10 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
       T_ALLOCATION_KEEP,
     ],
     log: true,
+    waitConfirmations: 5,
   })
 
   if (hre.network.tags.etherscan) {
-    await hre.ethers.provider.waitForTransaction(
-      vendingMachine.transactionHash,
-      5,
-      300000
-    )
     await helpers.etherscan.verify(vendingMachine)
   }
 

deploy/04_deploy_vending_machine_nu.ts

@@ -23,14 +23,10 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
       T_ALLOCATION_NU,
     ],
     log: true,
+    waitConfirmations: 5,
   })
 
   if (hre.network.tags.etherscan) {
-    await hre.ethers.provider.waitForTransaction(
-      vendingMachine.transactionHash,
-      5,
-      300000
-    )
     await helpers.etherscan.verify(vendingMachine)
   }
 

deploy/06_deploy_keep_stake.ts

@@ -11,14 +11,10 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
     from: deployer,
     args: [KeepTokenStaking.address],
     log: true,
+    waitConfirmations: 5,
   })
 
   if (hre.network.tags.etherscan) {
-    await hre.ethers.provider.waitForTransaction(
-      KeepStake.transactionHash,
-      5,
-      300000
-    )
     await helpers.etherscan.verify(KeepStake)
   }
 

deploy/07_deploy_token_staking.ts

@@ -64,18 +64,14 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
       from: deployer,
       args: tokenStakingConstructorArgs,
       log: true,
+      waitConfirmations: 5,
     })
     tokenStakingAddress = TokenStaking.address
 
     await execute("TokenStaking", { from: deployer }, "initialize")
     log("Initialized TokenStaking.")
 
     if (hre.network.tags.etherscan) {
-      await hre.ethers.provider.waitForTransaction(
-        TokenStaking.transactionHash,
-        5,
-        300000
-      )
       await helpers.etherscan.verify(TokenStaking)
     }
   }

deploy/30_deploy_tokenholder_timelock.ts

@@ -19,14 +19,10 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
     from: deployer,
     args: [minDelay, proposers, executors],
     log: true,
+    waitConfirmations: 5,
   })
 
   if (hre.network.tags.etherscan) {
-    await hre.ethers.provider.waitForTransaction(
-      timelock.transactionHash,
-      5,
-      300000
-    )
     await helpers.etherscan.verify(timelock)
   }
 

deploy/31_deploy_tokenholder_governor.ts

@@ -21,14 +21,10 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
       vetoer,
     ],
     log: true,
+    waitConfirmations: 5,
   })
 
   if (hre.network.tags.etherscan) {
-    await hre.ethers.provider.waitForTransaction(
-      timelock.transactionHash,
-      5,
-      300000
-    )
     await helpers.etherscan.verify(
       timelock,
       "contracts/governance/TokenholderGovernor.sol:TokenholderGovernor"