Skip to content

Commit 9a3ba1b

Browse files
committed
chore: remove old upgrade code
1 parent aa64b02 commit 9a3ba1b

2 files changed

Lines changed: 6 additions & 34 deletions

File tree

upgrade/store.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,11 @@ import (
2020
storetypes "cosmossdk.io/store/types"
2121
upgradetypes "cosmossdk.io/x/upgrade/types"
2222
"github.com/cosmos/cosmos-sdk/baseapp"
23-
orbitertypes "github.com/noble-assets/orbiter/types/core"
2423
)
2524

2625
func CreateStoreLoader(upgradeHeight int64) baseapp.StoreLoader {
2726
storeUpgrades := storetypes.StoreUpgrades{
28-
Added: []string{
29-
// Noble Modules
30-
orbitertypes.ModuleName,
31-
},
27+
Added: []string{},
3228
}
3329

3430
return upgradetypes.UpgradeStoreLoader(upgradeHeight, &storeUpgrades)

upgrade/upgrade.go

Lines changed: 5 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ package upgrade
1919
import (
2020
"context"
2121
"errors"
22+
"fmt"
2223

2324
"cosmossdk.io/core/address"
2425
"cosmossdk.io/log"
@@ -44,37 +45,12 @@ func CreateUpgradeHandler(
4445
) upgradetypes.UpgradeHandler {
4546
return func(ctx context.Context, _ upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) {
4647
sdkCtx := sdk.UnwrapSDKContext(ctx)
47-
48-
vm, err := mm.RunMigrations(ctx, cfg, vm)
49-
if err != nil {
50-
return vm, err
51-
}
52-
53-
err = ClaimDistributionFunds(ctx, logger, addressCodec, authorityKeeper, bankKeeper)
54-
if err != nil {
55-
return vm, err
48+
chainID := sdkCtx.ChainID()
49+
if chainID != TestnetChainID {
50+
return vm, fmt.Errorf("%s upgrade not allowed to execute on %s chain", UpgradeName, chainID)
5651
}
5752

58-
err = UpdateVaultsState(ctx, addressCodec, authorityKeeper, dollarKeeper)
59-
if err != nil {
60-
return vm, err
61-
}
62-
63-
// The IBC light client for the shido_9008-1 chain has expired on
64-
// Noble's mainnet. In IBC-Go v8.7.0, the MsgRecoverClient message does
65-
// not support the LegacyAminoJSON signing mode, preventing recovery
66-
// via the Noble Maintenance Multisig. As a result, the client must be
67-
// manually recovered as part of this software upgrade.
68-
if sdkCtx.ChainID() == MainnetChainID {
69-
err = clientKeeper.RecoverClient(sdkCtx, "07-tendermint-106", "07-tendermint-186")
70-
if err != nil {
71-
logger.Error("unable to recover shido_9008-1 light client", "err", err)
72-
}
73-
}
74-
75-
logger.Info(UpgradeASCII)
76-
77-
return vm, nil
53+
return mm.RunMigrations(ctx, cfg, vm)
7854
}
7955
}
8056

0 commit comments

Comments
 (0)