From 3f96d88ac56d66bb263a686ad9be9152c585213b Mon Sep 17 00:00:00 2001
From: dudong2 <leesj9476lsj@gmail.com>
Date: Mon, 29 Jul 2024 19:14:31 +0900
Subject: [PATCH 1/2] fix: VersionMap from upgrade handler
---
app/upgrades/v8/upgrades.go | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/app/upgrades/v8/upgrades.go b/app/upgrades/v8/upgrades.go
index b3f249076..e4ed7aaec 100644
--- a/app/upgrades/v8/upgrades.go
+++ b/app/upgrades/v8/upgrades.go
@@ -31,9 +31,14 @@ func CreateUpgradeHandler(
sdkCtx := sdk.UnwrapSDKContext(ctx)
logger := sdkCtx.Logger().With("upgrade: ", UpgradeName)
+ var (
+ updatedVM module.VersionMap
+ err error
+ )
+
// Leave modules are as-is to avoid running InitGenesis.
logger.Debug("running module migrations ...")
- if vm, err := mm.RunMigrations(ctx, configurator, vm); err != nil {
+ if updatedVM, err = mm.RunMigrations(ctx, configurator, vm); err != nil {
return vm, err
}
@@ -55,19 +60,19 @@ func CreateUpgradeHandler(
}
if err := baseapp.MigrateParams(sdkCtx, legacySubspace, consensusParamsStore); err != nil {
- return vm, err
+ return updatedVM, err
}
// canto v8 custom
{
params, err := stakingKeeper.GetParams(ctx)
if err != nil {
- return vm, err
+ return updatedVM, err
}
params.MinCommissionRate = MinCommissionRate
stakingKeeper.SetParams(ctx, params)
}
- return vm, nil
+ return updatedVM, nil
}
}
From 4dd371d11e0f84c07c9bed177e15be748143e4f2 Mon Sep 17 00:00:00 2001
From: dudong2 <leesj9476lsj@gmail.com>
Date: Mon, 29 Jul 2024 19:40:49 +0900
Subject: [PATCH 2/2] chore: Change return val
---
app/upgrades/v8/upgrades.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/upgrades/v8/upgrades.go b/app/upgrades/v8/upgrades.go
index e4ed7aaec..e84df9f19 100644
--- a/app/upgrades/v8/upgrades.go
+++ b/app/upgrades/v8/upgrades.go
@@ -39,7 +39,7 @@ func CreateUpgradeHandler(
// Leave modules are as-is to avoid running InitGenesis.
logger.Debug("running module migrations ...")
if updatedVM, err = mm.RunMigrations(ctx, configurator, vm); err != nil {
- return vm, err
+ return updatedVM, err
}
// ibc-go vX -> v6