Enhance error handling in LookupView to include error messages and update EtherscanVerifier to check contract verification status correctly

Author: manuelwedler

apps/contract-verification/src/app/Verifiers/EtherscanVerifier.ts

@@ -237,16 +237,16 @@ export class EtherscanVerifier extends AbstractVerifier {
 
     const lookupResponse: EtherscanGetSourceCodeResponse = await response.json()
 
-    if (lookupResponse.result[0].ABI === 'Contract source code not verified' || !lookupResponse.result[0].SourceCode || (lookupResponse.result as unknown as string) === 'Contract source code not verified') {
-      return { status: 'not verified' }
-    }
-
     if (lookupResponse.status !== '1' || !lookupResponse.message.startsWith('OK')) {
       const errorResponse = lookupResponse as unknown as EtherscanRpcResponse
       console.error('Error on Etherscan API lookup at ' + this.apiUrl + '\nStatus: ' + errorResponse.status + '\nMessage: ' + errorResponse.message + '\nResult: ' + errorResponse.result)
       throw new Error(errorResponse.result)
     }
 
+    if (lookupResponse.result[0].ABI === 'Contract source code not verified' || !lookupResponse.result[0].SourceCode || (lookupResponse.result as unknown as string) === 'Contract source code not verified') {
+      return { status: 'not verified' }
+    }
+
     const lookupUrl = this.getContractCodeUrl(contractAddress, chainId)
     const { sourceFiles, targetFilePath } = this.processReceivedFiles(lookupResponse.result[0], contractAddress, chainId)
 

apps/contract-verification/src/app/types/VerificationTypes.ts

@@ -80,4 +80,5 @@ export interface LookupResponse {
   lookupUrl?: string
   sourceFiles?: SourceFile[]
   targetFilePath?: string
+  errorMessage?: string
 }

apps/contract-verification/src/app/views/LookupView.tsx

@@ -52,7 +52,7 @@ export const LookupView = () => {
         .catch((err) =>
           setLookupResult((prev) => {
             console.error(err)
-            return { ...prev, [verifierId]: { status: 'lookup failed' } }
+            return { ...prev, [verifierId]: { status: 'lookup failed', errorMessage: err.message } }
           })
         )
         .finally(() => setLoadingVerifiers((prev) => ({ ...prev, [verifierId]: false })))
@@ -129,9 +129,21 @@ export const LookupView = () => {
                   <div>
                     <div className="pt-2">
                       Status:{' '}
-                      <span className="font-weight-bold" style={{ textTransform: 'capitalize' }}>
-                        {lookupResults[verifierId].status}
-                      </span>{' '}
+                      {lookupResults[verifierId].status === 'lookup failed' && !!lookupResults[verifierId].errorMessage ? (
+                        <CustomTooltip
+                          placement="top"
+                          tooltipClasses=" text-break"
+                          tooltipText={lookupResults[verifierId].errorMessage}
+                        >
+                          <span className="font-weight-bold" style={{ textTransform: 'capitalize' }}>
+                            {lookupResults[verifierId].status}
+                          </span>
+                        </CustomTooltip>
+                      ) : (
+                        <span className="font-weight-bold" style={{ textTransform: 'capitalize' }}>
+                          {lookupResults[verifierId].status}
+                        </span>
+                      )}{' '}
                       {!!lookupResults[verifierId].lookupUrl && verifierId === 'Blockscout' ? <CopyToClipboard tip="Copy code URL" content={lookupResults[verifierId].lookupUrl} direction="top" /> : !!lookupResults[verifierId].lookupUrl && <a href={lookupResults[verifierId].lookupUrl} target="_blank" className="fa fas fa-arrow-up-right-from-square"></a>}
                     </div>
                     {!!lookupResults[verifierId].sourceFiles && lookupResults[verifierId].sourceFiles.length > 0 && (