diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go
index dd19ca73d..2b4801a21 100644
--- a/app/keepers/keepers.go
+++ b/app/keepers/keepers.go
@@ -535,7 +535,7 @@ func (ak *AppKeepers) InitKeepers(
 		runtime.NewKVStoreService(keys[finalitytypes.StoreKey]),
 		ak.BTCStakingKeeper,
 		ak.IncentiveKeeper,
-		ak.CheckpointingKeeper,
+		&checkpointingKeeper,
 		appparams.AccGov.String(),
 	)
 
diff --git a/proto/buf.lock b/proto/buf.lock
index b7694ebc3..aad0e2501 100644
--- a/proto/buf.lock
+++ b/proto/buf.lock
@@ -1,6 +1,11 @@
 # Generated by buf. DO NOT EDIT.
 version: v1
 deps:
+  - remote: buf.build
+    owner: cometbft
+    repository: cometbft
+    commit: c0d3497e35d649538679874acdd86660
+    digest: shake256:05d2fb9e6b6bf82385ac26b250afbba281a2ca79f51729291373d24ca676d743183bf70a921daae6feafd5f9917120e2548a7c477d9743f668bca27cc1e12fdf
   - remote: buf.build
     owner: cosmos
     repository: cosmos-proto
@@ -19,8 +24,8 @@ deps:
   - remote: buf.build
     owner: cosmos
     repository: ibc
-    commit: 41fbc441e4d645119d275150719c5441
-    digest: shake256:a61d3e152909abddc91dcc1aec8ac997007bebd48a7921bc243681c708e6c9068f6484aa7ed4e6ff60101d3422c98744a4a5294bbda6aacdba07f1dfa4291020
+    commit: f3cb7e9a10ab4cd5a402b9913f65e38d
+    digest: shake256:aaa8a2a46a3ab5cb4c54f9f14920bc472e5e5f93453fa250de49f15c76dce7f82faa5615afd341967797ead8052306db6b1e6327cb1d8d94345bf07a22f8aebd
   - remote: buf.build
     owner: cosmos
     repository: ics23
diff --git a/test/e2e/btc_staking_pre_approval_e2e_test.go b/test/e2e/btc_staking_pre_approval_e2e_test.go
index 7f6354fbd..8f6ae73b8 100644
--- a/test/e2e/btc_staking_pre_approval_e2e_test.go
+++ b/test/e2e/btc_staking_pre_approval_e2e_test.go
@@ -110,12 +110,12 @@ func (s *BTCStakingPreApprovalTestSuite) Test1CreateFinalityProviderAndDelegatio
 	// submit the message for creating BTC delegation
 	delBtcPK := bbn.NewBIP340PubKeyFromBTCPK(s.delBTCSK.PubKey())
 	nonValidatorNode.CreateBTCDelegation(
-		*delBtcPK,
+		delBtcPK,
 		pop,
 		stakingTx,
 		// We are passing `nil` as inclusion proof will be provided in separate tx
 		nil,
-		[]*bbn.BIP340PubKey{s.cacheFP.BtcPk},
+		[]bbn.BIP340PubKey{*s.cacheFP.BtcPk},
 		stakingTimeBlocks,
 		btcutil.Amount(s.stakingValue),
 		testStakingInfo.SlashingTx,
diff --git a/test/e2e/configurer/chain/commands_btcstaking.go b/test/e2e/configurer/chain/commands_btcstaking.go
index dd48d5216..eefe27383 100644
--- a/test/e2e/configurer/chain/commands_btcstaking.go
+++ b/test/e2e/configurer/chain/commands_btcstaking.go
@@ -51,11 +51,11 @@ func (n *NodeConfig) CreateFinalityProvider(walletAddrOrName string, btcPK *bbn.
 }
 
 func (n *NodeConfig) CreateBTCDelegation(
-	btcPK bbn.BIP340PubKey,
+	btcPK *bbn.BIP340PubKey,
 	pop *bstypes.ProofOfPossessionBTC,
 	stakingTx []byte,
 	inclusionProof *bstypes.InclusionProof,
-	fpPKs []*bbn.BIP340PubKey,
+	fpPKs []bbn.BIP340PubKey,
 	stakingTimeBlocks uint16,
 	stakingValue btcutil.Amount,
 	slashingTx *bstypes.BTCSlashingTx,
@@ -428,7 +428,7 @@ func (n *NodeConfig) CreateBTCDelegationAndCheck(
 		popDel1,
 		stakingTx,
 		inclusionProof,
-		fp.BtcPk,
+		bbn.NewBIP340PKsFromBTCPKs([]*btcec.PublicKey{fp.BtcPk.MustToBTCPK()}),
 		stakingTimeBlocks,
 		btcutil.Amount(stakingSatAmt),
 		testStakingInfo.SlashingTx,
diff --git a/test/replay/driver.go b/test/replay/driver.go
index 3a8eccf19..974db133d 100644
--- a/test/replay/driver.go
+++ b/test/replay/driver.go
@@ -717,7 +717,6 @@ func (d *BabylonAppDriver) WaitTillAllFpsJailed(t *testing.T) {
 	}
 }
 
-// SendTxWithMsgsFromDriverAccount sends tx with msgs from driver account and asserts that
 // SendTxWithMsgsFromDriverAccount sends tx with msgs from driver account and asserts that
 // execution was successful. It assumes that there will only be one tx in the block.
 func (d *BabylonAppDriver) SendTxWithMsgsFromDriverAccount(
@@ -741,7 +740,7 @@ func (d *BabylonAppDriver) SendTxWithMsgsFromDriverAccount(
 		}
 
 		// all executions should be successful
-		require.Equal(t, rs.Code, uint32(0))
+		require.Equal(t, rs.Code, uint32(0), rs.Log)
 	}
 
 	d.DriverAccountSeqNr++
diff --git a/testutil/btcstaking-helper/keeper.go b/testutil/btcstaking-helper/keeper.go
index d3ac132c1..367cc3dd0 100644
--- a/testutil/btcstaking-helper/keeper.go
+++ b/testutil/btcstaking-helper/keeper.go
@@ -550,7 +550,7 @@ func (h *Helper) CreateCovenantSigs(
 	covenantMsgs := h.GenerateCovenantSignaturesMessages(r, covenantSKs, msgCreateBTCDel, del)
 	for _, m := range covenantMsgs {
 		msgCopy := m
-		h.BTCLightClientKeeper.EXPECT().GetTipInfo(gomock.Any()).Return(&btclctypes.BTCHeaderInfo{Height: lightClientTipHeight})
+		h.BTCLightClientKeeper.EXPECT().GetTipInfo(gomock.Any()).Return(&btclctypes.BTCHeaderInfo{Height: lightClientTipHeight}).MaxTimes(1)
 		_, err := h.MsgServer.AddCovenantSigs(h.Ctx, msgCopy)
 		h.NoError(err)
 	}
diff --git a/testutil/incentives-helper/keeper.go b/testutil/incentives-helper/keeper.go
index 6334bfdad..c61d62cba 100644
--- a/testutil/incentives-helper/keeper.go
+++ b/testutil/incentives-helper/keeper.go
@@ -75,7 +75,7 @@ func (h *IncentiveHelper) CreateBtcDelegation(
 	stakingTxHash, msgCreateBTCDel, _, _, _, unbondingInfo, err = h.CreateDelegationWithBtcBlockHeight(
 		r,
 		delSK,
-		fpPK,
+		[]*btcec.PublicKey{fpPK},
 		stakingValue,
 		stakingTime,
 		0,
diff --git a/testutil/keeper/btcstaking.go b/testutil/keeper/btcstaking.go
index 0cd86f398..fdd1557bd 100644
--- a/testutil/keeper/btcstaking.go
+++ b/testutil/keeper/btcstaking.go
@@ -15,6 +15,8 @@ import (
 	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
 	"github.com/cosmos/cosmos-sdk/runtime"
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
+	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
 	"github.com/stretchr/testify/require"
 
 	appparams "github.com/babylonlabs-io/babylon/app/params"
diff --git a/x/btcstaking/keeper/btc_consumer_delegations.go b/x/btcstaking/keeper/btc_consumer_delegations.go
index 69cf9699f..107036f54 100644
--- a/x/btcstaking/keeper/btc_consumer_delegations.go
+++ b/x/btcstaking/keeper/btc_consumer_delegations.go
@@ -77,7 +77,6 @@ func (k Keeper) GetBTCConsumerDelegatorDelegationsResponses(
 		for i, btcDel := range curBTCDels.Dels {
 			status := btcDel.GetStatus(
 				btcHeight,
-				wValue,
 				covenantQuorum,
 			)
 			btcDelsResp[i] = bstypes.NewBTCDelegationResponse(btcDel, status)
diff --git a/x/btcstaking/keeper/btc_delegations.go b/x/btcstaking/keeper/btc_delegations.go
index 8bf0bb857..1af989344 100644
--- a/x/btcstaking/keeper/btc_delegations.go
+++ b/x/btcstaking/keeper/btc_delegations.go
@@ -95,6 +95,7 @@ func (k Keeper) addCovenantSigsToBTCDelegation(
 	unbondingTxSig *bbn.BIP340Signature,
 	parsedUnbondingSlashingAdaptorSignatures []asig.AdaptorSignature,
 	params *types.Params,
+	btcTipHeight uint32,
 ) {
 	hadQuorum := btcDel.HasCovenantQuorums(params.CovenantQuorum)
 
@@ -138,8 +139,7 @@ func (k Keeper) addCovenantSigsToBTCDelegation(
 					NewState:      types.BTCDelegationStatus_ACTIVE,
 				},
 			)
-			btcTip := k.btclcKeeper.GetTipInfo(ctx)
-			k.addPowerDistUpdateEvent(ctx, btcTip.Height, activeEvent)
+			k.addPowerDistUpdateEvent(ctx, btcTipHeight, activeEvent)
 
 			// notify consumer chains about the active BTC delegation
 			k.notifyConsumersOnActiveBTCDel(ctx, btcDel)
diff --git a/x/btcstaking/keeper/btc_staking_consumer_events_test.go b/x/btcstaking/keeper/btc_staking_consumer_events_test.go
index 58684bd8c..e3ed0afca 100644
--- a/x/btcstaking/keeper/btc_staking_consumer_events_test.go
+++ b/x/btcstaking/keeper/btc_staking_consumer_events_test.go
@@ -6,6 +6,7 @@ import (
 
 	testutil "github.com/babylonlabs-io/babylon/testutil/btcstaking-helper"
 	"github.com/babylonlabs-io/babylon/testutil/datagen"
+	btclctypes "github.com/babylonlabs-io/babylon/x/btclightclient/types"
 	"github.com/babylonlabs-io/babylon/x/btcstaking/types"
 	bsctypes "github.com/babylonlabs-io/babylon/x/btcstkconsumer/types"
 	"github.com/btcsuite/btcd/btcec/v2"
@@ -85,8 +86,6 @@ func FuzzSetBTCStakingEventStore_ActiveDel(f *testing.F) {
 
 		// set all parameters
 		covenantSKs, _ := h.GenAndApplyParams(r)
-		changeAddress, err := datagen.GenRandomBTCAddress(r, h.Net)
-		require.NoError(t, err)
 
 		// register a random consumer on Babylon
 		randomConsumer := registerAndVerifyConsumer(t, r, h)
@@ -100,20 +99,23 @@ func FuzzSetBTCStakingEventStore_ActiveDel(f *testing.F) {
 		stakingValue := int64(2 * 10e8)
 		delSK, _, err := datagen.GenRandomBTCKeyPair(r)
 		h.NoError(err)
-		stakingTxHash, msgCreateBTCDel, _, _, _, _, err := h.CreateDelegation(
+		stakingTxHash, msgCreateBTCDel, _, _, _, _, err := h.CreateDelegationWithBtcBlockHeight(
 			r,
 			delSK,
 			[]*btcec.PublicKey{consumerFpPK, babylonFpPK},
-			changeAddress.EncodeAddress(),
 			stakingValue,
 			1000,
 			0,
 			0,
 			false,
 			false,
+			10,
+			30,
 		)
 		h.NoError(err)
 
+		h.BTCLightClientKeeper.EXPECT().GetTipInfo(gomock.Eq(h.Ctx)).Return(&btclctypes.BTCHeaderInfo{Height: 30}).AnyTimes()
+
 		// delegation related assertions
 		actualDel, err := h.BTCStakingKeeper.GetBTCDelegation(h.Ctx, stakingTxHash)
 		h.NoError(err)
@@ -133,7 +135,10 @@ func FuzzSetBTCStakingEventStore_ActiveDel(f *testing.F) {
 		h.NoError(err)
 		require.True(t, actualDel.HasCovenantQuorums(h.BTCStakingKeeper.GetParams(h.Ctx).CovenantQuorum))
 		require.True(t, actualDel.BtcUndelegation.HasCovenantQuorums(h.BTCStakingKeeper.GetParams(h.Ctx).CovenantQuorum))
-		votingPower := actualDel.VotingPower(h.BTCLightClientKeeper.GetTipInfo(h.Ctx).Height, h.BTCCheckpointKeeper.GetParams(h.Ctx).CheckpointFinalizationTimeout, h.BTCStakingKeeper.GetParams(h.Ctx).CovenantQuorum)
+		votingPower := actualDel.VotingPower(
+			h.BTCLightClientKeeper.GetTipInfo(h.Ctx).Height,
+			h.BTCStakingKeeper.GetParams(h.Ctx).CovenantQuorum,
+		)
 		require.Equal(t, uint64(stakingValue), votingPower)
 
 		// event store related assertions
@@ -177,9 +182,6 @@ func FuzzSetBTCStakingEventStore_UnbondedDel(f *testing.F) {
 		covenantSKs, _ := h.GenAndApplyParams(r)
 
 		bsParams := h.BTCStakingKeeper.GetParams(h.Ctx)
-		wValue := h.BTCCheckpointKeeper.GetParams(h.Ctx).CheckpointFinalizationTimeout
-		changeAddress, err := datagen.GenRandomBTCAddress(r, h.Net)
-		require.NoError(t, err)
 
 		// register a random consumer on Babylon
 		randomConsumer := registerAndVerifyConsumer(t, r, h)
@@ -193,28 +195,29 @@ func FuzzSetBTCStakingEventStore_UnbondedDel(f *testing.F) {
 		stakingValue := int64(2 * 10e8)
 		delSK, _, err := datagen.GenRandomBTCKeyPair(r)
 		h.NoError(err)
-		stakingTxHash, msgCreateBTCDel, actualDel, _, _, unbondingInfo, err := h.CreateDelegation(
+		stakingTxHash, msgCreateBTCDel, actualDel, _, _, unbondingInfo, err := h.CreateDelegationWithBtcBlockHeight(
 			r,
 			delSK,
 			[]*btcec.PublicKey{consumerFpPK, babylonFpPK},
-			changeAddress.EncodeAddress(),
 			stakingValue,
 			1000,
 			0,
 			0,
 			false,
 			false,
+			10,
+			30,
 		)
 		h.NoError(err)
 
 		// add covenant signatures to this BTC delegation
-		h.CreateCovenantSigs(r, covenantSKs, msgCreateBTCDel, actualDel)
+		h.CreateCovenantSigs(r, covenantSKs, msgCreateBTCDel, actualDel, 10)
 
 		// ensure the BTC delegation is bonded right now
 		actualDel, err = h.BTCStakingKeeper.GetBTCDelegation(h.Ctx, stakingTxHash)
 		h.NoError(err)
-		btcTip := h.BTCLightClientKeeper.GetTipInfo(h.Ctx).Height
-		status := actualDel.GetStatus(btcTip, wValue, bsParams.CovenantQuorum)
+		btcTip := uint32(30)
+		status := actualDel.GetStatus(btcTip, bsParams.CovenantQuorum)
 		require.Equal(t, types.BTCDelegationStatus_ACTIVE, status)
 
 		// construct unbonding msg
@@ -232,6 +235,8 @@ func FuzzSetBTCStakingEventStore_UnbondedDel(f *testing.F) {
 		_, err = h.MsgServer.BTCUndelegate(h.Ctx, &bogusMsg)
 		h.Error(err)
 
+		h.BTCLightClientKeeper.EXPECT().GetTipInfo(gomock.Eq(h.Ctx)).Return(&btclctypes.BTCHeaderInfo{Height: 30}).AnyTimes()
+
 		// unbond
 		_, err = h.MsgServer.BTCUndelegate(h.Ctx, msg)
 		h.NoError(err)
@@ -239,7 +244,7 @@ func FuzzSetBTCStakingEventStore_UnbondedDel(f *testing.F) {
 		// ensure the BTC delegation is unbonded
 		actualDel, err = h.BTCStakingKeeper.GetBTCDelegation(h.Ctx, stakingTxHash)
 		h.NoError(err)
-		status = actualDel.GetStatus(btcTip, wValue, bsParams.CovenantQuorum)
+		status = actualDel.GetStatus(btcTip, bsParams.CovenantQuorum)
 		require.Equal(t, types.BTCDelegationStatus_UNBONDED, status)
 
 		// event store related assertions
diff --git a/x/btcstaking/keeper/msg_server.go b/x/btcstaking/keeper/msg_server.go
index 211be3da3..489304e0c 100644
--- a/x/btcstaking/keeper/msg_server.go
+++ b/x/btcstaking/keeper/msg_server.go
@@ -578,6 +578,7 @@ func (ms msgServer) AddCovenantSigs(goCtx context.Context, req *types.MsgAddCove
 		req.UnbondingTxSig,
 		parsedUnbondingSlashingAdaptorSignatures,
 		params,
+		btcTipHeight,
 	)
 
 	// at this point, the covenant signatures are verified and are not duplicated.
diff --git a/x/btcstaking/keeper/restaking_test.go b/x/btcstaking/keeper/restaking_test.go
index fc5a96585..0c21846f7 100644
--- a/x/btcstaking/keeper/restaking_test.go
+++ b/x/btcstaking/keeper/restaking_test.go
@@ -8,6 +8,7 @@ import (
 	testutil "github.com/babylonlabs-io/babylon/testutil/btcstaking-helper"
 	"github.com/babylonlabs-io/babylon/testutil/datagen"
 	bbn "github.com/babylonlabs-io/babylon/types"
+	btclctypes "github.com/babylonlabs-io/babylon/x/btclightclient/types"
 	"github.com/babylonlabs-io/babylon/x/btcstaking/types"
 	"github.com/btcsuite/btcd/btcec/v2"
 	"github.com/golang/mock/gomock"
@@ -28,11 +29,8 @@ func FuzzRestaking_RestakedBTCDelegation(f *testing.F) {
 
 		// set all parameters
 		covenantSKs, _ := h.GenAndApplyParams(r)
-		changeAddress, err := datagen.GenRandomBTCAddress(r, h.Net)
-		h.NoError(err)
 
 		bsParams := h.BTCStakingKeeper.GetParams(h.Ctx)
-		wValue := h.BTCCheckpointKeeper.GetParams(h.Ctx).CheckpointFinalizationTimeout
 
 		// generate and insert new Babylon finality provider
 		_, fpPK, _ := h.CreateFinalityProvider(r)
@@ -67,17 +65,18 @@ func FuzzRestaking_RestakedBTCDelegation(f *testing.F) {
 		stakingValue := int64(2 * 10e8)
 		_, randomFPPK, err := datagen.GenRandomBTCKeyPair(r)
 		h.NoError(err)
-		_, _, _, _, _, _, err = h.CreateDelegation(
+		_, _, _, _, _, _, err = h.CreateDelegationWithBtcBlockHeight(
 			r,
 			delSK,
 			[]*btcec.PublicKey{fpPK, randomFPPK},
-			changeAddress.EncodeAddress(),
 			stakingValue,
 			1000,
 			0,
 			0,
 			false,
 			false,
+			10,
+			30,
 		)
 		h.Error(err)
 		require.True(t, errors.Is(err, types.ErrFpNotFound))
@@ -85,17 +84,18 @@ func FuzzRestaking_RestakedBTCDelegation(f *testing.F) {
 		/*
 			ensure BTC delegation request will fail if no PK corresponds to a Babylon fp
 		*/
-		_, _, _, _, _, _, err = h.CreateDelegation(
+		_, _, _, _, _, _, err = h.CreateDelegationWithBtcBlockHeight(
 			r,
 			delSK,
 			[]*btcec.PublicKey{czFPPK},
-			changeAddress.EncodeAddress(),
 			stakingValue,
 			1000,
 			0,
 			0,
 			false,
 			false,
+			10,
+			30,
 		)
 		h.Error(err)
 		require.True(t, errors.Is(err, types.ErrNoBabylonFPRestaked), err)
@@ -103,29 +103,31 @@ func FuzzRestaking_RestakedBTCDelegation(f *testing.F) {
 		/*
 			happy case -- restaking to a Babylon fp and a consumer fp
 		*/
-		_, msgBTCDel, actualDel, _, _, _, err := h.CreateDelegation(
+
+		_, msgBTCDel, actualDel, _, _, _, err := h.CreateDelegationWithBtcBlockHeight(
 			r,
 			delSK,
 			[]*btcec.PublicKey{fpPK, czFPPK},
-			changeAddress.EncodeAddress(),
 			stakingValue,
 			1000,
 			0,
 			0,
 			false,
 			false,
+			10,
+			30,
 		)
 		h.NoError(err)
 
 		// add covenant signatures to this restaked BTC delegation
-		h.CreateCovenantSigs(r, covenantSKs, msgBTCDel, actualDel)
+		h.CreateCovenantSigs(r, covenantSKs, msgBTCDel, actualDel, 10)
 
 		// ensure the restaked BTC delegation is bonded right now
 		stakingTxHash := actualDel.MustGetStakingTxHash()
 		actualDel, err = h.BTCStakingKeeper.GetBTCDelegation(h.Ctx, stakingTxHash.String())
 		h.NoError(err)
 		btcTip := h.BTCLightClientKeeper.GetTipInfo(h.Ctx).Height
-		status := actualDel.GetStatus(btcTip, wValue, bsParams.CovenantQuorum)
+		status := actualDel.GetStatus(btcTip, bsParams.CovenantQuorum)
 		require.Equal(t, types.BTCDelegationStatus_ACTIVE, status)
 	})
 }
@@ -144,12 +146,10 @@ func FuzzFinalityProviderDelegations_RestakingConsumers(f *testing.F) {
 
 		// set all parameters
 		h.GenAndApplyParams(r)
-		changeAddress, err := datagen.GenRandomBTCAddress(r, h.Net)
-		h.NoError(err)
 
 		// register a new consumer
 		consumerRegister := datagen.GenRandomCosmosConsumerRegister(r)
-		err = h.BTCStkConsumerKeeper.RegisterConsumer(h.Ctx, consumerRegister)
+		err := h.BTCStkConsumerKeeper.RegisterConsumer(h.Ctx, consumerRegister)
 		require.NoError(t, err)
 
 		// generate and insert new Babylon finality provider
@@ -166,22 +166,25 @@ func FuzzFinalityProviderDelegations_RestakingConsumers(f *testing.F) {
 		for j := uint64(0); j < numBTCDels; j++ {
 			delSK, _, err := datagen.GenRandomBTCKeyPair(r)
 			h.NoError(err)
-			_, _, btcDel, _, _, _, err := h.CreateDelegation(
+			_, _, btcDel, _, _, _, err := h.CreateDelegationWithBtcBlockHeight(
 				r,
 				delSK,
 				[]*btcec.PublicKey{fpPK, czFPPK},
-				changeAddress.EncodeAddress(),
 				stakingValue,
 				1000,
 				0,
 				0,
 				false,
 				false,
+				10,
+				30,
 			)
 			h.NoError(err)
 			expectedBtcDelsMap[btcDel.BtcPk.MarshalHex()] = btcDel
 		}
 
+		h.BTCLightClientKeeper.EXPECT().GetTipInfo(gomock.Eq(h.Ctx)).Return(&btclctypes.BTCHeaderInfo{Height: 30}).AnyTimes()
+
 		// Test nil request
 		resp, err := h.BTCStakingKeeper.FinalityProviderDelegations(h.Ctx, nil)
 		require.Nil(t, resp)
diff --git a/x/btcstaking/types/events.pb.go b/x/btcstaking/types/events.pb.go
index 1a7b2d74c..2e64e0115 100644
--- a/x/btcstaking/types/events.pb.go
+++ b/x/btcstaking/types/events.pb.go
@@ -6,9 +6,7 @@ package types
 import (
 	fmt "fmt"
 	github_com_babylonlabs_io_babylon_types "github.com/babylonlabs-io/babylon/types"
-	_ "github.com/cosmos/cosmos-proto"
 	_ "github.com/cosmos/cosmos-sdk/types/tx/amino"
-	_ "github.com/cosmos/cosmos-sdk/x/staking/types"
 	_ "github.com/cosmos/gogoproto/gogoproto"
 	proto "github.com/cosmos/gogoproto/proto"
 	io "io"
@@ -65,6 +63,7 @@ func (FinalityProviderStatus) EnumDescriptor() ([]byte, []int) {
 	return fileDescriptor_74118427820fff75, []int{0}
 }
 
+// EventNewFinalityProvider is the event emitted when new finality provider is created
 type EventNewFinalityProvider struct {
 	Fp *FinalityProvider `protobuf:"bytes,1,opt,name=fp,proto3" json:"fp,omitempty"`
 }
@@ -1358,90 +1357,89 @@ func init() {
 }
 
 var fileDescriptor_74118427820fff75 = []byte{
-	// 1327 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0x4b, 0x6f, 0xdb, 0xc6,
-	0x16, 0xd6, 0xc3, 0xcf, 0xb1, 0xe3, 0x38, 0x73, 0x7d, 0x0d, 0x59, 0x37, 0x51, 0x1c, 0xe5, 0x71,
-	0x7d, 0x73, 0x1b, 0x29, 0x71, 0x0c, 0xa4, 0x5b, 0x4b, 0x96, 0x23, 0xa5, 0x86, 0xa3, 0x52, 0x76,
-	0x80, 0x76, 0x43, 0xf0, 0x71, 0x24, 0x4d, 0x45, 0x0d, 0x09, 0x72, 0x24, 0x4b, 0x8b, 0xae, 0xbb,
-	0xcd, 0xba, 0x40, 0xf7, 0xdd, 0xb5, 0x3f, 0x23, 0x9b, 0x02, 0xd9, 0x14, 0x28, 0xba, 0x28, 0x8a,
-	0x64, 0xd1, 0x7f, 0x51, 0x14, 0x9c, 0x19, 0x52, 0xa2, 0x4c, 0x26, 0x76, 0x90, 0x6c, 0x0c, 0xcf,
-	0xcc, 0x77, 0xce, 0x77, 0xce, 0x77, 0xce, 0x9c, 0x11, 0x51, 0x51, 0xd7, 0xf4, 0xb1, 0x65, 0xd3,
-	0xb2, 0xce, 0x0c, 0x8f, 0x69, 0x3d, 0x42, 0x3b, 0xe5, 0xe1, 0xa3, 0x32, 0x0c, 0x81, 0x32, 0xaf,
-	0xe4, 0xb8, 0x36, 0xb3, 0xf1, 0xbf, 0x25, 0xa6, 0x34, 0xc1, 0x94, 0x86, 0x8f, 0xf2, 0x1b, 0x1d,
-	0xbb, 0x63, 0x73, 0x44, 0xd9, 0xff, 0x4f, 0x80, 0xf3, 0x77, 0x0c, 0xdb, 0xeb, 0xdb, 0x5e, 0x79,
-	0xe2, 0x4c, 0x07, 0xa6, 0x3d, 0x0a, 0xd6, 0x12, 0x75, 0x2f, 0x9e, 0x76, 0x8a, 0x40, 0xe0, 0xb6,
-	0x84, 0x37, 0x55, 0xd0, 0x88, 0x85, 0x3c, 0xba, 0xa6, 0xf5, 0x09, 0xb5, 0xcb, 0xfc, 0xaf, 0xd8,
-	0x2a, 0xb6, 0x50, 0xae, 0xe6, 0x07, 0x7e, 0x0c, 0x67, 0x87, 0x84, 0x6a, 0x16, 0x61, 0xe3, 0xa6,
-	0x6b, 0x0f, 0x89, 0x09, 0x2e, 0x7e, 0x82, 0x32, 0x6d, 0x27, 0x97, 0xde, 0x4e, 0xef, 0xac, 0xec,
-	0xfe, 0xb7, 0x14, 0x9b, 0x51, 0x69, 0xd6, 0x48, 0xc9, 0xb4, 0x9d, 0xe2, 0xf7, 0x19, 0x74, 0x9d,
-	0x7b, 0x9d, 0x3d, 0xad, 0xba, 0xa0, 0x31, 0x30, 0xf1, 0x6d, 0x84, 0x74, 0x66, 0xa8, 0x4e, 0x4f,
-	0xed, 0xc2, 0x88, 0x33, 0x2c, 0x57, 0xe6, 0x7f, 0xfc, 0xeb, 0xe7, 0xfb, 0x69, 0x65, 0x49, 0x67,
-	0x46, 0xb3, 0x57, 0x87, 0x11, 0xde, 0x42, 0x73, 0x9a, 0x69, 0xba, 0xb9, 0xcc, 0xf4, 0x31, 0xdf,
-	0xc2, 0x77, 0x11, 0x32, 0xec, 0x7e, 0x9f, 0x78, 0x1e, 0xb1, 0x69, 0x2e, 0x3b, 0x0d, 0x98, 0x3a,
-	0xc0, 0x39, 0xb4, 0xd8, 0xb7, 0x29, 0xe9, 0x81, 0x9b, 0x9b, 0xf3, 0x31, 0x4a, 0xb0, 0xc4, 0x79,
-	0xb4, 0x44, 0x4c, 0xa0, 0x8c, 0xb0, 0x71, 0x6e, 0x9e, 0x1f, 0x85, 0x6b, 0xdf, 0xea, 0x0c, 0x74,
-	0x8f, 0x30, 0xc8, 0x2d, 0x08, 0x2b, 0xb9, 0xc4, 0xff, 0x43, 0xeb, 0x1e, 0x18, 0x03, 0x97, 0xb0,
-	0xb1, 0x6a, 0xd8, 0x94, 0x69, 0x06, 0xcb, 0x2d, 0x72, 0xc8, 0xd5, 0x60, 0xbf, 0x2a, 0xb6, 0x7d,
-	0x27, 0x26, 0x30, 0x8d, 0x58, 0x5e, 0x6e, 0x49, 0x38, 0x91, 0xcb, 0xe2, 0xdf, 0x69, 0xf4, 0x9f,
-	0x58, 0x71, 0x6a, 0x26, 0xb9, 0xb0, 0x36, 0x51, 0x01, 0x32, 0x17, 0x10, 0x20, 0x9b, 0x2c, 0xc0,
-	0x5c, 0xb2, 0x00, 0xf3, 0xef, 0x17, 0x60, 0xe1, 0xbd, 0x02, 0x2c, 0x46, 0x05, 0x78, 0x99, 0x46,
-	0x37, 0xb8, 0x00, 0x95, 0x93, 0xea, 0x01, 0x58, 0xd0, 0xd1, 0x18, 0xb1, 0x69, 0x8b, 0x69, 0x0c,
-	0x4e, 0x1d, 0x53, 0x63, 0x80, 0xef, 0xa1, 0xab, 0xb2, 0xc5, 0x54, 0x36, 0x52, 0xbb, 0x9a, 0xd7,
-	0x15, 0x3a, 0x28, 0x57, 0xe4, 0xf6, 0xc9, 0xa8, 0xae, 0x79, 0x5d, 0xfc, 0x14, 0x2d, 0x53, 0x38,
-	0x53, 0x3d, 0xdf, 0x94, 0x8b, 0xb0, 0xb6, 0x7b, 0x3f, 0xa1, 0x4f, 0xcf, 0x71, 0x0d, 0x3c, 0x65,
-	0x89, 0xc2, 0x19, 0xa7, 0x2d, 0xb6, 0xd1, 0x26, 0x8f, 0xa8, 0x05, 0x16, 0x18, 0x8c, 0x0c, 0xa1,
-	0x65, 0x69, 0x5e, 0x97, 0xd0, 0x0e, 0x3e, 0x42, 0x4b, 0xe0, 0x57, 0x87, 0x1a, 0x20, 0x6f, 0xc2,
-	0xc3, 0x04, 0x86, 0x73, 0xb6, 0x35, 0x69, 0xa7, 0x84, 0x1e, 0x8a, 0xaf, 0x16, 0xd1, 0x06, 0x27,
-	0x6a, 0xda, 0x67, 0xe0, 0x1e, 0x10, 0x8f, 0xc9, 0x8c, 0x09, 0x42, 0x9e, 0x6f, 0x06, 0xa6, 0x1a,
-	0x5e, 0xb9, 0x7a, 0x02, 0x51, 0x9c, 0x03, 0xb1, 0xd9, 0x12, 0x2e, 0x66, 0x1b, 0xab, 0x9e, 0x52,
-	0x96, 0xa5, 0xf7, 0x43, 0x07, 0xb7, 0xd1, 0xf2, 0x37, 0x1a, 0xb1, 0x04, 0x53, 0x86, 0x33, 0x3d,
-	0xbd, 0x34, 0xd3, 0x33, 0xee, 0x21, 0x86, 0x68, 0x49, 0xf8, 0x3e, 0x74, 0xb0, 0x85, 0x56, 0x06,
-	0x74, 0xc2, 0x94, 0xe5, 0x4c, 0x8d, 0x4b, 0x33, 0x9d, 0x4a, 0x1f, 0x31, 0x5c, 0x28, 0xf0, 0x7f,
-	0xe8, 0xe0, 0x0e, 0xda, 0xf0, 0x6f, 0x8d, 0x09, 0x96, 0x68, 0x07, 0x75, 0xc0, 0x7d, 0xf0, 0xde,
-	0x5e, 0xd9, 0xdd, 0x7b, 0x17, 0x6d, 0x52, 0x1b, 0xd6, 0x53, 0xca, 0x35, 0x9d, 0x19, 0x07, 0x60,
-	0x4d, 0xf7, 0xe6, 0xb7, 0x68, 0x33, 0xa8, 0x94, 0x24, 0x94, 0x96, 0xfc, 0xae, 0xac, 0xec, 0xd6,
-	0x3e, 0xb4, 0x6a, 0x91, 0x30, 0xea, 0x29, 0x65, 0x43, 0xd2, 0x54, 0x78, 0x08, 0x72, 0x3f, 0xdf,
-	0x95, 0x93, 0x35, 0xa1, 0xd4, 0xb8, 0x8e, 0x32, 0x4e, 0x8f, 0x37, 0xd0, 0x6a, 0xe5, 0xf3, 0xdf,
-	0xff, 0xb8, 0xb9, 0xd7, 0x21, 0xac, 0x3b, 0xd0, 0x4b, 0x86, 0xdd, 0x2f, 0xcb, 0xc0, 0x2c, 0x4d,
-	0xf7, 0x1e, 0x10, 0x3b, 0x58, 0x96, 0xd9, 0xd8, 0x01, 0xaf, 0x54, 0x69, 0x34, 0x1f, 0xef, 0x3d,
-	0x6c, 0x0e, 0xf4, 0x2f, 0x60, 0xac, 0x64, 0x9c, 0x5e, 0xbe, 0x8a, 0xb6, 0x12, 0xc3, 0xbb, 0xe8,
-	0x0d, 0xcd, 0x77, 0xe4, 0xac, 0x8b, 0xef, 0x97, 0x8f, 0x18, 0x2d, 0x91, 0x33, 0x25, 0xa9, 0x5d,
-	0x3e, 0x1e, 0x55, 0x65, 0x0e, 0x65, 0x60, 0x58, 0x04, 0x74, 0x2b, 0x76, 0x8a, 0x8b, 0xd9, 0x52,
-	0xed, 0x6a, 0xb4, 0x03, 0xf8, 0x3a, 0x5a, 0x10, 0xb3, 0x3c, 0x3a, 0xc7, 0xe7, 0xf9, 0x1c, 0xc7,
-	0xc5, 0xd9, 0xf1, 0x35, 0x19, 0xf4, 0xe1, 0x64, 0x7a, 0x9d, 0x95, 0x65, 0x88, 0xe8, 0x1f, 0xbc,
-	0xa3, 0xff, 0x47, 0x6b, 0xd3, 0x65, 0x98, 0x7d, 0x2f, 0x56, 0x27, 0xc5, 0x80, 0x11, 0x7e, 0x82,
-	0x36, 0x02, 0xb0, 0x3d, 0x60, 0xce, 0x80, 0xa9, 0x84, 0x9a, 0x30, 0x8a, 0x32, 0x63, 0x09, 0x79,
-	0xce, 0x11, 0x0d, 0x1f, 0x80, 0x3f, 0x43, 0x6b, 0x8e, 0xe6, 0x6a, 0x7d, 0x4f, 0x1d, 0x82, 0x7b,
-	0xfe, 0xc5, 0xbd, 0x22, 0x0e, 0x5f, 0x88, 0x33, 0xfc, 0x14, 0xdd, 0x68, 0x4b, 0x4d, 0xfc, 0xdf,
-	0x20, 0x5c, 0x14, 0x55, 0xa8, 0xe0, 0xf1, 0x10, 0xe7, 0xb6, 0xb3, 0x13, 0xe3, 0xad, 0xf6, 0x8c,
-	0x7e, 0x15, 0x5f, 0x1a, 0xcf, 0x8f, 0xf7, 0x21, 0xba, 0xe6, 0x07, 0x13, 0x5a, 0x73, 0xe3, 0xf9,
-	0x69, 0xe6, 0x35, 0x71, 0x5e, 0x09, 0x5e, 0xc5, 0x1d, 0xb4, 0x1a, 0xca, 0x41, 0xfa, 0xf2, 0xf9,
-	0x0e, 0xc0, 0x2b, 0x81, 0x18, 0xa4, 0x0f, 0x7e, 0x4a, 0x03, 0xaa, 0xdb, 0xd4, 0x0c, 0xb1, 0x8b,
-	0x91, 0x94, 0xc2, 0x43, 0x8e, 0xde, 0x41, 0xab, 0x53, 0xe8, 0x91, 0x78, 0xd1, 0x43, 0xbf, 0x13,
-	0xec, 0x28, 0x5a, 0xd2, 0xe5, 0xf8, 0x92, 0xfe, 0x9a, 0x46, 0x05, 0x5e, 0xd2, 0xaa, 0x3d, 0x04,
-	0xaa, 0x51, 0xd6, 0x22, 0x1d, 0xaa, 0xb1, 0x81, 0x0b, 0x0a, 0x18, 0x40, 0x86, 0x60, 0xe2, 0x07,
-	0x09, 0xd7, 0x2b, 0x8c, 0x2f, 0xfa, 0x0e, 0xee, 0xa1, 0x7f, 0x19, 0xd2, 0xd7, 0xb4, 0x56, 0x91,
-	0xc2, 0xae, 0x07, 0x88, 0x50, 0xad, 0x63, 0xb4, 0x1d, 0x5a, 0x4d, 0xd2, 0xf3, 0x82, 0x60, 0xb8,
-	0x8b, 0x48, 0xa1, 0x6f, 0x04, 0xf0, 0xd3, 0x00, 0x1d, 0x46, 0x5e, 0x87, 0x51, 0xd1, 0x46, 0xf9,
-	0x48, 0x5a, 0x5f, 0x0e, 0x6c, 0x77, 0xd0, 0x57, 0x40, 0x33, 0xba, 0x97, 0x4f, 0xe9, 0x22, 0x77,
-	0xe3, 0x97, 0x34, 0xda, 0x39, 0x7f, 0x37, 0x1a, 0xd4, 0xb0, 0x06, 0x7e, 0x27, 0x36, 0x5d, 0xdb,
-	0x6e, 0x7f, 0xa8, 0xa4, 0xa2, 0x95, 0x5c, 0xa6, 0x76, 0x81, 0x74, 0xba, 0x2c, 0x1a, 0xc2, 0x0a,
-	0x3f, 0xaa, 0xf3, 0x13, 0x7c, 0x07, 0x21, 0xa0, 0x66, 0x80, 0x8b, 0x08, 0xb6, 0x0c, 0xd4, 0x94,
-	0xa8, 0x48, 0x3e, 0x73, 0xf1, 0xf9, 0xfc, 0x10, 0x34, 0x86, 0xc8, 0x47, 0xa4, 0x23, 0xb4, 0x06,
-	0xb3, 0xa6, 0xb9, 0xd6, 0xf8, 0xd3, 0x65, 0x11, 0x89, 0x2f, 0x1b, 0x1f, 0x1f, 0x8d, 0x1b, 0x45,
-	0xb5, 0x91, 0x43, 0xdc, 0x4f, 0x53, 0xdf, 0xef, 0x32, 0xb2, 0xa3, 0x4e, 0x29, 0x8c, 0x1c, 0x30,
-	0x18, 0x98, 0xa7, 0x53, 0x77, 0xed, 0xf2, 0x97, 0xc4, 0x73, 0xfc, 0x4a, 0xf1, 0xa1, 0x11, 0x9a,
-	0x44, 0x2f, 0x09, 0x47, 0xb4, 0x7c, 0x80, 0xb4, 0xda, 0x47, 0xf9, 0x59, 0x2b, 0xd0, 0xfc, 0x89,
-	0xc6, 0x8d, 0x23, 0x42, 0x6d, 0x46, 0x8c, 0x39, 0x2a, 0xc1, 0x85, 0x6e, 0xd9, 0x46, 0x4f, 0x4e,
-	0x5f, 0xbf, 0x17, 0xae, 0xc4, 0xba, 0xa8, 0xf8, 0x28, 0x3e, 0x81, 0xef, 0xff, 0x94, 0x46, 0x9b,
-	0xf1, 0x0f, 0x0d, 0xbe, 0x8b, 0x6e, 0x1d, 0x36, 0x8e, 0xf7, 0x8f, 0x1a, 0x27, 0x5f, 0xa9, 0x4d,
-	0xe5, 0xf9, 0x8b, 0xc6, 0x41, 0x4d, 0x51, 0x5b, 0x27, 0xfb, 0x27, 0xa7, 0x2d, 0xb5, 0x71, 0xbc,
-	0x5f, 0x3d, 0x69, 0xbc, 0xa8, 0xad, 0xa7, 0xf0, 0x6d, 0x74, 0x33, 0x11, 0x26, 0x41, 0xe9, 0x77,
-	0x82, 0x9e, 0xed, 0x37, 0x8e, 0x6a, 0x07, 0xeb, 0x19, 0x7c, 0x07, 0x6d, 0x27, 0x82, 0x5a, 0x47,
-	0xfb, 0xad, 0x7a, 0xed, 0x60, 0x3d, 0x5b, 0x39, 0x7e, 0xf5, 0xa6, 0x90, 0x7e, 0xfd, 0xa6, 0x90,
-	0xfe, 0xf3, 0x4d, 0x21, 0xfd, 0xf2, 0x6d, 0x21, 0xf5, 0xfa, 0x6d, 0x21, 0xf5, 0xdb, 0xdb, 0x42,
-	0xea, 0xeb, 0x0b, 0x3c, 0xbc, 0xa3, 0xe9, 0x6f, 0x5c, 0xfe, 0x0a, 0xeb, 0x0b, 0xfc, 0x73, 0xf5,
-	0xf1, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xe8, 0x77, 0x69, 0x4c, 0x7d, 0x0f, 0x00, 0x00,
+	// 1298 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0x4b, 0x6f, 0xdb, 0x46,
+	0x17, 0xd5, 0xc3, 0xcf, 0xb1, 0xe3, 0x38, 0xf3, 0xf9, 0x33, 0x14, 0x35, 0x51, 0x1c, 0xe5, 0x51,
+	0x37, 0x6d, 0xa4, 0xc4, 0x31, 0x90, 0x6e, 0x2d, 0x59, 0x8e, 0x94, 0x1a, 0x8e, 0x4a, 0xd9, 0x01,
+	0xda, 0x0d, 0xc1, 0xc7, 0x95, 0x34, 0x15, 0x35, 0x24, 0xc8, 0xa1, 0x4c, 0x2d, 0xba, 0xee, 0x36,
+	0xeb, 0x02, 0xdd, 0x77, 0xd7, 0xfe, 0x8c, 0x6c, 0x0a, 0x64, 0x53, 0xa0, 0xe8, 0xa2, 0x28, 0x92,
+	0x45, 0xff, 0x45, 0x51, 0x70, 0x38, 0xa4, 0x44, 0x99, 0x4c, 0xec, 0x20, 0xd9, 0x18, 0xe6, 0xcc,
+	0xb9, 0xf7, 0xdc, 0x7b, 0xee, 0x63, 0x20, 0x54, 0x56, 0x15, 0x75, 0x6c, 0x98, 0xb4, 0xaa, 0x32,
+	0xcd, 0x61, 0xca, 0x80, 0xd0, 0x5e, 0x75, 0xf4, 0xb0, 0x0a, 0x23, 0xa0, 0xcc, 0xa9, 0x58, 0xb6,
+	0xc9, 0x4c, 0xfc, 0x7f, 0x81, 0xa9, 0x4c, 0x30, 0x95, 0xd1, 0xc3, 0xe2, 0x46, 0xcf, 0xec, 0x99,
+	0x1c, 0x51, 0xf5, 0xff, 0x0b, 0xc0, 0xc5, 0xbb, 0xc9, 0x0e, 0xa7, 0x4c, 0x03, 0xdc, 0x15, 0x65,
+	0x48, 0xa8, 0x59, 0xe5, 0x7f, 0x83, 0xa3, 0x72, 0x07, 0x15, 0x1a, 0x3e, 0xef, 0x11, 0x9c, 0x1e,
+	0x10, 0xaa, 0x18, 0x84, 0x8d, 0xdb, 0xb6, 0x39, 0x22, 0x3a, 0xd8, 0xf8, 0x31, 0xca, 0x75, 0xad,
+	0x42, 0x76, 0x2b, 0xbb, 0xbd, 0xb2, 0xf3, 0x69, 0x25, 0x31, 0xa0, 0xca, 0xac, 0x91, 0x94, 0xeb,
+	0x5a, 0xe5, 0x1f, 0x73, 0xe8, 0x1a, 0xf7, 0x3a, 0x7b, 0x5b, 0xb7, 0x41, 0x61, 0xa0, 0xe3, 0x5b,
+	0x08, 0xa9, 0x4c, 0x93, 0xad, 0x81, 0xdc, 0x07, 0x8f, 0x33, 0x2c, 0xd7, 0xe6, 0x7f, 0xfe, 0xe7,
+	0xd7, 0x7b, 0x59, 0x69, 0x49, 0x65, 0x5a, 0x7b, 0xd0, 0x04, 0x0f, 0x5f, 0x45, 0x73, 0x8a, 0xae,
+	0xdb, 0x85, 0xdc, 0xf4, 0x35, 0x3f, 0xc2, 0x77, 0x10, 0xd2, 0xcc, 0xe1, 0x90, 0x38, 0x0e, 0x31,
+	0x69, 0x21, 0x3f, 0x0d, 0x98, 0xba, 0xc0, 0x05, 0xb4, 0x38, 0x34, 0x29, 0x19, 0x80, 0x5d, 0x98,
+	0xf3, 0x31, 0x52, 0xf8, 0x89, 0x8b, 0x68, 0x89, 0xe8, 0x40, 0x19, 0x61, 0xe3, 0xc2, 0x3c, 0xbf,
+	0x8a, 0xbe, 0x7d, 0xab, 0x53, 0x50, 0x1d, 0xc2, 0xa0, 0xb0, 0x10, 0x58, 0x89, 0x4f, 0xfc, 0x19,
+	0x5a, 0x77, 0x40, 0x73, 0x6d, 0xc2, 0xc6, 0xb2, 0x66, 0x52, 0xa6, 0x68, 0xac, 0xb0, 0xc8, 0x21,
+	0x97, 0xc3, 0xf3, 0x7a, 0x70, 0xec, 0x3b, 0xd1, 0x81, 0x29, 0xc4, 0x70, 0x0a, 0x4b, 0x81, 0x13,
+	0xf1, 0x59, 0xfe, 0x37, 0x8b, 0x3e, 0x49, 0x14, 0xa7, 0xa1, 0x93, 0x73, 0x6b, 0x13, 0x17, 0x20,
+	0x77, 0x0e, 0x01, 0xf2, 0xe9, 0x02, 0xcc, 0xa5, 0x0b, 0x30, 0xff, 0x6e, 0x01, 0x16, 0xde, 0x29,
+	0xc0, 0x62, 0x5c, 0x80, 0x17, 0x59, 0x74, 0x9d, 0x0b, 0x50, 0x3b, 0xae, 0xef, 0x83, 0x01, 0x3d,
+	0x85, 0x11, 0x93, 0x76, 0x98, 0xc2, 0xe0, 0xc4, 0xd2, 0x15, 0x06, 0xf8, 0x2e, 0xba, 0x2c, 0x5a,
+	0x4c, 0x66, 0x9e, 0xdc, 0x57, 0x9c, 0x7e, 0xa0, 0x83, 0x74, 0x49, 0x1c, 0x1f, 0x7b, 0x4d, 0xc5,
+	0xe9, 0xe3, 0x27, 0x68, 0x99, 0xc2, 0xa9, 0xec, 0xf8, 0xa6, 0x5c, 0x84, 0xb5, 0x9d, 0x7b, 0x29,
+	0x7d, 0x7a, 0x86, 0xcb, 0x75, 0xa4, 0x25, 0x0a, 0xa7, 0x9c, 0xb6, 0xdc, 0x45, 0x9b, 0x3c, 0xa2,
+	0x0e, 0x18, 0xa0, 0x31, 0x32, 0x82, 0x8e, 0xa1, 0x38, 0x7d, 0x42, 0x7b, 0xf8, 0x10, 0x2d, 0x81,
+	0x5f, 0x1d, 0xaa, 0x81, 0x98, 0x84, 0x07, 0x29, 0x0c, 0x67, 0x6c, 0x1b, 0xc2, 0x4e, 0x8a, 0x3c,
+	0x94, 0x5f, 0x2e, 0xa2, 0x0d, 0x4e, 0xd4, 0x36, 0x4f, 0xc1, 0xde, 0x27, 0x0e, 0x13, 0x19, 0x13,
+	0x84, 0x1c, 0xdf, 0x0c, 0x74, 0x39, 0x1a, 0xb9, 0x66, 0x0a, 0x51, 0x92, 0x83, 0xe0, 0xb0, 0x13,
+	0xb8, 0x98, 0x6d, 0xac, 0x66, 0x46, 0x5a, 0x16, 0xde, 0x0f, 0x2c, 0xdc, 0x45, 0xcb, 0xdf, 0x29,
+	0xc4, 0x08, 0x98, 0x72, 0x9c, 0xe9, 0xc9, 0x85, 0x99, 0x9e, 0x72, 0x0f, 0x09, 0x44, 0x4b, 0x81,
+	0xef, 0x03, 0x0b, 0x1b, 0x68, 0xc5, 0xa5, 0x13, 0xa6, 0x3c, 0x67, 0x6a, 0x5d, 0x98, 0xe9, 0x44,
+	0xf8, 0x48, 0xe0, 0x42, 0xa1, 0xff, 0x03, 0x0b, 0xf7, 0xd0, 0x86, 0x3f, 0x35, 0x3a, 0x18, 0x41,
+	0x3b, 0xc8, 0x2e, 0xf7, 0xc1, 0x7b, 0x7b, 0x65, 0x67, 0xf7, 0x6d, 0xb4, 0x69, 0x6d, 0xd8, 0xcc,
+	0x48, 0x57, 0x54, 0xa6, 0xed, 0x83, 0x31, 0xdd, 0x9b, 0xdf, 0xa3, 0xcd, 0xb0, 0x52, 0x82, 0x50,
+	0x58, 0xf2, 0x59, 0x59, 0xd9, 0x69, 0xbc, 0x6f, 0xd5, 0x62, 0x61, 0x34, 0x33, 0xd2, 0x86, 0xa0,
+	0xa9, 0xf1, 0x10, 0xc4, 0x79, 0xb1, 0x2f, 0x36, 0x6b, 0x4a, 0xa9, 0x71, 0x13, 0xe5, 0xac, 0x01,
+	0x6f, 0xa0, 0xd5, 0xda, 0x97, 0x7f, 0xfe, 0x75, 0x63, 0xb7, 0x47, 0x58, 0xdf, 0x55, 0x2b, 0x9a,
+	0x39, 0xac, 0x8a, 0xc0, 0x0c, 0x45, 0x75, 0xee, 0x13, 0x33, 0xfc, 0xac, 0xb2, 0xb1, 0x05, 0x4e,
+	0xa5, 0xd6, 0x6a, 0x3f, 0xda, 0x7d, 0xd0, 0x76, 0xd5, 0xaf, 0x60, 0x2c, 0xe5, 0xac, 0x41, 0xb1,
+	0x8e, 0xae, 0xa6, 0x86, 0x77, 0xde, 0x09, 0x2d, 0xf6, 0xc4, 0xae, 0x4b, 0xee, 0x97, 0x0f, 0x18,
+	0x2d, 0x11, 0x3b, 0x25, 0xad, 0x5d, 0x3e, 0x1c, 0x55, 0x6d, 0x0e, 0xe5, 0x60, 0x54, 0x06, 0x74,
+	0x33, 0x71, 0x8b, 0x07, 0xbb, 0xa5, 0xde, 0x57, 0x68, 0x0f, 0xf0, 0x35, 0xb4, 0x10, 0xec, 0xf2,
+	0xf8, 0x1e, 0x9f, 0xe7, 0x7b, 0x1c, 0x97, 0x67, 0xd7, 0xd7, 0x64, 0xd1, 0x47, 0x9b, 0xe9, 0x55,
+	0x5e, 0x94, 0x21, 0xa6, 0x7f, 0xf8, 0x8e, 0x7e, 0x8e, 0xd6, 0xa6, 0xcb, 0x30, 0xfb, 0x5e, 0xac,
+	0x4e, 0x8a, 0x01, 0x1e, 0x7e, 0x8c, 0x36, 0x42, 0xb0, 0xe9, 0x32, 0xcb, 0x65, 0x32, 0xa1, 0x3a,
+	0x78, 0x71, 0x66, 0x2c, 0x20, 0xcf, 0x38, 0xa2, 0xe5, 0x03, 0xf0, 0x17, 0x68, 0xcd, 0x52, 0x6c,
+	0x65, 0xe8, 0xc8, 0x23, 0xb0, 0xcf, 0xbe, 0xb8, 0x97, 0x82, 0xcb, 0xe7, 0xc1, 0x1d, 0x7e, 0x82,
+	0xae, 0x77, 0x85, 0x26, 0xb2, 0x25, 0x44, 0x91, 0x03, 0x15, 0x1c, 0x1e, 0xe2, 0xdc, 0x56, 0x7e,
+	0x62, 0x7c, 0xb5, 0x3b, 0xa3, 0x5f, 0xcd, 0x97, 0xc6, 0xf1, 0xe3, 0x7d, 0x80, 0xae, 0xf8, 0xc1,
+	0x44, 0xd6, 0xdc, 0x78, 0x7e, 0x9a, 0x79, 0x2d, 0xb8, 0xaf, 0x85, 0xaf, 0xe2, 0x36, 0x5a, 0x8d,
+	0xe4, 0x20, 0x43, 0xf1, 0x7c, 0x87, 0xe0, 0x95, 0x50, 0x0c, 0x32, 0x04, 0x3f, 0x25, 0x97, 0xaa,
+	0x26, 0xd5, 0x23, 0xec, 0x62, 0x2c, 0xa5, 0xe8, 0x92, 0xa3, 0xb7, 0xd1, 0xea, 0x14, 0xda, 0x0b,
+	0x5e, 0xf4, 0xc8, 0xef, 0x04, 0xeb, 0xc5, 0x4b, 0xba, 0x9c, 0x5c, 0xd2, 0xdf, 0xb3, 0xa8, 0xc4,
+	0x4b, 0x5a, 0x37, 0x47, 0x40, 0x15, 0xca, 0x3a, 0xa4, 0x47, 0x15, 0xe6, 0xda, 0x20, 0x81, 0x06,
+	0x64, 0x04, 0x3a, 0xbe, 0x9f, 0x32, 0x5e, 0x51, 0x7c, 0xf1, 0x77, 0x70, 0x17, 0xfd, 0x4f, 0x13,
+	0xbe, 0xa6, 0xb5, 0x8a, 0x15, 0x76, 0x3d, 0x44, 0x44, 0x6a, 0x1d, 0xa1, 0xad, 0xc8, 0x6a, 0x92,
+	0x9e, 0x13, 0x06, 0xc3, 0x5d, 0xc4, 0x0a, 0x7d, 0x3d, 0x84, 0x9f, 0x84, 0xe8, 0x28, 0xf2, 0x26,
+	0x78, 0x65, 0x13, 0x15, 0x63, 0x69, 0x7d, 0xed, 0x9a, 0xb6, 0x3b, 0x94, 0x40, 0xd1, 0xfa, 0x17,
+	0x4f, 0xe9, 0x3c, 0xb3, 0xf1, 0x5b, 0x16, 0x6d, 0x9f, 0x9d, 0x8d, 0x16, 0xd5, 0x0c, 0xd7, 0xef,
+	0xc4, 0xb6, 0x6d, 0x9a, 0xdd, 0xf7, 0x95, 0x34, 0x68, 0x25, 0x9b, 0xc9, 0x7d, 0x20, 0xbd, 0x3e,
+	0x8b, 0x87, 0xb0, 0xc2, 0xaf, 0x9a, 0xfc, 0x06, 0xdf, 0x46, 0x08, 0xa8, 0x1e, 0xe2, 0x62, 0x82,
+	0x2d, 0x03, 0xd5, 0x05, 0x2a, 0x96, 0xcf, 0x5c, 0x72, 0x3e, 0x3f, 0x85, 0x8d, 0x11, 0xe4, 0x13,
+	0xa4, 0x13, 0x68, 0x0d, 0x7a, 0x43, 0xb1, 0x8d, 0xf1, 0xc7, 0xcb, 0x22, 0x16, 0x5f, 0x3e, 0x39,
+	0x3e, 0x9a, 0xb4, 0x8a, 0x1a, 0x9e, 0x45, 0xec, 0x8f, 0x53, 0xdf, 0x1f, 0x72, 0xa2, 0xa3, 0x4e,
+	0x28, 0x78, 0x16, 0x68, 0x0c, 0xf4, 0x93, 0xa9, 0x59, 0xbb, 0xf8, 0x90, 0x38, 0x96, 0x5f, 0x29,
+	0xbe, 0x34, 0x22, 0x93, 0xf8, 0x90, 0x70, 0x44, 0xc7, 0x07, 0x08, 0xab, 0x3d, 0x54, 0x9c, 0xb5,
+	0x02, 0xc5, 0xdf, 0x68, 0xdc, 0x38, 0x26, 0xd4, 0x66, 0xcc, 0x98, 0xa3, 0x52, 0x5c, 0xa8, 0x86,
+	0xa9, 0x0d, 0xc4, 0xf6, 0xf5, 0x7b, 0xe1, 0x52, 0xa2, 0x8b, 0x9a, 0x8f, 0xe2, 0x1b, 0xf8, 0xde,
+	0x2f, 0x59, 0xb4, 0x99, 0xfc, 0xd0, 0xe0, 0x3b, 0xe8, 0xe6, 0x41, 0xeb, 0x68, 0xef, 0xb0, 0x75,
+	0xfc, 0x8d, 0xdc, 0x96, 0x9e, 0x3d, 0x6f, 0xed, 0x37, 0x24, 0xb9, 0x73, 0xbc, 0x77, 0x7c, 0xd2,
+	0x91, 0x5b, 0x47, 0x7b, 0xf5, 0xe3, 0xd6, 0xf3, 0xc6, 0x7a, 0x06, 0xdf, 0x42, 0x37, 0x52, 0x61,
+	0x02, 0x94, 0x7d, 0x2b, 0xe8, 0xe9, 0x5e, 0xeb, 0xb0, 0xb1, 0xbf, 0x9e, 0xc3, 0xb7, 0xd1, 0x56,
+	0x2a, 0xa8, 0x73, 0xb8, 0xd7, 0x69, 0x36, 0xf6, 0xd7, 0xf3, 0xb5, 0xa3, 0x97, 0xaf, 0x4b, 0xd9,
+	0x57, 0xaf, 0x4b, 0xd9, 0xbf, 0x5f, 0x97, 0xb2, 0x2f, 0xde, 0x94, 0x32, 0xaf, 0xde, 0x94, 0x32,
+	0x7f, 0xbc, 0x29, 0x65, 0xbe, 0x3d, 0xc7, 0xc3, 0xeb, 0x4d, 0xff, 0x90, 0xe5, 0xaf, 0xb0, 0xba,
+	0xc0, 0x7f, 0xae, 0x3e, 0xfa, 0x2f, 0x00, 0x00, 0xff, 0xff, 0xbb, 0xc1, 0xef, 0xb5, 0x3c, 0x0f,
+	0x00, 0x00,
 }
 
 func (m *EventNewFinalityProvider) Marshal() (dAtA []byte, err error) {
diff --git a/x/btcstaking/types/validate_parsed_message_test.go b/x/btcstaking/types/validate_parsed_message_test.go
index c3d04f471..41e3ca95b 100644
--- a/x/btcstaking/types/validate_parsed_message_test.go
+++ b/x/btcstaking/types/validate_parsed_message_test.go
@@ -262,20 +262,6 @@ func TestValidateParsedMessageAgainstTheParams(t *testing.T) {
 			errParsing:    types.ErrEmptyFpList,
 			errValidation: nil,
 		},
-		{
-			name: "too many finality providers",
-			fn: func(r *rand.Rand, t *testing.T) (*types.MsgCreateBTCDelegation, *types.Params, *btcckpttypes.Params) {
-				params := testStakingParams(r, t)
-				checkpointParams := testCheckpointParams()
-				msg, _ := createMsgDelegationForParams(r, t, params)
-
-				msg.FpBtcPkList = append(msg.FpBtcPkList, *msg.BtcPk)
-
-				return msg, params, checkpointParams
-			},
-			errParsing:    types.ErrTooManyFpKeys,
-			errValidation: nil,
-		},
 		{
 			name: "too low unbonding time",
 			fn: func(r *rand.Rand, t *testing.T) (*types.MsgCreateBTCDelegation, *types.Params, *btcckpttypes.Params) {
diff --git a/x/btcstkconsumer/types/btcstkconsumer.pb.go b/x/btcstkconsumer/types/btcstkconsumer.pb.go
index e6d15a518..8b8ad8a2a 100644
--- a/x/btcstkconsumer/types/btcstkconsumer.pb.go
+++ b/x/btcstkconsumer/types/btcstkconsumer.pb.go
@@ -6,7 +6,6 @@ package types
 import (
 	fmt "fmt"
 	_ "github.com/cosmos/cosmos-proto"
-	_ "github.com/cosmos/gogoproto/gogoproto"
 	proto "github.com/cosmos/gogoproto/proto"
 	io "io"
 	math "math"
@@ -276,35 +275,34 @@ func init() {
 }
 
 var fileDescriptor_de3ccd621fe1efd4 = []byte{
-	// 438 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x93, 0xc1, 0x6e, 0xd3, 0x30,
-	0x18, 0xc7, 0x93, 0x01, 0x93, 0xf6, 0x6d, 0x48, 0xc5, 0xeb, 0x46, 0x3a, 0x89, 0x30, 0x15, 0x09,
-	0x4d, 0x48, 0x4b, 0x68, 0x39, 0xc0, 0x95, 0x96, 0x49, 0x9d, 0xb4, 0x31, 0x29, 0xed, 0x89, 0x4b,
-	0xe4, 0x38, 0x26, 0xb5, 0x16, 0xdb, 0x55, 0xec, 0x4d, 0xe4, 0x2d, 0x78, 0x18, 0x1e, 0x82, 0xe3,
-	0xc4, 0x89, 0x23, 0x6a, 0x5f, 0x83, 0x03, 0x6a, 0x62, 0x77, 0x52, 0x1b, 0x76, 0xb3, 0xbf, 0xdf,
-	0xff, 0xff, 0xfd, 0xfd, 0x25, 0x36, 0x04, 0x09, 0x4e, 0xca, 0x5c, 0x8a, 0x30, 0xd1, 0x44, 0xe9,
-	0x6b, 0x22, 0x85, 0xba, 0xe1, 0xb4, 0x08, 0x6f, 0x7b, 0x6b, 0x95, 0x60, 0x56, 0x48, 0x2d, 0x51,
-	0xc7, 0xe8, 0x83, 0x35, 0x7a, 0xdb, 0x3b, 0x6a, 0x67, 0x32, 0x93, 0x95, 0x2a, 0x5c, 0xae, 0x6a,
-	0xc3, 0x51, 0x87, 0x48, 0xc5, 0xa5, 0x8a, 0x6b, 0x50, 0x6f, 0x6a, 0xd4, 0xfd, 0xbb, 0x05, 0xad,
-	0xa1, 0x69, 0x10, 0xd1, 0x8c, 0x29, 0x4d, 0x0b, 0xf4, 0x12, 0x76, 0x6d, 0xd3, 0x98, 0xa5, 0x9e,
-	0x7b, 0xec, 0x9e, 0xec, 0x44, 0x60, 0x4b, 0xe7, 0x29, 0x7a, 0x05, 0x4f, 0x57, 0x02, 0x81, 0x39,
-	0xf5, 0xb6, 0x2a, 0xc9, 0x9e, 0x2d, 0x7e, 0xc6, 0x9c, 0xa2, 0x1e, 0xb4, 0x57, 0xa2, 0x94, 0x2a,
-	0x52, 0xb0, 0x99, 0x66, 0x52, 0x78, 0x8f, 0x2a, 0xed, 0xbe, 0x65, 0x9f, 0xee, 0x11, 0xe2, 0xe0,
-	0x99, 0xa3, 0xae, 0x9c, 0x9c, 0x6a, 0x9c, 0x62, 0x8d, 0xbd, 0xc7, 0xc7, 0xee, 0xc9, 0x6e, 0xbf,
-	0x17, 0xfc, 0x77, 0xf8, 0x60, 0x58, 0x59, 0xed, 0x34, 0x97, 0xc6, 0x38, 0x72, 0xa2, 0x43, 0xd2,
-	0x48, 0xd0, 0x35, 0x78, 0x54, 0x4f, 0xe3, 0xbc, 0xdf, 0x10, 0xf7, 0xa4, 0x8a, 0x7b, 0xfb, 0x40,
-	0xdc, 0xd9, 0x64, 0x74, 0xd1, 0x6f, 0x48, 0x3b, 0xa0, 0x7a, 0xba, 0x09, 0x06, 0xfb, 0xf0, 0x6c,
-	0x23, 0xa5, 0xfb, 0x1e, 0x0e, 0x9b, 0x4f, 0x8d, 0x5e, 0x00, 0x90, 0x29, 0x16, 0x82, 0xe6, 0xf7,
-	0xbf, 0x60, 0xc7, 0x54, 0xce, 0xd3, 0x2e, 0x87, 0x83, 0xc6, 0x7c, 0x34, 0x81, 0xce, 0x57, 0x26,
-	0x70, 0xce, 0x74, 0xb9, 0x9c, 0x4a, 0x17, 0x98, 0xe8, 0x18, 0xa7, 0x69, 0x41, 0x95, 0xaa, 0xdb,
-	0x0c, 0xbc, 0x5f, 0x3f, 0x4e, 0xdb, 0xe6, 0x16, 0x7c, 0xac, 0xc9, 0x58, 0x17, 0x4c, 0x64, 0xd1,
-	0x73, 0x6b, 0x1d, 0x1a, 0xa7, 0xc1, 0x6f, 0x5e, 0xc3, 0x9e, 0x4d, 0x9a, 0x94, 0x33, 0x8a, 0x00,
-	0xb6, 0x87, 0x57, 0xe3, 0xcb, 0xab, 0x71, 0xcb, 0x59, 0xae, 0xcf, 0x26, 0xa3, 0xf8, 0xa2, 0xdf,
-	0x72, 0x07, 0xd1, 0xcf, 0xb9, 0xef, 0xde, 0xcd, 0x7d, 0xf7, 0xcf, 0xdc, 0x77, 0xbf, 0x2f, 0x7c,
-	0xe7, 0x6e, 0xe1, 0x3b, 0xbf, 0x17, 0xbe, 0xf3, 0xe5, 0x43, 0xc6, 0xf4, 0xf4, 0x26, 0x09, 0x88,
-	0xe4, 0xa1, 0xf9, 0xa6, 0x39, 0x4e, 0xd4, 0x29, 0x93, 0x76, 0x1b, 0x7e, 0x5b, 0x7f, 0x00, 0xba,
-	0x9c, 0x51, 0x95, 0x6c, 0x57, 0x37, 0xf5, 0xdd, 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x2d, 0x58,
-	0x3e, 0x87, 0x27, 0x03, 0x00, 0x00,
+	// 425 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x52, 0x4f, 0x6f, 0xd3, 0x30,
+	0x14, 0x4f, 0x06, 0x4c, 0xda, 0xdb, 0x90, 0x8a, 0xf7, 0x87, 0x14, 0x89, 0x30, 0x15, 0x09, 0x4d,
+	0x48, 0x4b, 0x68, 0x39, 0xc0, 0x95, 0x96, 0x49, 0x9d, 0xb4, 0x31, 0x29, 0xcd, 0x89, 0x4b, 0xe4,
+	0x38, 0xa6, 0xb1, 0x16, 0xdb, 0x51, 0xec, 0x4d, 0xe4, 0x5b, 0xf0, 0x61, 0xf8, 0x10, 0x1c, 0x27,
+	0x4e, 0x1c, 0x51, 0xfb, 0x35, 0x38, 0xa0, 0x25, 0x76, 0x27, 0x75, 0x81, 0x9b, 0xdf, 0xef, 0x8f,
+	0x7f, 0xef, 0xd9, 0x0f, 0x82, 0x14, 0xa7, 0x75, 0x21, 0x45, 0x98, 0x6a, 0xa2, 0xf4, 0x25, 0x91,
+	0x42, 0x5d, 0x71, 0x5a, 0x85, 0xd7, 0xc3, 0x35, 0x24, 0x28, 0x2b, 0xa9, 0x25, 0xea, 0x1b, 0x7d,
+	0xb0, 0xc6, 0x5e, 0x0f, 0x9f, 0xf5, 0x89, 0x54, 0x5c, 0xaa, 0xa4, 0x11, 0x86, 0x6d, 0xd1, 0xba,
+	0x06, 0x7f, 0x36, 0xa0, 0x37, 0x31, 0xd2, 0x88, 0xce, 0x99, 0xd2, 0xb4, 0x42, 0x2f, 0x60, 0xdb,
+	0xda, 0x13, 0x96, 0x79, 0xee, 0xa1, 0x7b, 0xb4, 0x15, 0x81, 0x85, 0x4e, 0x33, 0xf4, 0x12, 0x1e,
+	0xaf, 0x04, 0x02, 0x73, 0xea, 0x6d, 0x34, 0x92, 0x1d, 0x0b, 0x7e, 0xc2, 0x9c, 0xa2, 0x21, 0xec,
+	0xad, 0x44, 0x19, 0x55, 0xa4, 0x62, 0xa5, 0x66, 0x52, 0x78, 0x0f, 0x1a, 0xed, 0xae, 0xe5, 0x3e,
+	0xde, 0x51, 0x88, 0x83, 0x67, 0x5a, 0x5d, 0x39, 0x39, 0xd5, 0x38, 0xc3, 0x1a, 0x7b, 0x0f, 0x0f,
+	0xdd, 0xa3, 0xed, 0xd1, 0x30, 0xf8, 0xe7, 0x98, 0xc1, 0xa4, 0xb1, 0xda, 0x69, 0xce, 0x8d, 0x71,
+	0xea, 0x44, 0x07, 0xa4, 0x93, 0x41, 0x97, 0xe0, 0x51, 0x9d, 0x27, 0xc5, 0xa8, 0x23, 0xee, 0x51,
+	0x13, 0xf7, 0xe6, 0x3f, 0x71, 0x27, 0xf1, 0xf4, 0x6c, 0xd4, 0x91, 0xb6, 0x4f, 0x75, 0x7e, 0x9f,
+	0x18, 0xef, 0xc2, 0x93, 0x7b, 0x29, 0x83, 0x77, 0x70, 0xd0, 0xdd, 0x35, 0x7a, 0x0e, 0x40, 0x72,
+	0x2c, 0x04, 0x2d, 0xee, 0xbe, 0x60, 0xcb, 0x20, 0xa7, 0xd9, 0x80, 0xc3, 0x7e, 0x67, 0x3e, 0x8a,
+	0xa1, 0xff, 0x85, 0x09, 0x5c, 0x30, 0x5d, 0xdf, 0x4e, 0xa5, 0x2b, 0x4c, 0x74, 0x82, 0xb3, 0xac,
+	0xa2, 0x4a, 0xb5, 0xd7, 0x8c, 0xbd, 0x9f, 0xdf, 0x8f, 0xf7, 0xcc, 0x16, 0x7c, 0x68, 0x99, 0x99,
+	0xae, 0x98, 0x98, 0x47, 0x4f, 0xad, 0x75, 0x62, 0x9c, 0x86, 0x7e, 0xfd, 0x0a, 0x76, 0x6c, 0x52,
+	0x5c, 0x97, 0x14, 0x01, 0x6c, 0x4e, 0x2e, 0x66, 0xe7, 0x17, 0xb3, 0x9e, 0x73, 0x7b, 0x3e, 0x89,
+	0xa7, 0xc9, 0xd9, 0xa8, 0xe7, 0x8e, 0xa3, 0x1f, 0x0b, 0xdf, 0xbd, 0x59, 0xf8, 0xee, 0xef, 0x85,
+	0xef, 0x7e, 0x5b, 0xfa, 0xce, 0xcd, 0xd2, 0x77, 0x7e, 0x2d, 0x7d, 0xe7, 0xf3, 0xfb, 0x39, 0xd3,
+	0xf9, 0x55, 0x1a, 0x10, 0xc9, 0x43, 0xf3, 0xa6, 0x05, 0x4e, 0xd5, 0x31, 0x93, 0xb6, 0x0c, 0xbf,
+	0xae, 0xaf, 0xba, 0xae, 0x4b, 0xaa, 0xd2, 0xcd, 0x66, 0x53, 0xdf, 0xfe, 0x0d, 0x00, 0x00, 0xff,
+	0xff, 0x4a, 0xc8, 0xa7, 0x22, 0x11, 0x03, 0x00, 0x00,
 }
 
 func (m *ConsumerRegister) Marshal() (dAtA []byte, err error) {
diff --git a/x/checkpointing/types/query.pb.go b/x/checkpointing/types/query.pb.go
index a83900823..f4e2e75ec 100644
--- a/x/checkpointing/types/query.pb.go
+++ b/x/checkpointing/types/query.pb.go
@@ -1068,90 +1068,90 @@ func init() {
 }
 
 var fileDescriptor_113f1ca5c3c2ca44 = []byte{
-	// 1322 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x57, 0x5b, 0x8f, 0xdb, 0xc4,
-	0x17, 0xaf, 0xf7, 0xa6, 0xff, 0x9e, 0x6c, 0xb7, 0xdb, 0x51, 0xff, 0x6d, 0x48, 0xdb, 0x6c, 0x31,
-	0x6d, 0xe9, 0x45, 0xb5, 0x95, 0x6c, 0xf7, 0xa2, 0x5e, 0xe9, 0x96, 0x42, 0xa5, 0x5e, 0xb4, 0xf5,
-	0x52, 0x90, 0x78, 0xa8, 0x19, 0x7b, 0xa7, 0x8e, 0x89, 0x63, 0xbb, 0x9e, 0xf1, 0x6e, 0xa3, 0x52,
-	0x21, 0xc1, 0x17, 0x28, 0x42, 0xe2, 0x91, 0x2f, 0xc0, 0x0b, 0xbc, 0xf1, 0xcc, 0x53, 0x25, 0x78,
-	0xa8, 0xd4, 0x07, 0x10, 0x48, 0x50, 0xb5, 0x88, 0xcf, 0x81, 0x66, 0x3c, 0xb9, 0x38, 0x89, 0x93,
-	0x4d, 0xba, 0x2f, 0xbc, 0xc5, 0x67, 0xce, 0x39, 0xf3, 0x3b, 0xd7, 0xf9, 0x05, 0x8e, 0x5a, 0xd8,
-	0xaa, 0x7b, 0x81, 0xaf, 0xdb, 0x15, 0x62, 0x57, 0xc3, 0xc0, 0xf5, 0x99, 0xeb, 0x3b, 0xfa, 0x66,
-	0x49, 0x7f, 0x10, 0x93, 0xa8, 0xae, 0x85, 0x51, 0xc0, 0x02, 0x94, 0x97, 0x5a, 0x5a, 0x4a, 0x4b,
-	0xdb, 0x2c, 0x15, 0xf6, 0x39, 0x81, 0x13, 0x08, 0x25, 0x9d, 0xff, 0x4a, 0xf4, 0x0b, 0x87, 0x9c,
-	0x20, 0x70, 0x3c, 0xa2, 0xe3, 0xd0, 0xd5, 0xb1, 0xef, 0x07, 0x0c, 0x33, 0x37, 0xf0, 0xa9, 0x3c,
-	0x9d, 0x97, 0xa7, 0xe2, 0xcb, 0x8a, 0xef, 0xeb, 0xcc, 0xad, 0x11, 0xca, 0x70, 0x2d, 0x94, 0x0a,
-	0xc7, 0x33, 0x41, 0x59, 0x1e, 0x35, 0xab, 0x44, 0xc2, 0x2a, 0x9c, 0xcc, 0xd4, 0x6b, 0x09, 0xa4,
-	0xea, 0x29, 0x3b, 0xa0, 0xb5, 0x80, 0xea, 0x16, 0xa6, 0x24, 0x09, 0x4d, 0xdf, 0x2c, 0x59, 0x84,
-	0xe1, 0x92, 0x1e, 0x62, 0xc7, 0xf5, 0x05, 0xc0, 0x44, 0x57, 0xfd, 0x4e, 0x81, 0xc3, 0x77, 0xb8,
-	0x8a, 0x81, 0xb7, 0xae, 0x36, 0x1d, 0xdd, 0x74, 0x29, 0x33, 0xc8, 0x83, 0x98, 0x50, 0x86, 0x56,
-	0x61, 0x8a, 0x32, 0xcc, 0x62, 0x9a, 0x57, 0x8e, 0x28, 0x27, 0x66, 0xcb, 0xa7, 0xb4, 0xac, 0x04,
-	0x69, 0x2d, 0x07, 0xeb, 0xc2, 0xc2, 0x90, 0x96, 0xe8, 0x3d, 0x80, 0xd6, 0xcd, 0xf9, 0xb1, 0x23,
-	0xca, 0x89, 0x5c, 0xf9, 0xb8, 0x96, 0xc0, 0xd4, 0x38, 0x4c, 0x2d, 0xa9, 0x80, 0x84, 0xa9, 0xad,
-	0x61, 0x87, 0xc8, 0xfb, 0x8d, 0x36, 0x4b, 0xf5, 0x67, 0x05, 0x8a, 0x59, 0x68, 0x69, 0x18, 0xf8,
-	0x94, 0xa0, 0x4f, 0x60, 0x4f, 0x84, 0xb7, 0xcc, 0x16, 0x36, 0x8e, 0x7b, 0xfc, 0x44, 0xae, 0xbc,
-	0x9c, 0x8d, 0x3b, 0xe5, 0xed, 0x23, 0x97, 0x55, 0x6e, 0x11, 0x86, 0x1b, 0x1e, 0x8d, 0xd9, 0xa8,
-	0xfd, 0x98, 0xa2, 0xf7, 0x7b, 0x04, 0xf3, 0xf6, 0xc0, 0x60, 0xa4, 0xb3, 0xf6, 0x68, 0x56, 0xe0,
-	0x8d, 0xee, 0x60, 0x1a, 0x69, 0x3f, 0x08, 0xd3, 0x24, 0x0c, 0xec, 0x8a, 0xe9, 0xc7, 0x35, 0x91,
-	0xf9, 0x09, 0xe3, 0x7f, 0x42, 0x70, 0x3b, 0xae, 0xa9, 0x9f, 0x41, 0xa1, 0x97, 0xa5, 0x4c, 0xc1,
-	0x3d, 0x98, 0x4d, 0xa7, 0x40, 0xd8, 0xbf, 0x46, 0x06, 0x76, 0xa7, 0x32, 0xa0, 0x6e, 0xf4, 0xba,
-	0x9d, 0x36, 0x80, 0xa7, 0x6b, 0xad, 0x8c, 0x5c, 0xeb, 0xa7, 0x0a, 0x1c, 0xec, 0x79, 0xcd, 0x7f,
-	0xaf, 0xd0, 0x5f, 0x2a, 0x70, 0x48, 0x84, 0xb2, 0xea, 0xd1, 0xb5, 0xd8, 0xf2, 0x5c, 0xfb, 0x06,
-	0xa9, 0xb7, 0xcf, 0x58, 0xbf, 0x62, 0xef, 0xd8, 0xf0, 0x7c, 0xa5, 0x40, 0xbe, 0x1b, 0x80, 0xcc,
-	0xe6, 0x69, 0xd8, 0xbb, 0x89, 0x3d, 0x77, 0x03, 0xb3, 0x20, 0x32, 0xf1, 0xc6, 0x46, 0x44, 0x68,
-	0x32, 0xf0, 0xd3, 0xc6, 0x5c, 0xf3, 0xe0, 0x4a, 0x22, 0x47, 0xc7, 0x60, 0x0f, 0x5f, 0x4e, 0x61,
-	0x6c, 0xf1, 0x05, 0x65, 0x56, 0xc8, 0x43, 0x01, 0x6b, 0xda, 0x98, 0xb1, 0x84, 0xff, 0x1b, 0xa4,
-	0x7e, 0x9d, 0x3c, 0x44, 0x6f, 0xc2, 0xcc, 0x66, 0xc0, 0x53, 0x6f, 0x86, 0xc1, 0x16, 0x89, 0xf2,
-	0xe3, 0x22, 0xb0, 0x5c, 0x22, 0x5b, 0xe3, 0x22, 0xf5, 0x79, 0x63, 0xfd, 0x64, 0x02, 0x73, 0xe1,
-	0x40, 0x0b, 0xd8, 0x96, 0xcb, 0x2a, 0xa6, 0xdc, 0x8b, 0x8d, 0x72, 0x97, 0xb3, 0xcb, 0x9d, 0xe5,
-	0xd4, 0xd8, 0xd7, 0x74, 0xc9, 0x9b, 0x60, 0xd5, 0xa3, 0x37, 0x48, 0x7d, 0x07, 0xeb, 0xbd, 0x04,
-	0x07, 0x44, 0x50, 0xd7, 0x78, 0x09, 0xe5, 0x2a, 0xdc, 0xce, 0x58, 0xdf, 0x83, 0x7c, 0xb7, 0x9d,
-	0xcc, 0xc3, 0x0e, 0xac, 0x61, 0xf5, 0x1a, 0xa8, 0xc9, 0x44, 0x11, 0x9b, 0xf8, 0xac, 0xed, 0x96,
-	0xab, 0x41, 0xdc, 0xda, 0x3c, 0xf3, 0x90, 0x4b, 0x20, 0xda, 0x5c, 0x2a, 0x41, 0x82, 0x10, 0x09,
-	0x3d, 0xf5, 0x9b, 0x31, 0x78, 0xab, 0xaf, 0x1f, 0x09, 0xf9, 0x20, 0x4c, 0x33, 0x37, 0x34, 0x85,
-	0x65, 0x23, 0x56, 0xe6, 0x86, 0x42, 0xbf, 0xf3, 0x96, 0xb1, 0xce, 0x5b, 0xd0, 0x03, 0x98, 0x49,
-	0x60, 0x4b, 0x8d, 0x71, 0x51, 0xed, 0xdb, 0xd9, 0x61, 0x6f, 0x03, 0x92, 0xd6, 0x26, 0xbb, 0xe6,
-	0xb3, 0xa8, 0x6e, 0xe4, 0x68, 0x4b, 0x52, 0xb8, 0x04, 0x73, 0x9d, 0x0a, 0x68, 0x0e, 0xc6, 0xab,
-	0xa4, 0x2e, 0x47, 0x81, 0xff, 0x44, 0xfb, 0x60, 0x72, 0x13, 0x7b, 0x31, 0x91, 0x98, 0x93, 0x8f,
-	0x73, 0x63, 0x2b, 0x8a, 0xfa, 0x29, 0x1c, 0x15, 0x20, 0x6e, 0x62, 0xca, 0xd2, 0x7b, 0x26, 0xdd,
-	0x04, 0x3b, 0x51, 0xcb, 0xcf, 0xe1, 0xd8, 0x80, 0xbb, 0x64, 0x15, 0x3e, 0xcc, 0x78, 0x0d, 0xf4,
-	0x6d, 0xae, 0xc9, 0xac, 0x57, 0xe0, 0x57, 0x05, 0xfe, 0xdf, 0xfb, 0xfd, 0xe9, 0xbb, 0xcd, 0x8e,
-	0xc2, 0xac, 0xe5, 0x05, 0x76, 0xd5, 0xac, 0x60, 0x5a, 0x49, 0xaf, 0x8e, 0xc0, 0xae, 0x5e, 0xc7,
-	0xb4, 0xc2, 0x57, 0xc7, 0x7e, 0x98, 0xb2, 0x5c, 0x56, 0xc3, 0xa1, 0x58, 0x1a, 0x33, 0x86, 0xfc,
-	0x42, 0x36, 0xec, 0xe6, 0xe3, 0x5f, 0x8b, 0x3d, 0xe6, 0x9a, 0xd4, 0x75, 0xf2, 0x13, 0xfc, 0x78,
-	0xf5, 0xf2, 0xef, 0x7f, 0xce, 0x9f, 0x77, 0x5c, 0x56, 0x89, 0x2d, 0xcd, 0x0e, 0x6a, 0xba, 0x8c,
-	0xcc, 0xc3, 0x16, 0x3d, 0xe3, 0x06, 0x7a, 0x93, 0x3a, 0x45, 0xf5, 0x90, 0x05, 0x9c, 0x58, 0x95,
-	0xca, 0x0b, 0x2b, 0x25, 0x6d, 0xdd, 0x75, 0x7c, 0xcc, 0xe2, 0x88, 0x18, 0x39, 0xcb, 0xa3, 0xb7,
-	0xb8, 0xd3, 0x75, 0xd7, 0x51, 0xff, 0x51, 0xe0, 0x70, 0x3a, 0xef, 0xe4, 0x6e, 0xb8, 0x81, 0x59,
-	0x73, 0xd8, 0xd1, 0x3b, 0x30, 0xc9, 0xcb, 0x40, 0x46, 0xa8, 0x5f, 0x62, 0xc8, 0xdb, 0x5f, 0x76,
-	0xf7, 0x06, 0xa1, 0xb6, 0xcc, 0x01, 0x24, 0xa2, 0x77, 0x09, 0xb5, 0xf9, 0xf2, 0x94, 0x79, 0x22,
-	0xae, 0x53, 0x61, 0x8d, 0xe5, 0x99, 0x64, 0x49, 0x88, 0xd0, 0x65, 0x80, 0x44, 0x85, 0x73, 0x4a,
-	0x91, 0x89, 0x5c, 0xb9, 0xa0, 0x25, 0x84, 0x53, 0x6b, 0x10, 0x4e, 0xed, 0x83, 0x06, 0xe1, 0x5c,
-	0x9d, 0x78, 0xf2, 0xd7, 0xbc, 0x62, 0x4c, 0x0b, 0x1b, 0x2e, 0x55, 0xbf, 0x1d, 0x87, 0xc3, 0x7d,
-	0x9f, 0x44, 0x74, 0x15, 0x26, 0xec, 0x6a, 0x38, 0x72, 0xcb, 0x08, 0xe3, 0xb6, 0x76, 0x1f, 0x1b,
-	0x99, 0x41, 0x76, 0xe4, 0x6b, 0xbc, 0x2b, 0x5f, 0x26, 0xf0, 0x1a, 0x9a, 0xd8, 0x71, 0x22, 0x33,
-	0xac, 0xbe, 0x5e, 0x5f, 0x34, 0x1f, 0x0d, 0x9e, 0x2c, 0x7a, 0xc5, 0x71, 0xa2, 0xb5, 0x2a, 0xef,
-	0x6a, 0xf1, 0x8c, 0x99, 0x34, 0xae, 0xe5, 0x27, 0x93, 0xae, 0x16, 0x82, 0xf5, 0xb8, 0x86, 0xee,
-	0xc2, 0xb4, 0xe7, 0xde, 0x27, 0x76, 0xdd, 0xf6, 0x48, 0x7e, 0x6a, 0x10, 0x0d, 0xe9, 0xdb, 0x5c,
-	0x46, 0xcb, 0x53, 0xf9, 0x05, 0xc0, 0xa4, 0x98, 0x72, 0xf4, 0x93, 0x02, 0x7b, 0xbb, 0x48, 0x2f,
-	0x5a, 0x1e, 0xb4, 0x0d, 0x33, 0x48, 0x7d, 0x61, 0x65, 0x78, 0xc3, 0x04, 0x9d, 0x7a, 0xee, 0x8b,
-	0xe7, 0x7f, 0x7f, 0x3d, 0x76, 0x16, 0x95, 0xf5, 0xcc, 0x3f, 0x24, 0x1d, 0xb4, 0x4c, 0x7f, 0x94,
-	0x94, 0xe9, 0x31, 0xfa, 0x51, 0x81, 0xdd, 0x29, 0xcf, 0x68, 0x61, 0x18, 0x1c, 0x0d, 0xf0, 0x67,
-	0x87, 0x33, 0x92, 0xc0, 0x2f, 0x08, 0xe0, 0x4b, 0xe8, 0xec, 0x76, 0x81, 0xeb, 0x8f, 0x9a, 0x5b,
-	0xec, 0x31, 0xfa, 0x5e, 0x81, 0xd9, 0x34, 0x11, 0x45, 0x43, 0xc1, 0x68, 0xec, 0xfe, 0xc2, 0xe2,
-	0x90, 0x56, 0x12, 0x7d, 0x49, 0xa0, 0x3f, 0x8d, 0x4e, 0x6e, 0x3b, 0xed, 0xbc, 0x65, 0xe6, 0x3a,
-	0x19, 0x10, 0x5a, 0x1a, 0x70, 0x7d, 0x06, 0x43, 0x2d, 0x2c, 0x0f, 0x6d, 0x27, 0x81, 0x5f, 0x14,
-	0xc0, 0x97, 0xd1, 0xa2, 0xde, 0xf7, 0x8f, 0x6e, 0x28, 0x8c, 0x05, 0xaf, 0x4b, 0xe5, 0xfd, 0x07,
-	0x05, 0x72, 0x6d, 0xaf, 0x39, 0x2a, 0x0d, 0xc0, 0xd1, 0x4d, 0xb9, 0x0a, 0xe5, 0x61, 0x4c, 0x24,
-	0xea, 0xf3, 0x02, 0xf5, 0x22, 0x5a, 0xc8, 0x46, 0x2d, 0x40, 0xa6, 0xc0, 0xea, 0x72, 0x57, 0xfd,
-	0xa2, 0xc0, 0xfe, 0xde, 0x3c, 0x04, 0x5d, 0x18, 0x91, 0xbe, 0x24, 0x91, 0x5c, 0x7c, 0x2d, 0xf2,
-	0xa3, 0x2e, 0x8a, 0xa0, 0x74, 0x74, 0x66, 0x50, 0x50, 0xe7, 0xda, 0x89, 0x17, 0xfa, 0x43, 0x81,
-	0x7c, 0x16, 0xcb, 0x40, 0x97, 0x06, 0x40, 0x1a, 0x40, 0x85, 0x0a, 0x97, 0x47, 0xb6, 0x97, 0x41,
-	0x5d, 0x12, 0x41, 0xad, 0xa0, 0xa5, 0xec, 0xa0, 0x3c, 0x4c, 0x99, 0xd9, 0x39, 0xdb, 0x72, 0x27,
-	0xad, 0xde, 0x79, 0xfa, 0xb2, 0xa8, 0x3c, 0x7b, 0x59, 0x54, 0x5e, 0xbc, 0x2c, 0x2a, 0x4f, 0x5e,
-	0x15, 0x77, 0x3d, 0x7b, 0x55, 0xdc, 0xf5, 0xdb, 0xab, 0xe2, 0xae, 0x8f, 0x97, 0x07, 0x3f, 0x1c,
-	0x0f, 0x3b, 0x2e, 0x63, 0xf5, 0x90, 0x50, 0x6b, 0x4a, 0xbc, 0xbd, 0x0b, 0xff, 0x06, 0x00, 0x00,
-	0xff, 0xff, 0x7b, 0x7c, 0xcd, 0x82, 0x70, 0x12, 0x00, 0x00,
+	// 1314 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x57, 0xcb, 0x6f, 0xdc, 0x44,
+	0x18, 0xaf, 0xf3, 0x12, 0xf9, 0x36, 0x4d, 0xd3, 0x51, 0x69, 0x97, 0x6d, 0xbb, 0x29, 0xa6, 0x85,
+	0x3e, 0x54, 0x5b, 0xbb, 0x69, 0x1e, 0xea, 0x93, 0xa6, 0x14, 0x2a, 0xf5, 0xa1, 0xd4, 0xa1, 0x20,
+	0x71, 0xa8, 0x19, 0x3b, 0x53, 0xef, 0xb0, 0xde, 0xb5, 0xeb, 0x19, 0x27, 0xb5, 0x4a, 0x85, 0x04,
+	0xff, 0x40, 0x11, 0x12, 0x47, 0xfe, 0x01, 0x2e, 0x70, 0xe3, 0xcc, 0xa9, 0x12, 0x1c, 0x2a, 0xf5,
+	0x00, 0x02, 0x09, 0xaa, 0x16, 0xf1, 0x77, 0xa0, 0x19, 0xcf, 0x3e, 0xbc, 0x89, 0xb3, 0xd9, 0x34,
+	0x17, 0x6e, 0xeb, 0x6f, 0xbe, 0xc7, 0xef, 0x7b, 0xcc, 0x37, 0xbf, 0x85, 0xa3, 0x0e, 0x76, 0x12,
+	0x3f, 0x68, 0x9a, 0x6e, 0x8d, 0xb8, 0xf5, 0x30, 0xa0, 0x4d, 0x4e, 0x9b, 0x9e, 0xb9, 0x5a, 0x31,
+	0xef, 0xc7, 0x24, 0x4a, 0x8c, 0x30, 0x0a, 0x78, 0x80, 0x8a, 0x4a, 0xcb, 0xc8, 0x68, 0x19, 0xab,
+	0x95, 0xd2, 0x3e, 0x2f, 0xf0, 0x02, 0xa9, 0x64, 0x8a, 0x5f, 0xa9, 0x7e, 0xe9, 0x90, 0x17, 0x04,
+	0x9e, 0x4f, 0x4c, 0x1c, 0x52, 0x13, 0x37, 0x9b, 0x01, 0xc7, 0x9c, 0x06, 0x4d, 0xa6, 0x4e, 0xa7,
+	0xd5, 0xa9, 0xfc, 0x72, 0xe2, 0x7b, 0x26, 0xa7, 0x0d, 0xc2, 0x38, 0x6e, 0x84, 0x4a, 0xe1, 0x44,
+	0x2e, 0xa8, 0x8e, 0x40, 0xa9, 0x9e, 0x74, 0x03, 0xd6, 0x08, 0x98, 0xe9, 0x60, 0x46, 0x52, 0xc8,
+	0xe6, 0x6a, 0xc5, 0x21, 0x1c, 0x57, 0xcc, 0x10, 0x7b, 0xb4, 0x29, 0x03, 0xa7, 0xba, 0xfa, 0xf7,
+	0x1a, 0x1c, 0xbe, 0x2d, 0x54, 0x2c, 0xbc, 0x76, 0xa5, 0xed, 0xe8, 0x06, 0x65, 0xdc, 0x22, 0xf7,
+	0x63, 0xc2, 0x38, 0x5a, 0x84, 0x31, 0xc6, 0x31, 0x8f, 0x59, 0x51, 0x3b, 0xa2, 0x1d, 0x9f, 0xac,
+	0x9e, 0x34, 0xf2, 0x12, 0x37, 0x3a, 0x0e, 0x96, 0xa5, 0x85, 0xa5, 0x2c, 0xd1, 0xfb, 0x00, 0x9d,
+	0xc8, 0xc5, 0xa1, 0x23, 0xda, 0xf1, 0x42, 0xf5, 0x6d, 0x23, 0x85, 0x69, 0x08, 0x98, 0x46, 0x5a,
+	0x59, 0x05, 0xd3, 0x58, 0xc2, 0x1e, 0x51, 0xf1, 0xad, 0x2e, 0x4b, 0xfd, 0x17, 0x0d, 0xca, 0x79,
+	0x68, 0x59, 0x18, 0x34, 0x19, 0x41, 0x9f, 0xc2, 0x9e, 0x08, 0xaf, 0xd9, 0x1d, 0x6c, 0x02, 0xf7,
+	0xf0, 0xf1, 0x42, 0x75, 0x3e, 0x1f, 0x77, 0xc6, 0xdb, 0xc7, 0x94, 0xd7, 0x6e, 0x12, 0x8e, 0x5b,
+	0x1e, 0xad, 0xc9, 0xa8, 0xfb, 0x98, 0xa1, 0x0f, 0x36, 0x48, 0xe6, 0x9d, 0xbe, 0xc9, 0x28, 0x67,
+	0xdd, 0xd9, 0x2c, 0xc0, 0x1b, 0xeb, 0x93, 0x69, 0x95, 0xfd, 0x20, 0x8c, 0x93, 0x30, 0x70, 0x6b,
+	0x76, 0x33, 0x6e, 0xc8, 0xca, 0x8f, 0x58, 0xaf, 0x49, 0xc1, 0xad, 0xb8, 0xa1, 0x7f, 0x0e, 0xa5,
+	0x8d, 0x2c, 0x55, 0x09, 0xee, 0xc2, 0x64, 0xb6, 0x04, 0xd2, 0xfe, 0x15, 0x2a, 0xb0, 0x3b, 0x53,
+	0x01, 0x7d, 0x65, 0xa3, 0xe8, 0xac, 0x05, 0x3c, 0xdb, 0x6b, 0x6d, 0xdb, 0xbd, 0x7e, 0xa2, 0xc1,
+	0xc1, 0x0d, 0xc3, 0xfc, 0xff, 0x1a, 0xfd, 0x95, 0x06, 0x87, 0x64, 0x2a, 0x8b, 0x3e, 0x5b, 0x8a,
+	0x1d, 0x9f, 0xba, 0xd7, 0x49, 0xd2, 0x7d, 0xc7, 0x36, 0x6b, 0xf6, 0x8e, 0x5d, 0x9e, 0xaf, 0x35,
+	0x28, 0xae, 0x07, 0xa0, 0xaa, 0x79, 0x0a, 0xf6, 0xae, 0x62, 0x9f, 0xae, 0x60, 0x1e, 0x44, 0x36,
+	0x5e, 0x59, 0x89, 0x08, 0x4b, 0x2f, 0xfc, 0xb8, 0x35, 0xd5, 0x3e, 0xb8, 0x9c, 0xca, 0xd1, 0x31,
+	0xd8, 0xe3, 0xf8, 0xcc, 0x0e, 0x63, 0xc7, 0xae, 0x93, 0xc4, 0xae, 0x91, 0x07, 0x12, 0xd6, 0xb8,
+	0x35, 0xe1, 0x48, 0xff, 0xd7, 0x49, 0x72, 0x8d, 0x3c, 0x40, 0x6f, 0xc2, 0xc4, 0x6a, 0x20, 0x4a,
+	0x6f, 0x87, 0xc1, 0x1a, 0x89, 0x8a, 0xc3, 0x32, 0xb1, 0x42, 0x2a, 0x5b, 0x12, 0x22, 0xfd, 0x59,
+	0x6b, 0xfd, 0xe4, 0x02, 0xa3, 0x70, 0xa0, 0x03, 0x6c, 0x8d, 0xf2, 0x9a, 0x2d, 0x42, 0xd7, 0x49,
+	0xd2, 0x6a, 0x77, 0x35, 0xbf, 0xdd, 0x79, 0x4e, 0xad, 0x7d, 0x6d, 0x97, 0x62, 0x08, 0x16, 0x7d,
+	0x76, 0x9d, 0x24, 0x3b, 0xd8, 0xef, 0x39, 0x38, 0x20, 0x93, 0xba, 0x2a, 0x5a, 0xa8, 0x56, 0xe1,
+	0x56, 0xae, 0xf5, 0x5d, 0x28, 0xae, 0xb7, 0x53, 0x75, 0xd8, 0x81, 0x35, 0xac, 0x5f, 0x05, 0x3d,
+	0xbd, 0x51, 0xc4, 0x25, 0x4d, 0xde, 0x15, 0xe5, 0x4a, 0x10, 0x77, 0x36, 0xcf, 0x34, 0x14, 0x52,
+	0x88, 0xae, 0x90, 0x2a, 0x90, 0x20, 0x45, 0x52, 0x4f, 0xff, 0x76, 0x08, 0xde, 0xda, 0xd4, 0x8f,
+	0x82, 0x7c, 0x10, 0xc6, 0x39, 0x0d, 0x6d, 0x69, 0xd9, 0xca, 0x95, 0xd3, 0x50, 0xea, 0xf7, 0x46,
+	0x19, 0xea, 0x8d, 0x82, 0xee, 0xc3, 0x44, 0x0a, 0x5b, 0x69, 0x0c, 0xcb, 0x6e, 0xdf, 0xca, 0x4f,
+	0x7b, 0x0b, 0x90, 0x8c, 0x2e, 0xd9, 0xd5, 0x26, 0x8f, 0x12, 0xab, 0xc0, 0x3a, 0x92, 0xd2, 0x45,
+	0x98, 0xea, 0x55, 0x40, 0x53, 0x30, 0x5c, 0x27, 0x89, 0xba, 0x0a, 0xe2, 0x27, 0xda, 0x07, 0xa3,
+	0xab, 0xd8, 0x8f, 0x89, 0xc2, 0x9c, 0x7e, 0x9c, 0x1d, 0x5a, 0xd0, 0xf4, 0xcf, 0xe0, 0xa8, 0x04,
+	0x71, 0x03, 0x33, 0x9e, 0xdd, 0x33, 0xd9, 0x21, 0xd8, 0x89, 0x5e, 0x7e, 0x01, 0xc7, 0xfa, 0xc4,
+	0x52, 0x5d, 0xf8, 0x28, 0xe7, 0x35, 0x30, 0xb7, 0xb8, 0x26, 0xf3, 0x5e, 0x81, 0xdf, 0x34, 0x78,
+	0x7d, 0xe3, 0xf7, 0x67, 0xd3, 0x6d, 0x76, 0x14, 0x26, 0x1d, 0x3f, 0x70, 0xeb, 0x76, 0x0d, 0xb3,
+	0x5a, 0x76, 0x75, 0x04, 0x6e, 0xfd, 0x1a, 0x66, 0x35, 0xb1, 0x3a, 0xf6, 0xc3, 0x98, 0x43, 0x79,
+	0x03, 0x87, 0x72, 0x69, 0x4c, 0x58, 0xea, 0x0b, 0xb9, 0xb0, 0x5b, 0x5c, 0xff, 0x46, 0xec, 0x73,
+	0x6a, 0x33, 0xea, 0x15, 0x47, 0xc4, 0xf1, 0xe2, 0xa5, 0x3f, 0xfe, 0x9a, 0x3e, 0xe7, 0x51, 0x5e,
+	0x8b, 0x1d, 0xc3, 0x0d, 0x1a, 0xa6, 0xca, 0xcc, 0xc7, 0x0e, 0x3b, 0x4d, 0x03, 0xb3, 0x4d, 0x9d,
+	0xa2, 0x24, 0xe4, 0x81, 0xe9, 0xf8, 0xac, 0x52, 0x9d, 0x59, 0xa8, 0x18, 0xcb, 0xd4, 0x6b, 0x62,
+	0x1e, 0x47, 0xc4, 0x2a, 0x38, 0x3e, 0xbb, 0x29, 0x9c, 0x2e, 0x53, 0x4f, 0xff, 0x57, 0x83, 0xc3,
+	0xd9, 0xba, 0x93, 0x3b, 0xe1, 0x0a, 0xe6, 0xed, 0xcb, 0x8e, 0xde, 0x85, 0x51, 0xd1, 0x06, 0xb2,
+	0x8d, 0xfe, 0xa5, 0x86, 0x62, 0xfc, 0xd5, 0x74, 0xaf, 0x10, 0xe6, 0xaa, 0x1a, 0x40, 0x2a, 0x7a,
+	0x8f, 0x30, 0x57, 0x2c, 0x4f, 0x55, 0x27, 0x42, 0xbd, 0x1a, 0x6f, 0x2d, 0xcf, 0xb4, 0x4a, 0x52,
+	0x84, 0x2e, 0x01, 0xa4, 0x2a, 0x82, 0x2b, 0xca, 0x4a, 0x14, 0xaa, 0x25, 0x23, 0x25, 0x92, 0x46,
+	0x8b, 0x48, 0x1a, 0x1f, 0xb6, 0x88, 0xe4, 0xe2, 0xc8, 0xe3, 0xbf, 0xa7, 0x35, 0x6b, 0x5c, 0xda,
+	0x08, 0xa9, 0xfe, 0xdd, 0x30, 0x1c, 0xde, 0xf4, 0x49, 0x44, 0x57, 0x60, 0xc4, 0xad, 0x87, 0xdb,
+	0x1e, 0x19, 0x69, 0xdc, 0x35, 0xee, 0x43, 0xdb, 0x66, 0x90, 0x3d, 0xf5, 0x1a, 0x5e, 0x57, 0x2f,
+	0x1b, 0x44, 0x0f, 0x6d, 0xec, 0x79, 0x91, 0x1d, 0xd6, 0x5f, 0x6d, 0x2e, 0xda, 0x8f, 0x86, 0x28,
+	0x16, 0xbb, 0xec, 0x79, 0xd1, 0x52, 0x5d, 0x4c, 0xb5, 0x7c, 0xc6, 0x6c, 0x16, 0x37, 0x8a, 0xa3,
+	0xe9, 0x54, 0x4b, 0xc1, 0x72, 0xdc, 0x40, 0x77, 0x60, 0xdc, 0xa7, 0xf7, 0x88, 0x9b, 0xb8, 0x3e,
+	0x29, 0x8e, 0xf5, 0xa3, 0x21, 0x9b, 0x0e, 0x97, 0xd5, 0xf1, 0x54, 0x7d, 0x0e, 0x30, 0x2a, 0x6f,
+	0x39, 0xfa, 0x59, 0x83, 0xbd, 0xeb, 0x48, 0x2f, 0x9a, 0xef, 0xb7, 0x0d, 0x73, 0x48, 0x7d, 0x69,
+	0x61, 0x70, 0xc3, 0x14, 0x9d, 0x7e, 0xf6, 0xcb, 0x67, 0xff, 0x7c, 0x33, 0x74, 0x06, 0x55, 0xcd,
+	0xdc, 0x3f, 0x24, 0x3d, 0xb4, 0xcc, 0x7c, 0x98, 0xb6, 0xe9, 0x11, 0xfa, 0x49, 0x83, 0xdd, 0x19,
+	0xcf, 0x68, 0x66, 0x10, 0x1c, 0x2d, 0xf0, 0x67, 0x06, 0x33, 0x52, 0xc0, 0xcf, 0x4b, 0xe0, 0x73,
+	0xe8, 0xcc, 0x56, 0x81, 0x9b, 0x0f, 0xdb, 0x5b, 0xec, 0x11, 0xfa, 0x41, 0x83, 0xc9, 0x2c, 0x11,
+	0x45, 0x03, 0xc1, 0x68, 0xed, 0xfe, 0xd2, 0xec, 0x80, 0x56, 0x0a, 0x7d, 0x45, 0xa2, 0x3f, 0x85,
+	0x4e, 0x6c, 0xb9, 0xec, 0x62, 0x64, 0xa6, 0x7a, 0x19, 0x10, 0x9a, 0xeb, 0x13, 0x3e, 0x87, 0xa1,
+	0x96, 0xe6, 0x07, 0xb6, 0x53, 0xc0, 0x2f, 0x48, 0xe0, 0xf3, 0x68, 0x36, 0x1f, 0xb8, 0xe2, 0x92,
+	0x3e, 0x75, 0x25, 0xaf, 0xcb, 0xd4, 0xfd, 0x47, 0x0d, 0x0a, 0x5d, 0xaf, 0x39, 0xaa, 0xf4, 0xc1,
+	0xb1, 0x9e, 0x72, 0x95, 0xaa, 0x83, 0x98, 0x28, 0xd4, 0xe7, 0x24, 0xea, 0x59, 0x34, 0x93, 0x8f,
+	0x5a, 0x82, 0xcc, 0x80, 0x35, 0xd5, 0xae, 0xfa, 0x55, 0x83, 0xfd, 0x1b, 0xf3, 0x10, 0x74, 0x7e,
+	0x9b, 0xf4, 0x25, 0xcd, 0xe4, 0xc2, 0x2b, 0x91, 0x1f, 0x7d, 0x56, 0x26, 0x65, 0xa2, 0xd3, 0xfd,
+	0x92, 0x3a, 0xdb, 0x4d, 0xbc, 0xd0, 0x9f, 0x1a, 0x14, 0xf3, 0x58, 0x06, 0xba, 0xd8, 0x07, 0x52,
+	0x1f, 0x2a, 0x54, 0xba, 0xb4, 0x6d, 0x7b, 0x95, 0xd4, 0x45, 0x99, 0xd4, 0x02, 0x9a, 0xcb, 0x4f,
+	0xca, 0xc7, 0x8c, 0xdb, 0xbd, 0x77, 0x5b, 0xed, 0xa4, 0xc5, 0xdb, 0x4f, 0x5e, 0x94, 0xb5, 0xa7,
+	0x2f, 0xca, 0xda, 0xf3, 0x17, 0x65, 0xed, 0xf1, 0xcb, 0xf2, 0xae, 0xa7, 0x2f, 0xcb, 0xbb, 0x7e,
+	0x7f, 0x59, 0xde, 0xf5, 0xc9, 0x7c, 0xff, 0x87, 0xe3, 0x41, 0x4f, 0x30, 0x9e, 0x84, 0x84, 0x39,
+	0x63, 0xf2, 0xed, 0x9d, 0xf9, 0x2f, 0x00, 0x00, 0xff, 0xff, 0x63, 0xf0, 0x65, 0xc8, 0x48, 0x12,
+	0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/x/finality/keeper/liveness_test.go b/x/finality/keeper/liveness_test.go
index 2ebed01f5..f7f37f517 100644
--- a/x/finality/keeper/liveness_test.go
+++ b/x/finality/keeper/liveness_test.go
@@ -6,6 +6,7 @@ import (
 	"time"
 
 	"cosmossdk.io/core/header"
+	"github.com/btcsuite/btcd/btcec/v2"
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/require"
 
@@ -122,7 +123,7 @@ func FuzzHandleLivenessDeterminism(f *testing.F) {
 			stakingTxHash, msgCreateBTCDel, actualDel, btcHeaderInfo, inclusionProof, _, err := h1.CreateDelegationWithBtcBlockHeight(
 				r,
 				delSK,
-				fpPK,
+				[]*btcec.PublicKey{fpPK},
 				stakingValue,
 				1000,
 				0,
@@ -136,7 +137,7 @@ func FuzzHandleLivenessDeterminism(f *testing.F) {
 			stakingTxHash2, msgCreateBTCDel2, actualDel2, btcHeaderInfo2, inclusionProof2, _, err := h2.CreateDelegationWithBtcBlockHeight(
 				r,
 				delSK,
-				fpPK,
+				[]*btcec.PublicKey{fpPK},
 				stakingValue,
 				1000,
 				0,
diff --git a/x/finality/keeper/power_dist_change_test.go b/x/finality/keeper/power_dist_change_test.go
index 2316266c8..5de2db33c 100644
--- a/x/finality/keeper/power_dist_change_test.go
+++ b/x/finality/keeper/power_dist_change_test.go
@@ -712,7 +712,7 @@ func FuzzBTCDelegationEvents_NoPreApproval(f *testing.F) {
 		// due to no timestamped randomness
 		babylonHeight += 1
 		h.SetCtxHeight(babylonHeight)
-		h.BTCLightClientKeeper.EXPECT().GetTipInfo(gomock.Eq(h.Ctx)).Return(btcTip)
+		h.BTCLightClientKeeper.EXPECT().GetTipInfo(gomock.Eq(h.Ctx)).Return(btcTip).AnyTimes()
 		h.BeginBlocker()
 		require.Zero(t, h.FinalityKeeper.GetVotingPower(h.Ctx, *fp.BtcPk, babylonHeight))
 
diff --git a/x/finality/types/mocked_keepers.go b/x/finality/types/mocked_keepers.go
index bf41fb7e5..18eb54624 100644
--- a/x/finality/types/mocked_keepers.go
+++ b/x/finality/types/mocked_keepers.go
@@ -207,7 +207,7 @@ func (mr *MockBTCStakingKeeperMockRecorder) UnjailFinalityProvider(ctx, fpBTCPK
 }
 
 // UpdateFinalityProvider mocks base method.
-func (m *MockBTCStakingKeeper) UpdateFinalityProvider(ctx context.Context, fp *types.FinalityProvider) error {
+func (m *MockBTCStakingKeeper) UpdateFinalityProvider(ctx context.Context, fp *types0.FinalityProvider) error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "UpdateFinalityProvider", ctx, fp)
 	ret0, _ := ret[0].(error)
@@ -309,7 +309,7 @@ func (m *MockIncentiveKeeper) EXPECT() *MockIncentiveKeeperMockRecorder {
 }
 
 // BtcDelegationActivated mocks base method.
-func (m *MockIncentiveKeeper) BtcDelegationActivated(ctx context.Context, fp, del types1.AccAddress, sat uint64) error {
+func (m *MockIncentiveKeeper) BtcDelegationActivated(ctx context.Context, fp, del types2.AccAddress, sat uint64) error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "BtcDelegationActivated", ctx, fp, del, sat)
 	ret0, _ := ret[0].(error)
@@ -323,7 +323,7 @@ func (mr *MockIncentiveKeeperMockRecorder) BtcDelegationActivated(ctx, fp, del,
 }
 
 // BtcDelegationUnbonded mocks base method.
-func (m *MockIncentiveKeeper) BtcDelegationUnbonded(ctx context.Context, fp, del types1.AccAddress, sat uint64) error {
+func (m *MockIncentiveKeeper) BtcDelegationUnbonded(ctx context.Context, fp, del types2.AccAddress, sat uint64) error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "BtcDelegationUnbonded", ctx, fp, del, sat)
 	ret0, _ := ret[0].(error)
@@ -336,20 +336,6 @@ func (mr *MockIncentiveKeeperMockRecorder) BtcDelegationUnbonded(ctx, fp, del, s
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BtcDelegationUnbonded", reflect.TypeOf((*MockIncentiveKeeper)(nil).BtcDelegationUnbonded), ctx, fp, del, sat)
 }
 
-// FpSlashed mocks base method.
-func (m *MockIncentiveKeeper) FpSlashed(ctx context.Context, fp types1.AccAddress) error {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "FpSlashed", ctx, fp)
-	ret0, _ := ret[0].(error)
-	return ret0
-}
-
-// FpSlashed indicates an expected call of FpSlashed.
-func (mr *MockIncentiveKeeperMockRecorder) FpSlashed(ctx, fp interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FpSlashed", reflect.TypeOf((*MockIncentiveKeeper)(nil).FpSlashed), ctx, fp)
-}
-
 // IndexRefundableMsg mocks base method.
 func (m *MockIncentiveKeeper) IndexRefundableMsg(ctx context.Context, msg types2.Msg) {
 	m.ctrl.T.Helper()
diff --git a/x/incentive/types/query.pb.go b/x/incentive/types/query.pb.go
index 5feac9fe5..9b338cd62 100644
--- a/x/incentive/types/query.pb.go
+++ b/x/incentive/types/query.pb.go
@@ -500,56 +500,56 @@ func init() {
 func init() { proto.RegisterFile("babylon/incentive/query.proto", fileDescriptor_e1a59cc0c7c44135) }
 
 var fileDescriptor_e1a59cc0c7c44135 = []byte{
-	// 775 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x55, 0x41, 0x4f, 0x13, 0x41,
-	0x14, 0xee, 0x16, 0x5a, 0x75, 0x44, 0x81, 0xb1, 0xd1, 0xb6, 0x60, 0x2b, 0x1b, 0x51, 0xa2, 0x76,
-	0x47, 0x40, 0x02, 0x92, 0x68, 0xb4, 0x40, 0x4c, 0x4c, 0x34, 0xba, 0x98, 0x98, 0x78, 0xa9, 0xb3,
-	0xed, 0x64, 0xbb, 0xa1, 0xec, 0x94, 0x9d, 0x69, 0x6b, 0x45, 0x2e, 0x9e, 0x3c, 0x9a, 0xf8, 0x07,
-	0x38, 0x78, 0xd1, 0xa3, 0xf1, 0x47, 0x70, 0x24, 0x7a, 0xd1, 0x8b, 0x1a, 0xf0, 0x60, 0xbc, 0xf8,
-	0x17, 0x4c, 0x67, 0x66, 0x9b, 0x96, 0xee, 0x06, 0x48, 0x8c, 0xa7, 0xce, 0xcc, 0x7b, 0xdf, 0x7c,
-	0xdf, 0x37, 0xfb, 0xde, 0x2b, 0x38, 0x6b, 0x61, 0xab, 0x59, 0xa1, 0x2e, 0x72, 0xdc, 0x22, 0x71,
-	0xb9, 0x53, 0x27, 0x68, 0xad, 0x46, 0xbc, 0xa6, 0x51, 0xf5, 0x28, 0xa7, 0x70, 0x58, 0x85, 0x8d,
-	0x76, 0x38, 0x9d, 0xb0, 0xa9, 0x4d, 0x45, 0x14, 0xb5, 0x56, 0x32, 0x31, 0x3d, 0x6a, 0x53, 0x6a,
-	0x57, 0x08, 0xc2, 0x55, 0x07, 0x61, 0xd7, 0xa5, 0x1c, 0x73, 0x87, 0xba, 0x4c, 0x45, 0x33, 0xbd,
-	0x2c, 0x55, 0xec, 0xe1, 0x55, 0x3f, 0x3e, 0xd6, 0x1b, 0x6f, 0xaf, 0xfc, 0x2b, 0x8a, 0x94, 0xad,
-	0x52, 0x86, 0x2c, 0xcc, 0x08, 0xaa, 0x4f, 0x5a, 0x84, 0xe3, 0x49, 0x54, 0xa4, 0x8e, 0xab, 0xe2,
-	0x29, 0x19, 0x2f, 0x48, 0x65, 0x72, 0x23, 0x43, 0x7a, 0x02, 0xc0, 0x87, 0x2d, 0x4f, 0x0f, 0x04,
-	0xa5, 0x49, 0xd6, 0x6a, 0x84, 0x71, 0xfd, 0x3e, 0x38, 0xd5, 0x75, 0xca, 0xaa, 0xd4, 0x65, 0x04,
-	0xce, 0x82, 0xb8, 0x94, 0x96, 0xd4, 0xce, 0x69, 0x13, 0xc7, 0xa7, 0x52, 0x46, 0xcf, 0x13, 0x18,
-	0x12, 0x92, 0xef, 0xdf, 0xfa, 0x96, 0x8d, 0x98, 0x2a, 0x5d, 0xbf, 0x06, 0x92, 0xe2, 0x3e, 0x93,
-	0x34, 0xb0, 0x57, 0xba, 0x83, 0x6b, 0x36, 0xf1, 0xb9, 0x60, 0x12, 0x1c, 0xc1, 0xa5, 0x92, 0x47,
-	0x98, 0xbc, 0xf5, 0x98, 0xe9, 0x6f, 0xf5, 0x3f, 0x1a, 0x48, 0x74, 0x23, 0x94, 0x0e, 0x0c, 0x62,
-	0x2d, 0x77, 0x2d, 0x40, 0x9f, 0x90, 0xa1, 0x2c, 0xb5, 0xfc, 0x1b, 0xca, 0xbf, 0xb1, 0x40, 0x1d,
-	0x37, 0x7f, 0xb5, 0x25, 0xe3, 0xfd, 0xf7, 0xec, 0x84, 0xed, 0xf0, 0x72, 0xcd, 0x32, 0x8a, 0x74,
-	0x55, 0xf9, 0x57, 0x3f, 0x39, 0x56, 0x5a, 0x41, 0xbc, 0x59, 0x25, 0x4c, 0x00, 0x98, 0x29, 0x6f,
-	0x86, 0x1c, 0x0c, 0x36, 0x1c, 0x5e, 0x2e, 0x79, 0xb8, 0xe1, 0x16, 0x24, 0x59, 0xf4, 0xdf, 0x93,
-	0x9d, 0x6c, 0x73, 0x88, 0xbd, 0xfe, 0x5b, 0x03, 0xa9, 0x80, 0x87, 0x52, 0xb6, 0x8b, 0xe0, 0x84,
-	0x27, 0xce, 0x0b, 0xb6, 0x08, 0x28, 0xfb, 0x37, 0x03, 0xbe, 0x42, 0xe8, 0x25, 0x46, 0xe7, 0xe1,
-	0x92, 0xcb, 0xbd, 0xa6, 0x39, 0xe0, 0x75, 0x1c, 0xa5, 0xcb, 0x60, 0xb8, 0x27, 0x05, 0x0e, 0x81,
-	0xbe, 0x15, 0xd2, 0x54, 0xdf, 0xa7, 0xb5, 0x84, 0x37, 0x40, 0xac, 0x8e, 0x2b, 0x35, 0x92, 0x8c,
-	0x8a, 0x4a, 0xb8, 0x18, 0xa0, 0x21, 0x88, 0xde, 0x94, 0xa8, 0xf9, 0xe8, 0x9c, 0xa6, 0xcf, 0x80,
-	0x11, 0x21, 0x33, 0xff, 0x68, 0x61, 0x99, 0xe3, 0x15, 0xc7, 0xb5, 0x45, 0xae, 0x5f, 0x17, 0xa7,
-	0x41, 0xbc, 0x4c, 0x1c, 0xbb, 0xcc, 0x05, 0x6d, 0xbf, 0xa9, 0x76, 0xfa, 0x0b, 0x70, 0xa6, 0x07,
-	0xf1, 0xdf, 0xea, 0x42, 0x7f, 0x0a, 0x46, 0x83, 0x45, 0x2b, 0x09, 0xb7, 0x40, 0x4c, 0x7c, 0x1c,
-	0xd5, 0x21, 0x97, 0x02, 0xde, 0x25, 0x04, 0x6a, 0x4a, 0xa0, 0xde, 0x00, 0xe7, 0x05, 0xc3, 0x22,
-	0xa9, 0x10, 0x1b, 0x73, 0xea, 0x3d, 0x56, 0x35, 0x72, 0x5b, 0xb6, 0x85, 0xff, 0x3e, 0x4b, 0x60,
-	0xb8, 0xe4, 0xa7, 0x14, 0xba, 0x3a, 0x28, 0x9f, 0xfc, 0xf4, 0x31, 0x97, 0x50, 0xde, 0x15, 0x6a,
-	0x99, 0x7b, 0x8e, 0x6b, 0x9b, 0x43, 0x6d, 0x88, 0x3a, 0x9f, 0x3f, 0xfa, 0x6a, 0x33, 0x1b, 0xf9,
-	0xb5, 0x99, 0x8d, 0xe8, 0x75, 0x30, 0xbe, 0x0f, 0xb1, 0xf2, 0xb8, 0x00, 0x86, 0xfc, 0xba, 0x3d,
-	0x30, 0x71, 0xbb, 0x9b, 0x7a, 0x78, 0xa7, 0x3e, 0xc4, 0x40, 0x4c, 0x10, 0xc3, 0xe7, 0x20, 0x2e,
-	0xc7, 0x07, 0x1c, 0x0f, 0xab, 0xe9, 0xae, 0x39, 0x95, 0xbe, 0xb0, 0x5f, 0x9a, 0x54, 0xac, 0x8f,
-	0xbd, 0xfc, 0xfc, 0xf3, 0x4d, 0x74, 0x04, 0xa6, 0x50, 0xd8, 0xb0, 0x85, 0x6f, 0x35, 0x30, 0xd0,
-	0x59, 0xb1, 0xf0, 0xf2, 0xc1, 0xda, 0x4a, 0x0a, 0xb9, 0x72, 0x98, 0x1e, 0xd4, 0xaf, 0x0b, 0x39,
-	0xd3, 0x70, 0x32, 0x40, 0x8e, 0x7a, 0x50, 0xb4, 0xae, 0x16, 0x1b, 0xa8, 0xb3, 0xe7, 0xe1, 0x3b,
-	0x0d, 0x0c, 0xee, 0x29, 0x20, 0x68, 0x84, 0x91, 0x07, 0x77, 0x56, 0x1a, 0x1d, 0x38, 0x5f, 0xe9,
-	0x9d, 0x11, 0x7a, 0x11, 0xcc, 0x05, 0xe8, 0xb5, 0x78, 0xb1, 0xc0, 0x24, 0x48, 0x4a, 0x44, 0xeb,
-	0xb2, 0x51, 0x37, 0xe0, 0x57, 0x0d, 0x24, 0xc3, 0x8a, 0x09, 0xce, 0x86, 0x89, 0xd8, 0xa7, 0xee,
-	0xd3, 0x73, 0x87, 0x07, 0x2a, 0x1b, 0x77, 0x85, 0x8d, 0x45, 0x98, 0x0f, 0xb0, 0xd1, 0xee, 0x0b,
-	0x86, 0xd6, 0x7b, 0xda, 0x6a, 0x03, 0xed, 0xad, 0xf7, 0xfc, 0xbd, 0xad, 0x9d, 0x8c, 0xb6, 0xbd,
-	0x93, 0xd1, 0x7e, 0xec, 0x64, 0xb4, 0xd7, 0xbb, 0x99, 0xc8, 0xf6, 0x6e, 0x26, 0xf2, 0x65, 0x37,
-	0x13, 0x79, 0x32, 0xdd, 0x31, 0x52, 0x14, 0x4f, 0x05, 0x5b, 0x2c, 0xe7, 0xd0, 0x36, 0xed, 0xb3,
-	0x0e, 0x62, 0x31, 0x63, 0xac, 0xb8, 0xf8, 0x37, 0x9e, 0xfe, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x3d,
-	0xa7, 0x53, 0xdf, 0x73, 0x08, 0x00, 0x00,
+	// 772 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x55, 0x41, 0x4f, 0x13, 0x4d,
+	0x18, 0xee, 0x16, 0xda, 0xef, 0xfb, 0xde, 0x8f, 0xef, 0x03, 0xc6, 0x46, 0xdb, 0x82, 0xad, 0x6e,
+	0x44, 0x89, 0xda, 0x1d, 0x01, 0x09, 0x48, 0xa2, 0xd1, 0x02, 0x31, 0x31, 0xd1, 0xe8, 0x62, 0x62,
+	0xe2, 0xa5, 0xce, 0xb6, 0x93, 0xed, 0x86, 0xb2, 0x53, 0x76, 0xa7, 0xad, 0x15, 0xb9, 0x78, 0xf2,
+	0x68, 0xe2, 0x1f, 0xe0, 0xe0, 0x45, 0x8f, 0xc6, 0x1f, 0xc1, 0x91, 0xe8, 0x45, 0x2f, 0x6a, 0xc0,
+	0x83, 0xf1, 0xe2, 0x5f, 0x30, 0x9d, 0x99, 0x36, 0x2d, 0xdd, 0x0d, 0x90, 0x18, 0x4f, 0xdd, 0x99,
+	0xf7, 0x7d, 0xe6, 0x79, 0x9e, 0x99, 0xf7, 0x7d, 0x0b, 0x27, 0x2d, 0x62, 0x35, 0x2b, 0xcc, 0xc5,
+	0x8e, 0x5b, 0xa4, 0x2e, 0x77, 0xea, 0x14, 0xaf, 0xd7, 0xa8, 0xd7, 0x34, 0xaa, 0x1e, 0xe3, 0x0c,
+	0x8d, 0xaa, 0xb0, 0xd1, 0x09, 0xa7, 0x13, 0x36, 0xb3, 0x99, 0x88, 0xe2, 0xd6, 0x97, 0x4c, 0x4c,
+	0x8f, 0xdb, 0x8c, 0xd9, 0x15, 0x8a, 0x49, 0xd5, 0xc1, 0xc4, 0x75, 0x19, 0x27, 0xdc, 0x61, 0xae,
+	0xaf, 0xa2, 0x99, 0x7e, 0x96, 0x2a, 0xf1, 0xc8, 0x5a, 0x27, 0x5e, 0x64, 0xfe, 0x1a, 0xf3, 0xb1,
+	0x45, 0x7c, 0x8a, 0xeb, 0x53, 0x16, 0xe5, 0x64, 0x0a, 0x17, 0x99, 0xe3, 0xaa, 0x78, 0x4a, 0xc6,
+	0x0b, 0x92, 0x56, 0x2e, 0x64, 0x48, 0x4f, 0x00, 0xba, 0xd7, 0x12, 0x7c, 0x57, 0x9c, 0x67, 0xd2,
+	0xf5, 0x1a, 0xf5, 0xb9, 0x7e, 0x07, 0x8e, 0xf5, 0xec, 0xfa, 0x55, 0xe6, 0xfa, 0x14, 0xcd, 0x41,
+	0x5c, 0xf2, 0x26, 0xb5, 0x53, 0xda, 0xe4, 0xbf, 0xd3, 0x29, 0xa3, 0xcf, 0x9f, 0x21, 0x21, 0xf9,
+	0xc1, 0xed, 0xcf, 0xd9, 0x88, 0xa9, 0xd2, 0xf5, 0xcb, 0x90, 0x14, 0xe7, 0x99, 0xb4, 0x41, 0xbc,
+	0xd2, 0x4d, 0x52, 0xb3, 0x69, 0x9b, 0x0b, 0x25, 0xe1, 0x2f, 0x52, 0x2a, 0x79, 0xd4, 0x97, 0xa7,
+	0xfe, 0x63, 0xb6, 0x97, 0xfa, 0x4f, 0x0d, 0x12, 0xbd, 0x08, 0xa5, 0x83, 0x40, 0xac, 0xe5, 0xae,
+	0x05, 0x18, 0x10, 0x32, 0x94, 0xa5, 0x96, 0x7f, 0x43, 0xf9, 0x37, 0x16, 0x99, 0xe3, 0xe6, 0x2f,
+	0xb5, 0x64, 0xbc, 0xf9, 0x92, 0x9d, 0xb4, 0x1d, 0x5e, 0xae, 0x59, 0x46, 0x91, 0xad, 0x29, 0xff,
+	0xea, 0x27, 0xe7, 0x97, 0x56, 0x31, 0x6f, 0x56, 0xa9, 0x2f, 0x00, 0xbe, 0x29, 0x4f, 0x46, 0x1c,
+	0x86, 0x1b, 0x0e, 0x2f, 0x97, 0x3c, 0xd2, 0x70, 0x0b, 0x92, 0x2c, 0xfa, 0xfb, 0xc9, 0xfe, 0xef,
+	0x70, 0x88, 0xb5, 0xfe, 0x43, 0x83, 0x54, 0xc0, 0x45, 0x29, 0xdb, 0x45, 0xf8, 0xcf, 0x13, 0xfb,
+	0x05, 0x5b, 0x04, 0x94, 0xfd, 0x6b, 0x01, 0xaf, 0x10, 0x7a, 0x88, 0xd1, 0xbd, 0xb9, 0xec, 0x72,
+	0xaf, 0x69, 0x0e, 0x79, 0x5d, 0x5b, 0xe9, 0x32, 0x8c, 0xf6, 0xa5, 0xa0, 0x11, 0x18, 0x58, 0xa5,
+	0x4d, 0xf5, 0x3e, 0xad, 0x4f, 0x74, 0x15, 0x62, 0x75, 0x52, 0xa9, 0xd1, 0x64, 0x54, 0x54, 0xc2,
+	0xb9, 0x00, 0x0d, 0x41, 0xf4, 0xa6, 0x44, 0x2d, 0x44, 0xe7, 0x35, 0x7d, 0x16, 0xc6, 0x84, 0xcc,
+	0xfc, 0xfd, 0xc5, 0x15, 0x4e, 0x56, 0x1d, 0xd7, 0x16, 0xb9, 0xed, 0xba, 0x38, 0x0e, 0xf1, 0x32,
+	0x75, 0xec, 0x32, 0x17, 0xb4, 0x83, 0xa6, 0x5a, 0xe9, 0x4f, 0xe1, 0x44, 0x1f, 0xe2, 0x8f, 0xd5,
+	0x85, 0xfe, 0x08, 0xc6, 0x83, 0x45, 0x2b, 0x09, 0xd7, 0x21, 0x26, 0x1e, 0x47, 0x75, 0xc8, 0xf9,
+	0x80, 0x7b, 0x09, 0x81, 0x9a, 0x12, 0xa8, 0x37, 0xe0, 0x8c, 0x60, 0x58, 0xa2, 0x15, 0x6a, 0x13,
+	0xce, 0xbc, 0x07, 0xaa, 0x46, 0x6e, 0xc8, 0xb6, 0x68, 0xdf, 0xcf, 0x32, 0x8c, 0x96, 0xda, 0x29,
+	0x85, 0x9e, 0x0e, 0xca, 0x27, 0xdf, 0xbf, 0xcb, 0x25, 0x94, 0x77, 0x85, 0x5a, 0xe1, 0x9e, 0xe3,
+	0xda, 0xe6, 0x48, 0x07, 0xa2, 0xf6, 0x17, 0xfe, 0x7e, 0xbe, 0x95, 0x8d, 0x7c, 0xdf, 0xca, 0x46,
+	0xf4, 0x3a, 0x4c, 0x1c, 0x40, 0xac, 0x3c, 0x2e, 0xc2, 0x48, 0xbb, 0x6e, 0x0f, 0x4d, 0xdc, 0xe9,
+	0xa6, 0x3e, 0xde, 0xe9, 0xb7, 0x31, 0x88, 0x09, 0x62, 0xf4, 0x04, 0xe2, 0x72, 0x7c, 0xa0, 0x89,
+	0xb0, 0x9a, 0xee, 0x99, 0x53, 0xe9, 0xb3, 0x07, 0xa5, 0x49, 0xc5, 0xfa, 0xe9, 0x67, 0x1f, 0xbe,
+	0xbd, 0x8c, 0x8e, 0xa1, 0x14, 0x0e, 0x9b, 0xa4, 0xe8, 0x95, 0x06, 0x43, 0xdd, 0x15, 0x8b, 0x2e,
+	0x1c, 0xae, 0xad, 0xa4, 0x90, 0x8b, 0x47, 0xe9, 0x41, 0xfd, 0x8a, 0x90, 0x33, 0x83, 0xa6, 0x02,
+	0xe4, 0xa8, 0x0b, 0xc5, 0x1b, 0xea, 0x63, 0x13, 0x77, 0xf7, 0x3c, 0x7a, 0xad, 0xc1, 0xf0, 0xbe,
+	0x02, 0x42, 0x46, 0x18, 0x79, 0x70, 0x67, 0xa5, 0xf1, 0xa1, 0xf3, 0x95, 0xde, 0x59, 0xa1, 0x17,
+	0xa3, 0x5c, 0x80, 0x5e, 0x8b, 0x17, 0x0b, 0xbe, 0x04, 0x49, 0x89, 0x78, 0x43, 0x36, 0xea, 0x26,
+	0xfa, 0xa4, 0x41, 0x32, 0xac, 0x98, 0xd0, 0x5c, 0x98, 0x88, 0x03, 0xea, 0x3e, 0x3d, 0x7f, 0x74,
+	0xa0, 0xb2, 0x71, 0x4b, 0xd8, 0x58, 0x42, 0xf9, 0x00, 0x1b, 0x9d, 0xbe, 0xf0, 0xf1, 0x46, 0x5f,
+	0x5b, 0x6d, 0xe2, 0xfd, 0xf5, 0x9e, 0xbf, 0xbd, 0xbd, 0x9b, 0xd1, 0x76, 0x76, 0x33, 0xda, 0xd7,
+	0xdd, 0x8c, 0xf6, 0x62, 0x2f, 0x13, 0xd9, 0xd9, 0xcb, 0x44, 0x3e, 0xee, 0x65, 0x22, 0x0f, 0x67,
+	0xba, 0x46, 0x8a, 0xe2, 0xa9, 0x10, 0xcb, 0xcf, 0x39, 0xac, 0x43, 0xfb, 0xb8, 0x8b, 0x58, 0xcc,
+	0x18, 0x2b, 0x2e, 0xfe, 0x8d, 0x67, 0x7e, 0x05, 0x00, 0x00, 0xff, 0xff, 0x88, 0x1e, 0x59, 0x89,
+	0x50, 0x08, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/x/mint/types/query.pb.go b/x/mint/types/query.pb.go
index e5e2ff960..2a6928c0c 100644
--- a/x/mint/types/query.pb.go
+++ b/x/mint/types/query.pb.go
@@ -287,39 +287,38 @@ func init() {
 func init() { proto.RegisterFile("babylon/mint/v1/query.proto", fileDescriptor_bab217370cac4c70) }
 
 var fileDescriptor_bab217370cac4c70 = []byte{
-	// 501 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x92, 0xcd, 0x6e, 0xd3, 0x40,
-	0x14, 0x85, 0x33, 0xfc, 0x2d, 0x26, 0x2d, 0x94, 0x11, 0x12, 0xad, 0x53, 0x1c, 0x70, 0x04, 0x4a,
-	0xa9, 0x3a, 0xa3, 0x94, 0x27, 0x20, 0x20, 0xf1, 0x23, 0x16, 0x25, 0xea, 0x8a, 0x4d, 0x34, 0x0e,
-	0x53, 0x67, 0x84, 0x3d, 0xd7, 0xc9, 0x8c, 0x23, 0xb2, 0x65, 0x8f, 0x54, 0x09, 0xf1, 0x00, 0xbc,
-	0x4d, 0x97, 0x95, 0xba, 0x41, 0x2c, 0x0a, 0x4a, 0x78, 0x10, 0xe4, 0xb1, 0x5d, 0xd2, 0xc4, 0x91,
-	0xd2, 0x5d, 0x26, 0xe7, 0xe6, 0x9c, 0x2f, 0xf7, 0x5c, 0x5c, 0xf3, 0xb9, 0x3f, 0x0e, 0x41, 0xb1,
-	0x48, 0x2a, 0xc3, 0x46, 0x2d, 0x36, 0x48, 0xc4, 0x70, 0x4c, 0xe3, 0x21, 0x18, 0x20, 0x77, 0x72,
-	0x91, 0xa6, 0x22, 0x1d, 0xb5, 0x9c, 0x7b, 0x01, 0x04, 0x60, 0x35, 0x96, 0x7e, 0xca, 0xc6, 0x9c,
+	// 494 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x92, 0xcf, 0x6e, 0xd3, 0x40,
+	0x10, 0xc6, 0xb3, 0xfc, 0x3b, 0x6c, 0x5a, 0x28, 0x2b, 0x24, 0x5a, 0xa7, 0x38, 0xe0, 0x08, 0x94,
+	0x52, 0x75, 0x57, 0x29, 0x4f, 0x40, 0x40, 0xe2, 0x8f, 0x38, 0x94, 0xa8, 0x27, 0x2e, 0xd1, 0x3a,
+	0x6c, 0x9d, 0x15, 0xf6, 0x8e, 0x93, 0x5d, 0x47, 0xe4, 0xca, 0x1d, 0xa9, 0x12, 0xe2, 0x01, 0x78,
+	0x9b, 0x1e, 0x2b, 0xf5, 0x82, 0x38, 0x14, 0x94, 0xf0, 0x20, 0xc8, 0x6b, 0xbb, 0xa4, 0x89, 0x23,
+	0xa5, 0x37, 0x8f, 0xbf, 0xf1, 0x7c, 0x3f, 0xcf, 0x37, 0xb8, 0xe6, 0x73, 0x7f, 0x1c, 0x82, 0x62,
+	0x91, 0x54, 0x86, 0x8d, 0x5a, 0x6c, 0x90, 0x88, 0xe1, 0x98, 0xc6, 0x43, 0x30, 0x40, 0xee, 0xe4,
+	0x22, 0x4d, 0x45, 0x3a, 0x6a, 0x39, 0xf7, 0x02, 0x08, 0xc0, 0x6a, 0x2c, 0x7d, 0xca, 0xda, 0x9c,
 	0xed, 0x00, 0x20, 0x08, 0x05, 0xe3, 0xb1, 0x64, 0x5c, 0x29, 0x30, 0xdc, 0x48, 0x50, 0x3a, 0x57,
-	0x9d, 0xf9, 0x04, 0x6b, 0x96, 0x69, 0xf5, 0xfc, 0x97, 0xf6, 0xe5, 0x27, 0x47, 0xcc, 0xc8, 0x48,
-	0x68, 0xc3, 0xa3, 0x38, 0x1b, 0xf0, 0x6a, 0x78, 0xeb, 0x7d, 0x0a, 0xf4, 0x46, 0x1d, 0x85, 0xd6,
-	0xb5, 0xc3, 0x8d, 0xe8, 0x88, 0x41, 0x22, 0xb4, 0xf1, 0xfa, 0xd8, 0x29, 0x13, 0x75, 0x0c, 0x4a,
-	0x0b, 0xf2, 0x16, 0xdf, 0x96, 0x85, 0xd0, 0x1d, 0x72, 0x23, 0x36, 0xd1, 0x43, 0xd4, 0x5c, 0x6b,
-	0x37, 0x4e, 0xce, 0xeb, 0x95, 0x5f, 0xe7, 0xf5, 0x5a, 0x0f, 0x74, 0x04, 0x5a, 0x7f, 0xfc, 0x44,
-	0x25, 0xb0, 0x88, 0x9b, 0x3e, 0x7d, 0x27, 0x02, 0xde, 0x1b, 0xbf, 0x14, 0xbd, 0xce, 0xba, 0x9c,
-	0xf5, 0xf4, 0x5c, 0xbc, 0x6d, 0x93, 0x9e, 0x2b, 0x95, 0xf0, 0xf0, 0x60, 0x08, 0x23, 0xa9, 0xd3,
-	0xbf, 0x58, 0x90, 0x0c, 0xf0, 0x83, 0x25, 0x7a, 0x0e, 0x73, 0x80, 0xef, 0x72, 0xab, 0x75, 0xe3,
-	0x0b, 0xf1, 0x2a, 0x3c, 0x1b, 0x7c, 0xce, 0xd9, 0xdb, 0xc2, 0xf7, 0x6d, 0xe4, 0x2b, 0xa1, 0x84,
-	0x96, 0xfa, 0x50, 0x46, 0x17, 0x7b, 0xe9, 0xe2, 0xcd, 0x45, 0x29, 0x07, 0x79, 0x81, 0xd7, 0x82,
-	0xec, 0xeb, 0x6e, 0xba, 0x6b, 0xcb, 0x50, 0xdd, 0x77, 0x68, 0x56, 0x04, 0x2d, 0x8a, 0xa0, 0x87,
-	0x45, 0x11, 0xed, 0x1b, 0xc7, 0xbf, 0xeb, 0xa8, 0x53, 0x0d, 0xfe, 0x9b, 0xed, 0x9f, 0x5d, 0xc7,
-	0x37, 0x6d, 0x02, 0xf9, 0x8e, 0xf0, 0xfa, 0xa5, 0xf5, 0x93, 0xa7, 0x74, 0xee, 0x68, 0xe8, 0xd2,
-	0x02, 0x9d, 0xdd, 0x95, 0x66, 0x33, 0x72, 0x6f, 0xf7, 0xcb, 0xd9, 0xdf, 0x6f, 0xd7, 0x1e, 0x93,
-	0x06, 0xcb, 0x16, 0x55, 0xdc, 0x93, 0x2f, 0x0c, 0x6f, 0xb1, 0xcb, 0x55, 0x93, 0x1f, 0x08, 0x6f,
-	0xcc, 0x97, 0x41, 0xf6, 0xca, 0xe3, 0x96, 0x94, 0xea, 0xd0, 0x55, 0xc7, 0x73, 0x40, 0x6a, 0x01,
-	0x9b, 0xe4, 0x49, 0x29, 0xe0, 0x42, 0xfd, 0xe4, 0x2b, 0xc2, 0xd5, 0x99, 0x8a, 0x48, 0xb3, 0x3c,
-	0x6f, 0xb1, 0x60, 0x67, 0x67, 0x85, 0xc9, 0x1c, 0x6a, 0xc7, 0x42, 0x35, 0xc8, 0xa3, 0x52, 0xa8,
-	0xd9, 0x53, 0x68, 0xbf, 0x3e, 0x99, 0xb8, 0xe8, 0x74, 0xe2, 0xa2, 0x3f, 0x13, 0x17, 0x1d, 0x4f,
-	0xdd, 0xca, 0xe9, 0xd4, 0xad, 0xfc, 0x9c, 0xba, 0x95, 0x0f, 0x34, 0x90, 0xa6, 0x9f, 0xf8, 0xb4,
-	0x07, 0x11, 0xcb, 0x93, 0x43, 0xee, 0xeb, 0x3d, 0x09, 0xc5, 0x93, 0x7d, 0xce, 0x8c, 0xcd, 0x38,
-	0x16, 0xda, 0xbf, 0x65, 0xcf, 0xe8, 0xd9, 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xd3, 0xa4, 0xd5,
-	0x0a, 0x5d, 0x04, 0x00, 0x00,
+	0xeb, 0xb9, 0x6a, 0x2b, 0x3f, 0x39, 0x62, 0x46, 0x46, 0x42, 0x1b, 0x1e, 0xc5, 0x59, 0x83, 0x57,
+	0xc3, 0x5b, 0xef, 0x53, 0xd3, 0x37, 0xea, 0x28, 0xb4, 0x5f, 0x76, 0xb8, 0x11, 0x1d, 0x31, 0x48,
+	0x84, 0x36, 0x5e, 0x1f, 0x3b, 0x65, 0xa2, 0x8e, 0x41, 0x69, 0x41, 0xde, 0xe2, 0xdb, 0xb2, 0x10,
+	0xba, 0x43, 0x6e, 0xc4, 0x26, 0x7a, 0x88, 0x9a, 0x6b, 0xed, 0xc6, 0xc9, 0x79, 0xbd, 0xf2, 0xeb,
+	0xbc, 0x5e, 0xeb, 0x81, 0x8e, 0x40, 0xeb, 0x8f, 0x9f, 0xa8, 0x04, 0x16, 0x71, 0xd3, 0xa7, 0xef,
+	0x44, 0xc0, 0x7b, 0xe3, 0x97, 0xa2, 0xd7, 0x59, 0x97, 0xb3, 0x33, 0x3d, 0x17, 0x6f, 0x5b, 0xa7,
+	0xe7, 0x4a, 0x25, 0x3c, 0x3c, 0x18, 0xc2, 0x48, 0xea, 0xf4, 0x37, 0x0a, 0x92, 0x01, 0x7e, 0xb0,
+	0x44, 0xcf, 0x61, 0x0e, 0xf0, 0x5d, 0x6e, 0xb5, 0x6e, 0x7c, 0x21, 0x5e, 0x85, 0x67, 0x83, 0xcf,
+	0x4d, 0xf6, 0xb6, 0xf0, 0x7d, 0x6b, 0xf9, 0x4a, 0x28, 0xa1, 0xa5, 0x3e, 0x94, 0xd1, 0xc5, 0x5e,
+	0xba, 0x78, 0x73, 0x51, 0xca, 0x41, 0x5e, 0xe0, 0xb5, 0x20, 0x7b, 0xdd, 0x4d, 0x77, 0x6d, 0x19,
+	0xaa, 0xfb, 0x0e, 0xcd, 0x82, 0xa0, 0x45, 0x10, 0xf4, 0xb0, 0x08, 0xa2, 0x7d, 0xe3, 0xf8, 0x77,
+	0x1d, 0x75, 0xaa, 0xc1, 0xff, 0x61, 0xfb, 0x67, 0xd7, 0xf1, 0x4d, 0xeb, 0x40, 0xbe, 0x23, 0xbc,
+	0x7e, 0x69, 0xfd, 0xe4, 0x29, 0x9d, 0x3b, 0x0c, 0xba, 0x34, 0x40, 0x67, 0x77, 0xa5, 0xde, 0x8c,
+	0xdc, 0xdb, 0xfd, 0x72, 0xf6, 0xf7, 0xdb, 0xb5, 0xc7, 0xa4, 0xc1, 0xb2, 0x45, 0x15, 0x57, 0xe9,
+	0x0b, 0xc3, 0x5b, 0xec, 0x72, 0xd4, 0xe4, 0x07, 0xc2, 0x1b, 0xf3, 0x61, 0x90, 0xbd, 0x72, 0xbb,
+	0x25, 0xa1, 0x3a, 0x74, 0xd5, 0xf6, 0x1c, 0x90, 0x5a, 0xc0, 0x26, 0x79, 0x52, 0x0a, 0xb8, 0x10,
+	0x3f, 0xf9, 0x8a, 0x70, 0x75, 0x26, 0x22, 0xd2, 0x2c, 0xf7, 0x5b, 0x0c, 0xd8, 0xd9, 0x59, 0xa1,
+	0x33, 0x87, 0xda, 0xb1, 0x50, 0x0d, 0xf2, 0xa8, 0x14, 0x6a, 0xf6, 0x14, 0xda, 0xaf, 0x4f, 0x26,
+	0x2e, 0x3a, 0x9d, 0xb8, 0xe8, 0xcf, 0xc4, 0x45, 0xc7, 0x53, 0xb7, 0x72, 0x3a, 0x75, 0x2b, 0x3f,
+	0xa7, 0x6e, 0xe5, 0x03, 0x0d, 0xa4, 0xe9, 0x27, 0x3e, 0xed, 0x41, 0xc4, 0x72, 0xe7, 0x90, 0xfb,
+	0x7a, 0x4f, 0x42, 0x51, 0xb2, 0xcf, 0xd9, 0x60, 0x33, 0x8e, 0x85, 0xf6, 0x6f, 0xd9, 0x33, 0x7a,
+	0xf6, 0x2f, 0x00, 0x00, 0xff, 0xff, 0xbf, 0xd7, 0xaa, 0x0b, 0x41, 0x04, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/x/zoneconcierge/keeper/ibc_packet_btc_timestamp.go b/x/zoneconcierge/keeper/ibc_packet_btc_timestamp.go
index bfc995f2a..d5b5370b2 100644
--- a/x/zoneconcierge/keeper/ibc_packet_btc_timestamp.go
+++ b/x/zoneconcierge/keeper/ibc_packet_btc_timestamp.go
@@ -163,7 +163,6 @@ func (k Keeper) getDeepEnoughBTCHeaders(ctx context.Context) []*btclctypes.BTCHe
 // - either the whole known chain if we did not broadcast any headers yet
 // - headers from the child of the most recent header we sent which is still in the main chain up to the current tip
 func (k Keeper) getHeadersToBroadcast(ctx context.Context) []*btclctypes.BTCHeaderInfo {
-
 	lastSegment := k.GetLastSentSegment(ctx)
 
 	if lastSegment == nil {
@@ -180,7 +179,7 @@ func (k Keeper) getHeadersToBroadcast(ctx context.Context) []*btclctypes.BTCHead
 	var initHeader *btclctypes.BTCHeaderInfo
 	for i := len(lastSegment.BtcHeaders) - 1; i >= 0; i-- {
 		header := lastSegment.BtcHeaders[i]
-		if k.btclcKeeper.GetHeaderByHash(ctx, header.Hash) != nil {
+		if header, err := k.btclcKeeper.GetHeaderByHash(ctx, header.Hash); err == nil && header != nil {
 			initHeader = header
 			break
 		}
diff --git a/x/zoneconcierge/keeper/ibc_packet_btc_timestamp_test.go b/x/zoneconcierge/keeper/ibc_packet_btc_timestamp_test.go
index 1b3194664..f38f3dab1 100644
--- a/x/zoneconcierge/keeper/ibc_packet_btc_timestamp_test.go
+++ b/x/zoneconcierge/keeper/ibc_packet_btc_timestamp_test.go
@@ -30,7 +30,7 @@ func genRandomChain(
 	randomChain := datagen.NewBTCHeaderChainFromParentInfo(
 		r,
 		initHeader,
-		uint32(chainLength),
+		chainLength,
 	)
 	err := k.InsertHeadersWithHookAndEvents(ctx, randomChain.ChainToBytes())
 	require.NoError(t, err)
@@ -108,7 +108,7 @@ func FuzzGetHeadersToBroadcast(f *testing.F) {
 		// NOTE: it's possible that the last segment is totally reverted. We want to be resilient against
 		// this, by sending the BTC headers since the last reorg point
 		reorgPoint := uint32(datagen.RandomInt(r, int(btcTip.Height)))
-		revertedChainLength := btcTip.Height - uint32(reorgPoint)
+		revertedChainLength := btcTip.Height - reorgPoint
 		// the fork chain needs to be longer than the canonical one
 		forkChainLength := revertedChainLength + uint32(datagen.RandomInt(r, 10)) + 1
 		genRandomChain(
diff --git a/x/zoneconcierge/types/btc_timestamp.go b/x/zoneconcierge/types/btc_timestamp.go
index 7d9871a15..7865494e2 100644
--- a/x/zoneconcierge/types/btc_timestamp.go
+++ b/x/zoneconcierge/types/btc_timestamp.go
@@ -281,9 +281,9 @@ func (ts *BTCTimestamp) Verify(
 	btcHeadersWithCkpt := []*wire.BlockHeader{}
 	wDeep := false
 	for _, key := range ts.BtcSubmissionKey.Key {
-		header := btclcKeeper.GetHeaderByHash(ctx, key.Hash)
-		if header == nil {
-			return fmt.Errorf("header corresponding to the inclusion proof is not on BTC light client")
+		header, err := btclcKeeper.GetHeaderByHash(ctx, key.Hash)
+		if err == nil {
+			return fmt.Errorf("header corresponding to the inclusion proof is not on BTC light client: %v", err)
 		}
 		btcHeadersWithCkpt = append(btcHeadersWithCkpt, header.Header.ToBlockHeader())
 
diff --git a/x/zoneconcierge/types/expected_keepers.go b/x/zoneconcierge/types/expected_keepers.go
index adc9e3574..4ec457404 100644
--- a/x/zoneconcierge/types/expected_keepers.go
+++ b/x/zoneconcierge/types/expected_keepers.go
@@ -83,7 +83,7 @@ type BTCLightClientKeeper interface {
 	GetTipInfo(ctx context.Context) *btclctypes.BTCHeaderInfo
 	GetMainChainFrom(ctx context.Context, startHeight uint32) []*btclctypes.BTCHeaderInfo
 	GetMainChainUpTo(ctx context.Context, depth uint32) []*btclctypes.BTCHeaderInfo
-	GetHeaderByHash(ctx context.Context, hash *bbn.BTCHeaderHashBytes) *btclctypes.BTCHeaderInfo
+	GetHeaderByHash(ctx context.Context, hash *bbn.BTCHeaderHashBytes) (*btclctypes.BTCHeaderInfo, error)
 }
 
 type BtcCheckpointKeeper interface {
diff --git a/x/zoneconcierge/types/mocked_keepers.go b/x/zoneconcierge/types/mocked_keepers.go
index 51ec37d28..4bf1c4042 100644
--- a/x/zoneconcierge/types/mocked_keepers.go
+++ b/x/zoneconcierge/types/mocked_keepers.go
@@ -534,11 +534,12 @@ func (m *MockBTCLightClientKeeper) EXPECT() *MockBTCLightClientKeeperMockRecorde
 }
 
 // GetHeaderByHash mocks base method.
-func (m *MockBTCLightClientKeeper) GetHeaderByHash(ctx context.Context, hash *types.BTCHeaderHashBytes) *types1.BTCHeaderInfo {
+func (m *MockBTCLightClientKeeper) GetHeaderByHash(ctx context.Context, hash *types.BTCHeaderHashBytes) (*types1.BTCHeaderInfo, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetHeaderByHash", ctx, hash)
 	ret0, _ := ret[0].(*types1.BTCHeaderInfo)
-	return ret0
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
 }
 
 // GetHeaderByHash indicates an expected call of GetHeaderByHash.