From 192f259e77aed931142531ee86774ee91af4b31a Mon Sep 17 00:00:00 2001 From: SaReN Date: Thu, 9 Apr 2020 19:30:10 +0530 Subject: [PATCH] Merge PR #5967: Fixed cliCtx in tx cli --- x/bank/client/cli/tx.go | 4 ++++ x/crisis/client/cli/tx.go | 6 +++++- x/distribution/client/cli/tx.go | 8 ++++---- x/slashing/client/cli/tx.go | 6 +++++- x/staking/client/cli/tx.go | 28 +++++++++++++++++++++++----- 5 files changed, 41 insertions(+), 11 deletions(-) diff --git a/x/bank/client/cli/tx.go b/x/bank/client/cli/tx.go index 8a46c0aee1..597004519f 100644 --- a/x/bank/client/cli/tx.go +++ b/x/bank/client/cli/tx.go @@ -53,6 +53,10 @@ func NewSendTxCmd(m codec.Marshaler, txg tx.Generator, ar tx.AccountRetriever) * } msg := types.NewMsgSend(cliCtx.GetFromAddress(), toAddr, coins) + if err := msg.ValidateBasic(); err != nil { + return err + } + return tx.GenerateOrBroadcastTx(cliCtx, txf, msg) }, } diff --git a/x/crisis/client/cli/tx.go b/x/crisis/client/cli/tx.go index 3ca350ee67..320515123a 100644 --- a/x/crisis/client/cli/tx.go +++ b/x/crisis/client/cli/tx.go @@ -40,13 +40,17 @@ func NewMsgVerifyInvariantTxCmd(m codec.Marshaler, txg tx.Generator, ar tx.Accou Args: cobra.ExactArgs(2), RunE: func(cmd *cobra.Command, args []string) error { inBuf := bufio.NewReader(cmd.InOrStdin()) - cliCtx := context.NewCLIContextWithInputAndFrom(inBuf, args[0]).WithMarshaler(m) + cliCtx := context.NewCLIContextWithInput(inBuf).WithMarshaler(m) txf := tx.NewFactoryFromCLI(inBuf).WithTxGenerator(txg).WithAccountRetriever(ar) senderAddr := cliCtx.GetFromAddress() moduleName, route := args[0], args[1] msg := types.NewMsgVerifyInvariant(senderAddr, moduleName, route) + if err := msg.ValidateBasic(); err != nil { + return err + } + return tx.GenerateOrBroadcastTx(cliCtx, txf, msg) }, } diff --git a/x/distribution/client/cli/tx.go b/x/distribution/client/cli/tx.go index 4c2a055ac9..25d1e85f75 100644 --- a/x/distribution/client/cli/tx.go +++ b/x/distribution/client/cli/tx.go @@ -107,7 +107,7 @@ $ %s tx distribution withdraw-rewards cosmosvaloper1gghjut3ccd8ay0zduzj64hwre2fx txf := tx.NewFactoryFromCLI(inBuf). WithTxGenerator(txg). WithAccountRetriever(ar) - cliCtx := context.NewCLIContextWithInputAndFrom(inBuf, args[0]).WithMarshaler(m) + cliCtx := context.NewCLIContextWithInput(inBuf).WithMarshaler(m) delAddr := cliCtx.GetFromAddress() valAddr, err := sdk.ValAddressFromBech32(args[0]) @@ -152,7 +152,7 @@ $ %s tx distribution withdraw-all-rewards --from mykey txf := tx.NewFactoryFromCLI(inBuf). WithTxGenerator(txg). WithAccountRetriever(ar) - cliCtx := context.NewCLIContextWithInputAndFrom(inBuf, args[0]).WithMarshaler(m) + cliCtx := context.NewCLIContextWithInput(inBuf).WithMarshaler(m) delAddr := cliCtx.GetFromAddress() @@ -193,7 +193,7 @@ $ %s tx distribution set-withdraw-addr cosmos1gghjut3ccd8ay0zduzj64hwre2fxs9ld75 txf := tx.NewFactoryFromCLI(inBuf). WithTxGenerator(txg). WithAccountRetriever(ar) - cliCtx := context.NewCLIContextWithInputAndFrom(inBuf, args[0]).WithMarshaler(m) + cliCtx := context.NewCLIContextWithInput(inBuf).WithMarshaler(m) delAddr := cliCtx.GetFromAddress() withdrawAddr, err := sdk.AccAddressFromBech32(args[0]) @@ -242,7 +242,7 @@ Where proposal.json contains: txf := tx.NewFactoryFromCLI(inBuf). WithTxGenerator(txg). WithAccountRetriever(ar) - cliCtx := context.NewCLIContextWithInputAndFrom(inBuf, args[0]).WithMarshaler(m) + cliCtx := context.NewCLIContextWithInput(inBuf).WithMarshaler(m) depositorAddr := cliCtx.GetFromAddress() amount, err := sdk.ParseCoins(args[0]) diff --git a/x/slashing/client/cli/tx.go b/x/slashing/client/cli/tx.go index e04a7e16cf..0389cc6316 100644 --- a/x/slashing/client/cli/tx.go +++ b/x/slashing/client/cli/tx.go @@ -45,10 +45,14 @@ $ tx slashing unjail --from mykey WithTxGenerator(txg). WithAccountRetriever(ar) - cliCtx := context.NewCLIContextWithInputAndFrom(inBuf, args[0]).WithMarshaler(m) + cliCtx := context.NewCLIContextWithInput(inBuf).WithMarshaler(m) valAddr := cliCtx.GetFromAddress() msg := types.NewMsgUnjail(sdk.ValAddress(valAddr)) + if err := msg.ValidateBasic(); err != nil { + return err + } + return tx.GenerateOrBroadcastTx(cliCtx, txf, msg) }, } diff --git a/x/staking/client/cli/tx.go b/x/staking/client/cli/tx.go index c9b9211e18..9735c5b3fa 100644 --- a/x/staking/client/cli/tx.go +++ b/x/staking/client/cli/tx.go @@ -66,7 +66,7 @@ func NewCreateValidatorCmd(m codec.Marshaler, txg tx.Generator, ar tx.AccountRet WithTxGenerator(txg). WithAccountRetriever(ar) - cliCtx := context.NewCLIContextWithInputAndFrom(inBuf, args[0]).WithMarshaler(m) + cliCtx := context.NewCLIContextWithInput(inBuf).WithMarshaler(m) txf, msg, err := NewBuildCreateValidatorMsg(cliCtx, txf) if err != nil { @@ -101,7 +101,7 @@ func NewEditValidatorCmd(m codec.Marshaler, txg tx.Generator, ar tx.AccountRetri WithTxGenerator(txg). WithAccountRetriever(ar) - cliCtx := context.NewCLIContextWithInputAndFrom(inBuf, args[0]).WithMarshaler(m) + cliCtx := context.NewCLIContextWithInput(inBuf).WithMarshaler(m) valAddr := cliCtx.GetFromAddress() description := types.NewDescription( @@ -137,6 +137,9 @@ func NewEditValidatorCmd(m codec.Marshaler, txg tx.Generator, ar tx.AccountRetri } msg := types.NewMsgEditValidator(sdk.ValAddress(valAddr), description, newRate, newMinSelfDelegation) + if err := msg.ValidateBasic(); err != nil { + return err + } // build and sign the transaction, then broadcast to Tendermint return tx.GenerateOrBroadcastTx(cliCtx, txf, msg) @@ -165,7 +168,7 @@ $ %s tx staking delegate cosmosvaloper1l2rsakp388kuv9k8qzq6lrm9taddae7fpx59wm 10 WithTxGenerator(txg). WithAccountRetriever(ar) - cliCtx := context.NewCLIContextWithInputAndFrom(inBuf, args[0]).WithMarshaler(m) + cliCtx := context.NewCLIContextWithInput(inBuf).WithMarshaler(m) amount, err := sdk.ParseCoin(args[1]) if err != nil { @@ -179,6 +182,10 @@ $ %s tx staking delegate cosmosvaloper1l2rsakp388kuv9k8qzq6lrm9taddae7fpx59wm 10 } msg := types.NewMsgDelegate(delAddr, valAddr, amount) + if err := msg.ValidateBasic(); err != nil { + return err + } + return tx.GenerateOrBroadcastTx(cliCtx, txf, msg) }, } @@ -209,7 +216,7 @@ $ %s tx staking redelegate cosmosvaloper1gghjut3ccd8ay0zduzj64hwre2fxs9ldmqhffj WithTxGenerator(txg). WithAccountRetriever(ar) - cliCtx := context.NewCLIContextWithInputAndFrom(inBuf, args[0]).WithMarshaler(m) + cliCtx := context.NewCLIContextWithInput(inBuf).WithMarshaler(m) delAddr := cliCtx.GetFromAddress() valSrcAddr, err := sdk.ValAddressFromBech32(args[0]) if err != nil { @@ -227,6 +234,10 @@ $ %s tx staking redelegate cosmosvaloper1gghjut3ccd8ay0zduzj64hwre2fxs9ldmqhffj } msg := types.NewMsgBeginRedelegate(delAddr, valSrcAddr, valDstAddr, amount) + if err := msg.ValidateBasic(); err != nil { + return err + } + return tx.GenerateOrBroadcastTx(cliCtx, txf, msg) }, } @@ -253,7 +264,7 @@ $ %s tx staking unbond cosmosvaloper1gghjut3ccd8ay0zduzj64hwre2fxs9ldmqhffj 100s WithTxGenerator(txg). WithAccountRetriever(ar) - cliCtx := context.NewCLIContextWithInputAndFrom(inBuf, args[0]).WithMarshaler(m) + cliCtx := context.NewCLIContextWithInput(inBuf).WithMarshaler(m) delAddr := cliCtx.GetFromAddress() valAddr, err := sdk.ValAddressFromBech32(args[0]) @@ -267,6 +278,10 @@ $ %s tx staking unbond cosmosvaloper1gghjut3ccd8ay0zduzj64hwre2fxs9ldmqhffj 100s } msg := types.NewMsgUndelegate(delAddr, valAddr, amount) + if err := msg.ValidateBasic(); err != nil { + return err + } + return tx.GenerateOrBroadcastTx(cliCtx, txf, msg) }, } @@ -315,6 +330,9 @@ func NewBuildCreateValidatorMsg(cliCtx context.CLIContext, txf tx.Factory) (tx.F msg := types.NewMsgCreateValidator( sdk.ValAddress(valAddr), pk, amount, description, commissionRates, minSelfDelegation, ) + if err := msg.ValidateBasic(); err != nil { + return txf, nil, err + } if viper.GetBool(flags.FlagGenerateOnly) { ip := viper.GetString(FlagIP)