Merge branch 'rebase-devnet-5' into rebase-devnet-5-debug-ssh

babylonlabs-io · Nov 20, 2024 · aa3e5df · aa3e5df
2 parents 52fb66d + 32edaec
commit aa3e5df
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go
@@ -19,6 +19,7 @@ import (
 	wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
 	mintkeeper "github.com/babylonlabs-io/babylon/x/mint/keeper"
 	minttypes "github.com/babylonlabs-io/babylon/x/mint/types"
+	"github.com/babylonlabs-io/babylon/x/zoneconcierge"
 	"github.com/cosmos/cosmos-sdk/baseapp"
 	"github.com/cosmos/cosmos-sdk/codec"
 	"github.com/cosmos/cosmos-sdk/runtime"
@@ -625,13 +626,18 @@ func (ak *AppKeepers) InitKeepers(
 	transferStack = transfer.NewIBCModule(ak.TransferKeeper)
 	transferStack = ibcfee.NewIBCMiddleware(transferStack, ak.IBCFeeKeeper)
 
+	var zoneConciergeStack porttypes.IBCModule
+	zoneConciergeStack = zoneconcierge.NewIBCModule(ak.ZoneConciergeKeeper)
+	zoneConciergeStack = ibcfee.NewIBCMiddleware(zoneConciergeStack, ak.IBCFeeKeeper)
+
 	var wasmStack porttypes.IBCModule
 	wasmStack = wasm.NewIBCHandler(ak.WasmKeeper, ak.IBCKeeper.ChannelKeeper, ak.IBCFeeKeeper)
 	wasmStack = ibcfee.NewIBCMiddleware(wasmStack, ak.IBCFeeKeeper)
 
 	// Create static IBC router, add ibc-transfer module route, then set and seal it
 	ibcRouter := porttypes.NewRouter().
 		AddRoute(ibctransfertypes.ModuleName, transferStack).
+		AddRoute(zctypes.ModuleName, zoneConciergeStack).
 		AddRoute(wasmtypes.ModuleName, wasmStack)
 
 	// Setting Router will finalize all routes by sealing router

diff --git a/test/e2e/bcd_consumer_integration/clientcontroller/cosmwasm/msg.go b/test/e2e/bcd_consumer_integration/clientcontroller/cosmwasm/msg.go
@@ -12,7 +12,7 @@ type ConsumerFpsResponse struct {
 type SingleConsumerFpResponse struct {
 	BtcPkHex         string `json:"btc_pk_hex"`
 	SlashedHeight    uint64 `json:"slashed_height"`
-	SlashedBtcHeight uint64 `json:"slashed_btc_height"`
+	SlashedBtcHeight uint32 `json:"slashed_btc_height"`
 	ConsumerId       string `json:"consumer_id"`
 }
 
@@ -23,8 +23,8 @@ type ConsumerDelegationsResponse struct {
 type SingleConsumerDelegationResponse struct {
 	BtcPkHex             string                      `json:"btc_pk_hex"`
 	FpBtcPkList          []string                    `json:"fp_btc_pk_list"`
-	StartHeight          uint64                      `json:"start_height"`
-	EndHeight            uint64                      `json:"end_height"`
+	StartHeight          uint32                      `json:"start_height"`
+	EndHeight            uint32                      `json:"end_height"`
 	TotalSat             uint64                      `json:"total_sat"`
 	StakingTx            []byte                      `json:"staking_tx"`
 	SlashingTx           []byte                      `json:"slashing_tx"`
@@ -104,8 +104,8 @@ type ActiveBtcDelegation struct {
 	StakerAddr           string                      `json:"staker_addr"`
 	BTCPkHex             string                      `json:"btc_pk_hex"`
 	FpBtcPkList          []string                    `json:"fp_btc_pk_list"`
-	StartHeight          uint64                      `json:"start_height"`
-	EndHeight            uint64                      `json:"end_height"`
+	StartHeight          uint32                      `json:"start_height"`
+	EndHeight            uint32                      `json:"end_height"`
 	TotalSat             uint64                      `json:"total_sat"`
 	StakingTx            []byte                      `json:"staking_tx"`
 	SlashingTx           []byte                      `json:"slashing_tx"`