From 7a92f8d798c85868f1e20bd0cc6bed86b2a23b48 Mon Sep 17 00:00:00 2001 From: Roshan Date: Wed, 27 Mar 2024 18:38:48 +0800 Subject: [PATCH] add `registerErdosUpgradeHandler` --- app/app.go | 6 ------ app/upgrade.go | 29 +++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 6 deletions(-) diff --git a/app/app.go b/app/app.go index 996bdf729..7cb184c3d 100644 --- a/app/app.go +++ b/app/app.go @@ -733,12 +733,6 @@ func (app *App) initModules(ctx sdk.Context) { app.initBridge() app.initStorage() app.initGov() - - executorApp := storagemodulekeeper.NewExecutorApp(app.StorageKeeper, storagemodulekeeper.NewMsgServerImpl(app.StorageKeeper), paymentmodulekeeper.NewMsgServerImpl(app.PaymentKeeper)) - err := app.CrossChainKeeper.RegisterChannel(storagemoduletypes.ExecutorChannel, storagemoduletypes.ExecutorChannelId, executorApp) - if err != nil { - panic(err) - } } func (app *App) initCrossChain() { diff --git a/app/upgrade.go b/app/upgrade.go index 7d4e34531..d59660460 100644 --- a/app/upgrade.go +++ b/app/upgrade.go @@ -9,7 +9,9 @@ import ( bridgemoduletypes "github.com/bnb-chain/greenfield/x/bridge/types" paymentmodule "github.com/bnb-chain/greenfield/x/payment" + paymentmodulekeeper "github.com/bnb-chain/greenfield/x/payment/keeper" paymenttypes "github.com/bnb-chain/greenfield/x/payment/types" + storagemodulekeeper "github.com/bnb-chain/greenfield/x/storage/keeper" storagemoduletypes "github.com/bnb-chain/greenfield/x/storage/types" virtualgroupmodule "github.com/bnb-chain/greenfield/x/virtualgroup" virtualgrouptypes "github.com/bnb-chain/greenfield/x/virtualgroup/types" @@ -31,6 +33,7 @@ func (app *App) RegisterUpgradeHandlers(chainID string, serverCfg *serverconfig. app.registerUralUpgradeHandler() app.registerPawneeUpgradeHandler() app.registerSerengetiUpgradeHandler() + app.registerErdosUpgradeHandler() // app.register...() // ... return nil @@ -238,3 +241,29 @@ func (app *App) registerSerengetiUpgradeHandler() { return nil }) } + +func (app *App) registerErdosUpgradeHandler() { + // Register the upgrade handler + app.UpgradeKeeper.SetUpgradeHandler(upgradetypes.Erdos, + func(ctx sdk.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) { + app.Logger().Info("upgrade to ", plan.Name) + executorApp := storagemodulekeeper.NewExecutorApp(app.StorageKeeper, storagemodulekeeper.NewMsgServerImpl(app.StorageKeeper), paymentmodulekeeper.NewMsgServerImpl(app.PaymentKeeper)) + err := app.CrossChainKeeper.RegisterChannel(storagemoduletypes.ExecutorChannel, storagemoduletypes.ExecutorChannelId, executorApp) + if err != nil { + panic(err) + } + return app.mm.RunMigrations(ctx, app.configurator, fromVM) + }) + + // Register the upgrade initializer + app.UpgradeKeeper.SetUpgradeInitializer(upgradetypes.Erdos, + func() error { + app.Logger().Info("Init Erdos upgrade") + executorApp := storagemodulekeeper.NewExecutorApp(app.StorageKeeper, storagemodulekeeper.NewMsgServerImpl(app.StorageKeeper), paymentmodulekeeper.NewMsgServerImpl(app.PaymentKeeper)) + err := app.CrossChainKeeper.RegisterChannel(storagemoduletypes.ExecutorChannel, storagemoduletypes.ExecutorChannelId, executorApp) + if err != nil { + panic(err) + } + return nil + }) +}