Skip to content

P
plugin
Commit d4c4cb68 authored by heyubin's avatar heyubin Committed by vipwzw
Browse files
Options

add by hyb for gosec

parent 854ce979
Hide whitespace changes
Inline Side-by-side
Showing with 148 additions and 278 deletions
plugin/dapp/multisig/commands/multisig.go
View file @ d4c4cb68
...@@ -105,35 +105,31 @@ func CreateMultiSigAccCreateCmd() *cobra.Command { ...@@ -105,35 +105,31 @@ func CreateMultiSigAccCreateCmd() *cobra.Command {
func createMultiSigAccTransferFlags(cmd *cobra.Command) { func createMultiSigAccTransferFlags(cmd *cobra.Command) {
cmd.Flags().StringP("owners_addr", "a", "", "address of owners,separated by '-', addr0-addr1-addr2...") cmd.Flags().StringP("owners_addr", "a", "", "address of owners,separated by '-', addr0-addr1-addr2...")
err := cmd.MarkFlagRequired("owners_addr") cmd.MarkFlagRequired("owners_addr")
cmd.Flags().StringP("owners_weight", "w", "", "weight of owners,separated by '-', w0-w1-w2..., uint64 type") cmd.Flags().StringP("owners_weight", "w", "", "weight of owners,separated by '-', w0-w1-w2..., uint64 type")
err = cmd.MarkFlagRequired("owners_weight") cmd.MarkFlagRequired("owners_weight")
cmd.Flags().Uint64P("required_weight", "r", 0, "required weight of account execute tx") cmd.Flags().Uint64P("required_weight", "r", 0, "required weight of account execute tx")
err = cmd.MarkFlagRequired("required_weight") cmd.MarkFlagRequired("required_weight")
cmd.Flags().StringP("execer", "e", "", "assets execer name") cmd.Flags().StringP("execer", "e", "", "assets execer name")
err = cmd.MarkFlagRequired("execer") cmd.MarkFlagRequired("execer")
cmd.Flags().StringP("symbol", "s", "", "assets symbol") cmd.Flags().StringP("symbol", "s", "", "assets symbol")
err = cmd.MarkFlagRequired("symbol") cmd.MarkFlagRequired("symbol")
cmd.Flags().Float64P("daily_limit", "d", 0, "daily_limit of assets ") cmd.Flags().Float64P("daily_limit", "d", 0, "daily_limit of assets ")
err = cmd.MarkFlagRequired("daily_limit") cmd.MarkFlagRequired("daily_limit")
if err != nil {
fmt.Fprintln(os.Stderr, err)
return
}
} }
func createMultiSigAccTransfer(cmd *cobra.Command, args []string) { func createMultiSigAccTransfer(cmd *cobra.Command, args []string) {
rpcLaddr, err := cmd.Flags().GetString("rpc_laddr") rpcLaddr, _ := cmd.Flags().GetString("rpc_laddr")
address, err := cmd.Flags().GetString("owners_addr") address, _ := cmd.Flags().GetString("owners_addr")
addressArr := strings.Split(address, "-") addressArr := strings.Split(address, "-")
weightstr, err := cmd.Flags().GetString("owners_weight") weightstr, _ := cmd.Flags().GetString("owners_weight")
weightsArr := strings.Split(weightstr, "-") weightsArr := strings.Split(weightstr, "-")
//校验owner和权重数量要一致 //校验owner和权重数量要一致
...@@ -174,10 +170,10 @@ func createMultiSigAccTransfer(cmd *cobra.Command, args []string) { ...@@ -174,10 +170,10 @@ func createMultiSigAccTransfer(cmd *cobra.Command, args []string) {
return return
} }
execer, err := cmd.Flags().GetString("execer") execer, _ := cmd.Flags().GetString("execer")
symbol, err := cmd.Flags().GetString("symbol") symbol, _ := cmd.Flags().GetString("symbol")
dailylimit, err := cmd.Flags().GetFloat64("daily_limit") dailylimit, _ := cmd.Flags().GetFloat64("daily_limit")
err = isValidDailylimit(dailylimit) err = isValidDailylimit(dailylimit)
if err != nil { if err != nil {
fmt.Fprintln(os.Stderr, err) fmt.Fprintln(os.Stderr, err)
...@@ -213,28 +209,22 @@ func CreateMultiSigAccOwnerAddCmd() *cobra.Command { ...@@ -213,28 +209,22 @@ func CreateMultiSigAccOwnerAddCmd() *cobra.Command {
func createOwnerAddTransferFlags(cmd *cobra.Command) { func createOwnerAddTransferFlags(cmd *cobra.Command) {
cmd.Flags().StringP("multisig_addr", "a", "", "address of multisig account") cmd.Flags().StringP("multisig_addr", "a", "", "address of multisig account")
err := cmd.MarkFlagRequired("multisig_addr") cmd.MarkFlagRequired("multisig_addr")
cmd.Flags().StringP("owner_addr", "o", "", "address of owner") cmd.Flags().StringP("owner_addr", "o", "", "address of owner")
err = cmd.MarkFlagRequired("owner_addr") cmd.MarkFlagRequired("owner_addr")
cmd.Flags().Uint64P("owner_weight", "w", 0, "weight of owner") cmd.Flags().Uint64P("owner_weight", "w", 0, "weight of owner")
err = cmd.MarkFlagRequired("owner_weight") cmd.MarkFlagRequired("owner_weight")
if err != nil {
fmt.Fprintln(os.Stderr, err)
return
}
} }
func createOwnerAddTransfer(cmd *cobra.Command, args []string) { func createOwnerAddTransfer(cmd *cobra.Command, args []string) {
rpcLaddr, err := cmd.Flags().GetString("rpc_laddr") rpcLaddr, _ := cmd.Flags().GetString("rpc_laddr")
multiSigAddr, err := cmd.Flags().GetString("multisig_addr") multiSigAddr, _ := cmd.Flags().GetString("multisig_addr")
ownerAddr, err := cmd.Flags().GetString("owner_addr") ownerAddr, _ := cmd.Flags().GetString("owner_addr")
ownerWeight, err := cmd.Flags().GetUint64("owner_weight") ownerWeight, _ := cmd.Flags().GetUint64("owner_weight")
if err != nil {
fmt.Fprintln(os.Stderr, err)
return
}
params := &mty.MultiSigOwnerOperate{ params := &mty.MultiSigOwnerOperate{
MultiSigAccAddr: multiSigAddr, MultiSigAccAddr: multiSigAddr,
NewOwner: ownerAddr, NewOwner: ownerAddr,
...@@ -260,24 +250,17 @@ func CreateMultiSigAccOwnerDelCmd() *cobra.Command { ...@@ -260,24 +250,17 @@ func CreateMultiSigAccOwnerDelCmd() *cobra.Command {
func createOwnerDelTransferFlags(cmd *cobra.Command) { func createOwnerDelTransferFlags(cmd *cobra.Command) {
cmd.Flags().StringP("multisig_addr", "a", "", "address of multisig account") cmd.Flags().StringP("multisig_addr", "a", "", "address of multisig account")
err := cmd.MarkFlagRequired("multisig_addr") cmd.MarkFlagRequired("multisig_addr")
cmd.Flags().StringP("owner_addr", "o", "", "address of owner") cmd.Flags().StringP("owner_addr", "o", "", "address of owner")
err = cmd.MarkFlagRequired("owner_addr") cmd.MarkFlagRequired("owner_addr")
if err != nil {
fmt.Fprintln(os.Stderr, err)
return
}
} }
func createOwnerDelTransfer(cmd *cobra.Command, args []string) { func createOwnerDelTransfer(cmd *cobra.Command, args []string) {
rpcLaddr, err := cmd.Flags().GetString("rpc_laddr") rpcLaddr, _ := cmd.Flags().GetString("rpc_laddr")
multiSigAddr, err := cmd.Flags().GetString("multisig_addr") multiSigAddr, _ := cmd.Flags().GetString("multisig_addr")
ownerAddr, err := cmd.Flags().GetString("owner_addr") ownerAddr, _ := cmd.Flags().GetString("owner_addr")
if err != nil {
fmt.Fprintln(os.Stderr, err)
return
}
params := &mty.MultiSigOwnerOperate{ params := &mty.MultiSigOwnerOperate{
MultiSigAccAddr: multiSigAddr, MultiSigAccAddr: multiSigAddr,
OldOwner: ownerAddr, OldOwner: ownerAddr,
...@@ -302,26 +285,19 @@ func CreateMultiSigAccOwnerModifyCmd() *cobra.Command { ...@@ -302,26 +285,19 @@ func CreateMultiSigAccOwnerModifyCmd() *cobra.Command {
func createOwnerModifyTransferFlags(cmd *cobra.Command) { func createOwnerModifyTransferFlags(cmd *cobra.Command) {
cmd.Flags().StringP("multisig_addr", "a", "", "address of multisig account") cmd.Flags().StringP("multisig_addr", "a", "", "address of multisig account")
err := cmd.MarkFlagRequired("multisig_addr") cmd.MarkFlagRequired("multisig_addr")
cmd.Flags().StringP("owner_addr", "o", "", "address of owner") cmd.Flags().StringP("owner_addr", "o", "", "address of owner")
err = cmd.MarkFlagRequired("owner_addr") cmd.MarkFlagRequired("owner_addr")
cmd.Flags().Uint64P("owner_weight", "w", 0, "new weight of owner") cmd.Flags().Uint64P("owner_weight", "w", 0, "new weight of owner")
err = cmd.MarkFlagRequired("owner_weight") cmd.MarkFlagRequired("owner_weight")
if err != nil {
fmt.Fprintln(os.Stderr, err)
return
}
} }
func createOwnerModifyTransfer(cmd *cobra.Command, args []string) { func createOwnerModifyTransfer(cmd *cobra.Command, args []string) {
rpcLaddr, err := cmd.Flags().GetString("rpc_laddr") rpcLaddr, _ := cmd.Flags().GetString("rpc_laddr")
multiSigAddr, err := cmd.Flags().GetString("multisig_addr") multiSigAddr, _ := cmd.Flags().GetString("multisig_addr")
ownerAddr, err := cmd.Flags().GetString("owner_addr") ownerAddr, _ := cmd.Flags().GetString("owner_addr")
ownerWeight, err := cmd.Flags().GetUint64("owner_weight") ownerWeight, _ := cmd.Flags().GetUint64("owner_weight")
if err != nil {
fmt.Fprintln(os.Stderr, err)
return
}
params := &mty.MultiSigOwnerOperate{ params := &mty.MultiSigOwnerOperate{
MultiSigAccAddr: multiSigAddr, MultiSigAccAddr: multiSigAddr,
OldOwner: ownerAddr, OldOwner: ownerAddr,
...@@ -347,26 +323,19 @@ func CreateMultiSigAccOwnerReplaceCmd() *cobra.Command { ...@@ -347,26 +323,19 @@ func CreateMultiSigAccOwnerReplaceCmd() *cobra.Command {
func createOwnerReplaceTransferFlags(cmd *cobra.Command) { func createOwnerReplaceTransferFlags(cmd *cobra.Command) {
cmd.Flags().StringP("multisig_addr", "a", "", "address of multisig account") cmd.Flags().StringP("multisig_addr", "a", "", "address of multisig account")
err := cmd.MarkFlagRequired("multisig_addr") cmd.MarkFlagRequired("multisig_addr")
cmd.Flags().StringP("owner_addr", "o", "", "address of old owner") cmd.Flags().StringP("owner_addr", "o", "", "address of old owner")
err = cmd.MarkFlagRequired("owner_addr") cmd.MarkFlagRequired("owner_addr")
cmd.Flags().StringP("new_owner", "n", "", "address of new owner") cmd.Flags().StringP("new_owner", "n", "", "address of new owner")
err = cmd.MarkFlagRequired("new_owner") cmd.MarkFlagRequired("new_owner")
if err != nil {
fmt.Fprintln(os.Stderr, err)
return
}
} }
func createOwnerReplaceTransfer(cmd *cobra.Command, args []string) { func createOwnerReplaceTransfer(cmd *cobra.Command, args []string) {
rpcLaddr, err := cmd.Flags().GetString("rpc_laddr") rpcLaddr, _ := cmd.Flags().GetString("rpc_laddr")
multiSigAddr, err := cmd.Flags().GetString("multisig_addr") multiSigAddr, _ := cmd.Flags().GetString("multisig_addr")
ownerAddr, err := cmd.Flags().GetString("owner_addr") ownerAddr, _ := cmd.Flags().GetString("owner_addr")
newOwner, err := cmd.Flags().GetString("new_owner") newOwner, _ := cmd.Flags().GetString("new_owner")
if err != nil {
fmt.Fprintln(os.Stderr, err)
return
}
params := &mty.MultiSigOwnerOperate{ params := &mty.MultiSigOwnerOperate{
MultiSigAccAddr: multiSigAddr, MultiSigAccAddr: multiSigAddr,
OldOwner: ownerAddr, OldOwner: ownerAddr,
...@@ -392,22 +361,15 @@ func CreateMultiSigAccWeightModifyCmd() *cobra.Command { ...@@ -392,22 +361,15 @@ func CreateMultiSigAccWeightModifyCmd() *cobra.Command {
func createMultiSigAccWeightModifyTransferFlags(cmd *cobra.Command) { func createMultiSigAccWeightModifyTransferFlags(cmd *cobra.Command) {
cmd.Flags().StringP("multisig_addr", "a", "", "address of multisig account") cmd.Flags().StringP("multisig_addr", "a", "", "address of multisig account")
err := cmd.MarkFlagRequired("multisig_addr") cmd.MarkFlagRequired("multisig_addr")
cmd.Flags().Uint64P("weight", "w", 0, "new required weight of multisig account ") cmd.Flags().Uint64P("weight", "w", 0, "new required weight of multisig account ")
if err != nil {
fmt.Fprintln(os.Stderr, err)
return
}
} }
func createMultiSigAccWeightModifyTransfer(cmd *cobra.Command, args []string) { func createMultiSigAccWeightModifyTransfer(cmd *cobra.Command, args []string) {
rpcLaddr, err := cmd.Flags().GetString("rpc_laddr") rpcLaddr, _ := cmd.Flags().GetString("rpc_laddr")
multiSigAddr, err := cmd.Flags().GetString("multisig_addr") multiSigAddr, _ := cmd.Flags().GetString("multisig_addr")
weight, err := cmd.Flags().GetUint64("weight") weight, _ := cmd.Flags().GetUint64("weight")
if err != nil {
fmt.Fprintln(os.Stderr, err)
return
}
params := &mty.MultiSigAccOperate{ params := &mty.MultiSigAccOperate{
MultiSigAccAddr: multiSigAddr, MultiSigAccAddr: multiSigAddr,
NewRequiredWeight: weight, NewRequiredWeight: weight,
...@@ -432,33 +394,26 @@ func CreateMultiSigAccDailyLimitModifyCmd() *cobra.Command { ...@@ -432,33 +394,26 @@ func CreateMultiSigAccDailyLimitModifyCmd() *cobra.Command {
func createMultiSigAccDailyLimitModifyTransferFlags(cmd *cobra.Command) { func createMultiSigAccDailyLimitModifyTransferFlags(cmd *cobra.Command) {
cmd.Flags().StringP("multisig_addr", "a", "", "address of multisig account") cmd.Flags().StringP("multisig_addr", "a", "", "address of multisig account")
err := cmd.MarkFlagRequired("multisig_addr") cmd.MarkFlagRequired("multisig_addr")
cmd.Flags().StringP("execer", "e", "", "assets execer name") cmd.Flags().StringP("execer", "e", "", "assets execer name")
err = cmd.MarkFlagRequired("execer") cmd.MarkFlagRequired("execer")
cmd.Flags().StringP("symbol", "s", "", "assets symbol") cmd.Flags().StringP("symbol", "s", "", "assets symbol")
err = cmd.MarkFlagRequired("symbol") cmd.MarkFlagRequired("symbol")
cmd.Flags().Float64P("daily_limit", "d", 0, "daily_limit of assets ") cmd.Flags().Float64P("daily_limit", "d", 0, "daily_limit of assets ")
err = cmd.MarkFlagRequired("daily_limit") cmd.MarkFlagRequired("daily_limit")
if err != nil {
fmt.Fprintln(os.Stderr, err)
return
}
} }
func createMultiSigAccDailyLimitModifyTransfer(cmd *cobra.Command, args []string) { func createMultiSigAccDailyLimitModifyTransfer(cmd *cobra.Command, args []string) {
rpcLaddr, err := cmd.Flags().GetString("rpc_laddr") rpcLaddr, _ := cmd.Flags().GetString("rpc_laddr")
multiSigAddr, err := cmd.Flags().GetString("multisig_addr") multiSigAddr, _ := cmd.Flags().GetString("multisig_addr")
execer, err := cmd.Flags().GetString("execer") execer, _ := cmd.Flags().GetString("execer")
symbol, err := cmd.Flags().GetString("symbol") symbol, _ := cmd.Flags().GetString("symbol")
dailylimit, err := cmd.Flags().GetFloat64("daily_limit") dailylimit, _ := cmd.Flags().GetFloat64("daily_limit")
if err != nil {
fmt.Fprintln(os.Stderr, err) err := isValidDailylimit(dailylimit)
return
}
err = isValidDailylimit(dailylimit)
if err != nil { if err != nil {
fmt.Fprintln(os.Stderr, err) fmt.Fprintln(os.Stderr, err)
return return
...@@ -492,24 +447,21 @@ func CreateMultiSigConfirmTxCmd() *cobra.Command { ...@@ -492,24 +447,21 @@ func CreateMultiSigConfirmTxCmd() *cobra.Command {
func createMultiSigConfirmTransferFlags(cmd *cobra.Command) { func createMultiSigConfirmTransferFlags(cmd *cobra.Command) {
cmd.Flags().StringP("multisig_addr", "a", "", "address of multisig account") cmd.Flags().StringP("multisig_addr", "a", "", "address of multisig account")
err := cmd.MarkFlagRequired("multisig_addr") cmd.MarkFlagRequired("multisig_addr")
cmd.Flags().Uint64P("txid", "i", 0, "txid of multisig transaction") cmd.Flags().Uint64P("txid", "i", 0, "txid of multisig transaction")
err = cmd.MarkFlagRequired("txid") cmd.MarkFlagRequired("txid")
cmd.Flags().StringP("confirm_or_revoke", "c", "t", "whether confirm or revoke tx (0/f/false for No; 1/t/true for Yes)") cmd.Flags().StringP("confirm_or_revoke", "c", "t", "whether confirm or revoke tx (0/f/false for No; 1/t/true for Yes)")
if err != nil {
fmt.Fprintln(os.Stderr, err)
return
}
} }
func createMultiSigConfirmTransfer(cmd *cobra.Command, args []string) { func createMultiSigConfirmTransfer(cmd *cobra.Command, args []string) {
rpcLaddr, err := cmd.Flags().GetString("rpc_laddr") rpcLaddr, _ := cmd.Flags().GetString("rpc_laddr")
multiSigAddr, err := cmd.Flags().GetString("multisig_addr") multiSigAddr, _ := cmd.Flags().GetString("multisig_addr")
txid, err := cmd.Flags().GetUint64("txid") txid, _ := cmd.Flags().GetUint64("txid")
confirmOrRevoke, err := cmd.Flags().GetString("confirm_or_revoke") confirmOrRevoke, _ := cmd.Flags().GetString("confirm_or_revoke")
confirmOrRevokeBool, err := strconv.ParseBool(confirmOrRevoke) confirmOrRevokeBool, err := strconv.ParseBool(confirmOrRevoke)
if err != nil { if err != nil {
fmt.Fprintln(os.Stderr, err) fmt.Fprintln(os.Stderr, err)
...@@ -539,35 +491,28 @@ func CreateMultiSigAccTransferInCmd() *cobra.Command { ...@@ -539,35 +491,28 @@ func CreateMultiSigAccTransferInCmd() *cobra.Command {
func createMultiSigAccTransferInFlags(cmd *cobra.Command) { func createMultiSigAccTransferInFlags(cmd *cobra.Command) {
cmd.Flags().StringP("to", "t", "", "address of multisig account") cmd.Flags().StringP("to", "t", "", "address of multisig account")
err := cmd.MarkFlagRequired("to") cmd.MarkFlagRequired("to")
cmd.Flags().StringP("execer", "e", "", "assets execer") cmd.Flags().StringP("execer", "e", "", "assets execer")
err = cmd.MarkFlagRequired("execer") cmd.MarkFlagRequired("execer")
cmd.Flags().StringP("symbol", "s", "", "assets symbol") cmd.Flags().StringP("symbol", "s", "", "assets symbol")
err = cmd.MarkFlagRequired("symbol") cmd.MarkFlagRequired("symbol")
cmd.Flags().StringP("note", "n", "", "transaction note info") cmd.Flags().StringP("note", "n", "", "transaction note info")
cmd.Flags().Float64P("amount", "a", 0, "transaction amount") cmd.Flags().Float64P("amount", "a", 0, "transaction amount")
err = cmd.MarkFlagRequired("amount") cmd.MarkFlagRequired("amount")
if err != nil {
fmt.Fprintln(os.Stderr, err)
return
}
} }
func createMultiSigAccTransferIn(cmd *cobra.Command, args []string) { func createMultiSigAccTransferIn(cmd *cobra.Command, args []string) {
rpcLaddr, err := cmd.Flags().GetString("rpc_laddr") rpcLaddr, _ := cmd.Flags().GetString("rpc_laddr")
to, err := cmd.Flags().GetString("to") to, _ := cmd.Flags().GetString("to")
execer, err := cmd.Flags().GetString("execer") execer, _ := cmd.Flags().GetString("execer")
symbol, err := cmd.Flags().GetString("symbol") symbol, _ := cmd.Flags().GetString("symbol")
note, err := cmd.Flags().GetString("note") note, _ := cmd.Flags().GetString("note")
amount, err := cmd.Flags().GetFloat64("amount") amount, _ := cmd.Flags().GetFloat64("amount")
if err != nil {
fmt.Fprintln(os.Stderr, err)
return
}
if float64(types.MaxCoin/types.Coin) < amount { if float64(types.MaxCoin/types.Coin) < amount {
fmt.Fprintln(os.Stderr, types.ErrAmount) fmt.Fprintln(os.Stderr, types.ErrAmount)
return return
...@@ -598,39 +543,32 @@ func CreateMultiSigAccTransferOutCmd() *cobra.Command { ...@@ -598,39 +543,32 @@ func CreateMultiSigAccTransferOutCmd() *cobra.Command {
func createMultiSigAccTransferOutFlags(cmd *cobra.Command) { func createMultiSigAccTransferOutFlags(cmd *cobra.Command) {
cmd.Flags().StringP("from", "f", "", "address of multisig account") cmd.Flags().StringP("from", "f", "", "address of multisig account")
err := cmd.MarkFlagRequired("from") cmd.MarkFlagRequired("from")
cmd.Flags().StringP("to", "t", "", "address of account") cmd.Flags().StringP("to", "t", "", "address of account")
err = cmd.MarkFlagRequired("to") cmd.MarkFlagRequired("to")
cmd.Flags().StringP("execer", "e", "", "assets execer") cmd.Flags().StringP("execer", "e", "", "assets execer")
err = cmd.MarkFlagRequired("execer") cmd.MarkFlagRequired("execer")
cmd.Flags().StringP("symbol", "s", "", "assets symbol") cmd.Flags().StringP("symbol", "s", "", "assets symbol")
err = cmd.MarkFlagRequired("symbol") cmd.MarkFlagRequired("symbol")
cmd.Flags().StringP("note", "n", "", "transaction note info") cmd.Flags().StringP("note", "n", "", "transaction note info")
cmd.Flags().Float64P("amount", "a", 0, "transaction amount") cmd.Flags().Float64P("amount", "a", 0, "transaction amount")
err = cmd.MarkFlagRequired("amount") cmd.MarkFlagRequired("amount")
if err != nil {
fmt.Fprintln(os.Stderr, err)
return
}
} }
func createMultiSigAccTransferOut(cmd *cobra.Command, args []string) { func createMultiSigAccTransferOut(cmd *cobra.Command, args []string) {
rpcLaddr, err := cmd.Flags().GetString("rpc_laddr") rpcLaddr, _ := cmd.Flags().GetString("rpc_laddr")
from, err := cmd.Flags().GetString("from") from, _ := cmd.Flags().GetString("from")
to, err := cmd.Flags().GetString("to") to, _ := cmd.Flags().GetString("to")
execer, err := cmd.Flags().GetString("execer") execer, _ := cmd.Flags().GetString("execer")
symbol, err := cmd.Flags().GetString("symbol") symbol, _ := cmd.Flags().GetString("symbol")
note, err := cmd.Flags().GetString("note") note, _ := cmd.Flags().GetString("note")
amount, err := cmd.Flags().GetFloat64("amount") amount, _ := cmd.Flags().GetFloat64("amount")
if err != nil {
fmt.Fprintln(os.Stderr, err)
return
}
if float64(types.MaxCoin/types.Coin) < amount { if float64(types.MaxCoin/types.Coin) < amount {
fmt.Fprintln(os.Stderr, types.ErrAmount) fmt.Fprintln(os.Stderr, types.ErrAmount)
return return
...@@ -659,11 +597,8 @@ func GetMultiSigAccCountCmd() *cobra.Command { ...@@ -659,11 +597,8 @@ func GetMultiSigAccCountCmd() *cobra.Command {
} }
func getMultiSigAccCount(cmd *cobra.Command, args []string) { func getMultiSigAccCount(cmd *cobra.Command, args []string) {
rpcLaddr, err := cmd.Flags().GetString("rpc_laddr") rpcLaddr, _ := cmd.Flags().GetString("rpc_laddr")
if err != nil {
fmt.Fprintln(os.Stderr, err)
return
}
var params rpctypes.Query4Jrpc var params rpctypes.Query4Jrpc
var rep interface{} var rep interface{}
...@@ -690,25 +625,18 @@ func GetMultiSigAccountsCmd() *cobra.Command { ...@@ -690,25 +625,18 @@ func GetMultiSigAccountsCmd() *cobra.Command {
func addgetMultiSigAccountsFlags(cmd *cobra.Command) { func addgetMultiSigAccountsFlags(cmd *cobra.Command) {
cmd.Flags().Int64P("start", "s", 0, "account start index") cmd.Flags().Int64P("start", "s", 0, "account start index")
err := cmd.MarkFlagRequired("start") cmd.MarkFlagRequired("start")
cmd.Flags().Int64P("end", "e", 0, "account end index") cmd.Flags().Int64P("end", "e", 0, "account end index")
err = cmd.MarkFlagRequired("end") cmd.MarkFlagRequired("end")
if err != nil {
fmt.Fprintln(os.Stderr, err)
return
}
} }
func getMultiSigAccounts(cmd *cobra.Command, args []string) { func getMultiSigAccounts(cmd *cobra.Command, args []string) {
rpcLaddr, err := cmd.Flags().GetString("rpc_laddr") rpcLaddr, _ := cmd.Flags().GetString("rpc_laddr")
start, _ := cmd.Flags().GetInt64("start")
end, _ := cmd.Flags().GetInt64("end")
start, err := cmd.Flags().GetInt64("start")
end, err := cmd.Flags().GetInt64("end")
if err != nil {
fmt.Fprintln(os.Stderr, err)
return
}
if start > end || start < 0 { if start > end || start < 0 {
fmt.Fprintln(os.Stderr, "input parameter invalid!") fmt.Fprintln(os.Stderr, "input parameter invalid!")
return return
...@@ -742,20 +670,13 @@ func GetMultiSigAccountInfoCmd() *cobra.Command { ...@@ -742,20 +670,13 @@ func GetMultiSigAccountInfoCmd() *cobra.Command {
func getMultiSigAccountInfoFlags(cmd *cobra.Command) { func getMultiSigAccountInfoFlags(cmd *cobra.Command) {
cmd.Flags().StringP("addr", "a", "", "address of multisig account") cmd.Flags().StringP("addr", "a", "", "address of multisig account")
err := cmd.MarkFlagRequired("addr") cmd.MarkFlagRequired("addr")
if err != nil {
fmt.Fprintln(os.Stderr, err)
return
}
} }
func getMultiSigAccountInfo(cmd *cobra.Command, args []string) { func getMultiSigAccountInfo(cmd *cobra.Command, args []string) {
rpcLaddr, err := cmd.Flags().GetString("rpc_laddr") rpcLaddr, _ := cmd.Flags().GetString("rpc_laddr")
addr, err := cmd.Flags().GetString("addr") addr, _ := cmd.Flags().GetString("addr")
if err != nil {
fmt.Fprintln(os.Stderr, err)
return
}
req := mty.ReqMultiSigAccInfo{ req := mty.ReqMultiSigAccInfo{
MultiSigAccAddr: addr, MultiSigAccAddr: addr,
} }
...@@ -815,20 +736,13 @@ func GetMultiSigAccTxCountCmd() *cobra.Command { ...@@ -815,20 +736,13 @@ func GetMultiSigAccTxCountCmd() *cobra.Command {
func getMultiSigAccTxCountFlags(cmd *cobra.Command) { func getMultiSigAccTxCountFlags(cmd *cobra.Command) {
cmd.Flags().StringP("addr", "a", "", "address of multisig account") cmd.Flags().StringP("addr", "a", "", "address of multisig account")
err := cmd.MarkFlagRequired("addr") cmd.MarkFlagRequired("addr")
if err != nil {
fmt.Fprintln(os.Stderr, err)
return
}
} }
func getMultiSigAccTxCount(cmd *cobra.Command, args []string) { func getMultiSigAccTxCount(cmd *cobra.Command, args []string) {
rpcLaddr, err := cmd.Flags().GetString("rpc_laddr") rpcLaddr, _ := cmd.Flags().GetString("rpc_laddr")
addr, err := cmd.Flags().GetString("addr") addr, _ := cmd.Flags().GetString("addr")
if err != nil {
fmt.Fprintln(os.Stderr, err)
return
}
req := mty.ReqMultiSigAccInfo{ req := mty.ReqMultiSigAccInfo{
MultiSigAccAddr: addr, MultiSigAccAddr: addr,
} }
...@@ -857,45 +771,39 @@ func GetMultiSigTxidsCmd() *cobra.Command { ...@@ -857,45 +771,39 @@ func GetMultiSigTxidsCmd() *cobra.Command {
func getMultiSigTxidsCmdFlags(cmd *cobra.Command) { func getMultiSigTxidsCmdFlags(cmd *cobra.Command) {
cmd.Flags().StringP("addr", "a", "", "address of multisig account") cmd.Flags().StringP("addr", "a", "", "address of multisig account")
err := cmd.MarkFlagRequired("addr") cmd.MarkFlagRequired("addr")
cmd.Flags().Uint64P("start", "s", 0, "tx start index") cmd.Flags().Uint64P("start", "s", 0, "tx start index")
err = cmd.MarkFlagRequired("start") cmd.MarkFlagRequired("start")
cmd.Flags().Uint64P("end", "e", 0, "tx end index") cmd.Flags().Uint64P("end", "e", 0, "tx end index")
err = cmd.MarkFlagRequired("end") cmd.MarkFlagRequired("end")
cmd.Flags().StringP("pending", "p", "t", "whether pending tx (0/f/false for No; 1/t/true for Yes)") cmd.Flags().StringP("pending", "p", "t", "whether pending tx (0/f/false for No; 1/t/true for Yes)")
cmd.Flags().StringP("executed", "x", "t", "whether executed tx (0/f/false for No; 1/t/true for Yes)") cmd.Flags().StringP("executed", "x", "t", "whether executed tx (0/f/false for No; 1/t/true for Yes)")
if err != nil {
fmt.Fprintln(os.Stderr, err)
return
}
} }
func getMultiSigTxids(cmd *cobra.Command, args []string) { func getMultiSigTxids(cmd *cobra.Command, args []string) {
rpcLaddr, err := cmd.Flags().GetString("rpc_laddr") rpcLaddr, _ := cmd.Flags().GetString("rpc_laddr")
addr, err := cmd.Flags().GetString("addr") addr, _ := cmd.Flags().GetString("addr")
start, err := cmd.Flags().GetUint64("start") start, _ := cmd.Flags().GetUint64("start")
end, err := cmd.Flags().GetUint64("end") end, _ := cmd.Flags().GetUint64("end")
if err != nil {
fmt.Fprintln(os.Stderr, err)
return
}
if start > end || start < 0 { if start > end || start < 0 {
fmt.Fprintln(os.Stderr, "input parameter invalid!") fmt.Fprintln(os.Stderr, "input parameter invalid!")
return return
} }
pending, err := cmd.Flags().GetString("pending") pending, _ := cmd.Flags().GetString("pending")
pendingBool, err := strconv.ParseBool(pending) pendingBool, err := strconv.ParseBool(pending)
if err != nil { if err != nil {
fmt.Fprintln(os.Stderr, err) fmt.Fprintln(os.Stderr, err)
return return
} }
executed, err := cmd.Flags().GetString("executed") executed, _ := cmd.Flags().GetString("executed")
executedBool, err := strconv.ParseBool(executed) executedBool, err := strconv.ParseBool(executed)
if err != nil { if err != nil {
fmt.Fprintln(os.Stderr, err) fmt.Fprintln(os.Stderr, err)
...@@ -934,24 +842,17 @@ func GetMultiSigTxInfoCmd() *cobra.Command { ...@@ -934,24 +842,17 @@ func GetMultiSigTxInfoCmd() *cobra.Command {
func getMultiSigTxInfoFlags(cmd *cobra.Command) { func getMultiSigTxInfoFlags(cmd *cobra.Command) {
cmd.Flags().StringP("addr", "a", "", "address of multisig account") cmd.Flags().StringP("addr", "a", "", "address of multisig account")
err := cmd.MarkFlagRequired("addr") cmd.MarkFlagRequired("addr")
cmd.Flags().Uint64P("txid", "i", 0, "txid of multisig transaction") cmd.Flags().Uint64P("txid", "i", 0, "txid of multisig transaction")
err = cmd.MarkFlagRequired("txid") cmd.MarkFlagRequired("txid")
if err != nil {
fmt.Fprintln(os.Stderr, err)
return
}
} }
func getMultiSigTxInfo(cmd *cobra.Command, args []string) { func getMultiSigTxInfo(cmd *cobra.Command, args []string) {
rpcLaddr, err := cmd.Flags().GetString("rpc_laddr") rpcLaddr, _ := cmd.Flags().GetString("rpc_laddr")
addr, err := cmd.Flags().GetString("addr") addr, _ := cmd.Flags().GetString("addr")
txid, err := cmd.Flags().GetUint64("txid") txid, _ := cmd.Flags().GetUint64("txid")
if err != nil {
fmt.Fprintln(os.Stderr, err)
return
}
req := mty.ReqMultiSigTxInfo{ req := mty.ReqMultiSigTxInfo{
MultiSigAddr: addr, MultiSigAddr: addr,
TxId: txid, TxId: txid,
...@@ -981,24 +882,17 @@ func GetMultiSigTxConfirmedWeightCmd() *cobra.Command { ...@@ -981,24 +882,17 @@ func GetMultiSigTxConfirmedWeightCmd() *cobra.Command {
func getMultiSigTxConfirmedWeightFlags(cmd *cobra.Command) { func getMultiSigTxConfirmedWeightFlags(cmd *cobra.Command) {
cmd.Flags().StringP("addr", "a", "", "address of multisig account") cmd.Flags().StringP("addr", "a", "", "address of multisig account")
err := cmd.MarkFlagRequired("addr") cmd.MarkFlagRequired("addr")
cmd.Flags().Uint64P("txid", "i", 0, "txid of multisig transaction") cmd.Flags().Uint64P("txid", "i", 0, "txid of multisig transaction")
err = cmd.MarkFlagRequired("txid") cmd.MarkFlagRequired("txid")
if err != nil {
fmt.Fprintln(os.Stderr, err)
return
}
} }
func getGetMultiSigTxConfirmedWeight(cmd *cobra.Command, args []string) { func getGetMultiSigTxConfirmedWeight(cmd *cobra.Command, args []string) {
rpcLaddr, err := cmd.Flags().GetString("rpc_laddr") rpcLaddr, _ := cmd.Flags().GetString("rpc_laddr")
addr, err := cmd.Flags().GetString("addr") addr, _ := cmd.Flags().GetString("addr")
txid, err := cmd.Flags().GetUint64("txid") txid, _ := cmd.Flags().GetUint64("txid")
if err != nil {
fmt.Fprintln(os.Stderr, err)
return
}
req := mty.ReqMultiSigTxInfo{ req := mty.ReqMultiSigTxInfo{
MultiSigAddr: addr, MultiSigAddr: addr,
TxId: txid, TxId: txid,
...@@ -1028,25 +922,18 @@ func GetMultiSigAccUnSpentTodayCmd() *cobra.Command { ...@@ -1028,25 +922,18 @@ func GetMultiSigAccUnSpentTodayCmd() *cobra.Command {
func getMultiSigAccUnSpentTodayFlags(cmd *cobra.Command) { func getMultiSigAccUnSpentTodayFlags(cmd *cobra.Command) {
cmd.Flags().StringP("addr", "a", "", "address of multisig account") cmd.Flags().StringP("addr", "a", "", "address of multisig account")
err := cmd.MarkFlagRequired("addr") cmd.MarkFlagRequired("addr")
cmd.Flags().StringP("execer", "e", "", "assets execer name") cmd.Flags().StringP("execer", "e", "", "assets execer name")
cmd.Flags().StringP("symbol", "s", "", "assets symbol") cmd.Flags().StringP("symbol", "s", "", "assets symbol")
if err != nil {
fmt.Fprintln(os.Stderr, err)
return
}
} }
func getMultiSigAccUnSpentToday(cmd *cobra.Command, args []string) { func getMultiSigAccUnSpentToday(cmd *cobra.Command, args []string) {
rpcLaddr, err := cmd.Flags().GetString("rpc_laddr") rpcLaddr, _ := cmd.Flags().GetString("rpc_laddr")
addr, err := cmd.Flags().GetString("addr") addr, _ := cmd.Flags().GetString("addr")
execer, err := cmd.Flags().GetString("execer") execer, _ := cmd.Flags().GetString("execer")
symbol, err := cmd.Flags().GetString("symbol") symbol, _ := cmd.Flags().GetString("symbol")
if err != nil {
fmt.Fprintln(os.Stderr, err)
return
}
isallBool := true isallBool := true
assets := &mty.Assets{} assets := &mty.Assets{}
//获取指定资产信息时，execer和symbol不能为空 //获取指定资产信息时，execer和symbol不能为空
...@@ -1108,25 +995,18 @@ func GetMultiSigAccAssetsCmd() *cobra.Command { ...@@ -1108,25 +995,18 @@ func GetMultiSigAccAssetsCmd() *cobra.Command {
func getMultiSigAccAssetsFlags(cmd *cobra.Command) { func getMultiSigAccAssetsFlags(cmd *cobra.Command) {
cmd.Flags().StringP("addr", "a", "", "address of multisig account") cmd.Flags().StringP("addr", "a", "", "address of multisig account")
err := cmd.MarkFlagRequired("addr") cmd.MarkFlagRequired("addr")
cmd.Flags().StringP("execer", "e", "coins", "assets execer name ") cmd.Flags().StringP("execer", "e", "coins", "assets execer name ")
cmd.Flags().StringP("symbol", "s", "BTY", "assets symbol") cmd.Flags().StringP("symbol", "s", "BTY", "assets symbol")
if err != nil {
fmt.Fprintln(os.Stderr, err)
return
}
} }
func getMultiSigAccAssets(cmd *cobra.Command, args []string) { func getMultiSigAccAssets(cmd *cobra.Command, args []string) {
rpcLaddr, err := cmd.Flags().GetString("rpc_laddr") rpcLaddr, _ := cmd.Flags().GetString("rpc_laddr")
addr, err := cmd.Flags().GetString("addr") addr, _ := cmd.Flags().GetString("addr")
execer, err := cmd.Flags().GetString("execer") execer, _ := cmd.Flags().GetString("execer")
symbol, err := cmd.Flags().GetString("symbol") symbol, _ := cmd.Flags().GetString("symbol")
if err != nil {
fmt.Fprintln(os.Stderr, err)
return
}
isallBool := true isallBool := true
assets := &mty.Assets{} assets := &mty.Assets{}
//获取指定资产信息时，execer和symbol不能为空 //获取指定资产信息时，execer和symbol不能为空
...@@ -1195,20 +1075,13 @@ func GetMultiSigAccAllAddressCmd() *cobra.Command { ...@@ -1195,20 +1075,13 @@ func GetMultiSigAccAllAddressCmd() *cobra.Command {
func getMultiSigAccAllAddressFlags(cmd *cobra.Command) { func getMultiSigAccAllAddressFlags(cmd *cobra.Command) {
cmd.Flags().StringP("addr", "a", "", "address of created multisig account") cmd.Flags().StringP("addr", "a", "", "address of created multisig account")
err := cmd.MarkFlagRequired("addr") cmd.MarkFlagRequired("addr")
if err != nil {
fmt.Fprintln(os.Stderr, err)
return
}
} }
func getMultiSigAccAllAddress(cmd *cobra.Command, args []string) { func getMultiSigAccAllAddress(cmd *cobra.Command, args []string) {
rpcLaddr, err := cmd.Flags().GetString("rpc_laddr") rpcLaddr, _ := cmd.Flags().GetString("rpc_laddr")
createAddr, err := cmd.Flags().GetString("addr") createAddr, _ := cmd.Flags().GetString("addr")
if err != nil {
fmt.Fprintln(os.Stderr, err)
return
}
var params rpctypes.Query4Jrpc var params rpctypes.Query4Jrpc
var rep interface{} var rep interface{}
req := mty.ReqMultiSigAccInfo{ req := mty.ReqMultiSigAccInfo{
...@@ -1245,12 +1118,9 @@ func getMultiSigAccByOwnerFlags(cmd *cobra.Command) { ...@@ -1245,12 +1118,9 @@ func getMultiSigAccByOwnerFlags(cmd *cobra.Command) {
} }
func getMultiSigAccByOwner(cmd *cobra.Command, args []string) { func getMultiSigAccByOwner(cmd *cobra.Command, args []string) {
rpcLaddr, err := cmd.Flags().GetString("rpc_laddr") rpcLaddr, _ := cmd.Flags().GetString("rpc_laddr")
ownerAddr, err := cmd.Flags().GetString("addr") ownerAddr, _ := cmd.Flags().GetString("addr")
if err != nil {
fmt.Fprintln(os.Stderr, err)
return
}
params := &types.ReqString{ params := &types.ReqString{
Data: ownerAddr, Data: ownerAddr,
} }
......
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