Skip to content

Commit

Permalink
feat: null upgrade handler for upgrade-9
Browse files Browse the repository at this point in the history
  • Loading branch information
JimLarson committed Feb 12, 2023
1 parent 4570403 commit bfbc86f
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 23 deletions.
25 changes: 4 additions & 21 deletions golang/cosmos/app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -736,11 +736,11 @@ func NewAgoricApp(

app.UpgradeKeeper.SetUpgradeHandler(
upgradeName,
upgrade8Handler(app, upgradeName),
upgrade9Handler(app, upgradeName),
)
app.UpgradeKeeper.SetUpgradeHandler(
upgradeNameTest,
upgrade8Handler(app, upgradeNameTest),
upgrade9Handler(app, upgradeNameTest),
)

upgradeInfo, err := app.UpgradeKeeper.ReadUpgradeInfoFromDisk()
Expand Down Expand Up @@ -771,26 +771,9 @@ func NewAgoricApp(
return app
}

func upgrade8Handler(app *GaiaApp, targetUpgrade string) func(sdk.Context, upgradetypes.Plan, module.VersionMap) (module.VersionMap, error) {
func upgrade9Handler(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) {
swingsettypes.DefaultBeansPerBlockComputeLimit = sdk.NewUint(6_500_000_000)
// Set bootstrap
switch targetUpgrade {
case upgradeName:
swingsettypes.DefaultBootstrapVatConfig = "@agoric/vats/decentral-main-psm-config.json"
case upgradeNameTest:
swingsettypes.DefaultBootstrapVatConfig = "@agoric/vats/decentral-test-psm-config.json"
default:
return fromVm, fmt.Errorf("invalid upgrade name")
}

//Run migrations so InitGenesis is called for lien, swingset, vibc, vbank, vstorage
fromVm, err := app.mm.RunMigrations(ctx, app.configurator, fromVm)
if err != nil {
return fromVm, err
}

return fromVm, err
return fromVm, nil
}
}

Expand Down
4 changes: 2 additions & 2 deletions golang/cosmos/app/const.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package gaia

const (
upgradeName = "agoric-upgrade-8"
upgradeNameTest = "agorictest-upgrade-8"
upgradeName = "agoric-upgrade-9"
upgradeNameTest = "agorictest-upgrade-9"
)

0 comments on commit bfbc86f

Please sign in to comment.