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

fix(x/gov): Return ErrInvalidProposalContent in SubmitProposal when legacy handler returns an error. #13051

Merged
merged 6 commits into from
Aug 26, 2022
Merged

fix(x/gov): Return ErrInvalidProposalContent in SubmitProposal when legacy handler returns an error. #13051

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2076e48
[13030]: When a legacy gov proposal fails it's handler check, wrap th…
SpicyLemon Aug 25, 2022
fdbd653
[13030]: Add changelog entry.
SpicyLemon Aug 25, 2022
d2b4d74
[13030]: If the error is already a ErrNoProposalHandlerExists, just r…
SpicyLemon Aug 25, 2022
b3edb86
Merge branch 'main' into dwedul/13030-fix-bad-no-handler-wrap
SpicyLemon Aug 25, 2022
89f3572
Merge branch 'main' into dwedul/13030-fix-bad-no-handler-wrap
alexanderbez Aug 25, 2022
638e386
Merge branch 'main' into dwedul/13030-fix-bad-no-handler-wrap
SpicyLemon Aug 25, 2022
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
* (x/upgrade) [#12906](https://github.com/cosmos/cosmos-sdk/pull/12906) Fix upgrade failure by moving downgrade verification logic after store migration.
* (store) [#12945](https://github.com/cosmos/cosmos-sdk/pull/12945) Fix nil end semantics in store/cachekv/iterator when iterating a dirty cache.
* (export) [#13029](https://github.com/cosmos/cosmos-sdk/pull/13029) Fix exporting the blockParams regression.
* (x/gov) [#13051](https://github.com/cosmos/cosmos-sdk/pull/13051) In SubmitPropsal, when a legacy msg fails it's handler call, wrap the error as ErrInvalidProposalContent (instead of ErrNoProposalHandlerExists).

### Deprecated

Expand Down
6 changes: 5 additions & 1 deletion x/gov/keeper/proposal.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package keeper

import (
"errors"
"fmt"

"github.com/cosmos/cosmos-sdk/client"
Expand Down Expand Up @@ -54,7 +55,10 @@ func (keeper Keeper) SubmitProposal(ctx sdk.Context, messages []sdk.Msg, metadat
if msg, ok := msg.(*v1.MsgExecLegacyContent); ok {
cacheCtx, _ := ctx.CacheContext()
if _, err := handler(cacheCtx, msg); err != nil {
return v1.Proposal{}, sdkerrors.Wrap(types.ErrNoProposalHandlerExists, err.Error())
if errors.Is(types.ErrNoProposalHandlerExists, err) {
return v1.Proposal{}, err
}
return v1.Proposal{}, sdkerrors.Wrap(types.ErrInvalidProposalContent, err.Error())
}
}

Expand Down