feat: add ibc-crosschain module

app/app.go

@@ -131,6 +131,10 @@ import (
 	observermodule "github.com/zeta-chain/zetacore/x/observer"
 	observerkeeper "github.com/zeta-chain/zetacore/x/observer/keeper"
 	observertypes "github.com/zeta-chain/zetacore/x/observer/types"
+
+	"github.com/zeta-chain/zetacore/x/ibccrosschain"
+	ibccrosschainkeeper "github.com/zeta-chain/zetacore/x/ibccrosschain/keeper"
+	ibccrosschaintypes "github.com/zeta-chain/zetacore/x/ibccrosschain/types"
 )
 
 const Name = "zetacore"
@@ -207,6 +211,7 @@ var (
 		authoritymodule.AppModuleBasic{},
 		lightclientmodule.AppModuleBasic{},
 		crosschainmodule.AppModuleBasic{},
+		ibccrosschain.AppModuleBasic{},
 		observermodule.AppModuleBasic{},
 		fungiblemodule.AppModuleBasic{},
 		emissionsmodule.AppModuleBasic{},
@@ -223,6 +228,7 @@ var (
 		govtypes.ModuleName:                             {authtypes.Burner},
 		ibctransfertypes.ModuleName:                     {authtypes.Minter, authtypes.Burner},
 		crosschaintypes.ModuleName:                      {authtypes.Minter, authtypes.Burner},
+		ibccrosschaintypes.ModuleName:                   nil,
 		evmtypes.ModuleName:                             {authtypes.Minter, authtypes.Burner},
 		fungibletypes.ModuleName:                        {authtypes.Minter, authtypes.Burner},
 		emissionstypes.ModuleName:                       nil,
@@ -284,20 +290,22 @@ type App struct {
 	ConsensusParamsKeeper consensusparamkeeper.Keeper
 
 	// scoped keepers
-	ScopedIBCKeeper      capabilitykeeper.ScopedKeeper
-	ScopedTransferKeeper capabilitykeeper.ScopedKeeper
+	ScopedIBCKeeper           capabilitykeeper.ScopedKeeper
+	ScopedTransferKeeper      capabilitykeeper.ScopedKeeper
+	ScopedIBCCrosschainKeeper capabilitykeeper.ScopedKeeper
 
 	// evm keepers
 	EvmKeeper       *evmkeeper.Keeper
 	FeeMarketKeeper feemarketkeeper.Keeper
 
 	// zetachain keepers
-	AuthorityKeeper   authoritykeeper.Keeper
-	LightclientKeeper lightclientkeeper.Keeper
-	CrosschainKeeper  crosschainkeeper.Keeper
-	ObserverKeeper    *observerkeeper.Keeper
-	FungibleKeeper    fungiblekeeper.Keeper
-	EmissionsKeeper   emissionskeeper.Keeper
+	AuthorityKeeper     authoritykeeper.Keeper
+	LightclientKeeper   lightclientkeeper.Keeper
+	CrosschainKeeper    crosschainkeeper.Keeper
+	IBCCrosschainKeeper ibccrosschainkeeper.Keeper
+	ObserverKeeper      *observerkeeper.Keeper
+	FungibleKeeper      fungiblekeeper.Keeper
+	EmissionsKeeper     emissionskeeper.Keeper
 
 	transferModule transfer.AppModule
 }
@@ -345,6 +353,7 @@ func New(
 		authoritytypes.StoreKey,
 		lightclienttypes.StoreKey,
 		crosschaintypes.StoreKey,
+		ibccrosschaintypes.StoreKey,
 		observertypes.StoreKey,
 		fungibletypes.StoreKey,
 		emissionstypes.StoreKey,
@@ -586,6 +595,25 @@ func New(
 		app.AuthorityKeeper,
 		app.LightclientKeeper,
 	)
+
+	// initialize ibccrosschain keeper and set it to the crosschain keeper
+	// there is a circular dependency between the two keepers, crosschain keeper must be initialized first
+
+	scopedIBCCrosschainKeeper := app.CapabilityKeeper.ScopeToModule(ibccrosschaintypes.ModuleName)
+	app.ScopedIBCCrosschainKeeper = scopedIBCCrosschainKeeper
+
+	app.IBCCrosschainKeeper = *ibccrosschainkeeper.NewKeeper(
+		appCodec,
+		keys[ibccrosschaintypes.StoreKey],
+		keys[ibccrosschaintypes.MemStoreKey],
+		&app.CrosschainKeeper,
+		app.TransferKeeper,
+	)
+
+	ibcRouter.AddRoute(ibccrosschaintypes.ModuleName, ibccrosschain.NewIBCModule(app.IBCCrosschainKeeper))
+
+	app.CrosschainKeeper.SetIBCCrosschainKeeper(app.IBCCrosschainKeeper)
+
 	app.GroupKeeper = groupkeeper.NewKeeper(
 		keys[group.StoreKey],
 		appCodec,
@@ -670,6 +698,7 @@ func New(
 		authoritymodule.NewAppModule(appCodec, app.AuthorityKeeper),
 		lightclientmodule.NewAppModule(appCodec, app.LightclientKeeper),
 		crosschainmodule.NewAppModule(appCodec, app.CrosschainKeeper),
+		ibccrosschain.NewAppModule(appCodec, app.IBCCrosschainKeeper),
 		observermodule.NewAppModule(appCodec, *app.ObserverKeeper),
 		fungiblemodule.NewAppModule(appCodec, app.FungibleKeeper),
 		emissionsmodule.NewAppModule(appCodec, app.EmissionsKeeper, app.GetSubspace(emissionstypes.ModuleName)),
@@ -700,6 +729,7 @@ func New(
 		ibctransfertypes.ModuleName,
 		feemarkettypes.ModuleName,
 		crosschaintypes.ModuleName,
+		ibccrosschaintypes.ModuleName,
 		observertypes.ModuleName,
 		fungibletypes.ModuleName,
 		emissionstypes.ModuleName,
@@ -728,6 +758,7 @@ func New(
 		evmtypes.ModuleName,
 		feemarkettypes.ModuleName,
 		crosschaintypes.ModuleName,
+		ibccrosschaintypes.ModuleName,
 		observertypes.ModuleName,
 		fungibletypes.ModuleName,
 		emissionstypes.ModuleName,

app/init_genesis.go

@@ -25,6 +25,7 @@ import (
 	crosschaintypes "github.com/zeta-chain/zetacore/x/crosschain/types"
 	emissionsModuleTypes "github.com/zeta-chain/zetacore/x/emissions/types"
 	fungibleModuleTypes "github.com/zeta-chain/zetacore/x/fungible/types"
+	ibccrosschaintypes "github.com/zeta-chain/zetacore/x/ibccrosschain/types"
 	lightclienttypes "github.com/zeta-chain/zetacore/x/lightclient/types"
 	observertypes "github.com/zeta-chain/zetacore/x/observer/types"
 )
@@ -52,6 +53,7 @@ func InitGenesisModuleList() []string {
 		vestingtypes.ModuleName,
 		observertypes.ModuleName,
 		crosschaintypes.ModuleName,
+		ibccrosschaintypes.ModuleName,
 		fungibleModuleTypes.ModuleName,
 		emissionsModuleTypes.ModuleName,
 		authz.ModuleName,

app/setup_handlers.go

@@ -21,6 +21,7 @@ import (
 	ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported"
 	"github.com/zeta-chain/zetacore/pkg/constant"
 	emissionstypes "github.com/zeta-chain/zetacore/x/emissions/types"
+	ibccrosschaintypes "github.com/zeta-chain/zetacore/x/ibccrosschain/types"
 )
 
 func SetupHandlers(app *App) {
@@ -88,6 +89,7 @@ func SetupHandlers(app *App) {
 				capabilitytypes.ModuleName,
 				ibcexported.ModuleName,
 				ibctransfertypes.ModuleName,
+				ibccrosschaintypes.ModuleName,
 			},
 		}
 		// Use upgrade store loader for the initial loading of all stores when app starts,

changelog.md

@@ -14,6 +14,7 @@
 * [2145](https://github.com/zeta-chain/node/pull/2145) - add `ibc` and `ibc-transfer` modules
 * [2135](https://github.com/zeta-chain/node/pull/2135) - add develop build version logic
 * [2113](https://github.com/zeta-chain/node/pull/2113) - add zetaclientd-supervisor process
+* [2154](https://github.com/zeta-chain/node/pull/2154) - add `ibccrosschain` module
 
 ### Refactor
 

docs/cli/zetacored/zetacored_query.md

@@ -52,4 +52,5 @@ zetacored query [flags]
 * [zetacored query tx](zetacored_query_tx.md)	 - Query for a transaction by hash, "[addr]/[seq]" combination or comma-separated signatures in a committed block
 * [zetacored query txs](zetacored_query_txs.md)	 - Query for paginated transactions that match a set of events
 * [zetacored query upgrade](zetacored_query_upgrade.md)	 - Querying commands for the upgrade module
+* [zetacored query zetaibccrosschain](zetacored_query_zetaibccrosschain.md)	 - Querying commands for the zetaibccrosschain module
 

docs/cli/zetacored/zetacored_query_zetaibccrosschain.md

@@ -0,0 +1,29 @@
+# query zetaibccrosschain
+
+Querying commands for the zetaibccrosschain module
+
+```
+zetacored query zetaibccrosschain [flags]
+```
+
+### Options
+
+```
+  -h, --help   help for zetaibccrosschain
+```
+
+### Options inherited from parent commands
+
+```
+      --chain-id string     The network chain ID
+      --home string         directory for config and data 
+      --log_format string   The logging format (json|plain) 
+      --log_level string    The logging level (trace|debug|info|warn|error|fatal|panic) 
+      --log_no_color        Disable colored logs
+      --trace               print out full stack trace on errors
+```
+
+### SEE ALSO
+
+* [zetacored query](zetacored_query.md)	 - Querying subcommands
+

docs/cli/zetacored/zetacored_tx.md

@@ -53,4 +53,5 @@ zetacored tx [flags]
 * [zetacored tx staking](zetacored_tx_staking.md)	 - Staking transaction subcommands
 * [zetacored tx validate-signatures](zetacored_tx_validate-signatures.md)	 - validate transactions signatures
 * [zetacored tx vesting](zetacored_tx_vesting.md)	 - Vesting transaction subcommands
+* [zetacored tx zetaibccrosschain](zetacored_tx_zetaibccrosschain.md)	 - zetaibccrosschain transactions subcommands
 

docs/cli/zetacored/zetacored_tx_zetaibccrosschain.md

@@ -0,0 +1,29 @@
+# tx zetaibccrosschain
+
+zetaibccrosschain transactions subcommands
+
+```
+zetacored tx zetaibccrosschain [flags]
+```
+
+### Options
+
+```
+  -h, --help   help for zetaibccrosschain
+```
+
+### Options inherited from parent commands
+
+```
+      --chain-id string     The network chain ID
+      --home string         directory for config and data 
+      --log_format string   The logging format (json|plain) 
+      --log_level string    The logging level (trace|debug|info|warn|error|fatal|panic) 
+      --log_no_color        Disable colored logs
+      --trace               print out full stack trace on errors
+```
+
+### SEE ALSO
+
+* [zetacored tx](zetacored_tx.md)	 - Transactions subcommands
+

proto/zetachain/zetacore/ibccrosschain/genesis.proto

@@ -0,0 +1,9 @@
+syntax = "proto3";
+package zetachain.zetacore.ibccrosschain;
+
+import "gogoproto/gogo.proto";
+
+option go_package = "github.com/zeta-chain/zetacore/x/ibccrosschain/types";
+
+// GenesisState defines the ibccrosschain module's genesis state.
+message GenesisState {}

proto/zetachain/zetacore/ibccrosschain/query.proto

@@ -0,0 +1,7 @@
+syntax = "proto3";
+package zetachain.zetacore.ibccrosschain;
+
+option go_package = "github.com/zeta-chain/zetacore/x/ibccrosschain/types";
+
+// Query defines the gRPC querier service.
+service Query {}

proto/zetachain/zetacore/ibccrosschain/tx.proto

@@ -0,0 +1,9 @@
+syntax = "proto3";
+package zetachain.zetacore.ibccrosschain;
+
+import "gogoproto/gogo.proto";
+
+option go_package = "github.com/zeta-chain/zetacore/x/ibccrosschain/types";
+
+// Msg defines the Msg service.
+service Msg {}