Update deploy/verify script

Author: kanewallmann

scripts/deploy-upgrade.v1.4.js

@@ -113,6 +113,18 @@ async function deployUpgrade(rocketStorageAddress) {
     const deployedContracts = {};
     const contractPlan = {};
 
+    const deployTxs = []
+
+    // Construct ABI for rocketMegapool
+    const rocketMegapoolAbi = []
+        .concat(artifacts.require('RocketMegapoolDelegate').abi)
+        .concat(artifacts.require('RocketMegapoolDelegateBase').abi)
+        .concat(artifacts.require('RocketMegapoolProxy').abi)
+        .filter(i => i.type !== 'fallback' && i.type !== 'receive');
+
+    rocketMegapoolAbi.push({ stateMutability: 'payable', type: 'fallback'});
+    rocketMegapoolAbi.push({ stateMutability: 'payable', type: 'receive'});
+
     async function deployNetworkContract(name) {
         const plan = contractPlan[name];
         if (!plan) {
@@ -146,6 +158,8 @@ async function deployUpgrade(rocketStorageAddress) {
             address: address,
             instance: instance,
         };
+
+        deployTxs.push(rsTx);
     }
 
     // Setup contract plan
@@ -192,6 +206,9 @@ async function deployUpgrade(rocketStorageAddress) {
     // Deploy upgrade
     await deployNetworkContract('RocketUpgradeOneDotFour');
 
+    // Wait for all contract to be deployed
+    await Promise.all(deployTxs.map(deployTx => deployTx.wait()))
+
     // Set
     const upgradeContract = deployedContracts['RocketUpgradeOneDotFour'].instance;
     const setAddressesA = [
@@ -271,6 +288,7 @@ async function deployUpgrade(rocketStorageAddress) {
         compressABI(networkContracts.rocketMegapoolPenalties.abi),
         compressABI(networkContracts.rocketNetworkSnapshotsTime.abi),
         compressABI(networkContracts.rocketDAOProtocolSettingsProposals.abi),
+        compressABI(rocketMegapoolAbi),
     ];
     await upgradeContract.connect(signer).setA(setAddressesA, setAbisA);
     await upgradeContract.connect(signer).setB(setAddressesB, setAbisB);
@@ -383,6 +401,7 @@ async function verify() {
             const status = await verifier.getVerificationStatus(verificationResults[contract]);
             console.log(`  - ${contract}: ${status.result}`);
         }
+        await new Promise(resolve => setTimeout(resolve, 500));
     }
 
     console.log();

test/_helpers/verify.js

@@ -43,9 +43,11 @@ const defaultOpts = {
     preamble: '',
 };
 
-const endpointMap = {
-    'mainnet': 'https://api.etherscan.io/api',
-    'hoodi': 'https://api-hoodi.etherscan.io/api',
+const endpoint = 'https://api.etherscan.io/v2/api'
+
+const chainIdMap = {
+    'mainnet': '1',
+    'hoodi': '560048',
 };
 
 export class EtherscanVerifier {
@@ -74,6 +76,8 @@ export class EtherscanVerifier {
 
         for (const contract of contracts) {
             results[contract.contractName] = await this.verify(contract.buildInfoId, contract.sourceName, contract.contractName, contract.address, contract.constructorArgs);
+            // Avoid Etherscans 3/s rate limit
+            await new Promise(resolve => setTimeout(resolve, 500));
         }
 
         return results;
@@ -149,14 +153,12 @@ export class EtherscanVerifier {
     }
 
     async getVerificationStatus(guid) {
-        const apiEndpoint = endpointMap[this.opts.chain];
-        const result = await axios.get(`${apiEndpoint}?module=contract&action=checkverifystatus&apikey=${this.opts.apiKey}&guid=${guid}`);
+        const result = await axios.get(`${endpoint}?chainid=${chainIdMap[this.opts.chain]}&module=contract&action=checkverifystatus&apikey=${this.opts.apiKey}&guid=${guid}`);
         return result.data;
     }
 
     async isVerified(address) {
-        const apiEndpoint = endpointMap[this.opts.chain];
-        const result = await axios.get(`${apiEndpoint}?module=contract&action=getabi&apikey=${this.opts.apiKey}&address=${address}`);
+        const result = await axios.get(`${endpoint}?chainid=${chainIdMap[this.opts.chain]}&module=contract&action=getabi&apikey=${this.opts.apiKey}&address=${address}`);
         return result.data.status !== '0';
     }
 
@@ -207,7 +209,7 @@ export class EtherscanVerifier {
 
         // Submit to API
         const formData = querystring.stringify(payload);
-        const result = await axios.post(endpointMap[this.opts.chain], formData);
+        const result = await axios.post(`${endpoint}?chainid=${chainIdMap[this.opts.chain]}`, formData);
 
         // Check result
         if (result.data.status !== '1') {