feat(ibc)!: ibc-go v10 is not supported

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## UNRELEASED
 
+### State Machine Breaking
+
+* [#1731](https://github.com/crypto-org-chain/cronos/pull/1804) Upgrade to ibc-go v10.1.1
+
+
 ### Improvements
 
 * [#1779](https://github.com/crypto-org-chain/cronos/pull/1779) Upgrade rocksdb to `v9.11.2`.

app/sim_test.go

@@ -32,12 +32,10 @@ import (
 	simcli "github.com/cosmos/cosmos-sdk/x/simulation/client/cli"
 	slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
-	capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types"
 
 	simtypes "github.com/cosmos/cosmos-sdk/types/simulation"
-	ibcfeetypes "github.com/cosmos/ibc-go/v8/modules/apps/29-fee/types"
-	ibctransfertypes "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types"
-	ibcexported "github.com/cosmos/ibc-go/v8/modules/core/exported"
+	ibctransfertypes "github.com/cosmos/ibc-go/v10/modules/apps/transfer/types"
+	ibcexported "github.com/cosmos/ibc-go/v10/modules/core/exported"
 	cronosmoduletypes "github.com/crypto-org-chain/cronos/v2/x/cronos/types"
 )
 
@@ -236,12 +234,10 @@ func TestAppImportExport(t *testing.T) {
 		{app.keys[paramtypes.StoreKey], newApp.keys[paramtypes.StoreKey], [][]byte{}},
 		{app.keys[govtypes.StoreKey], newApp.keys[govtypes.StoreKey], [][]byte{}},
 		{app.keys[evidencetypes.StoreKey], newApp.keys[evidencetypes.StoreKey], [][]byte{}},
-		{app.keys[capabilitytypes.StoreKey], newApp.keys[capabilitytypes.StoreKey], [][]byte{}},
 		{app.keys[evmtypes.StoreKey], newApp.keys[evmtypes.StoreKey], [][]byte{}},
 		{app.keys[cronosmoduletypes.StoreKey], newApp.keys[cronosmoduletypes.StoreKey], [][]byte{}},
 		{app.keys[ibcexported.StoreKey], newApp.keys[ibcexported.StoreKey], [][]byte{}},
 		{app.keys[ibctransfertypes.StoreKey], newApp.keys[ibctransfertypes.StoreKey], [][]byte{}},
-		{app.keys[ibcfeetypes.StoreKey], newApp.keys[ibcfeetypes.StoreKey], [][]byte{}},
 	}
 
 	for _, skp := range storeKeysPrefixes {

app/upgrades.go

@@ -2,121 +2,17 @@ package app
 
 import (
 	"context"
-	"fmt"
-	"time"
 
-	sdkmath "cosmossdk.io/math"
-	storetypes "cosmossdk.io/store/types"
 	upgradetypes "cosmossdk.io/x/upgrade/types"
 	"github.com/cosmos/cosmos-sdk/codec"
-	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
-	govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper"
-	govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
-	icahosttypes "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/host/types"
-	evmtypes "github.com/evmos/ethermint/x/evm/types"
 )
 
 // RegisterUpgradeHandlers returns if store loader is overridden
 func (app *App) RegisterUpgradeHandlers(cdc codec.BinaryCodec, maxVersion int64) bool {
-	planName := "v1.4"
+	planName := "v1.5" // TBD
 	app.UpgradeKeeper.SetUpgradeHandler(planName, func(ctx context.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
-		m, err := app.ModuleManager.RunMigrations(ctx, app.configurator, fromVM)
-		if err != nil {
-			return m, err
-		}
-
-		sdkCtx := sdk.UnwrapSDKContext(ctx)
-		{
-			params := app.ICAHostKeeper.GetParams(sdkCtx)
-			params.HostEnabled = false
-			app.ICAHostKeeper.SetParams(sdkCtx, params)
-			evmParams := app.EvmKeeper.GetParams(sdkCtx)
-			evmParams.HeaderHashNum = evmtypes.DefaultHeaderHashNum
-			if err := app.EvmKeeper.SetParams(sdkCtx, evmParams); err != nil {
-				return m, err
-			}
-			if err := UpdateExpeditedParams(ctx, app.GovKeeper); err != nil {
-				return m, err
-			}
-		}
-		return m, nil
-	})
-
-	// a hotfix upgrade plan just for testnet
-	hotfixPlanName := "v1.4.0-rc5-testnet"
-	app.UpgradeKeeper.SetUpgradeHandler(hotfixPlanName, func(ctx context.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
 		return app.ModuleManager.RunMigrations(ctx, app.configurator, fromVM)
 	})
-
-	upgradeInfo, err := app.UpgradeKeeper.ReadUpgradeInfoFromDisk()
-	if err != nil {
-		panic(fmt.Sprintf("failed to read upgrade info from disk %s", err))
-	}
-	if !app.UpgradeKeeper.IsSkipHeight(upgradeInfo.Height) {
-		if upgradeInfo.Name == planName {
-			app.SetStoreLoader(MaxVersionUpgradeStoreLoader(maxVersion, upgradeInfo.Height, &storetypes.StoreUpgrades{
-				Added: []string{
-					icahosttypes.StoreKey,
-				},
-				Deleted: []string{"icaauth"},
-			}))
-
-			return true
-		}
-	}
-
 	return false
 }
-
-func UpdateExpeditedParams(ctx context.Context, gov govkeeper.Keeper) error {
-	govParams, err := gov.Params.Get(ctx)
-	if err != nil {
-		return err
-	}
-	if len(govParams.MinDeposit) > 0 {
-		minDeposit := govParams.MinDeposit[0]
-		expeditedAmount := minDeposit.Amount.MulRaw(govv1.DefaultMinExpeditedDepositTokensRatio)
-		govParams.ExpeditedMinDeposit = sdk.NewCoins(sdk.NewCoin(minDeposit.Denom, expeditedAmount))
-	}
-	threshold, err := sdkmath.LegacyNewDecFromStr(govParams.Threshold)
-	if err != nil {
-		return fmt.Errorf("invalid threshold string: %w", err)
-	}
-	expeditedThreshold, err := sdkmath.LegacyNewDecFromStr(govParams.ExpeditedThreshold)
-	if err != nil {
-		return fmt.Errorf("invalid expedited threshold string: %w", err)
-	}
-	if expeditedThreshold.LTE(threshold) {
-		expeditedThreshold = threshold.Mul(DefaultThresholdRatio())
-	}
-	if expeditedThreshold.GT(sdkmath.LegacyOneDec()) {
-		expeditedThreshold = sdkmath.LegacyOneDec()
-	}
-	govParams.ExpeditedThreshold = expeditedThreshold.String()
-	if govParams.ExpeditedVotingPeriod != nil && govParams.VotingPeriod != nil && *govParams.ExpeditedVotingPeriod >= *govParams.VotingPeriod {
-		votingPeriod := DurationToDec(*govParams.VotingPeriod)
-		period := DecToDuration(DefaultPeriodRatio().Mul(votingPeriod))
-		govParams.ExpeditedVotingPeriod = &period
-	}
-	if err := govParams.ValidateBasic(); err != nil {
-		return err
-	}
-	return gov.Params.Set(ctx, govParams)
-}
-
-func DefaultThresholdRatio() sdkmath.LegacyDec {
-	return govv1.DefaultExpeditedThreshold.Quo(govv1.DefaultThreshold)
-}
-
-func DefaultPeriodRatio() sdkmath.LegacyDec {
-	return DurationToDec(govv1.DefaultExpeditedPeriod).Quo(DurationToDec(govv1.DefaultPeriod))
-}
-
-func DurationToDec(d time.Duration) sdkmath.LegacyDec {
-	return sdkmath.LegacyMustNewDecFromStr(fmt.Sprintf("%f", d.Seconds()))
-}
-
-func DecToDuration(d sdkmath.LegacyDec) time.Duration {
-	return time.Second * time.Duration(d.RoundInt64())
-}

app/versiondb.go

@@ -16,7 +16,6 @@ func (app *App) setupVersionDB(
 	homePath string,
 	keys map[string]*storetypes.KVStoreKey,
 	tkeys map[string]*storetypes.TransientStoreKey,
-	memKeys map[string]*storetypes.MemoryStoreKey,
 	okeys map[string]*storetypes.ObjectStoreKey,
 ) (storetypes.RootMultiStore, error) {
 	dataDir := filepath.Join(homePath, "data", "versiondb")
@@ -51,9 +50,6 @@ func (app *App) setupVersionDB(
 	for _, k := range tkeys {
 		delegatedStoreKeys[k] = struct{}{}
 	}
-	for _, k := range memKeys {
-		delegatedStoreKeys[k] = struct{}{}
-	}
 	for _, k := range okeys {
 		delegatedStoreKeys[k] = struct{}{}
 	}

app/versiondb_placeholder.go

@@ -13,7 +13,6 @@ func (app *App) setupVersionDB(
 	homePath string,
 	keys map[string]*storetypes.KVStoreKey,
 	tkeys map[string]*storetypes.TransientStoreKey,
-	memKeys map[string]*storetypes.MemoryStoreKey,
 	okeys map[string]*storetypes.ObjectStoreKey,
 ) (storetypes.RootMultiStore, error) {
 	return nil, errors.New("versiondb is not supported in this binary")

cmd/cronosd/cmd/versiondb.go

@@ -14,7 +14,7 @@ import (
 )
 
 func ChangeSetCmd() *cobra.Command {
-	keys, _, _, _ := app.StoreKeys()
+	keys, _, _ := app.StoreKeys()
 	storeNames := make([]string, 0, len(keys))
 	for name := range keys {
 		storeNames = append(storeNames, name)

default.nix

@@ -11,7 +11,7 @@
   nativeByteOrder ? true, # nativeByteOrder mode will panic on big endian machines
 }:
 let
-  version = "v1.4.7";
+  version = "v1.5.0";
   pname = "cronosd";
   tags = [
     "ledger"

flake.nix

@@ -83,7 +83,7 @@
         gomod2nix.overlays.default
         (import ./testground/benchmark/overlay.nix)
         (final: super: {
-          go = super.go_1_22;
+          go = super.go_1_23;
           test-env = final.callPackage ./nix/testenv.nix { };
           cronos-matrix = final.callPackage ./nix/cronos-matrix.nix {
             inherit rev;