data inclusion

harmony-one · Dec 19, 2023 · daa2c65 · daa2c65
1 parent ba01a18
commit daa2c65
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 15 deletions.
diff --git a/cmd/subcommands/transfer.go b/cmd/subcommands/transfer.go
@@ -42,6 +42,7 @@ var (
 	transferFileFlags []transferFlags
 	timeout           uint32
 	timeFormat        = "2006-01-02 15:04:05.000000"
+	data              string
 )
 
 type transactionLog struct {
@@ -169,6 +170,11 @@ func handlerForTransaction(txLog *transactionLog) error {
 		gLimit = uint64(tempLimit)
 	}
 
+	dataByte, err := transaction.StringToByte(data)
+	if err != nil {
+		return handlerForError(txLog, err)
+	}
+
 	addr := toAddress.String()
 
 	txLog.TimeSigned = time.Now().UTC().Format(timeFormat) // Approximate time of signature
@@ -177,7 +183,7 @@ func handlerForTransaction(txLog *transactionLog) error {
 		&addr,
 		fromShardID, toShardID,
 		amt, gPrice,
-		[]byte{},
+		dataByte,
 	)
 
 	if dryRun {
@@ -418,6 +424,7 @@ Create a transaction, sign it, and send off to the Harmony blockchain
 	cmdTransfer.Flags().Uint32Var(&timeout, "timeout", defaultTimeout, "set timeout in seconds. Set to 0 to not wait for confirm")
 	cmdTransfer.Flags().BoolVar(&userProvidesPassphrase, "passphrase", false, ppPrompt)
 	cmdTransfer.Flags().StringVar(&passphraseFilePath, "passphrase-file", "", "path to a file containing the passphrase")
+	cmdTransfer.Flags().StringVar(&data, "data", "", "transaction data")
 
 	RootCmd.AddCommand(cmdTransfer)
 

diff --git a/pkg/console/console.go b/pkg/console/console.go
@@ -4,18 +4,6 @@ import (
 	"encoding/hex"
 	"errors"
 	"fmt"
-	ethereum_rpc "github.com/ethereum/go-ethereum/rpc"
-	"github.com/harmony-one/go-sdk/pkg/account"
-	"github.com/harmony-one/go-sdk/pkg/address"
-	"github.com/harmony-one/go-sdk/pkg/common"
-	"github.com/harmony-one/go-sdk/pkg/console/jsre"
-	"github.com/harmony-one/go-sdk/pkg/console/jsre/deps"
-	"github.com/harmony-one/go-sdk/pkg/console/prompt"
-	"github.com/harmony-one/go-sdk/pkg/console/web3ext"
-	"github.com/harmony-one/go-sdk/pkg/rpc"
-	"github.com/harmony-one/go-sdk/pkg/store"
-	"github.com/harmony-one/go-sdk/pkg/transaction"
-	"github.com/harmony-one/harmony/accounts"
 	"io"
 	"io/ioutil"
 	"math/big"
@@ -29,6 +17,19 @@ import (
 	"syscall"
 	"time"
 
+	ethereum_rpc "github.com/ethereum/go-ethereum/rpc"
+	"github.com/harmony-one/go-sdk/pkg/account"
+	"github.com/harmony-one/go-sdk/pkg/address"
+	"github.com/harmony-one/go-sdk/pkg/common"
+	"github.com/harmony-one/go-sdk/pkg/console/jsre"
+	"github.com/harmony-one/go-sdk/pkg/console/jsre/deps"
+	"github.com/harmony-one/go-sdk/pkg/console/prompt"
+	"github.com/harmony-one/go-sdk/pkg/console/web3ext"
+	"github.com/harmony-one/go-sdk/pkg/rpc"
+	"github.com/harmony-one/go-sdk/pkg/store"
+	"github.com/harmony-one/go-sdk/pkg/transaction"
+	"github.com/harmony-one/harmony/accounts"
+
 	"github.com/dop251/goja"
 	"github.com/mattn/go-colorable"
 	"github.com/peterh/liner"
@@ -553,6 +554,10 @@ func (b *bridge) HmySignTransaction(call jsre.Call) (goja.Value, error) {
 	gasLimit := getStringFromJsObjWithDefault(txObj, "gas", "1000000")
 	amount := getStringFromJsObjWithDefault(txObj, "value", "0")
 	gasPrice := getStringFromJsObjWithDefault(txObj, "gasPrice", "1")
+	input, err := transaction.StringToByte(getStringFromJsObjWithDefault(txObj, "data", ""))
+	if err != nil {
+		return nil, err
+	}
 
 	networkHandler := rpc.NewHTTPHandler(b.console.nodeUrl)
 	chanId, err := common.StringToChainID(b.console.net)
@@ -598,7 +603,7 @@ func (b *bridge) HmySignTransaction(call jsre.Call) (goja.Value, error) {
 		toP,
 		uint32(b.console.shardId), uint32(b.console.shardId),
 		amt, gPrice,
-		[]byte{},
+		input,
 	)
 	if err != nil {
 		return nil, err
@@ -635,6 +640,10 @@ func (b *bridge) HmySendTransaction(call jsre.Call) (goja.Value, error) {
 	gasLimit := getStringFromJsObjWithDefault(txObj, "gas", "1000000")
 	amount := getStringFromJsObjWithDefault(txObj, "value", "0")
 	gasPrice := getStringFromJsObjWithDefault(txObj, "gasPrice", "1")
+	input, err := transaction.StringToByte(getStringFromJsObjWithDefault(txObj, "data", ""))
+	if err != nil {
+		return nil, err
+	}
 
 	networkHandler := rpc.NewHTTPHandler(b.console.nodeUrl)
 	chanId, err := common.StringToChainID(b.console.net)
@@ -680,7 +689,7 @@ func (b *bridge) HmySendTransaction(call jsre.Call) (goja.Value, error) {
 		toP,
 		uint32(b.console.shardId), uint32(b.console.shardId),
 		amt, gPrice,
-		[]byte{},
+		input,
 	)
 	if err != nil {
 		return nil, err

diff --git a/pkg/transaction/util.go b/pkg/transaction/util.go
@@ -0,0 +1,17 @@
+package transaction
+
+import (
+	"encoding/hex"
+	"fmt"
+	"strings"
+)
+
+func StringToByte(dataStr string) ([]byte, error) {
+	if len(dataStr) == 0 {
+		return []byte{}, nil
+	}
+	if !strings.HasPrefix(dataStr, "0x") {
+		return nil, fmt.Errorf("invalid data literal: %q", dataStr)
+	}
+	return hex.DecodeString(dataStr[2:])
+}