feat: Add canonical light client for Rollapps

app/ante/ante_options.go

@@ -6,6 +6,7 @@ import (
 	authsigning "github.com/cosmos/cosmos-sdk/x/auth/signing"
 	bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper"
 	ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper"
+	lightclientkeeper "github.com/dymensionxyz/dymension/v3/x/lightclient/keeper"
 	rollappkeeper "github.com/dymensionxyz/dymension/v3/x/rollapp/keeper"
 	ethante "github.com/evmos/ethermint/app/ante"
 
@@ -26,6 +27,7 @@ type HandlerOptions struct {
 	MaxTxGasWanted         uint64
 	ExtensionOptionChecker ante.ExtensionOptionChecker
 	RollappKeeper          rollappkeeper.Keeper
+	LightClientKeeper      *lightclientkeeper.Keeper
 }
 
 func (options HandlerOptions) validate() error {
@@ -47,5 +49,8 @@ func (options HandlerOptions) validate() error {
 	if options.TxFeesKeeper == nil {
 		return errorsmod.Wrap(errortypes.ErrLogic, "tx fees keeper is required for AnteHandler")
 	}
+	if options.LightClientKeeper == nil {
+		return errorsmod.Wrap(errortypes.ErrLogic, "light client keeper is required for AnteHandler")
+	}
 	return nil
 }

app/ante/ante_test.go

@@ -56,14 +56,15 @@ func (s *AnteTestSuite) SetupTestCheckTx(isCheckTx bool) {
 
 	anteHandler, err := ante.NewAnteHandler(
 		ante.HandlerOptions{
-			AccountKeeper:   &s.app.AccountKeeper,
-			BankKeeper:      s.app.BankKeeper,
-			IBCKeeper:       s.app.IBCKeeper,
-			EvmKeeper:       s.app.EvmKeeper,
-			FeeMarketKeeper: s.app.FeeMarketKeeper,
-			TxFeesKeeper:    s.app.TxFeesKeeper,
-			FeegrantKeeper:  s.app.FeeGrantKeeper,
-			SignModeHandler: txConfig.SignModeHandler(),
+			AccountKeeper:     &s.app.AccountKeeper,
+			BankKeeper:        s.app.BankKeeper,
+			IBCKeeper:         s.app.IBCKeeper,
+			EvmKeeper:         s.app.EvmKeeper,
+			FeeMarketKeeper:   s.app.FeeMarketKeeper,
+			TxFeesKeeper:      s.app.TxFeesKeeper,
+			FeegrantKeeper:    s.app.FeeGrantKeeper,
+			SignModeHandler:   txConfig.SignModeHandler(),
+			LightClientKeeper: &s.app.LightClientKeeper,
 		},
 	)
 

app/ante/handlers.go

@@ -12,6 +12,7 @@ import (
 	evmtypes "github.com/evmos/ethermint/x/evm/types"
 
 	delayedack "github.com/dymensionxyz/dymension/v3/x/delayedack"
+	lightclientante "github.com/dymensionxyz/dymension/v3/x/lightclient/ante"
 )
 
 func newEthAnteHandler(options HandlerOptions) sdk.AnteHandler {
@@ -70,6 +71,7 @@ func newLegacyCosmosAnteHandlerEip712(options HandlerOptions) sdk.AnteHandler {
 		// Note: signature verification uses EIP instead of the cosmos signature validator
 		NewLegacyEip712SigVerificationDecorator(options.AccountKeeper, options.SignModeHandler),
 		ante.NewIncrementSequenceDecorator(options.AccountKeeper),
+		lightclientante.NewIBCMessagesDecorator(*options.LightClientKeeper, options.IBCKeeper.ClientKeeper, options.IBCKeeper.ChannelKeeper, options.RollappKeeper),
 		delayedack.NewIBCProofHeightDecorator(),
 		ibcante.NewRedundantRelayDecorator(options.IBCKeeper),
 		ethante.NewGasWantedDecorator(options.EvmKeeper, options.FeeMarketKeeper),
@@ -107,6 +109,7 @@ func newCosmosAnteHandler(options HandlerOptions) sdk.AnteHandler {
 		ante.NewSigVerificationDecorator(options.AccountKeeper, options.SignModeHandler),
 		ante.NewIncrementSequenceDecorator(options.AccountKeeper),
 		delayedack.NewIBCProofHeightDecorator(),
+		lightclientante.NewIBCMessagesDecorator(*options.LightClientKeeper, options.IBCKeeper.ClientKeeper, options.IBCKeeper.ChannelKeeper, options.RollappKeeper),
 		ibcante.NewRedundantRelayDecorator(options.IBCKeeper),
 		ethante.NewGasWantedDecorator(options.EvmKeeper, options.FeeMarketKeeper),
 

app/app.go

@@ -15,7 +15,6 @@ import (
 
 	simappparams "cosmossdk.io/simapp/params"
 	"github.com/cosmos/cosmos-sdk/runtime"
-	"github.com/cosmos/cosmos-sdk/x/auth/posthandler"
 
 	"github.com/dymensionxyz/dymension/v3/app/keepers"
 	"github.com/dymensionxyz/dymension/v3/app/upgrades"
@@ -46,6 +45,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/types/module"
 	moduletestutil "github.com/cosmos/cosmos-sdk/types/module/testutil"
 	"github.com/cosmos/cosmos-sdk/version"
+	"github.com/cosmos/cosmos-sdk/x/auth/posthandler"
 	authtx "github.com/cosmos/cosmos-sdk/x/auth/tx"
 
 	"github.com/cosmos/cosmos-sdk/x/crisis"
@@ -217,6 +217,7 @@ func New(
 		MaxTxGasWanted:         maxGasWanted,
 		ExtensionOptionChecker: nil, // uses default
 		RollappKeeper:          *app.RollappKeeper,
+		LightClientKeeper:      &app.LightClientKeeper,
 	})
 	if err != nil {
 		panic(err)

app/apptesting/test_suite.go

@@ -2,6 +2,7 @@ package apptesting
 
 import (
 	"strings"
+	"time"
 
 	bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper"
 
@@ -109,7 +110,7 @@ func (s *KeeperTestHelper) PostStateUpdate(ctx sdk.Context, rollappId, seqAddr s
 	var bds rollapptypes.BlockDescriptors
 	bds.BD = make([]rollapptypes.BlockDescriptor, numOfBlocks)
 	for k := 0; k < int(numOfBlocks); k++ {
-		bds.BD[k] = rollapptypes.BlockDescriptor{Height: startHeight + uint64(k)}
+		bds.BD[k] = rollapptypes.BlockDescriptor{Height: startHeight + uint64(k), Timestamp: time.Now().UTC()}
 	}
 
 	updateState := rollapptypes.MsgUpdateState{

app/keepers/keepers.go

@@ -84,6 +84,8 @@ import (
 	eibcmoduletypes "github.com/dymensionxyz/dymension/v3/x/eibc/types"
 	incentiveskeeper "github.com/dymensionxyz/dymension/v3/x/incentives/keeper"
 	incentivestypes "github.com/dymensionxyz/dymension/v3/x/incentives/types"
+	lightclientmodulekeeper "github.com/dymensionxyz/dymension/v3/x/lightclient/keeper"
+	lightclientmoduletypes "github.com/dymensionxyz/dymension/v3/x/lightclient/types"
 	rollappmodule "github.com/dymensionxyz/dymension/v3/x/rollapp"
 	rollappmodulekeeper "github.com/dymensionxyz/dymension/v3/x/rollapp/keeper"
 	"github.com/dymensionxyz/dymension/v3/x/rollapp/transfergenesis"
@@ -143,6 +145,7 @@ type AppKeepers struct {
 	SponsorshipKeeper sponsorshipkeeper.Keeper
 	StreamerKeeper    streamermodulekeeper.Keeper
 	EIBCKeeper        eibckeeper.Keeper
+	LightClientKeeper lightclientmodulekeeper.Keeper
 
 	DelayedAckKeeper    delayedackkeeper.Keeper
 	DenomMetadataKeeper *denommetadatamodulekeeper.Keeper
@@ -360,6 +363,14 @@ func (a *AppKeepers) InitKeepers(
 		a.RollappKeeper,
 	)
 
+	a.LightClientKeeper = *lightclientmodulekeeper.NewKeeper(
+		appCodec,
+		a.keys[lightclientmoduletypes.StoreKey],
+		a.IBCKeeper.ClientKeeper,
+		a.SequencerKeeper,
+		a.RollappKeeper,
+	)
+
 	a.RollappKeeper.SetSequencerKeeper(a.SequencerKeeper)
 
 	a.IncentivesKeeper = incentiveskeeper.NewKeeper(
@@ -501,7 +512,6 @@ func (a *AppKeepers) InitTransferStack() {
 	)
 	a.TransferStack = a.delayedAckMiddleware
 	a.TransferStack = transfergenesis.NewIBCModule(a.TransferStack, a.DelayedAckKeeper, *a.RollappKeeper, a.TransferKeeper, a.DenomMetadataKeeper)
-	a.TransferStack = transfergenesis.NewIBCModuleCanonicalChannelHack(a.TransferStack, *a.RollappKeeper, a.IBCKeeper.ChannelKeeper)
 
 	// Create static IBC router, add transfer route, then set and seal it
 	ibcRouter := ibcporttypes.NewRouter()
@@ -575,6 +585,7 @@ func (a *AppKeepers) SetupHooks() {
 		a.delayedAckMiddleware,
 		a.StreamerKeeper.Hooks(),
 		a.DymNSKeeper.GetRollAppHooks(),
+		a.LightClientKeeper.RollappHooks(),
 	))
 }
 

app/keepers/keys.go

@@ -33,6 +33,7 @@ import (
 	delayedacktypes "github.com/dymensionxyz/dymension/v3/x/delayedack/types"
 	eibcmoduletypes "github.com/dymensionxyz/dymension/v3/x/eibc/types"
 	incentivestypes "github.com/dymensionxyz/dymension/v3/x/incentives/types"
+	lightcliendmoduletypes "github.com/dymensionxyz/dymension/v3/x/lightclient/types"
 	rollappmoduletypes "github.com/dymensionxyz/dymension/v3/x/rollapp/types"
 	sequencermoduletypes "github.com/dymensionxyz/dymension/v3/x/sequencer/types"
 	sponsorshiptypes "github.com/dymensionxyz/dymension/v3/x/sponsorship/types"
@@ -130,4 +131,5 @@ var KVStoreKeys = sdk.NewKVStoreKeys(
 	poolmanagertypes.StoreKey,
 	incentivestypes.StoreKey,
 	txfeestypes.StoreKey,
+	lightcliendmoduletypes.StoreKey,
 )

app/keepers/modules.go

@@ -92,6 +92,8 @@ import (
 	incentivestypes "github.com/dymensionxyz/dymension/v3/x/incentives/types"
 	"github.com/dymensionxyz/dymension/v3/x/rollapp"
 
+	lightclientmodule "github.com/dymensionxyz/dymension/v3/x/lightclient"
+	lightclientmoduletypes "github.com/dymensionxyz/dymension/v3/x/lightclient/types"
 	rollappmoduleclient "github.com/dymensionxyz/dymension/v3/x/rollapp/client"
 	rollappmoduletypes "github.com/dymensionxyz/dymension/v3/x/rollapp/types"
 	"github.com/dymensionxyz/dymension/v3/x/sequencer"
@@ -150,6 +152,7 @@ var ModuleBasics = module.NewBasicManager(
 	delayedack.AppModuleBasic{},
 	eibc.AppModuleBasic{},
 	dymnsmodule.AppModuleBasic{},
+	lightclientmodule.AppModuleBasic{},
 
 	// Ethermint modules
 	evm.AppModuleBasic{},
@@ -202,6 +205,7 @@ func (a *AppKeepers) SetupModules(
 		denommetadatamodule.NewAppModule(a.DenomMetadataKeeper, *a.EvmKeeper, a.BankKeeper),
 		eibcmodule.NewAppModule(appCodec, a.EIBCKeeper, a.AccountKeeper, a.BankKeeper),
 		dymnsmodule.NewAppModule(appCodec, a.DymNSKeeper),
+		lightclientmodule.NewAppModule(appCodec, a.LightClientKeeper),
 
 		// Ethermint app modules
 		evm.NewAppModule(a.EvmKeeper, a.AccountKeeper, a.BankKeeper, a.GetSubspace(evmtypes.ModuleName).WithKeyTable(evmtypes.ParamKeyTable())),
@@ -289,6 +293,7 @@ var BeginBlockers = []string{
 	incentivestypes.ModuleName,
 	txfeestypes.ModuleName,
 	consensusparamtypes.ModuleName,
+	lightclientmoduletypes.ModuleName,
 }
 
 var EndBlockers = []string{
@@ -328,6 +333,7 @@ var EndBlockers = []string{
 	incentivestypes.ModuleName,
 	txfeestypes.ModuleName,
 	consensusparamtypes.ModuleName,
+	lightclientmoduletypes.ModuleName,
 }
 
 var InitGenesis = []string{
@@ -367,4 +373,5 @@ var InitGenesis = []string{
 	incentivestypes.ModuleName,
 	txfeestypes.ModuleName,
 	consensusparamtypes.ModuleName,
+	lightclientmoduletypes.ModuleName,
 }

app/upgrades/v4/constants.go

@@ -5,6 +5,7 @@ import (
 	consensustypes "github.com/cosmos/cosmos-sdk/x/consensus/types"
 	crisistypes "github.com/cosmos/cosmos-sdk/x/crisis/types"
 	"github.com/dymensionxyz/dymension/v3/app/upgrades"
+	lightclienttypes "github.com/dymensionxyz/dymension/v3/x/lightclient/types"
 )
 
 const (
@@ -18,6 +19,7 @@ var Upgrade = upgrades.Upgrade{
 		Added: []string{
 			consensustypes.ModuleName,
 			crisistypes.ModuleName,
+			lightclienttypes.ModuleName,
 		},
 	},
 }

app/upgrades/v4/upgrade.go

@@ -17,6 +17,8 @@ import (
 	slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
+	ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types"
+	ibcchannelkeeper "github.com/cosmos/ibc-go/v7/modules/core/04-channel/keeper"
 
 	evmtypes "github.com/evmos/ethermint/x/evm/types"
 	feemarkettypes "github.com/evmos/ethermint/x/feemarket/types"
@@ -26,6 +28,7 @@ import (
 	"github.com/dymensionxyz/dymension/v3/app/upgrades"
 	delayedackkeeper "github.com/dymensionxyz/dymension/v3/x/delayedack/keeper"
 	delayedacktypes "github.com/dymensionxyz/dymension/v3/x/delayedack/types"
+	lightclientkeeper "github.com/dymensionxyz/dymension/v3/x/lightclient/keeper"
 	rollappkeeper "github.com/dymensionxyz/dymension/v3/x/rollapp/keeper"
 	rollapptypes "github.com/dymensionxyz/dymension/v3/x/rollapp/types"
 	sequencerkeeper "github.com/dymensionxyz/dymension/v3/x/sequencer/keeper"
@@ -49,6 +52,7 @@ func CreateUpgradeHandler(
 			return nil, err
 		}
 		migrateSequencers(ctx, keepers.SequencerKeeper)
+		migrateRollappLightClients(ctx, keepers.RollappKeeper, keepers.LightClientKeeper, keepers.IBCKeeper.ChannelKeeper)
 
 		// TODO: create rollapp gauges for each existing rollapp (https://github.com/dymensionxyz/dymension/issues/1005)
 
@@ -136,6 +140,25 @@ func migrateSequencers(ctx sdk.Context, sequencerkeeper sequencerkeeper.Keeper)
 	}
 }
 
+func migrateRollappLightClients(ctx sdk.Context, rollappkeeper *rollappkeeper.Keeper, lightClientKeeper lightclientkeeper.Keeper, ibcChannelKeeper ibcchannelkeeper.Keeper) {
+	list := rollappkeeper.GetAllRollapps(ctx)
+	for _, rollapp := range list {
+		// check if the rollapp has a canonical channel already
+		if rollapp.ChannelId == "" {
+			return
+		}
+		// get the client ID the channel belongs to
+		_, connection, err := ibcChannelKeeper.GetChannelConnection(ctx, ibctransfertypes.PortID, rollapp.ChannelId)
+		if err != nil {
+			// if could not find a connection, skip the canonical client assignment
+			return
+		}
+		clientID := connection.GetClientID()
+		// store the rollapp to canonical light client ID mapping
+		lightClientKeeper.SetCanonicalClient(ctx, rollapp.RollappId, clientID)
+	}
+}
+
 func ConvertOldRollappToNew(oldRollapp rollapptypes.Rollapp) rollapptypes.Rollapp {
 	return rollapptypes.Rollapp{
 		RollappId:        oldRollapp.RollappId,

go.mod

@@ -17,6 +17,7 @@ require (
 	github.com/cosmos/gogoproto v1.4.10
 	github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.1.3
 	github.com/cosmos/ibc-go/v7 v7.5.1
+	github.com/cosmos/ics23/go v0.10.0
 	github.com/decred/dcrd/dcrec/edwards v1.0.0
 	github.com/dustin/go-humanize v1.0.1
 	github.com/dymensionxyz/gerr-cosmos v1.0.0
@@ -84,7 +85,6 @@ require (
 	github.com/cosmos/go-bip39 v1.0.0 // indirect
 	github.com/cosmos/gogogateway v1.2.0 // indirect
 	github.com/cosmos/iavl v0.20.1 // indirect
-	github.com/cosmos/ics23/go v0.10.0 // indirect
 	github.com/cosmos/ledger-cosmos-go v0.12.4 // indirect
 	github.com/cosmos/rosetta-sdk-go v0.10.0 // indirect
 	github.com/creachadair/taskgroup v0.4.2 // indirect

ibctesting/genesis_transfer_test.go

@@ -31,10 +31,13 @@ func TestTransferGenesisTestSuite(t *testing.T) {
 func (s *transferGenesisSuite) SetupTest() {
 	s.utilSuite.SetupTest()
 	path := s.newTransferPath(s.hubChain(), s.rollappChain())
-	s.coordinator.Setup(path)
+	s.coordinator.SetupConnections(path)
 	s.createRollapp(false, nil) // genesis protocol is not finished yet
 	s.registerSequencer()
 	s.path = path
+	// set the canonical client before creating channels
+	s.hubApp().LightClientKeeper.SetCanonicalClient(s.hubCtx(), rollappChainID(), s.path.EndpointA.ClientID)
+	s.coordinator.CreateChannels(path)
 
 	// set hooks to avoid actually creating VFC contract, as this places extra requirements on the test setup
 	// we assume that if the denom metadata was created (checked below), then the hooks ran correctly