fix: overwrite sequence and account-number flags when used with offline=false (#9856)
## Description Closes: #9784 Overwrite --sequence and --account-number flags by default flag values, when used with offline=false in sign-batch command. --- ### Author Checklist *All items are required. Please add a note to the item if the item is not applicable and please add links to any relevant follow up issues.* I have... - [ ] included the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title - [ ] added `!` to the type prefix if API or client breaking change - [ ] targeted the correct branch (see [PR Targeting](https://github.com/cosmos/cosmos-sdk/blob/master/CONTRIBUTING.md#pr-targeting)) - [ ] provided a link to the relevant issue or specification - [ ] followed the guidelines for [building modules](https://github.com/cosmos/cosmos-sdk/blob/master/docs/building-modules) - [ ] included the necessary unit and integration [tests](https://github.com/cosmos/cosmos-sdk/blob/master/CONTRIBUTING.md#testing) - [ ] added a changelog entry to `CHANGELOG.md` - [ ] included comments for [documenting Go code](https://blog.golang.org/godoc) - [ ] updated the relevant documentation or specification - [ ] reviewed "Files changed" and left comments if necessary - [ ] confirmed all CI checks have passed ### Reviewers Checklist *All items are required. Please add a note if the item is not applicable and please add your handle next to the items reviewed if you only reviewed selected items.* I have... - [ ] confirmed the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title - [ ] confirmed `!` in the type prefix if API or client breaking change - [ ] confirmed all author checklist items have been addressed - [ ] reviewed state machine logic - [ ] reviewed API design and naming - [ ] reviewed documentation is accurate - [ ] reviewed tests and test coverage - [ ] manually tested (if applicable)
This commit is contained in:
parent
1d07ea4c8c
commit
59f63a2a86
|
@ -82,6 +82,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
|
|||
|
||||
### Improvements
|
||||
|
||||
* (cli) [\#9856](https://github.com/cosmos/cosmos-sdk/pull/9856) Overwrite `--sequence` and `--account-number` flags with default flag values when used with `offline=false` in `sign-batch` command.
|
||||
* (cli) [\#9593](https://github.com/cosmos/cosmos-sdk/pull/9593) Check if chain-id is blank before verifying signatures in multisign and error.
|
||||
* (cli) [\#9717](https://github.com/cosmos/cosmos-sdk/pull/9717) Added CLI flag `--output json/text` to `tx` cli commands.
|
||||
|
||||
|
|
|
@ -28,7 +28,7 @@ func GetSignBatchCommand() *cobra.Command {
|
|||
Long: `Sign batch files of transactions generated with --generate-only.
|
||||
The command processes list of transactions from file (one StdTx each line), generate
|
||||
signed transactions or signatures and print their JSON encoding, delimited by '\n'.
|
||||
As the signatures are generated, the command updates the account sequence number accordingly.
|
||||
As the signatures are generated, the command updates the account and sequence number accordingly.
|
||||
|
||||
If the --signature-only flag is set, it will output the signature parts only.
|
||||
|
||||
|
@ -38,6 +38,9 @@ it is required to set such parameters manually. Note, invalid values will cause
|
|||
the transaction to fail. The sequence will be incremented automatically for each
|
||||
transaction that is signed.
|
||||
|
||||
If --account-number or --sequence flag is used when offline=false, they are ignored and
|
||||
overwritten by the default flag values.
|
||||
|
||||
The --multisig=<multisig_key> flag generates a signature on behalf of a multisig
|
||||
account key. It implies --signature-only.
|
||||
`,
|
||||
|
@ -89,6 +92,10 @@ func makeSignBatchCmd() func(cmd *cobra.Command, args []string) error {
|
|||
}
|
||||
scanner := authclient.NewBatchScanner(txCfg, infile)
|
||||
|
||||
if !clientCtx.Offline {
|
||||
txFactory = txFactory.WithAccountNumber(0).WithSequence(0)
|
||||
}
|
||||
|
||||
for sequence := txFactory.Sequence(); scanner.Scan(); sequence++ {
|
||||
unsignedStdTx := scanner.Tx()
|
||||
txFactory = txFactory.WithSequence(sequence)
|
||||
|
|
|
@ -126,8 +126,21 @@ func (s *IntegrationTestSuite) TestCLISignBatch() {
|
|||
_, err = TxSignBatchExec(val.ClientCtx, val.Address, outputFile.Name(), fmt.Sprintf("--%s=%s", flags.FlagChainID, val.ClientCtx.ChainID), "--offline")
|
||||
s.Require().EqualError(err, "required flag(s) \"account-number\", \"sequence\" not set")
|
||||
|
||||
// sign-batch file - offline and sequence is set but account-number is not set
|
||||
_, err = TxSignBatchExec(val.ClientCtx, val.Address, outputFile.Name(), fmt.Sprintf("--%s=%s", flags.FlagChainID, val.ClientCtx.ChainID), fmt.Sprintf("--%s=%s", flags.FlagSequence, "1"), "--offline")
|
||||
s.Require().EqualError(err, "required flag(s) \"account-number\" not set")
|
||||
|
||||
// sign-batch file - offline and account-number is set but sequence is not set
|
||||
_, err = TxSignBatchExec(val.ClientCtx, val.Address, outputFile.Name(), fmt.Sprintf("--%s=%s", flags.FlagChainID, val.ClientCtx.ChainID), fmt.Sprintf("--%s=%s", flags.FlagAccountNumber, "1"), "--offline")
|
||||
s.Require().EqualError(err, "required flag(s) \"sequence\" not set")
|
||||
|
||||
// sign-batch file - sequence and account-number are set when offline is false
|
||||
res, err := TxSignBatchExec(val.ClientCtx, val.Address, outputFile.Name(), fmt.Sprintf("--%s=%s", flags.FlagChainID, val.ClientCtx.ChainID), fmt.Sprintf("--%s=%s", flags.FlagSequence, "1"), fmt.Sprintf("--%s=%s", flags.FlagAccountNumber, "1"))
|
||||
s.Require().NoError(err)
|
||||
s.Require().Equal(3, len(strings.Split(strings.Trim(res.String(), "\n"), "\n")))
|
||||
|
||||
// sign-batch file
|
||||
res, err := TxSignBatchExec(val.ClientCtx, val.Address, outputFile.Name(), fmt.Sprintf("--%s=%s", flags.FlagChainID, val.ClientCtx.ChainID))
|
||||
res, err = TxSignBatchExec(val.ClientCtx, val.Address, outputFile.Name(), fmt.Sprintf("--%s=%s", flags.FlagChainID, val.ClientCtx.ChainID))
|
||||
s.Require().NoError(err)
|
||||
s.Require().Equal(3, len(strings.Split(strings.Trim(res.String(), "\n"), "\n")))
|
||||
|
||||
|
|
Loading…
Reference in New Issue