Address comments in PR #702. Part of #638

geth/common/rpccall.go

@@ -110,8 +110,8 @@ func (r RPCCall) ParseGas() *hexutil.Uint64 {
 		return nil
 	}
 
-	_v := hexutil.Uint64(parsedValue)
-	return &_v
+	v := hexutil.Uint64(parsedValue)
+	return &v
 }
 
 // ParseGasPrice returns the hex big associated with the call.
@@ -155,7 +155,7 @@ func (r RPCCall) ToSendTxArgs() SendTxArgs {
 		To:       &toAddr,
 		From:     fromAddr,
 		Value:    r.ParseValue(),
-		Input:    &input,
+		Input:    input,
 		Gas:      r.ParseGas(),
 		GasPrice: r.ParseGasPrice(),
 	}

geth/common/types.go

@@ -160,17 +160,16 @@ type QueuedTx struct {
 }
 
 // SendTxArgs represents the arguments to submit a new transaction into the transaction pool.
+// This struct is based on go-ethereum's type in internal/ethapi/api.go, but we have freedom
+// over the exact layout of this struct.
 type SendTxArgs struct {
 	From     common.Address  `json:"from"`
 	To       *common.Address `json:"to"`
 	Gas      *hexutil.Uint64 `json:"gas"`
 	GasPrice *hexutil.Big    `json:"gasPrice"`
 	Value    *hexutil.Big    `json:"value"`
 	Nonce    *hexutil.Uint64 `json:"nonce"`
-	// We accept "data" and "input" for backwards-compatibility reasons. "input" is the
-	// newer name and should be preferred by clients.
-	Data  *hexutil.Bytes `json:"data"`
-	Input *hexutil.Bytes `json:"input"`
+	Input    hexutil.Bytes   `json:"input"`
 }
 
 // JailCell represents single jail cell, which is basically a JavaScript VM.

geth/common/utils.go

@@ -15,7 +15,6 @@ import (
 
 	"github.com/ethereum/go-ethereum/accounts"
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/pborman/uuid"
 	"github.com/status-im/status-go/geth/log"
 	"github.com/status-im/status-go/static"
@@ -144,11 +143,6 @@ func Fatalf(reason interface{}, args ...interface{}) {
 
 // CreateTransaction returns a transaction object.
 func CreateTransaction(ctx context.Context, args SendTxArgs) *QueuedTx {
-	if args.Input == nil && args.Data == nil {
-		// If neither Input nor Data were initialized, let's pass an empty slice in Input
-		emptyByteArray := hexutil.Bytes(make([]byte, 0))
-		args.Input = &emptyByteArray
-	}
 	return &QueuedTx{
 		ID:      QueuedTxID(uuid.New()),
 		Context: ctx,

geth/transactions/txqueue_manager.go

@@ -2,7 +2,6 @@ package transactions
 
 import (
 	"context"
-	"errors"
 	"math/big"
 	"sync"
 	"time"
@@ -208,14 +207,6 @@ func (m *Manager) completeTransaction(config *params.NodeConfig, selectedAccount
 	}
 
 	chainID := big.NewInt(int64(config.NetworkID))
-	input := args.Input
-	if input == nil {
-		input = args.Data
-	}
-	if input == nil {
-		return hash, errors.New("Missing Input/Data byte array")
-	}
-	data := []byte(*input)
 	value := (*big.Int)(args.Value)
 	toAddr := gethcommon.Address{}
 	if args.To != nil {
@@ -231,7 +222,7 @@ func (m *Manager) completeTransaction(config *params.NodeConfig, selectedAccount
 			To:       args.To,
 			GasPrice: gasPrice,
 			Value:    value,
-			Data:     data,
+			Data:     args.Input,
 		})
 		if err != nil {
 			return hash, err
@@ -252,7 +243,7 @@ func (m *Manager) completeTransaction(config *params.NodeConfig, selectedAccount
 		"gasPrice", gasPrice,
 		"value", value,
 	)
-	tx := types.NewTransaction(nonce, toAddr, value, gas, gasPrice, data)
+	tx := types.NewTransaction(nonce, toAddr, value, gas, gasPrice, args.Input)
 	signedTx, err := types.SignTx(tx, types.NewEIP155Signer(chainID), selectedAccount.AccountKey.PrivateKey)
 	if err != nil {
 		return hash, err

geth/transactions/txqueue_manager_test.go

@@ -108,17 +108,13 @@ func (s *TxQueueTestSuite) setupTransactionPoolAPI(tx *common.QueuedTx, returnNo
 }
 
 func (s *TxQueueTestSuite) rlpEncodeTx(tx *common.QueuedTx, config *params.NodeConfig, account *common.SelectedExtKey, nonce *hexutil.Uint64, gas hexutil.Uint64, gasPrice *big.Int) hexutil.Bytes {
-	input := tx.Args.Input
-	if input == nil {
-		input = tx.Args.Data
-	}
 	newTx := types.NewTransaction(
 		uint64(*nonce),
 		gethcommon.Address(*tx.Args.To),
 		tx.Args.Value.ToInt(),
 		uint64(gas),
 		gasPrice,
-		[]byte(*input),
+		[]byte(tx.Args.Input),
 	)
 	chainID := big.NewInt(int64(config.NetworkID))
 	signedTx, err := types.SignTx(newTx, types.NewEIP155Signer(chainID), account.AccountKey.PrivateKey)
@@ -142,41 +138,30 @@ func (s *TxQueueTestSuite) TestCompleteTransaction() {
 		Address:    common.FromAddress(TestConfig.Account1.Address),
 		AccountKey: &keystore.Key{PrivateKey: key},
 	}
-	input := hexutil.Bytes(make([]byte, 0))
 	testCases := []struct {
 		name     string
 		gas      *hexutil.Uint64
 		gasPrice *hexutil.Big
-		data     *hexutil.Bytes
-		input    *hexutil.Bytes
 	}{
 		{
 			"noGasDef",
 			nil,
 			nil,
-			nil,
-			&input,
 		},
 		{
 			"gasDefined",
 			&testGas,
 			nil,
-			nil,
-			&input,
 		},
 		{
 			"gasPriceDefined",
 			nil,
 			testGasPrice,
-			nil,
-			&input,
 		},
 		{
 			"inputPassedInLegacyDataField",
 			nil,
 			testGasPrice,
-			&input,
-			nil,
 		},
 	}
 
@@ -189,8 +174,6 @@ func (s *TxQueueTestSuite) TestCompleteTransaction() {
 				To:       common.ToAddress(TestConfig.Account2.Address),
 				Gas:      testCase.gas,
 				GasPrice: testCase.gasPrice,
-				Data:     testCase.data,
-				Input:    testCase.input,
 			})
 			s.setupTransactionPoolAPI(tx, testNonce, testNonce, account, nil)
 

t/e2e/transactions/transactions_test.go

@@ -213,7 +213,7 @@ func (s *TransactionsTestSuite) TestSendContractTx() {
 		To:   nil, // marker, contract creation is expected
 		//Value: (*hexutil.Big)(new(big.Int).Mul(big.NewInt(1), gethcommon.Ether)),
 		Gas:   (*hexutil.Uint64)(&gas),
-		Input: (*hexutil.Bytes)(&byteCode),
+		Input: (hexutil.Bytes)(byteCode),
 	})
 	s.NoError(err, "cannot send transaction")