feat: upgrade ibc to v10

Signed-off-by: Artur Troian <[email protected]>

Author: troian

app/app.go

@@ -55,10 +55,9 @@ import (
 	paramstypes "github.com/cosmos/cosmos-sdk/x/params/types"
 	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"
-	transfertypes "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types"
-	ibchost "github.com/cosmos/ibc-go/v8/modules/core/exported"
-	"github.com/cosmos/ibc-go/v8/testing/simapp"
+	transfertypes "github.com/cosmos/ibc-go/v10/modules/apps/transfer/types"
+	ibchost "github.com/cosmos/ibc-go/v10/modules/core/exported"
+	"github.com/cosmos/ibc-go/v10/testing/simapp"
 
 	cflags "pkg.akt.dev/go/cli/flags"
 	audittypes "pkg.akt.dev/go/node/audit/v1"
@@ -219,7 +218,6 @@ func NewApp(
 	// initialize stores
 	app.MountKVStores(app.GetKVStoreKey())
 	app.MountTransientStores(app.GetTransientStoreKey())
-	app.MountMemoryStores(app.GetMemoryStoreKey())
 
 	anteOpts := HandlerOptions{
 		HandlerOptions: ante.HandlerOptions{
@@ -267,7 +265,6 @@ func NewApp(
 func orderBeginBlockers(_ []string) []string {
 	return []string{
 		upgradetypes.ModuleName,
-		capabilitytypes.ModuleName,
 		banktypes.ModuleName,
 		paramstypes.ModuleName,
 		deploymenttypes.ModuleName,
@@ -299,7 +296,6 @@ func OrderEndBlockers(_ []string) []string {
 		govtypes.ModuleName,
 		stakingtypes.ModuleName,
 		upgradetypes.ModuleName,
-		capabilitytypes.ModuleName,
 		banktypes.ModuleName,
 		paramstypes.ModuleName,
 		deploymenttypes.ModuleName,

app/app_configure.go

@@ -18,9 +18,8 @@ import (
 	paramstypes "github.com/cosmos/cosmos-sdk/x/params/types"
 	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"
-	transfertypes "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types"
-	ibchost "github.com/cosmos/ibc-go/v8/modules/core/exported"
+	transfertypes "github.com/cosmos/ibc-go/v10/modules/apps/transfer/types"
+	ibchost "github.com/cosmos/ibc-go/v10/modules/core/exported"
 
 	audittypes "pkg.akt.dev/go/node/audit/v1"
 	taketypes "pkg.akt.dev/go/node/take/v1"
@@ -54,7 +53,6 @@ func akashModuleBasics() []module.AppModuleBasic {
 // can do so safely.
 func OrderInitGenesis(_ []string) []string {
 	return []string{
-		capabilitytypes.ModuleName,
 		authtypes.ModuleName,
 		authz.ModuleName,
 		banktypes.ModuleName,

app/config.go

@@ -22,9 +22,9 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/slashing"
 	"github.com/cosmos/cosmos-sdk/x/staking"
 	"github.com/cosmos/ibc-go/modules/capability"
-	"github.com/cosmos/ibc-go/v8/modules/apps/transfer"
-	ibc "github.com/cosmos/ibc-go/v8/modules/core"
-	ibclightclient "github.com/cosmos/ibc-go/v8/modules/light-clients/07-tendermint"
+	"github.com/cosmos/ibc-go/v10/modules/apps/transfer"
+	ibc "github.com/cosmos/ibc-go/v10/modules/core"
+	ibclightclient "github.com/cosmos/ibc-go/v10/modules/light-clients/07-tendermint"
 )
 
 var mbasics = module.NewBasicManager(

app/mac.go

@@ -6,7 +6,7 @@ import (
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
 	minttypes "github.com/cosmos/cosmos-sdk/x/mint/types"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
-	ibctransfertypes "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types"
+	ibctransfertypes "github.com/cosmos/ibc-go/v10/modules/apps/transfer/types"
 
 	escrowtypes "pkg.akt.dev/go/node/escrow/v1"
 )

app/modules.go

@@ -26,10 +26,9 @@ import (
 	slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types"
 	"github.com/cosmos/cosmos-sdk/x/staking"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
-	"github.com/cosmos/ibc-go/modules/capability"
-	"github.com/cosmos/ibc-go/v8/modules/apps/transfer"
-	ibc "github.com/cosmos/ibc-go/v8/modules/core"
-	ibctm "github.com/cosmos/ibc-go/v8/modules/light-clients/07-tendermint"
+	"github.com/cosmos/ibc-go/v10/modules/apps/transfer"
+	ibc "github.com/cosmos/ibc-go/v10/modules/core"
+	ibctm "github.com/cosmos/ibc-go/v10/modules/light-clients/07-tendermint"
 
 	"pkg.akt.dev/go/sdkutil"
 
@@ -71,11 +70,6 @@ func appModules(
 			app.Keepers.Cosmos.Acct,
 			app.GetSubspace(banktypes.ModuleName),
 		),
-		capability.NewAppModule(
-			cdc,
-			*app.Keepers.Cosmos.Cap,
-			false,
-		),
 		gov.NewAppModule(
 			cdc,
 			app.Keepers.Cosmos.Gov,
@@ -140,7 +134,9 @@ func appModules(
 		transfer.NewAppModule(
 			app.Keepers.Cosmos.Transfer,
 		),
-		ibctm.NewAppModule(),
+		ibctm.NewAppModule(
+			app.Keepers.Modules.TMLight,
+		),
 		params.NewAppModule( //nolint: staticcheck
 			app.Keepers.Cosmos.Params,
 		),
@@ -225,11 +221,6 @@ func appSimModules(
 			app.Keepers.Cosmos.FeeGrant,
 			app.interfaceRegistry,
 		),
-		capability.NewAppModule(
-			app.cdc,
-			*app.Keepers.Cosmos.Cap,
-			false,
-		),
 		authzmodule.NewAppModule(
 			app.cdc,
 			app.Keepers.Cosmos.Authz,

app/sim_test.go

@@ -7,10 +7,21 @@ import (
 	"os"
 	"testing"
 
+	"github.com/spf13/viper"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
+	abci "github.com/cometbft/cometbft/abci/types"
+
 	"cosmossdk.io/log"
+	"cosmossdk.io/store"
+	storetypes "cosmossdk.io/store/types"
 	evidencetypes "cosmossdk.io/x/evidence/types"
 	"cosmossdk.io/x/feegrant"
 	upgradetypes "cosmossdk.io/x/upgrade/types"
+	dbm "github.com/cosmos/cosmos-db"
+	"github.com/cosmos/cosmos-sdk/baseapp"
+	sdksim "github.com/cosmos/cosmos-sdk/types/simulation"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 	authzkeeper "github.com/cosmos/cosmos-sdk/x/authz/keeper"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
@@ -19,13 +30,12 @@ import (
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
 	minttypes "github.com/cosmos/cosmos-sdk/x/mint/types"
 	paramtypes "github.com/cosmos/cosmos-sdk/x/params/types"
+	"github.com/cosmos/cosmos-sdk/x/simulation"
 	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"
-	ibctransfertypes "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types"
-	"github.com/spf13/viper"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
+	ibctransfertypes "github.com/cosmos/ibc-go/v10/modules/apps/transfer/types"
+	ibchost "github.com/cosmos/ibc-go/v10/modules/core/exported"
+
 	atypes "pkg.akt.dev/go/node/audit/v1"
 	ctypes "pkg.akt.dev/go/node/cert/v1"
 	dtypes "pkg.akt.dev/go/node/deployment/v1"
@@ -34,15 +44,6 @@ import (
 	taketypes "pkg.akt.dev/go/node/take/v1"
 	"pkg.akt.dev/go/sdkutil"
 
-	abci "github.com/cometbft/cometbft/abci/types"
-
-	"cosmossdk.io/store"
-	storetypes "cosmossdk.io/store/types"
-	dbm "github.com/cosmos/cosmos-db"
-	"github.com/cosmos/cosmos-sdk/baseapp"
-	sdksim "github.com/cosmos/cosmos-sdk/types/simulation"
-	"github.com/cosmos/cosmos-sdk/x/simulation"
-
 	akash "pkg.akt.dev/node/app"
 	"pkg.akt.dev/node/app/sim"
 	simtestutil "pkg.akt.dev/node/testutil/sims"
@@ -236,6 +237,7 @@ func TestAppImportExport(t *testing.T) {
 			appB,
 			[][]byte{
 				authzkeeper.GrantQueuePrefix,
+				authzkeeper.GranteeKey,
 			},
 		},
 		{
@@ -291,12 +293,12 @@ func TestAppImportExport(t *testing.T) {
 			appB,
 			[][]byte{},
 		},
-		// {
-		//	ibchost.StoreKey,
-		//	appA,
-		//	appB,
-		//	[][]byte{},
-		// },
+		{
+			ibchost.StoreKey,
+			appA,
+			appB,
+			[][]byte{},
+		},
 		{
 			ibctransfertypes.StoreKey,
 			appA,
@@ -319,12 +321,6 @@ func TestAppImportExport(t *testing.T) {
 			appB,
 			[][]byte{},
 		},
-		{
-			capabilitytypes.StoreKey,
-			appA,
-			appB,
-			[][]byte{},
-		},
 		{
 			atypes.StoreKey,
 			appA,

app/types/app.go

@@ -45,18 +45,17 @@ import (
 	slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types"
 	stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
-	capabilitykeeper "github.com/cosmos/ibc-go/modules/capability/keeper"
-	capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types"
-	icacontrollertypes "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/controller/types"
-	icahosttypes "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/host/types"
-	"github.com/cosmos/ibc-go/v8/modules/apps/transfer"
-	ibctransferkeeper "github.com/cosmos/ibc-go/v8/modules/apps/transfer/keeper"
-	ibctransfertypes "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types"
-	ibcclienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types"
-	ibcconnectiontypes "github.com/cosmos/ibc-go/v8/modules/core/03-connection/types"
-	porttypes "github.com/cosmos/ibc-go/v8/modules/core/05-port/types"
-	ibcexported "github.com/cosmos/ibc-go/v8/modules/core/exported"
-	ibckeeper "github.com/cosmos/ibc-go/v8/modules/core/keeper"
+	icacontrollertypes "github.com/cosmos/ibc-go/v10/modules/apps/27-interchain-accounts/controller/types"
+	icahosttypes "github.com/cosmos/ibc-go/v10/modules/apps/27-interchain-accounts/host/types"
+	"github.com/cosmos/ibc-go/v10/modules/apps/transfer"
+	ibctransferkeeper "github.com/cosmos/ibc-go/v10/modules/apps/transfer/keeper"
+	ibctransfertypes "github.com/cosmos/ibc-go/v10/modules/apps/transfer/types"
+	ibcclienttypes "github.com/cosmos/ibc-go/v10/modules/core/02-client/types"
+	ibcconnectiontypes "github.com/cosmos/ibc-go/v10/modules/core/03-connection/types"
+	porttypes "github.com/cosmos/ibc-go/v10/modules/core/05-port/types"
+	ibcexported "github.com/cosmos/ibc-go/v10/modules/core/exported"
+	ibckeeper "github.com/cosmos/ibc-go/v10/modules/core/keeper"
+	ibctm "github.com/cosmos/ibc-go/v10/modules/light-clients/07-tendermint"
 
 	atypes "pkg.akt.dev/go/node/audit/v1"
 	ctypes "pkg.akt.dev/go/node/cert/v1"
@@ -88,25 +87,22 @@ var ErrEmptyFieldName = errors.New("empty field name")
 
 type AppKeepers struct {
 	Cosmos struct {
-		Acct                 authkeeper.AccountKeeper
-		Authz                authzkeeper.Keeper
-		FeeGrant             feegrantkeeper.Keeper
-		Bank                 bankkeeper.Keeper
-		Cap                  *capabilitykeeper.Keeper
-		Staking              *stakingkeeper.Keeper
-		Slashing             slashingkeeper.Keeper
-		Mint                 mintkeeper.Keeper
-		Distr                distrkeeper.Keeper
-		Gov                  *govkeeper.Keeper
-		Upgrade              *upgradekeeper.Keeper
-		Crisis               *crisiskeeper.Keeper //nolint: staticcheck
-		Params               paramskeeper.Keeper  //nolint: staticcheck
-		ConsensusParams      *consensusparamkeeper.Keeper
-		IBC                  *ibckeeper.Keeper
-		Evidence             *evidencekeeper.Keeper
-		Transfer             ibctransferkeeper.Keeper
-		ScopedIBCKeeper      capabilitykeeper.ScopedKeeper
-		ScopedTransferKeeper capabilitykeeper.ScopedKeeper
+		Acct            authkeeper.AccountKeeper
+		Authz           authzkeeper.Keeper
+		FeeGrant        feegrantkeeper.Keeper
+		Bank            bankkeeper.Keeper
+		Staking         *stakingkeeper.Keeper
+		Slashing        slashingkeeper.Keeper
+		Mint            mintkeeper.Keeper
+		Distr           distrkeeper.Keeper
+		Gov             *govkeeper.Keeper
+		Upgrade         *upgradekeeper.Keeper
+		Crisis          *crisiskeeper.Keeper //nolint: staticcheck
+		Params          paramskeeper.Keeper  //nolint: staticcheck
+		ConsensusParams *consensusparamkeeper.Keeper
+		IBC             *ibckeeper.Keeper
+		Evidence        *evidencekeeper.Keeper
+		Transfer        ibctransferkeeper.Keeper
 	}
 
 	Akash struct {
@@ -118,6 +114,10 @@ type AppKeepers struct {
 		Audit      akeeper.Keeper
 		Cert       ckeeper.Keeper
 	}
+
+	Modules struct {
+		TMLight ibctm.LightClientModule
+	}
 }
 
 type App struct {
@@ -224,20 +224,6 @@ func (app *App) InitSpecialKeepers(
 
 	bApp.SetParamStore(app.Keepers.Cosmos.ConsensusParams.ParamsStore)
 
-	// add capability keeper and ScopeToModule for ibc module
-	app.Keepers.Cosmos.Cap = capabilitykeeper.NewKeeper(
-		cdc,
-		app.keys[capabilitytypes.StoreKey],
-		app.memKeys[capabilitytypes.MemStoreKey],
-	)
-
-	app.Keepers.Cosmos.ScopedIBCKeeper = app.Keepers.Cosmos.Cap.ScopeToModule(ibcexported.ModuleName)
-	app.Keepers.Cosmos.ScopedTransferKeeper = app.Keepers.Cosmos.Cap.ScopeToModule(ibctransfertypes.ModuleName)
-
-	// seal the capability keeper so all persistent capabilities are loaded in-memory and prevent
-	// any further modules from creating scoped sub-keepers.
-	app.Keepers.Cosmos.Cap.Seal()
-
 	app.Keepers.Cosmos.Crisis = crisiskeeper.NewKeeper( //nolint: staticcheck
 		cdc, runtime.NewKVStoreService(app.keys[crisistypes.StoreKey]),
 		invCheckPeriod,
@@ -324,11 +310,9 @@ func (app *App) InitNormalKeepers(
 	// register IBC Keeper
 	app.Keepers.Cosmos.IBC = ibckeeper.NewKeeper(
 		cdc,
-		app.keys[ibcexported.StoreKey],
+		runtime.NewKVStoreService(app.keys[ibcexported.StoreKey]),
 		app.GetSubspace(ibcexported.ModuleName),
-		app.Keepers.Cosmos.Staking,
 		app.Keepers.Cosmos.Upgrade,
-		app.Keepers.Cosmos.ScopedIBCKeeper,
 		authtypes.NewModuleAddress(govtypes.ModuleName).String(),
 	)
 
@@ -391,14 +375,13 @@ func (app *App) InitNormalKeepers(
 	// register Transfer Keepers
 	app.Keepers.Cosmos.Transfer = ibctransferkeeper.NewKeeper(
 		cdc,
-		app.keys[ibctransfertypes.StoreKey],
+		runtime.NewKVStoreService(app.keys[ibctransfertypes.StoreKey]),
 		app.GetSubspace(ibctransfertypes.ModuleName),
 		app.Keepers.Cosmos.IBC.ChannelKeeper,
 		app.Keepers.Cosmos.IBC.ChannelKeeper,
-		app.Keepers.Cosmos.IBC.PortKeeper,
+		bApp.MsgServiceRouter(),
 		app.Keepers.Cosmos.Acct,
 		app.Keepers.Cosmos.Bank,
-		app.Keepers.Cosmos.ScopedTransferKeeper,
 		authtypes.NewModuleAddress(govtypes.ModuleName).String(),
 	)
 
@@ -410,6 +393,13 @@ func (app *App) InitNormalKeepers(
 
 	app.Keepers.Cosmos.IBC.SetRouter(ibcRouter)
 
+	/// Light client modules
+	clientKeeper := app.Keepers.Cosmos.IBC.ClientKeeper
+	storeProvider := app.Keepers.Cosmos.IBC.ClientKeeper.GetStoreProvider()
+	app.Keepers.Modules.TMLight = ibctm.NewLightClientModule(cdc, storeProvider)
+
+	clientKeeper.AddRoute(ibctm.ModuleName, &app.Keepers.Modules.TMLight)
+
 	app.Keepers.Akash.Take = tkeeper.NewKeeper(
 		cdc,
 		app.keys[ttypes.StoreKey],
@@ -526,7 +516,6 @@ func kvStoreKeys() []string {
 		upgradetypes.StoreKey,
 		evidencetypes.StoreKey,
 		ibctransfertypes.StoreKey,
-		capabilitytypes.StoreKey,
 	}
 
 	keys = append(keys, akashKVStoreKeys()...,
@@ -554,9 +543,7 @@ func transientStoreKeys() []string {
 }
 
 func memStoreKeys() []string {
-	return []string{
-		capabilitytypes.MemStoreKey,
-	}
+	return []string{}
 }
 
 // FindStructField if an interface is either a struct or a pointer to a struct