From e4fcea6333dec197aa32d09c1044c66578cde616 Mon Sep 17 00:00:00 2001 From: Julien Robert Date: Tue, 15 Aug 2023 10:40:45 +0200 Subject: [PATCH 1/2] feat(x/gov): add MsgSubmitProposal SetMsgs method (#17387) (cherry picked from commit ded6b47aea992af05dc2171b6e8c27617602387c) # Conflicts: # x/gov/types/v1/msgs.go --- CHANGELOG.md | 1 + x/gov/types/v1/msgs.go | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9d0448dcdbac..6a3e86401617 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -39,6 +39,7 @@ Ref: https://keepachangelog.com/en/1.0.0/ ### Improvements +* (x/gov) [#17387](https://github.com/cosmos/cosmos-sdk/pull/17387) Add `MsgSubmitProposal` `SetMsgs` method. * (x/gov) [#17354](https://github.com/cosmos/cosmos-sdk/issues/17354) Emit `VoterAddr` in `proposal_vote` event. * (x/genutil) [#17296](https://github.com/cosmos/cosmos-sdk/pull/17296) Add `MigrateHandler` to allow reuse migrate genesis related function. * In v0.46, v0.47 this function is additive to the `genesis migrate` command. However in v0.50+, adding custom migrations to the `genesis migrate` command is directly possible. diff --git a/x/gov/types/v1/msgs.go b/x/gov/types/v1/msgs.go index dd83bf5dfa47..ab0e968fa954 100644 --- a/x/gov/types/v1/msgs.go +++ b/x/gov/types/v1/msgs.go @@ -40,7 +40,23 @@ func (m *MsgSubmitProposal) GetMsgs() ([]sdk.Msg, error) { return sdktx.GetMsgs(m.Messages, "sdk.MsgProposal") } +<<<<<<< HEAD // Route implements Msg +======= +// SetMsgs packs sdk.Msg's into m.Messages Any's +// NOTE: this will overwrite any existing messages +func (m *MsgSubmitProposal) SetMsgs(msgs []sdk.Msg) error { + anys, err := sdktx.SetMsgs(msgs) + if err != nil { + return err + } + + m.Messages = anys + return nil +} + +// Route implements the sdk.Msg interface. +>>>>>>> ded6b47ae (feat(x/gov): add MsgSubmitProposal SetMsgs method (#17387)) func (m MsgSubmitProposal) Route() string { return types.RouterKey } // Type implements Msg From 0defac44467cc4cae817567f027b9d361aef8a46 Mon Sep 17 00:00:00 2001 From: Julien Robert Date: Tue, 15 Aug 2023 10:50:11 +0200 Subject: [PATCH 2/2] fix conflicts --- x/gov/types/v1/msgs.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/x/gov/types/v1/msgs.go b/x/gov/types/v1/msgs.go index ab0e968fa954..e78121b0ab19 100644 --- a/x/gov/types/v1/msgs.go +++ b/x/gov/types/v1/msgs.go @@ -40,9 +40,6 @@ func (m *MsgSubmitProposal) GetMsgs() ([]sdk.Msg, error) { return sdktx.GetMsgs(m.Messages, "sdk.MsgProposal") } -<<<<<<< HEAD -// Route implements Msg -======= // SetMsgs packs sdk.Msg's into m.Messages Any's // NOTE: this will overwrite any existing messages func (m *MsgSubmitProposal) SetMsgs(msgs []sdk.Msg) error { @@ -55,8 +52,7 @@ func (m *MsgSubmitProposal) SetMsgs(msgs []sdk.Msg) error { return nil } -// Route implements the sdk.Msg interface. ->>>>>>> ded6b47ae (feat(x/gov): add MsgSubmitProposal SetMsgs method (#17387)) +// Route implements Msg func (m MsgSubmitProposal) Route() string { return types.RouterKey } // Type implements Msg