Merge pull request #202 from canopy-network/tx-create-order-data

tx create order data support

Author: andrewnguyen22

cmd/cli/admin.go

@@ -8,6 +8,7 @@ import (
 	"github.com/canopy-network/canopy/cmd/rpc"
 	"github.com/canopy-network/canopy/lib"
 	"github.com/canopy-network/canopy/lib/crypto"
+	"github.com/ethereum/go-ethereum/common"
 	"github.com/spf13/cobra"
 	"golang.org/x/term"
 )
@@ -20,6 +21,7 @@ var adminCmd = &cobra.Command{
 var (
 	pwd             string
 	nick            string
+	data            string
 	fee             uint64
 	delegate        bool
 	earlyWithdrawal bool
@@ -35,6 +37,7 @@ func init() {
 	txEditStakeCmd.PersistentFlags().BoolVar(&delegate, "delegate", false, "delegate tokens to committee(s) only without actual validator operation")
 	txStakeCmd.PersistentFlags().BoolVar(&earlyWithdrawal, "early-withdrawal", false, "immediately withdrawal any rewards (with penalty) directly to output address instead of auto-compounding directly to stake")
 	txEditStakeCmd.PersistentFlags().BoolVar(&earlyWithdrawal, "early-withdrawal", false, "immediately withdrawal any rewards (with penalty) directly to output address instead of auto-compounding directly to stake")
+	txCreateOrderCmd.PersistentFlags().StringVar(&data, "data", "", "data for create order")
 	adminCmd.AddCommand(ksCmd)
 	adminCmd.AddCommand(ksNewKeyCmd)
 	adminCmd.AddCommand(ksImportCmd)
@@ -215,11 +218,11 @@ var (
 	}
 
 	txCreateOrderCmd = &cobra.Command{
-		Use:   "tx-create-order <address or nickname> <sell-amount> <receive-amount> <chain-id> <receive-address> --fee=10000 --simulate=true",
+		Use:   "tx-create-order <address or nickname> <sell-amount> <receive-amount> <chain-id> <receive-address> --fee=10000 --data=<hex-data> --simulate=true",
 		Short: "create a sell order - use the simulate flag to generate json only",
 		Args:  cobra.MinimumNArgs(5),
 		Run: func(cmd *cobra.Command, args []string) {
-			writeTxResultToConsole(client.TxCreateOrder(argGetAddrOrNickname(args[0]), uint64(argToInt(args[1])), uint64(argToInt(args[2])), uint64(argToInt(args[3])), args[4], getPassword(), !sim, fee))
+			writeTxResultToConsole(client.TxCreateOrder(argGetAddrOrNickname(args[0]), uint64(argToInt(args[1])), uint64(argToInt(args[2])), uint64(argToInt(args[3])), args[4], getPassword(), argStringToBytes(data), !sim, fee))
 		},
 	}
 
@@ -374,6 +377,11 @@ func writeTxResultToConsole(hash *string, tx json.RawMessage, e lib.ErrorI) {
 	}
 }
 
+func argStringToBytes(data string) []byte {
+	bz := common.FromHex(data)
+	return bz
+}
+
 func argGetAddr(arg string) string {
 	bz, err := lib.StringToBytes(arg)
 	if err != nil {

cmd/rpc/client.go

@@ -559,7 +559,7 @@ func (c *Client) TxSubsidy(from AddrOrNickname, amt, chainId uint64, opCode stri
 }
 
 func (c *Client) TxCreateOrder(from AddrOrNickname, sellAmount, receiveAmount, chainId uint64, receiveAddress string,
-	pwd string, submit bool, optFee uint64) (hash *string, tx json.RawMessage, e lib.ErrorI) {
+	pwd string, data lib.HexBytes, submit bool, optFee uint64) (hash *string, tx json.RawMessage, e lib.ErrorI) {
 	receiveAddr, err := lib.NewHexBytesFromString(receiveAddress)
 	if err != nil {
 		return nil, nil, err
@@ -570,6 +570,7 @@ func (c *Client) TxCreateOrder(from AddrOrNickname, sellAmount, receiveAmount, c
 		Submit:               submit,
 		ReceiveAmount:        receiveAmount,
 		ReceiveAddress:       receiveAddr,
+		Data:                 data,
 		Password:             pwd,
 		txChangeParamRequest: txChangeParamRequest{},
 		committeesRequest:    committeesRequest{fmt.Sprintf("%d", chainId)},

cmd/rpc/types.go

@@ -215,6 +215,7 @@ type txCreateOrder struct {
 	Fee            uint64       `json:"fee"`
 	Amount         uint64       `json:"amount"`
 	Password       string       `json:"password"`
+	Data           lib.HexBytes `json:"data"`
 	Submit         bool         `json:"submit"`
 	ReceiveAmount  uint64       `json:"receiveAmount"`
 	ReceiveAddress lib.HexBytes `json:"receiveAddress"`