Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add failing address to multisig validation #8518

Merged
merged 11 commits into from
Feb 19, 2021
Merged

Add failing address to multisig validation #8518

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8398210
Add helper to multisig validation
jackzampolin Feb 5, 2021
b0ef661
Added bech32 address output
jackzampolin Feb 6, 2021
59ba8d0
Merge branch 'master' into jack/multisig-index
jackzampolin Feb 6, 2021
68f2b69
Merge branch 'master' into jack/multisig-index
mergify[bot] Feb 18, 2021
1da471a
Merge branch 'master' into jack/multisig-index
mergify[bot] Feb 18, 2021
b1a45be
Merge branch 'master' into jack/multisig-index
mergify[bot] Feb 18, 2021
70f7b90
Merge branch 'master' into jack/multisig-index
mergify[bot] Feb 19, 2021
b4ea420
Fix test
amaury1093 Feb 19, 2021
82e6044
Merge branch 'jack/multisig-index' of ssh://github.com/cosmos/cosmos-…
amaury1093 Feb 19, 2021
5d242b2
Merge branch 'master' into jack/multisig-index
mergify[bot] Feb 19, 2021
d8132ba
Merge branch 'master' into jack/multisig-index
mergify[bot] Feb 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion x/auth/client/cli/cli_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -732,7 +732,7 @@ func (s *IntegrationTestSuite) TestCLIMultisign() {

// Does not work in offline mode.
_, err = authtest.TxMultiSignExec(val1.ClientCtx, multisigInfo.GetName(), multiGeneratedTxFile.Name(), "--offline", sign1File.Name(), sign2File.Name())
s.Require().EqualError(err, "couldn't verify signature: unable to verify single signer signature")
s.Require().EqualError(err, fmt.Sprintf("couldn't verify signature for address %s", account1.GetAddress()))

val1.ClientCtx.Offline = false
multiSigWith2Signatures, err := authtest.TxMultiSignExec(val1.ClientCtx, multisigInfo.GetName(), multiGeneratedTxFile.Name(), sign1File.Name(), sign2File.Name())
Expand Down
3 changes: 2 additions & 1 deletion x/auth/client/cli/tx_multisign.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,8 @@ func makeMultiSignCmd() func(cmd *cobra.Command, args []string) (err error) {
for _, sig := range sigs {
err = signing.VerifySignature(sig.PubKey, signingData, sig.Data, txCfg.SignModeHandler(), txBuilder.GetTx())
if err != nil {
return fmt.Errorf("couldn't verify signature: %w", err)
addr, _ := sdk.AccAddressFromHex(sig.PubKey.Address().String())
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit you can drop the .String() as the %s formatter will automatically do this.

return fmt.Errorf("couldn't verify signature for address %s", addr)
}

if err := multisig.AddSignatureV2(multisigSig, sig, multisigPub.GetPubKeys()); err != nil {
Expand Down