Merge pull request #3730 from NomicFoundation/fix-etherscan-bug

Fix hardcoded URL in the etherscan plugin
NomicFoundation · Mar 2, 2023 · 6e61bab · 6e61bab
2 parents 18b08c5 + 71c2ff1
commit 6e61bab
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 24 deletions.
diff --git a/packages/hardhat-etherscan/src/etherscan/EtherscanService.ts b/packages/hardhat-etherscan/src/etherscan/EtherscanService.ts
@@ -156,12 +156,21 @@ export class EtherscanResponse {
 }
 
 export async function isAlreadyVerified(
+  apiURL: string,
   apiKey: string,
   address: string
 ): Promise<boolean> {
-  const url = `https://api.etherscan.io/api?module=contract&action=getsourcecode&address=${address}&apikey=${apiKey}`;
+  const parameters = new URLSearchParams({
+    module: "contract",
+    action: "getsourcecode",
+    address,
+    apikey: apiKey,
+  });
 
-  const response = await sendGetRequest(new URL(url));
+  const url = new URL(apiURL);
+  url.search = parameters.toString();
+
+  const response = await sendGetRequest(url);
   const json = await response.body.json();
 
   if (json.message !== "OK") {

diff --git a/packages/hardhat-etherscan/src/index.ts b/packages/hardhat-etherscan/src/index.ts
@@ -225,7 +225,13 @@ If your constructor has no arguments pass an empty array. E.g:
     verificationNetwork
   );
 
-  if (await isAlreadyVerified(etherscanAPIKey, address)) {
+  const alreadyVerified = await isAlreadyVerified(
+    etherscanAPIEndpoints.apiURL,
+    etherscanAPIKey,
+    address
+  );
+
+  if (alreadyVerified) {
     console.log(`The contract ${address} has already been verified`);
     return;
   }

diff --git a/packages/hardhat-etherscan/src/network/prober.ts b/packages/hardhat-etherscan/src/network/prober.ts
@@ -1,7 +1,4 @@
-import {
-  HARDHAT_NETWORK_NAME,
-  NomicLabsHardhatPluginError,
-} from "hardhat/plugins";
+import { NomicLabsHardhatPluginError } from "hardhat/plugins";
 import { EthereumProvider } from "hardhat/types";
 
 import { pluginName } from "../constants";
@@ -14,13 +11,6 @@ export async function getEtherscanEndpoints(
   chainConfig: ChainConfig,
   customChains: CustomChain[]
 ): Promise<EtherscanNetworkEntry> {
-  if (networkName === HARDHAT_NETWORK_NAME) {
-    throw new NomicLabsHardhatPluginError(
-      pluginName,
-      `The selected network is ${networkName}. Please select a network supported by Etherscan.`
-    );
-  }
-
   const chainIdsToNames = new Map(
     entries(chainConfig).map(([chainName, config]) => [
       config.chainId,

diff --git a/packages/hardhat-etherscan/test/integration/PluginTests.ts b/packages/hardhat-etherscan/test/integration/PluginTests.ts
@@ -9,10 +9,7 @@ import {
 import { NomicLabsHardhatPluginError } from "hardhat/plugins";
 import path from "path";
 
-import {
-  TASK_VERIFY_GET_ETHERSCAN_ENDPOINT,
-  TASK_VERIFY_GET_MINIMUM_BUILD,
-} from "../../src/constants";
+import { TASK_VERIFY_GET_MINIMUM_BUILD } from "../../src/constants";
 import { deployContract, getRandomString, useEnvironment } from "../helpers";
 
 // These are skipped because they can't currently be run in CI
@@ -336,12 +333,6 @@ describe("Plugin integration tests", function () {
       // This avoids failure due to compiler downloads.
       await this.env.run(TASK_COMPILE, { quiet: true });
 
-      const { task }: { task: typeof taskT } = require("hardhat/config");
-
-      // We override this task to avoid posting to an actual endpoint and to avoid our own sanity checks.
-      task(TASK_VERIFY_GET_ETHERSCAN_ENDPOINT).setAction(async () => {
-        return "http://127.0.0.1:54321";
-      });
       const { ethers } = this.env as any;
       const signers = await ethers.getSigners();
       signer = signers[0];