fix(core): Handle already verified response after successful submission

hujw77 · Apr 9, 2024 · 0c375c0 · 0c375c0
1 parent 0da20a7
commit 0c375c0
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 9 deletions.
diff --git a/.changeset/early-buses-watch.md b/.changeset/early-buses-watch.md
@@ -0,0 +1,5 @@
+---
+'@sphinx-labs/core': patch
+---
+
+Handle alreay verified response after successful verification submission
diff --git a/packages/core/src/etherscan.ts b/packages/core/src/etherscan.ts
@@ -170,6 +170,21 @@ export const verifyDeploymentWithRetries = async (
   }
 }
 
+export const handleAlreadyVerifiedResponse = (
+  err: any,
+  address: string,
+  contractURL: string
+) => {
+  if ((err.message as string)?.toLowerCase().includes('already verified')) {
+    console.log(
+      `The contract ${address} has already been verified on Etherscan:\n${contractURL}`
+    )
+    return { success: true }
+  } else {
+    return { success: false, message: err.message }
+  }
+}
+
 export const attemptVerification = async (
   address: string,
   encodedConstructorArgs: string,
@@ -237,14 +252,7 @@ export const attemptVerification = async (
     )
     guid = response.message
   } catch (err) {
-    if ((err.message as string).toLowerCase().includes('already verified')) {
-      console.log(
-        `The contract ${address} has already been verified on Etherscan:\n${contractURL}`
-      )
-      return { success: true }
-    } else {
-      return { success: false, message: err.message }
-    }
+    return handleAlreadyVerifiedResponse(err, address, contractURL)
   }
 
   const networkName = fetchNameForNetwork(BigInt(chainId))
@@ -263,7 +271,7 @@ export const attemptVerification = async (
   try {
     verificationStatus = await etherscan.getVerificationStatus(guid)
   } catch (err) {
-    return { success: false, message: err.message }
+    return handleAlreadyVerifiedResponse(err, address, contractURL)
   }
 
   if (!(verificationStatus.isFailure() || verificationStatus.isSuccess())) {