Skip to content

Commit

Permalink
refactor: change UpgradeName
Browse files Browse the repository at this point in the history
  • Loading branch information
hoank101 committed Feb 26, 2024
1 parent e95670f commit 76cfa4d
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 11 deletions.
4 changes: 1 addition & 3 deletions app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ import (
"github.com/rakyll/statik/fs"

v3_0_2 "github.com/White-Whale-Defi-Platform/migaloo-chain/v4/app/upgrades/v3_0_2"
v4 "github.com/White-Whale-Defi-Platform/migaloo-chain/v4/app/upgrades/v4_1_1"
v4 "github.com/White-Whale-Defi-Platform/migaloo-chain/v4/app/upgrades/v4_1_2"

// unnamed import of statik for swagger UI support
_ "github.com/White-Whale-Defi-Platform/migaloo-chain/v4/client/docs/statik"
Expand Down Expand Up @@ -1149,8 +1149,6 @@ func (app *MigalooApp) setupUpgradeHandlers() {
app.ConsensusParamsKeeper,
app.ICAControllerKeeper,
app.AccountKeeper,
*app.StakingKeeper,
app.BankKeeper,
),
)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package v4

// UpgradeName defines the on-chain upgrade name for the Migaloo v4.1.0 upgrade.
// UpgradeName defines the on-chain upgrade name for the Migaloo v4.1.2 upgrade.
// this upgrade includes the fix for pfm
const (
UpgradeName = "v4.1.1"
UpgradeName = "v4.1.2"
)
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,17 @@ import (
"github.com/cosmos/cosmos-sdk/types/module"
authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper"
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
bankKeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper"
consensuskeeper "github.com/cosmos/cosmos-sdk/x/consensus/keeper"
paramskeeper "github.com/cosmos/cosmos-sdk/x/params/keeper"
paramstypes "github.com/cosmos/cosmos-sdk/x/params/types"
stakingKeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
icacontrollerkeeper "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/keeper"
icacontrollertypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/types"
clientkeeper "github.com/cosmos/ibc-go/v7/modules/core/02-client/keeper"
ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported"
)

// CreateUpgradeHandler that migrates the chain from v3.0.2 to v4.1.1
// CreateUpgradeHandler that migrates the chain from v3.0.2 to v4.1.2
func CreateUpgradeHandler(
mm *module.Manager,
configurator module.Configurator,
Expand All @@ -27,8 +25,6 @@ func CreateUpgradeHandler(
consensusParamsKeeper consensuskeeper.Keeper,
icacontrollerKeeper icacontrollerkeeper.Keeper,
accountKeeper authkeeper.AccountKeeper,
_ stakingKeeper.Keeper,
_ bankKeeper.Keeper,
) upgradetypes.UpgradeHandler {
return func(ctx sdk.Context, _ upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
// READ: https://github.com/cosmos/cosmos-sdk/blob/v0.47.4/UPGRADING.md#xconsensus
Expand Down
2 changes: 1 addition & 1 deletion scripts/upgrade_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ HOME=mytestnet
ROOT=$(pwd)
DENOM=uwhale
CHAIN_ID=localmigaloo
SOFTWARE_UPGRADE_NAME="v4.1.1"
SOFTWARE_UPGRADE_NAME="v4.1.2"
ADDITIONAL_PRE_SCRIPTS=${ADDITIONAL_PRE_SCRIPTS:-""}
ADDITIONAL_AFTER_SCRIPTS=${ADDITIONAL_AFTER_SCRIPTS:-""}

Expand Down

0 comments on commit 76cfa4d

Please sign in to comment.