Use gov v1 instead of v1beta1 for new proposals #1269
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
alpe
reviewed
Mar 17, 2023
Indeed, @alpe is right, this is absolutely not a trivial task. Thanks for taking this on. |
pinosu
force-pushed
the
deprecate_proposal_types
branch
from
3c1bd4e to
a6d571b
Compare
alpe
reviewed
Mar 21, 2023
| if _, err := sdk.AccAddressFromBech32(msg.Authority); err != nil { | ||
| return errorsmod.Wrap(err, "authority") | ||
| } | ||
|
|
There was a problem hiding this comment.
Use ValidateVerificationInfo(p.Source, p.Builder, p.CodeHash) as in StoreAndInstantiateContractProposal for optional fields
alpe
reviewed
Mar 22, 2023
Codecov Report
@@ Coverage Diff @@
## main #1269 +/- ##
==========================================
+ Coverage 59.49% 63.47% +3.98%
==========================================
Files 57 56 -1
Lines 7320 6971 -349
==========================================
+ Hits 4355 4425 +70
+ Misses 2652 2218 -434
- Partials 313 328 +15
|
alpe
approved these changes
Mar 29, 2023
| }, nil | ||
| } | ||
|
|
||
| func (m msgServer) selectAuthorizationPolicy(actor string) AuthorizationPolicy { |
x/wasm/client/cli/tx.go
Outdated
| @@ -44,6 +44,7 @@ const ( | |||
| flagMaxFunds = "max-funds" | |||
| flagAllowAllMsgs = "allow-all-messages" | |||
| flagNoTokenTransfer = "no-token-transfer" //nolint:gosec | |||
| flagAuthority = "authority" | |||
There was a problem hiding this comment.
this flag is unused now and can be removed
x/wasm/client/proposal_handler.go
Outdated
| govclient.NewProposalHandler(cli.ProposalStoreAndInstantiateContractCmd), | ||
| govclient.NewProposalHandler(cli.ProposalInstantiateContract2Cmd), | ||
| } | ||
| var ProposalHandlers = []govclient.ProposalHandler{} |
x/wasm/keeper/proposal_handler.go
Outdated
| @@ -20,6 +20,8 @@ func NewWasmProposalHandler(k decoratedKeeper, enabledProposalTypes []types.Prop | |||
| } | |||
|
|
|||
| // NewWasmProposalHandlerX creates a new governance Handler for wasm proposals | |||
| // | |||
| //nolint:staticcheck | |||
There was a problem hiding this comment.
please add Deprecated annotation here and NewWasmProposalHandler to mark this
| @@ -63,6 +65,7 @@ func NewWasmProposalHandlerX(k types.ContractOpsKeeper, enabledProposalTypes []t | |||
| } | |||
| } | |||
|
|
|||
| //nolint:staticcheck | |||
| @@ -38,6 +38,7 @@ const ( | |||
|
|
|||
| // WasmKeeper is a subset of the wasm keeper used by simulations | |||
| type WasmKeeper interface { | |||
| GetAuthority() string | |||
| &MsgSudoContract{}, | ||
| &MsgPinCodes{}, | ||
| &MsgUnpinCodes{}, | ||
| &MsgStoreAndInstantiateContract{}, |
| cdc.RegisterConcrete(&MsgSudoContract{}, "wasm/MsgSudoContract", nil) | ||
| cdc.RegisterConcrete(&MsgPinCodes{}, "wasm/MsgPinCodes", nil) | ||
| cdc.RegisterConcrete(&MsgUnpinCodes{}, "wasm/MsgUnpinCodes", nil) | ||
| cdc.RegisterConcrete(&MsgStoreAndInstantiateContract{}, "wasm/MsgStoreAndInstantiateContract", nil) |
| } | ||
| }) | ||
| } | ||
| } |
There was a problem hiding this comment.
Very nice to see all these tests! This will give high confidence that things work as expected. Thanks for taking care!
Can you add a test for UpdateInstantiateConfig so that we have this covered, too?
| @@ -60,65 +57,3 @@ func TestParseAccessConfigFlags(t *testing.T) { | |||
| }) | |||
| } | |||
| } | |||
There was a problem hiding this comment.
Can you add tests for the new messages ValidateBasic for regression?
- MsgUpdateParams
- MsgPinCodes
- MsgUnpinCodes
- MsgSudoContract
- MsgStoreAndInstantiateContract
alpe
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Part of #1246
With this PR, the v1beta1 wasm proposal types are removed from CLI and types and methods are deprecated.
In-flight proposals can still be executed but no new ones added.
In order to make use of the new gov v1 types, you can use the new wizard
wasmd tx gov draft-proposalto create a template.Update:
The proposal template generator is not really a good fit with for wasm proposals due to their more complex fields. We will follow up on this