-
Notifications
You must be signed in to change notification settings - Fork 3.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: Add x/gov v043->v046 migrations (#11036)
## Description Closes: #10869 depends on: - [x] #11029 --- ### 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)
- Loading branch information
1 parent
63a248e
commit dbc19b3
Showing
13 changed files
with
477 additions
and
5 deletions.
There are no files selected for viewing
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
package v046 | ||
|
||
import ( | ||
"github.com/cosmos/cosmos-sdk/client" | ||
"github.com/cosmos/cosmos-sdk/x/genutil/types" | ||
v043gov "github.com/cosmos/cosmos-sdk/x/gov/migrations/v043" | ||
v046gov "github.com/cosmos/cosmos-sdk/x/gov/migrations/v046" | ||
gov "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" | ||
) | ||
|
||
// Migrate migrates exported state from v0.43 to a v0.46 genesis state. | ||
func Migrate(appState types.AppMap, clientCtx client.Context) types.AppMap { | ||
// Migrate x/gov. | ||
if appState[v043gov.ModuleName] != nil { | ||
// unmarshal relative source genesis application state | ||
var oldGovState gov.GenesisState | ||
clientCtx.Codec.MustUnmarshalJSON(appState[v043gov.ModuleName], &oldGovState) | ||
|
||
// delete deprecated x/gov genesis state | ||
delete(appState, v043gov.ModuleName) | ||
|
||
// Migrate relative source genesis application state and marshal it into | ||
// the respective key. | ||
newGovState, err := v046gov.MigrateJSON(&oldGovState) | ||
if err != nil { | ||
panic(err) | ||
} | ||
appState[v046gov.ModuleName] = clientCtx.Codec.MustMarshalJSON(newGovState) | ||
} | ||
|
||
return appState | ||
} |
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
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
package v046 | ||
|
||
import ( | ||
"github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" | ||
"github.com/cosmos/cosmos-sdk/x/gov/types/v1beta2" | ||
) | ||
|
||
// MigrateJSON accepts exported v0.43 x/gov genesis state and migrates it to | ||
// v0.46 x/gov genesis state. The migration includes: | ||
// | ||
// - Updating everything to v1beta2. | ||
// - Migrating proposals to be Msg-based. | ||
func MigrateJSON(oldState *v1beta1.GenesisState) (*v1beta2.GenesisState, error) { | ||
newProps, err := convertToNewProposals(oldState.Proposals) | ||
if err != nil { | ||
return nil, err | ||
} | ||
newVotes, err := convertToNewVotes(oldState.Votes) | ||
if err != nil { | ||
return nil, err | ||
} | ||
|
||
depParams, votingParms, tallyParams := convertToNewDepParams(oldState.DepositParams), convertToNewVotingParams(oldState.VotingParams), convertToNewTallyParams(oldState.TallyParams) | ||
|
||
return &v1beta2.GenesisState{ | ||
StartingProposalId: oldState.StartingProposalId, | ||
Deposits: convertToNewDeposits(oldState.Deposits), | ||
Votes: newVotes, | ||
Proposals: newProps, | ||
DepositParams: &depParams, | ||
VotingParams: &votingParms, | ||
TallyParams: &tallyParams, | ||
}, nil | ||
} |
Oops, something went wrong.