Skip to content

Commit

Permalink
Merge PR #4135: Minor Fixes
Browse files Browse the repository at this point in the history
* Add clarification to gen-only
* Add nil type check in NewResponseFormatBroadcastTxCommit
* Add small note to docs re: generate-only
  • Loading branch information
alexanderbez authored Apr 16, 2019
1 parent 356e819 commit 0c23dec
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 2 deletions.
4 changes: 3 additions & 1 deletion client/context/context.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import (
"os"
"path/filepath"

"github.com/pkg/errors"

"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/client/keys"
"github.com/cosmos/cosmos-sdk/codec"
Expand Down Expand Up @@ -292,7 +294,7 @@ func GetFromFields(from string, genOnly bool) (sdk.AccAddress, string, error) {
if genOnly {
addr, err := sdk.AccAddressFromBech32(from)
if err != nil {
return nil, "", err
return nil, "", errors.Wrap(err, "must provide a valid Bech32 address for generate-only")
}

return addr, "", nil
Expand Down
2 changes: 1 addition & 1 deletion client/flags.go
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ func PostCommands(cmds ...*cobra.Command) []*cobra.Command {
c.Flags().Bool(FlagPrintResponse, true, "return tx response (only works with async = false)")
c.Flags().Bool(FlagTrustNode, true, "Trust connected full node (don't verify proofs for responses)")
c.Flags().Bool(FlagDryRun, false, "ignore the --gas flag and perform a simulation of a transaction, but don't broadcast it")
c.Flags().Bool(FlagGenerateOnly, false, "build an unsigned transaction and write it to STDOUT")
c.Flags().Bool(FlagGenerateOnly, false, "Build an unsigned transaction and write it to STDOUT (when enabled, the local Keybase is not accessible)")
c.Flags().BoolP(FlagSkipConfirmation, "y", false, "Skip tx broadcasting prompt confirmation")

// --gas can accept integers and "simulate"
Expand Down
4 changes: 4 additions & 0 deletions docs/cosmos-hub/gaiacli.md
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,10 @@ gaiacli tx sign \
unsignedSendTx.json > signedSendTx.json
```

::: tip Note
The `--generate-only` flag prevents `gaiacli` from accessing the local keybase.
:::

You can validate the transaction's signatures by typing the following:

```bash
Expand Down
4 changes: 4 additions & 0 deletions types/result.go
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,10 @@ func NewResponseResultTx(res *ctypes.ResultTx, tx Tx, timestamp string) TxRespon
// NewResponseFormatBroadcastTxCommit returns a TxResponse given a
// ResultBroadcastTxCommit from tendermint.
func NewResponseFormatBroadcastTxCommit(res *ctypes.ResultBroadcastTxCommit) TxResponse {
if res == nil {
return TxResponse{}
}

if !res.CheckTx.IsOK() {
return newTxResponseCheckTx(res)
}
Expand Down

0 comments on commit 0c23dec

Please sign in to comment.