Commit 9dc1768e authored by vipwzw's avatar vipwzw Committed by 33cn

update chain33 2019/01/16

parent 1cdfc010
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
package commands package commands
import ( import (
"encoding/json"
"fmt" "fmt"
"math" "math"
"os" "os"
...@@ -132,10 +133,15 @@ func CreateAssetSendToExec(cmd *cobra.Command, args []string, fromExec string) { ...@@ -132,10 +133,15 @@ func CreateAssetSendToExec(cmd *cobra.Command, args []string, fromExec string) {
ExecName: exec, ExecName: exec,
} }
data, err := json.Marshal(&payload)
if err != nil {
fmt.Fprintln(os.Stderr, err)
return
}
params := &rpcTypes.CreateTxIn{ params := &rpcTypes.CreateTxIn{
Execer: types.ExecName(fromExec), Execer: types.ExecName(fromExec),
ActionName: "TransferToExec", ActionName: "TransferToExec",
Payload: types.MustPBToJSON(payload), Payload: data,
} }
rpcLaddr, _ := cmd.Flags().GetString("rpc_laddr") rpcLaddr, _ := cmd.Flags().GetString("rpc_laddr")
...@@ -165,10 +171,15 @@ func CreateAssetWithdraw(cmd *cobra.Command, args []string, fromExec string) { ...@@ -165,10 +171,15 @@ func CreateAssetWithdraw(cmd *cobra.Command, args []string, fromExec string) {
Cointoken: symbol, Cointoken: symbol,
ExecName: exec, ExecName: exec,
} }
data, err := json.Marshal(&payload)
if err != nil {
fmt.Fprintln(os.Stderr, err)
return
}
params := &rpcTypes.CreateTxIn{ params := &rpcTypes.CreateTxIn{
Execer: types.ExecName(fromExec), Execer: types.ExecName(fromExec),
ActionName: "Withdraw", ActionName: "Withdraw",
Payload: types.MustPBToJSON(payload), Payload: data,
} }
rpcLaddr, _ := cmd.Flags().GetString("rpc_laddr") rpcLaddr, _ := cmd.Flags().GetString("rpc_laddr")
...@@ -189,10 +200,15 @@ func CreateAssetTransfer(cmd *cobra.Command, args []string, fromExec string) { ...@@ -189,10 +200,15 @@ func CreateAssetTransfer(cmd *cobra.Command, args []string, fromExec string) {
Note: []byte(note), Note: []byte(note),
Cointoken: symbol, Cointoken: symbol,
} }
data, err := json.Marshal(&payload)
if err != nil {
fmt.Fprintln(os.Stderr, err)
return
}
params := &rpcTypes.CreateTxIn{ params := &rpcTypes.CreateTxIn{
Execer: types.ExecName(fromExec), Execer: types.ExecName(fromExec),
ActionName: "Transfer", ActionName: "Transfer",
Payload: types.MustPBToJSON(payload), Payload: data,
} }
rpcLaddr, _ := cmd.Flags().GetString("rpc_laddr") rpcLaddr, _ := cmd.Flags().GetString("rpc_laddr")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment