fix: use ethercan plugin to verify contracts at polygonscan

helpers/contracts-helpers.ts

@@ -26,7 +26,6 @@ import { Artifact as BuidlerArtifact } from '@nomiclabs/buidler/types';
 import { verifyEtherscanContract } from './etherscan-verification';
 import { getFirstSigner, getIErc20Detailed } from './contracts-getters';
 import { usingTenderly, verifyAtTenderly } from './tenderly-utils';
-import { usingPolygon, verifyAtPolygon } from './polygon-utils';
 import { ConfigNames, loadPoolConfig } from './configuration';
 import { ZERO_ADDRESS } from './constants';
 import { getDefenderRelaySigner, usingDefender } from './defender-utils';
@@ -192,7 +191,10 @@ export const getOptionalParamAddressPerNetwork = (
   return getParamPerNetwork(param, network);
 };
 
-export const getParamPerPool = <T>({ proto, amm, matic, avalanche }: iParamsPerPool<T>, pool: AavePools) => {
+export const getParamPerPool = <T>(
+  { proto, amm, matic, avalanche }: iParamsPerPool<T>,
+  pool: AavePools
+) => {
   switch (pool) {
     case AavePools.proto:
       return proto;
@@ -378,14 +380,10 @@ export const verifyContract = async (
   instance: Contract,
   args: (string | string[])[]
 ) => {
-  if (usingPolygon()) {
+  if (usingTenderly()) {
-    await verifyAtPolygon(id, instance, args);
+    await verifyAtTenderly(id, instance);
-  } else {
-    if (usingTenderly()) {
-      await verifyAtTenderly(id, instance);
-    }
-    await verifyEtherscanContract(instance.address, args);
   }
+  await verifyEtherscanContract(instance.address, args);
   return instance;
 };
 

helpers/etherscan-verification.ts

@@ -14,7 +14,7 @@ const okErrors = [`Contract source code already verified`];
 
 const unableVerifyError = 'Fail - Unable to verify';
 
-export const SUPPORTED_ETHERSCAN_NETWORKS = ['main', 'ropsten', 'kovan'];
+export const SUPPORTED_ETHERSCAN_NETWORKS = ['main', 'ropsten', 'kovan', 'matic', 'mumbai'];
 
 function delay(ms: number) {
   return new Promise((resolve) => setTimeout(resolve, ms));

helpers/polygon-utils.ts

@@ -11,132 +11,3 @@ const TASK_COMPILE_SOLIDITY_GET_SOURCE_PATHS = 'compile:solidity:get-source-path
 
 export const usingPolygon = () =>
   DRE && Object.keys(ePolygonNetwork).includes((DRE as HardhatRuntimeEnvironment).network.name);
-
-/* Polygon Verifier */
-
-const SOLIDITY_PRAGMA = 'pragma solidity';
-const LICENSE_IDENTIFIER = 'License-Identifier';
-const EXPERIMENTAL_ABIENCODER = 'pragma experimental ABIEncoderV2;';
-
-const encodeDeployParams = (instance: Contract, args: (string | string[])[]) => {
-  return instance.interface.encodeDeploy(args).replace('0x', '');
-};
-
-// Remove lines at "text" that includes "matcher" string, but keeping first "keep" lines
-const removeLines = (text: string, matcher: string, keep = 0): string => {
-  let counter = keep;
-  return text
-    .split('\n')
-    .filter((line) => {
-      const match = !line.includes(matcher);
-      if (match === false && counter > 0) {
-        counter--;
-        return true;
-      }
-      return match;
-    })
-    .join('\n');
-};
-
-// Try to find the path of a Contract by name of the file without ".sol"
-const findPath = async (id: string): Promise<string> => {
-  const paths = await DRE.run(TASK_COMPILE_SOLIDITY_GET_SOURCE_PATHS);
-  const path = paths.find((x) => {
-    const t = x.split('/');
-    return t[t.length - 1].split('.')[0] == id;
-  });
-
-  if (!path) {
-    throw Error('Missing path for contract name: ${id}');
-  }
-
-  return path;
-};
-
-// Hardhat Flattener, similar to truffle flattener
-const hardhatFlattener = async (filePath: string) =>
-  await DRE.run(TASK_FLATTEN_GET_FLATTENED_SOURCE, { files: [filePath] });
-
-// Verify a smart contract at Polygon Matic network via a GET request to the block explorer
-export const verifyAtPolygon = async (
-  id: string,
-  instance: Contract,
-  args: (string | string[])[]
-) => {
-  /*
-    ${net == mumbai or mainnet}
-    https://explorer-${net}.maticvigil.com/api
-    ?module=contract
-    &action=verify
-    &addressHash={addressHash}
-    &name={name}
-    &compilerVersion={compilerVersion}
-    &optimization={false}
-    &contractSourceCode={contractSourceCode}
-  */
-  const network = (DRE as HardhatRuntimeEnvironment).network.name;
-  const net = network === EthereumNetworkNames.matic ? 'mainnet' : network;
-  const filePath = await findPath(id);
-  const encodedConstructorParams = encodeDeployParams(instance, args);
-  const flattenSourceCode = await hardhatFlattener(filePath);
-
-  // Remove pragmas and license identifier after first match, required by block explorers like explorer-mainnet.maticgivil.com or Etherscan
-  const cleanedSourceCode = removeLines(
-    removeLines(removeLines(flattenSourceCode, LICENSE_IDENTIFIER, 1), SOLIDITY_PRAGMA, 1),
-    EXPERIMENTAL_ABIENCODER,
-    1
-  );
-  try {
-    console.log(
-      `[Polygon Verify] Verifying ${id} with address ${instance.address} at Matic ${net} network`
-    );
-    const response = await axios.post(
-      `https://explorer-${net}.maticvigil.com/api`,
-      {
-        addressHash: instance.address,
-        name: id,
-        compilerVersion: 'v0.6.12+commit.27d51765',
-        optimization: 'true',
-        contractSourceCode: cleanedSourceCode,
-        constructorArguments: encodedConstructorParams,
-      },
-      {
-        params: {
-          module: 'contract',
-          action: 'verify',
-        },
-        headers: {
-          'Content-Type': 'application/json',
-          Referer: 'aavematic-42e1f6da',
-        },
-      }
-    );
-    if (response.status === 200 && response.data.message === 'OK') {
-      console.log(`[Polygon Verify] Verified contract at Matic ${net} network.`);
-      console.log(
-        `[Polygon Verify] Check at: https://explorer-${net}.maticvigil.com/address/${instance.address}/contracts) \n`
-      );
-      return;
-    }
-
-    throw Error(JSON.stringify(response.data, null, 2));
-  } catch (error) {
-    if (error?.message.includes('Smart-contract already verified.')) {
-      console.log(
-        `[Polygon Verify] Already verified. Check it at: https://explorer-${net}.maticvigil.com/address/${instance.address}/contracts) \n`
-      );
-      return;
-    }
-    console.error('[Polygon Verify] Error:', error.toString());
-    console.log(
-      `[Polygon Verify] Skipping verification for ${id} with ${instance.address} due an unknown error.`
-    );
-    console.log(
-      `Please proceed with manual verification at https://explorer-${net}.maticvigil.com/address/${instance.address}/contracts`
-    );
-    console.log(`- Use the following as encoded constructor params`);
-    console.log(encodedConstructorParams);
-    console.log(`- Flattened and cleaned source code`);
-    console.log(cleanedSourceCode);
-  }
-};

package-lock.json

@@ -14793,7 +14793,7 @@
               }
             },
             "ethereumjs-abi": {
-              "version": "git+https://github.com/ethereumjs/ethereumjs-abi.git#1a27c59c15ab1e95ee8e5c4ed6ad814c49cc439e",
+              "version": "git+https://github.com/ethereumjs/ethereumjs-abi.git#ee3994657fa7a427238e6ba92a84d0b529bbcde0",
               "from": "git+https://github.com/ethereumjs/ethereumjs-abi.git",
               "dev": true,
               "requires": {