Index methods by signature when there is ambiguity (#1880)

* Index methods by signature when there is ambiguity

* Lint fix and renames

* Simplify

consensus/polybft/contractsapi/bindings-gen/main.go

@@ -487,14 +487,19 @@ func main() {
 			// There could be two objects with the same name in the generated JSON ABI (hardhat bug).
 			// This case can be fixed by specifying a function signature instead of just name
 			// e.g. "myFunc(address,bool,uint256)" instead of just "myFunc"
-			var method *abi.Method
+			var (
+				method              *abi.Method
+				resolvedBySignature = false
+			)
+
 			if signatureFunctionFormat.MatchString(methodRaw) {
 				method = c.artifact.Abi.GetMethodBySignature(methodRaw)
+				resolvedBySignature = true
 			} else {
 				method = c.artifact.Abi.GetMethod(methodRaw)
 			}
 
-			if err := generateFunction(generatedData, c.contractName, method); err != nil {
+			if err := generateFunction(generatedData, c.contractName, method, resolvedBySignature); err != nil {
 				log.Fatal(err)
 			}
 		}
@@ -769,7 +774,8 @@ func ({{.Sig}} *{{.TName}}) DecodeAbi(buf []byte) error {
 }
 
 // generateFunction generates code for smart contract function and its parameters
-func generateFunction(generatedData *generatedData, contractName string, method *abi.Method) error {
+func generateFunction(generatedData *generatedData, contractName string,
+	method *abi.Method, fnSigResolution bool) error {
 	methodName := fmt.Sprintf(functionNameFormat, strings.Title(method.Name+contractName))
 	res := []string{}
 
@@ -779,32 +785,43 @@ func generateFunction(generatedData *generatedData, contractName string, method
 	}
 
 	// write encode/decode functions
-	tmplStr := `
-{{range .Structs}}
-	{{.}}
-{{ end }}
-
-func ({{.Sig}} *{{.TName}}) Sig() []byte {
-	return {{.ContractName}}.Abi.Methods["{{.Name}}"].ID()
-}
 
-func ({{.Sig}} *{{.TName}}) EncodeAbi() ([]byte, error) {
-	return {{.ContractName}}.Abi.Methods["{{.Name}}"].Encode({{.Sig}})
-}
+	tmplString := `
+	{{range .Structs}}
+		{{.}}
+	{{ end }}
+	
+	func ({{.Sig}} *{{.TName}}) Sig() []byte {
+		return {{.ContractName}}.Abi.{{.MethodGetter}}["{{.Name}}"].ID()
+	}
+	
+	func ({{.Sig}} *{{.TName}}) EncodeAbi() ([]byte, error) {
+		return {{.ContractName}}.Abi.{{.MethodGetter}}["{{.Name}}"].Encode({{.Sig}})
+	}
+	
+	func ({{.Sig}} *{{.TName}}) DecodeAbi(buf []byte) error {
+		return decodeMethod({{.ContractName}}.Abi.{{.MethodGetter}}["{{.Name}}"], buf, {{.Sig}})
+	}`
 
-func ({{.Sig}} *{{.TName}}) DecodeAbi(buf []byte) error {
-	return decodeMethod({{.ContractName}}.Abi.Methods["{{.Name}}"], buf, {{.Sig}})
-}`
+	methodGetter := "Methods"
+	if fnSigResolution {
+		methodGetter = "MethodsBySignature"
+	}
 
 	inputs := map[string]interface{}{
 		"Structs":      res,
 		"Sig":          strings.ToLower(string(methodName[0])),
 		"Name":         method.Name,
 		"ContractName": contractName,
 		"TName":        strings.Title(methodName),
+		"MethodGetter": methodGetter,
 	}
 
-	renderedString, err := renderTmpl(tmplStr, inputs)
+	if fnSigResolution {
+		inputs["Name"] = method.Sig()
+	}
+
+	renderedString, err := renderTmpl(tmplString, inputs)
 	if err != nil {
 		return err
 	}