remove Etherscan.ts utility script

masa-finance · Jan 12, 2023 · b66ba33 · b66ba33
1 parent 2adcbc1
commit b66ba33
Show file tree

Hide file tree

Showing 7 changed files with 87 additions and 41 deletions.
diff --git a/deploy/SoulLinker.ts b/deploy/SoulLinker.ts
@@ -1,7 +1,7 @@
+import hre from "hardhat";
 import { SignerWithAddress } from "@nomiclabs/hardhat-ethers/signers";
 import { DeployFunction } from "hardhat-deploy/dist/types";
 import { getEnvParams, getPrivateKey } from "../src/EnvParams";
-import { verifyOnEtherscan } from "../src/Etherscan";
 import { paymentParams } from "../src/PaymentParams";
 
 let admin: SignerWithAddress;
@@ -50,7 +50,22 @@ const func: DeployFunction = async ({
 
   // verify contract with etherscan, if its not a local network
   if (network.name == "mainnet" || network.name == "goerli") {
-    verifyOnEtherscan(soulLinkerDeploymentResult.address, constructorArguments);
+    try {
+      console.log(11);
+      await hre.run("verify:verify", {
+        address: soulLinkerDeploymentResult.address,
+        constructorArguments
+      });
+      console.log(22);
+    } catch (error) {
+      console.log("error", error);
+      if (
+        !error.message.includes("Contract source code already verified") &&
+        !error.message.includes("Reason: Already Verified")
+      ) {
+        throw error;
+      }
+    }
   }
 
   if (network.name == "hardhat") {

diff --git a/deploy/SoulName.ts b/deploy/SoulName.ts
@@ -1,7 +1,7 @@
+import hre from "hardhat";
 import { SignerWithAddress } from "@nomiclabs/hardhat-ethers/signers";
 import { DeployFunction } from "hardhat-deploy/dist/types";
 import { getEnvParams, getPrivateKey } from "../src/EnvParams";
-import { verifyOnEtherscan } from "../src/Etherscan";
 
 let admin: SignerWithAddress;
 
@@ -37,7 +37,19 @@ const func: DeployFunction = async ({
 
   // verify contract with etherscan, if its not a local network
   if (network.name == "mainnet" || network.name == "goerli") {
-    verifyOnEtherscan(soulNameDeploymentResult.address, constructorArguments);
+    try {
+      await hre.run("verify:verify", {
+        address: soulNameDeploymentResult.address,
+        constructorArguments
+      });
+    } catch (error) {
+      if (
+        !error.message.includes("Contract source code already verified") &&
+        !error.message.includes("Reason: Already Verified")
+      ) {
+        throw error;
+      }
+    }
   }
 
   if (network.name == "hardhat") {

diff --git a/deploy/SoulStore.ts b/deploy/SoulStore.ts
@@ -1,7 +1,7 @@
+import hre from "hardhat";
 import { SignerWithAddress } from "@nomiclabs/hardhat-ethers/signers";
 import { DeployFunction } from "hardhat-deploy/dist/types";
 import { getEnvParams, getPrivateKey } from "../src/EnvParams";
-import { verifyOnEtherscan } from "../src/Etherscan";
 import { paymentParams } from "../src/PaymentParams";
 
 let admin: SignerWithAddress;
@@ -48,7 +48,19 @@ const func: DeployFunction = async ({
 
   // verify contract with etherscan, if its not a local network
   if (network.name == "mainnet" || network.name == "goerli") {
-    verifyOnEtherscan(soulStoreDeploymentResult.address, constructorArguments);
+    try {
+      await hre.run("verify:verify", {
+        address: soulStoreDeploymentResult.address,
+        constructorArguments
+      });
+    } catch (error) {
+      if (
+        !error.message.includes("Contract source code already verified") &&
+        !error.message.includes("Reason: Already Verified")
+      ) {
+        throw error;
+      }
+    }
   }
 
   if (network.name == "hardhat") {

diff --git a/deploy/Soulbound2FA.ts b/deploy/Soulbound2FA.ts
@@ -1,7 +1,7 @@
+import hre from "hardhat";
 import { SignerWithAddress } from "@nomiclabs/hardhat-ethers/signers";
 import { DeployFunction } from "hardhat-deploy/dist/types";
 import { getEnvParams, getPrivateKey } from "../src/EnvParams";
-import { verifyOnEtherscan } from "../src/Etherscan";
 import { paymentParams } from "../src/PaymentParams";
 
 let admin: SignerWithAddress;
@@ -55,10 +55,19 @@ const func: DeployFunction = async ({
 
   // verify contract with etherscan, if its not a local network
   if (network.name == "goerli") {
-    verifyOnEtherscan(
-      soulbound2FADeploymentResult.address,
-      constructorArguments
-    );
+    try {
+      await hre.run("verify:verify", {
+        address: soulbound2FADeploymentResult.address,
+        constructorArguments
+      });
+    } catch (error) {
+      if (
+        !error.message.includes("Contract source code already verified") &&
+        !error.message.includes("Reason: Already Verified")
+      ) {
+        throw error;
+      }
+    }
   }
 
   if (network.name == "hardhat") {

diff --git a/deploy/SoulboundCreditScore.ts b/deploy/SoulboundCreditScore.ts
@@ -1,7 +1,7 @@
+import hre from "hardhat";
 import { SignerWithAddress } from "@nomiclabs/hardhat-ethers/signers";
 import { DeployFunction } from "hardhat-deploy/dist/types";
 import { getEnvParams, getPrivateKey } from "../src/EnvParams";
-import { verifyOnEtherscan } from "../src/Etherscan";
 import { paymentParams } from "../src/PaymentParams";
 
 let admin: SignerWithAddress;
@@ -55,10 +55,19 @@ const func: DeployFunction = async ({
 
   // verify contract with etherscan, if its not a local network
   if (network.name == "mainnet" || network.name == "goerli") {
-    verifyOnEtherscan(
-      soulboundCreditScoreDeploymentResult.address,
-      constructorArguments
-    );
+    try {
+      await hre.run("verify:verify", {
+        address: soulboundCreditScoreDeploymentResult.address,
+        constructorArguments
+      });
+    } catch (error) {
+      if (
+        !error.message.includes("Contract source code already verified") &&
+        !error.message.includes("Reason: Already Verified")
+      ) {
+        throw error;
+      }
+    }
   }
 
   if (network.name == "hardhat") {

diff --git a/deploy/SoulboundIdentity.ts b/deploy/SoulboundIdentity.ts
@@ -1,7 +1,7 @@
+import hre from "hardhat";
 import { SignerWithAddress } from "@nomiclabs/hardhat-ethers/signers";
 import { DeployFunction } from "hardhat-deploy/dist/types";
 import { getEnvParams } from "../src/EnvParams";
-import { verifyOnEtherscan } from "../src/Etherscan";
 
 let admin: SignerWithAddress;
 
@@ -35,10 +35,19 @@ const func: DeployFunction = async ({
 
   // verify contract with etherscan, if its not a local network
   if (network.name == "mainnet" || network.name == "goerli") {
-    verifyOnEtherscan(
-      soulboundIdentityDeploymentResult.address,
-      constructorArguments
-    );
+    try {
+      await hre.run("verify:verify", {
+        address: soulboundIdentityDeploymentResult.address,
+        constructorArguments
+      });
+    } catch (error) {
+      if (
+        !error.message.includes("Contract source code already verified") &&
+        !error.message.includes("Reason: Already Verified")
+      ) {
+        throw error;
+      }
+    }
   }
 };
 

diff --git a/src/Etherscan.ts b/src/Etherscan.ts