Skip to content

Commit

Permalink
feat(cosmos): Next upgrade is agoric-upgrade-17
Browse files Browse the repository at this point in the history
  • Loading branch information
gibson042 committed Sep 14, 2024
1 parent e67cd91 commit 5663eac
Show file tree
Hide file tree
Showing 17 changed files with 6 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"agoricProposal": {
"releaseNotes": false,
"sdkImageTag": "unreleased",
"planName": "UNRELEASED_A3P_INTEGRATION",
"planName": "agoric-upgrade-17",
"upgradeInfo": {
"coreProposals": []
},
Expand Down
2 changes: 1 addition & 1 deletion golang/cosmos/app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -876,7 +876,7 @@ func NewAgoricApp(
for _, name := range upgradeNamesOfThisVersion {
app.UpgradeKeeper.SetUpgradeHandler(
name,
unreleasedUpgradeHandler(app, name),
upgrade17Handler(app, name),
)
}

Expand Down
11 changes: 4 additions & 7 deletions golang/cosmos/app/upgrade.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,8 @@ import (
)

var upgradeNamesOfThisVersion = []string{
"UNRELEASED_BASIC", // no-frills
"UNRELEASED_A3P_INTEGRATION",
"UNRELEASED_main",
"UNRELEASED_devnet",
"UNRELEASED_REAPPLY",
"agoric-upgrade-17",
"agorictest-upgrade-17",
}

// isUpgradeNameOfThisVersion returns whether the provided plan name is a
Expand Down Expand Up @@ -72,8 +69,8 @@ func isFirstTimeUpgradeOfThisVersion(app *GaiaApp, ctx sdk.Context) bool {
return true
}

// unreleasedUpgradeHandler performs standard upgrade actions plus custom actions for the unreleased upgrade.
func unreleasedUpgradeHandler(app *GaiaApp, targetUpgrade string) func(sdk.Context, upgradetypes.Plan, module.VersionMap) (module.VersionMap, error) {
// upgrade17Handler performs standard upgrade actions plus custom actions for upgrade-17.
func upgrade17Handler(app *GaiaApp, targetUpgrade string) func(sdk.Context, upgradetypes.Plan, module.VersionMap) (module.VersionMap, error) {
return func(ctx sdk.Context, plan upgradetypes.Plan, fromVm module.VersionMap) (module.VersionMap, error) {
app.CheckControllerInited(false)

Expand Down

0 comments on commit 5663eac

Please sign in to comment.