Bump github.com/ethereum/go-ethereum from 1.9.12 to 1.9.15

core/adapters/eth_tx.go

@@ -52,9 +52,8 @@ func (e *EthTx) TaskType() models.TaskType {
 func (e *EthTx) Perform(input models.RunInput, store *strpkg.Store) models.RunOutput {
 	if store.Config.EnableBulletproofTxManager() {
 		return e.perform(input, store)
-	} else {
-		return e.legacyPerform(input, store)
 	}
+	return e.legacyPerform(input, store)
 }
 
 // TODO(sam): https://www.pivotaltracker.com/story/show/173280188

core/adapters/eth_tx_abi_encode.go

@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"math/big"
 	"regexp"
+	"strings"
 
 	"github.com/pkg/errors"
 
@@ -143,7 +144,7 @@ func abiEncode(fnABI *abi.Method, args map[string]interface{}) ([]byte, error) {
 		panic("unexpected size of static part")
 	}
 
-	result := fnABI.ID()
+	result := functionSelector(fnABI)
 	result = append(result, encodedStaticPart...)
 	result = append(result, encodedDynamicPart...)
 	return result, nil
@@ -457,3 +458,12 @@ func assertPadded(b []byte) {
 		panic("ABI encoded data isn't padded properly")
 	}
 }
+
+func functionSelector(fnABI *abi.Method) []byte {
+	types := []string{}
+	for _, input := range fnABI.Inputs {
+		types = append(types, input.Type.String())
+	}
+	signature := fmt.Sprintf("%v(%v)", fnABI.Name, strings.Join(types, ","))
+	return utils.MustHash(signature).Bytes()[:4]
+}

core/adapters/eth_tx_abi_encode_test.go

@@ -71,22 +71,10 @@ func TestEthTxABIEncodeAdapter_Perform_ConfirmedWithJSON(t *testing.T) {
 			Name:    "verifyVRFProof",
 			RawName: "verifyVRFProof",
 			Inputs: []abi.Argument{
-				abi.Argument{
-					Name: "gammaX",
-					Type: uint256Type,
-				},
-				abi.Argument{
-					Name: "gammaY",
-					Type: uint256Type,
-				},
-				abi.Argument{
-					Name: "c",
-					Type: uint256Type,
-				},
-				abi.Argument{
-					Name: "s",
-					Type: uint256Type,
-				},
+				{Name: "gammaX", Type: uint256Type},
+				{Name: "gammaY", Type: uint256Type},
+				{Name: "c", Type: uint256Type},
+				{Name: "s", Type: uint256Type},
 			},
 			Outputs: []abi.Argument{},
 		},

core/eth/contracts.go

@@ -87,7 +87,7 @@ func (cc *contractCodec) GetMethodID(method string) ([]byte, error) {
 	if !found {
 		return []byte{}, errors.New("unable to find contract method " + method)
 	}
-	return mabi.ID(), nil
+	return mabi.ID, nil
 }
 
 // MustGetV6ContractEventID finds the event for the given contract by searching
@@ -102,7 +102,7 @@ func MustGetV6ContractEventID(name, eventName string) common.Hash {
 	if !found {
 		logger.Panic(fmt.Errorf("unable to find event %s for contract %s", eventName, name))
 	}
-	return event.ID()
+	return event.ID
 }
 
 func (cc *contractCodec) UnpackLog(out interface{}, event string, log Log) error {