chore: bump deps (#3)

(cherry picked from commit 3a28da1)

CHANGELOG.md

@@ -14,6 +14,11 @@
 
 ## [Unreleased]
 
+### Improvements
+
+- (deps) [#3](https://github.com/KYVENetwork/chain/pull/3) Bump Cosmos SDK to [v0.46.9](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.46.9) ([`v0.46.9-kyve-rc0`](https://github.com/KYVENetwork/cosmos-sdk/releases/tag/v0.46.9-kyve-rc0)).
+- (deps) [#3](https://github.com/KYVENetwork/chain/pull/3) Bump IBC to [v6.1.0](https://github.com/cosmos/ibc-go/releases/tag/v6.1.0).
+
 ### State Machine Breaking
 
 - (`x/bundles`) [#1](https://github.com/KYVENetwork/chain/pull/1) Migrate `StorageCost` param to type `sdk.Dec`.

Makefile

@@ -96,7 +96,7 @@ vet:
 ###                                Protobuf                                 ###
 ###############################################################################
 
-BUF_VERSION=1.13.1
+BUF_VERSION=1.14.0
 
 proto-all: proto-format proto-lint proto-gen
 

app/ante.go

@@ -17,8 +17,8 @@ import (
 	// Gov
 	govKeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper"
 	// IBC
-	ibcAnte "github.com/cosmos/ibc-go/v5/modules/core/ante"
-	ibcKeeper "github.com/cosmos/ibc-go/v5/modules/core/keeper"
+	ibcAnte "github.com/cosmos/ibc-go/v6/modules/core/ante"
+	ibcKeeper "github.com/cosmos/ibc-go/v6/modules/core/keeper"
 	// Staking
 	stakingKeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
 )

app/app.go

@@ -77,24 +77,27 @@ import (
 	upgradeclient "github.com/cosmos/cosmos-sdk/x/upgrade/client"
 	upgradekeeper "github.com/cosmos/cosmos-sdk/x/upgrade/keeper"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
-	ica "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts"
-	icaHost "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/host"
-	icahostkeeper "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/host/keeper"
-	icaHostTypes "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/host/types"
-	icatypes "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/types"
-	ibcFee "github.com/cosmos/ibc-go/v5/modules/apps/29-fee"
-	ibcFeeKeeper "github.com/cosmos/ibc-go/v5/modules/apps/29-fee/keeper"
-	ibcFeeTypes "github.com/cosmos/ibc-go/v5/modules/apps/29-fee/types"
-	ibcTransfer "github.com/cosmos/ibc-go/v5/modules/apps/transfer"
-	ibctransferkeeper "github.com/cosmos/ibc-go/v5/modules/apps/transfer/keeper"
-	ibcTransferTypes "github.com/cosmos/ibc-go/v5/modules/apps/transfer/types"
-	ibc "github.com/cosmos/ibc-go/v5/modules/core"
-	ibcclient "github.com/cosmos/ibc-go/v5/modules/core/02-client"
-	ibcclientclient "github.com/cosmos/ibc-go/v5/modules/core/02-client/client"
-	ibcclienttypes "github.com/cosmos/ibc-go/v5/modules/core/02-client/types"
-	ibcPortTypes "github.com/cosmos/ibc-go/v5/modules/core/05-port/types"
-	ibchost "github.com/cosmos/ibc-go/v5/modules/core/24-host"
-	ibckeeper "github.com/cosmos/ibc-go/v5/modules/core/keeper"
+	ica "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts"
+	icaController "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts/controller"
+	icaControllerKeeper "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts/controller/keeper"
+	icaControllerTypes "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts/controller/types"
+	icaHost "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts/host"
+	icahostkeeper "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts/host/keeper"
+	icaHostTypes "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts/host/types"
+	icatypes "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts/types"
+	ibcFee "github.com/cosmos/ibc-go/v6/modules/apps/29-fee"
+	ibcFeeKeeper "github.com/cosmos/ibc-go/v6/modules/apps/29-fee/keeper"
+	ibcFeeTypes "github.com/cosmos/ibc-go/v6/modules/apps/29-fee/types"
+	ibcTransfer "github.com/cosmos/ibc-go/v6/modules/apps/transfer"
+	ibctransferkeeper "github.com/cosmos/ibc-go/v6/modules/apps/transfer/keeper"
+	ibcTransferTypes "github.com/cosmos/ibc-go/v6/modules/apps/transfer/types"
+	ibc "github.com/cosmos/ibc-go/v6/modules/core"
+	ibcclient "github.com/cosmos/ibc-go/v6/modules/core/02-client"
+	ibcclientclient "github.com/cosmos/ibc-go/v6/modules/core/02-client/client"
+	ibcclienttypes "github.com/cosmos/ibc-go/v6/modules/core/02-client/types"
+	ibcPortTypes "github.com/cosmos/ibc-go/v6/modules/core/05-port/types"
+	ibchost "github.com/cosmos/ibc-go/v6/modules/core/24-host"
+	ibckeeper "github.com/cosmos/ibc-go/v6/modules/core/keeper"
 	"github.com/spf13/cast"
 	abci "github.com/tendermint/tendermint/abci/types"
 	tmjson "github.com/tendermint/tendermint/libs/json"
@@ -230,8 +233,9 @@ func NewKYVEApp(
 		authtypes.StoreKey, authzTypes.ModuleName, banktypes.StoreKey, stakingtypes.StoreKey,
 		minttypes.StoreKey, distrtypes.StoreKey, slashingtypes.StoreKey, govtypes.StoreKey,
 		paramstypes.StoreKey, ibchost.StoreKey, upgradetypes.StoreKey, feegrant.StoreKey,
-		evidencetypes.StoreKey, ibcFeeTypes.StoreKey, ibcTransferTypes.StoreKey, icaHostTypes.StoreKey,
-		capabilitytypes.StoreKey, groupTypes.StoreKey,
+		evidencetypes.StoreKey, ibcFeeTypes.StoreKey, ibcTransferTypes.StoreKey,
+		icaControllerTypes.StoreKey, icaHostTypes.StoreKey, capabilitytypes.StoreKey,
+		groupTypes.StoreKey,
 
 		bundlesTypes.StoreKey,
 		delegationTypes.StoreKey,
@@ -275,6 +279,7 @@ func NewKYVEApp(
 	// grant capabilities for the ibc and ibc-transfer modules
 	scopedIBCKeeper := app.CapabilityKeeper.ScopeToModule(ibchost.ModuleName)
 	scopedIBCTransferKeeper := app.CapabilityKeeper.ScopeToModule(ibcTransferTypes.ModuleName)
+	scopedICAControllerKeeper := app.CapabilityKeeper.ScopeToModule(icaControllerTypes.SubModuleName)
 	scopedICAHostKeeper := app.CapabilityKeeper.ScopeToModule(icaHostTypes.SubModuleName)
 	// this line is used by starport scaffolding # stargate/app/scopedKeeper
 
@@ -457,7 +462,6 @@ func NewKYVEApp(
 
 	app.IBCFeeKeeper = ibcFeeKeeper.NewKeeper(
 		appCodec, keys[ibcFeeTypes.StoreKey],
-		app.GetSubspace(ibcFeeTypes.ModuleName),
 		app.IBCKeeper.ChannelKeeper,
 		app.IBCKeeper.ChannelKeeper,
 		&app.IBCKeeper.PortKeeper,
@@ -476,6 +480,16 @@ func NewKYVEApp(
 		scopedIBCTransferKeeper,
 	)
 
+	app.ICAControllerKeeper = icaControllerKeeper.NewKeeper(
+		appCodec, keys[icaControllerTypes.StoreKey],
+		app.GetSubspace(icaControllerTypes.SubModuleName),
+		app.IBCKeeper.ChannelKeeper,
+		app.IBCKeeper.ChannelKeeper,
+		&app.IBCKeeper.PortKeeper,
+		scopedICAControllerKeeper,
+		app.MsgServiceRouter(),
+	)
+
 	app.ICAHostKeeper = icahostkeeper.NewKeeper(
 		appCodec, keys[icaHostTypes.StoreKey],
 		app.GetSubspace(icaHostTypes.SubModuleName),
@@ -542,12 +556,17 @@ func NewKYVEApp(
 	ibcTransferStack = ibcTransfer.NewIBCModule(app.IBCTransferKeeper)
 	ibcTransferStack = ibcFee.NewIBCMiddleware(ibcTransferStack, app.IBCFeeKeeper)
 
+	var icaControllerStack ibcPortTypes.IBCModule
+	icaControllerStack = icaController.NewIBCMiddleware(icaControllerStack, app.ICAControllerKeeper)
+	icaControllerStack = ibcFee.NewIBCMiddleware(icaControllerStack, app.IBCFeeKeeper)
+
 	var icaHostStack ibcPortTypes.IBCModule
 	icaHostStack = icaHost.NewIBCModule(app.ICAHostKeeper)
 	icaHostStack = ibcFee.NewIBCMiddleware(icaHostStack, app.IBCFeeKeeper)
 
 	ibcRouter := ibcPortTypes.NewRouter()
 	ibcRouter.AddRoute(ibcTransferTypes.ModuleName, ibcTransferStack).
+		AddRoute(icaControllerTypes.SubModuleName, icaControllerStack).
 		AddRoute(icaHostTypes.SubModuleName, icaHostStack)
 	app.IBCKeeper.SetRouter(ibcRouter)
 
@@ -587,7 +606,7 @@ func NewKYVEApp(
 		ibc.NewAppModule(app.IBCKeeper),
 		ibcFee.NewAppModule(app.IBCFeeKeeper),
 		ibcTransfer.NewAppModule(app.IBCTransferKeeper),
-		ica.NewAppModule(nil, &app.ICAHostKeeper),
+		ica.NewAppModule(&app.ICAControllerKeeper, &app.ICAHostKeeper),
 
 		// KYVE
 		bundles.NewAppModule(appCodec, app.BundlesKeeper, app.AccountKeeper, app.BankKeeper),
@@ -774,6 +793,7 @@ func NewKYVEApp(
 
 	app.ScopedIBCKeeper = scopedIBCKeeper
 	app.ScopedIBCTransferKeeper = scopedIBCTransferKeeper
+	app.ScopedICAControllerKeeper = scopedICAControllerKeeper
 	app.ScopedICAHostKeeper = scopedICAHostKeeper
 
 	return app

app/keepers.go

@@ -37,16 +37,19 @@ import (
 	// Group
 	groupKeeper "github.com/cosmos/cosmos-sdk/x/group/keeper"
 	// IBC
-	ibcHost "github.com/cosmos/ibc-go/v5/modules/core/24-host"
-	ibcKeeper "github.com/cosmos/ibc-go/v5/modules/core/keeper"
+	ibcHost "github.com/cosmos/ibc-go/v6/modules/core/24-host"
+	ibcKeeper "github.com/cosmos/ibc-go/v6/modules/core/keeper"
 	// IBC Fee
-	ibcFeeKeeper "github.com/cosmos/ibc-go/v5/modules/apps/29-fee/keeper"
+	ibcFeeKeeper "github.com/cosmos/ibc-go/v6/modules/apps/29-fee/keeper"
 	// IBC Transfer
-	ibcTransferKeeper "github.com/cosmos/ibc-go/v5/modules/apps/transfer/keeper"
-	ibcTransferTypes "github.com/cosmos/ibc-go/v5/modules/apps/transfer/types"
+	ibcTransferKeeper "github.com/cosmos/ibc-go/v6/modules/apps/transfer/keeper"
+	ibcTransferTypes "github.com/cosmos/ibc-go/v6/modules/apps/transfer/types"
+	// ICA Controller
+	icaControllerKeeper "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts/controller/keeper"
+	icaControllerTypes "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts/controller/types"
 	// ICA Host
-	icaHostKeeper "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/host/keeper"
-	icaHostTypes "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/host/types"
+	icaHostKeeper "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts/host/keeper"
+	icaHostTypes "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts/host/types"
 	// Mint
 	mintKeeper "github.com/cosmos/cosmos-sdk/x/mint/keeper"
 	mintTypes "github.com/cosmos/cosmos-sdk/x/mint/types"
@@ -89,10 +92,11 @@ type Keepers struct {
 	UpgradeKeeper      upgradeKeeper.Keeper
 
 	// IBC
-	IBCKeeper         *ibcKeeper.Keeper // IBC Keeper must be a pointer in the app, so we can SetRouter on it correctly
-	IBCFeeKeeper      ibcFeeKeeper.Keeper
-	IBCTransferKeeper ibcTransferKeeper.Keeper
-	ICAHostKeeper     icaHostKeeper.Keeper
+	IBCKeeper           *ibcKeeper.Keeper // IBC Keeper must be a pointer in the app, so we can SetRouter on it correctly
+	IBCFeeKeeper        ibcFeeKeeper.Keeper
+	IBCTransferKeeper   ibcTransferKeeper.Keeper
+	ICAControllerKeeper icaControllerKeeper.Keeper
+	ICAHostKeeper       icaHostKeeper.Keeper
 
 	// KYVE
 	BundlesKeeper    bundlesKeeper.Keeper
@@ -105,9 +109,10 @@ type Keepers struct {
 
 	// ----- Scoped Keepers -----
 	// make scoped keepers public for test purposes
-	ScopedIBCKeeper         capabilityKeeper.ScopedKeeper
-	ScopedIBCTransferKeeper capabilityKeeper.ScopedKeeper
-	ScopedICAHostKeeper     capabilityKeeper.ScopedKeeper
+	ScopedIBCKeeper           capabilityKeeper.ScopedKeeper
+	ScopedIBCTransferKeeper   capabilityKeeper.ScopedKeeper
+	ScopedICAControllerKeeper capabilityKeeper.ScopedKeeper
+	ScopedICAHostKeeper       capabilityKeeper.ScopedKeeper
 }
 
 // initParamsKeeper init params keeper and its subspaces
@@ -124,6 +129,7 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino
 	keeper.Subspace(crisisTypes.ModuleName)
 	keeper.Subspace(ibcTransferTypes.ModuleName)
 	keeper.Subspace(ibcHost.ModuleName)
+	keeper.Subspace(icaControllerTypes.SubModuleName)
 	keeper.Subspace(icaHostTypes.SubModuleName)
 
 	return keeper

app/modules.go

@@ -39,16 +39,16 @@ import (
 	// Group
 	group "github.com/cosmos/cosmos-sdk/x/group/module"
 	// IBC
-	ibc "github.com/cosmos/ibc-go/v5/modules/core"
+	ibc "github.com/cosmos/ibc-go/v6/modules/core"
 	// IBC Fee
-	ibcFee "github.com/cosmos/ibc-go/v5/modules/apps/29-fee"
-	ibcFeeTypes "github.com/cosmos/ibc-go/v5/modules/apps/29-fee/types"
+	ibcFee "github.com/cosmos/ibc-go/v6/modules/apps/29-fee"
+	ibcFeeTypes "github.com/cosmos/ibc-go/v6/modules/apps/29-fee/types"
 	// IBC Transfer
-	ibcTransfer "github.com/cosmos/ibc-go/v5/modules/apps/transfer"
-	ibcTransferTypes "github.com/cosmos/ibc-go/v5/modules/apps/transfer/types"
+	ibcTransfer "github.com/cosmos/ibc-go/v6/modules/apps/transfer"
+	ibcTransferTypes "github.com/cosmos/ibc-go/v6/modules/apps/transfer/types"
 	// ICA
-	ica "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts"
-	icaTypes "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/types"
+	ica "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts"
+	icaTypes "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts/types"
 	// Mint
 	"github.com/cosmos/cosmos-sdk/x/mint"
 	mintTypes "github.com/cosmos/cosmos-sdk/x/mint/types"

app/upgrades/v1_rc1/upgrade.go

@@ -24,6 +24,9 @@ func CreateUpgradeHandler(
 			return vm, nil
 		}
 
+		// TODO(@john): Do we need to run the ICS27 migration?
+		// We never used ICA Controller features prior to this upgrade.
+
 		ReinitialiseBundlesParams(ctx, bundlesKeeper, bundlesStoreKey)
 		return mm.RunMigrations(ctx, configurator, vm)
 	}