update contractFetchAddress in chains.json and enhance error logging in verify.go

Author: freehere107

compile.go

@@ -95,40 +95,6 @@ type SolcOutput struct {
 	CompileTarget string
 }
 
-func (o *SolcOutput) PickDeployedBytesCode(compileTarget, contractName string) string {
-	if compileTarget == "" {
-		for target := range o.Contracts {
-			for name := range o.Contracts[target] {
-				return o.Contracts[target][name].Evm.DeployedBytecode.Object
-			}
-		}
-	}
-	return o.Contracts[compileTarget][contractName].Evm.DeployedBytecode.Object
-}
-
-func (o *SolcOutput) PickBytesCode(compileTarget, contractName string) string {
-	if compileTarget == "" {
-		for target := range o.Contracts {
-			for name := range o.Contracts[target] {
-				return o.Contracts[target][name].Evm.Bytecode.Object
-			}
-		}
-	}
-	return o.Contracts[compileTarget][contractName].Evm.Bytecode.Object
-}
-
-func (o *SolcOutput) retryToFindCompileTarget() {
-	for target := range o.Contracts {
-		for contractName, source := range o.Contracts[target] {
-			if source.Evm.Bytecode.Object != "" {
-				o.CompileTarget = target
-				o.ContractName = contractName
-				return
-			}
-		}
-	}
-}
-
 type SolcContract struct {
 	Abi []any `json:"abi"`
 	Evm struct {
@@ -173,12 +139,6 @@ func (s *SolcMetadata) recompileContract(_ context.Context, version string) (*So
 	if err = json.Unmarshal(stdoutBuf.Bytes(), &result); err != nil {
 		return nil, err
 	}
-	if result.CompileTarget == "" || result.ContractName == "" {
-		result.retryToFindCompileTarget()
-	}
-	if _, ok := result.Contracts[result.CompileTarget][result.ContractName]; !ok {
-		result.retryToFindCompileTarget()
-	}
 	return &result, nil
 }
 

revive.go

@@ -56,12 +56,6 @@ func (s *ReviveMetadata) recompileContract(_ context.Context, version string) (*
 	if err = json.Unmarshal(stdoutBuf.Bytes(), &result); err != nil {
 		return nil, err
 	}
-	if result.CompileTarget == "" || result.ContractName == "" {
-		result.retryToFindCompileTarget()
-	}
-	if _, ok := result.Contracts[result.CompileTarget][result.ContractName]; !ok {
-		result.retryToFindCompileTarget()
-	}
 	return &result, nil
 }
 

verify.go

@@ -92,32 +92,48 @@ type Match struct {
 }
 
 func (v *VerificationRequest) compareBytecodes(ctx context.Context, chainBytecode string, compiledOutput *SolcOutput) (*Match, error) {
-	recompileDeployCodeWithLibraries := addLibraryAddresses(compiledOutput.PickDeployedBytesCode(compiledOutput.CompileTarget, compiledOutput.ContractName), chainBytecode).Replaced
-	if util.TrimHex(recompileDeployCodeWithLibraries) == util.TrimHex(chainBytecode) {
-		return &Match{Status: perfect}, nil
-	}
-
 	trimmedChainBytecode := util.TrimHex(BytecodeWithoutMetadata(chainBytecode))
-	trimmedWithLibraries := util.TrimHex(BytecodeWithoutMetadata(recompileDeployCodeWithLibraries))
-	if trimmedChainBytecode == util.TrimHex(trimmedWithLibraries) {
-		return &Match{Status: partial}, nil
-	}
+	trimmedRawChainBytecode := util.TrimHex(chainBytecode)
+	createData := ""
+	fetchedCreateData := false
+
+	for compileTarget, contracts := range compiledOutput.Contracts {
+		for contractName, contract := range contracts {
+			recompileDeployCodeWithLibraries := addLibraryAddresses(contract.Evm.DeployedBytecode.Object, chainBytecode).Replaced
+			if util.TrimHex(recompileDeployCodeWithLibraries) == trimmedRawChainBytecode {
+				compiledOutput.CompileTarget = compileTarget
+				compiledOutput.ContractName = contractName
+				return &Match{Status: perfect}, nil
+			}
 
-	if len(trimmedChainBytecode) == len(trimmedWithLibraries) {
-		createData, err := fetchCreateBytecode(ctx, v.Address, v.Chain)
-		if err != nil {
-			return &Match{Status: mismatch}, fmt.Errorf("fetch create bytecode failed: please retry later")
-		}
+			trimmedWithLibraries := util.TrimHex(BytecodeWithoutMetadata(recompileDeployCodeWithLibraries))
+			if trimmedChainBytecode == trimmedWithLibraries {
+				compiledOutput.CompileTarget = compileTarget
+				compiledOutput.ContractName = contractName
+				return &Match{Status: partial}, nil
+			}
 
-		createData = util.TrimHex(createData)
-		if len(createData) > 0 {
-			recompileBytesCodeWithLibraries := addLibraryAddresses(compiledOutput.PickBytesCode(compiledOutput.CompileTarget, compiledOutput.ContractName), createData).Replaced
-			encodedConstructorArgs := extractEncodedConstructorArgs(createData, recompileBytesCodeWithLibraries)
-			if strings.HasPrefix(createData, BytecodeWithoutMetadata(recompileBytesCodeWithLibraries)) {
-				return &Match{Status: perfect, ConstructorArgs: encodedConstructorArgs}, nil
+			if len(trimmedChainBytecode) == len(trimmedWithLibraries) {
+				if !fetchedCreateData {
+					var err error
+					createData, err = fetchCreateBytecode(ctx, v.Address, v.Chain)
+					if err != nil {
+						return &Match{Status: mismatch}, fmt.Errorf("fetch create bytecode failed: please retry later")
+					}
+					createData = util.TrimHex(createData)
+					fetchedCreateData = true
+				}
+				if len(createData) > 0 {
+					recompileBytesCodeWithLibraries := addLibraryAddresses(contract.Evm.Bytecode.Object, createData).Replaced
+					encodedConstructorArgs := extractEncodedConstructorArgs(createData, recompileBytesCodeWithLibraries)
+					if strings.HasPrefix(createData, BytecodeWithoutMetadata(recompileBytesCodeWithLibraries)) {
+						compiledOutput.CompileTarget = compileTarget
+						compiledOutput.ContractName = contractName
+						return &Match{Status: perfect, ConstructorArgs: encodedConstructorArgs}, nil
+					}
+				}
 			}
 		}
-
 	}
 	return &Match{Status: mismatch}, nil
 }