remove additional data from the state

proto/babylon/btcstaking/v1/btcstaking.proto

@@ -120,11 +120,6 @@ message DelegatorUnbondingInfo {
     // filled only if spend_stake_tx is different than unbonding_tx registered
     // on the Babylon chain.
     bytes spend_stake_tx = 1;
-    // spend_stake_tx_inclusion_block_hash is the block hash of the block in which
-    // spend_stake_tx was included
-    bytes spend_stake_tx_inclusion_block_hash = 2;
-    // spend_stake_tx_inclusion_index is the index of spend_stake_tx in the block
-    uint32 spend_stake_tx_inclusion_index = 3;
 }
 
 // BTCUndelegation contains the information about the early unbonding path of the BTC delegation

proto/babylon/btcstaking/v1/query.proto

@@ -313,13 +313,9 @@ message BTCDelegationResponse {
 // DelegatorUnbondingInfoResponse provides all necessary info about transaction
 // which spent the staking output
 message DelegatorUnbondingInfoResponse {
-  // spend_stake_tx_hex is the transaction which spent the staking output
+  // spend_stake_tx_hex is the transaction which spent the staking output. It is
+  // filled only if the spend_stake_tx_hex is different than the unbonding_tx_hex
   string spend_stake_tx_hex = 1;
-  // spend_stake_tx_inclusion_block_hash_hex is the block hash of the block in which
-  // spend_stake_tx was included
-  string spend_stake_tx_inclusion_block_hash_hex = 2;
-  // spend_stake_tx_inclusion_index is the index of spend_stake_tx in the block
-  uint32 spend_stake_tx_inclusion_index = 3;
 }
 
 // BTCUndelegationResponse provides all necessary info about the undeleagation

test/e2e/btc_staking_e2e_test.go

@@ -869,16 +869,8 @@ func ParseRespBTCDelToBTCDel(resp *bstypes.BTCDelegationResponse) (btcDel *bstyp
 				}
 			}
 
-			unbondingHeader, err := bbn.NewBTCHeaderHashBytesFromHex(ud.DelegatorUnbondingInfoResponse.SpendStakeTxInclusionBlockHashHex)
-
-			if err != nil {
-				return nil, err
-			}
-
 			btcDel.BtcUndelegation.DelegatorUnbondingInfo = &bstypes.DelegatorUnbondingInfo{
-				SpendStakeTx:                   spendStakeTx,
-				SpendStakeTxInclusionBlockHash: unbondingHeader,
-				SpendStakeTxInclusionIndex:     ud.DelegatorUnbondingInfoResponse.SpendStakeTxInclusionIndex,
+				SpendStakeTx: spendStakeTx,
 			}
 		}
 	}

x/btcstaking/keeper/btc_delegations.go

@@ -161,34 +161,6 @@ func (k Keeper) btcUndelegate(
 	btcDel.BtcUndelegation.DelegatorUnbondingInfo = u
 	k.setBTCDelegation(ctx, btcDel)
 
-	// stake is unbonding through unexpected tx, emit additional event
-	if len(u.SpendStakeTx) > 0 {
-		tx, err := bbn.NewBTCTxFromBytes(u.SpendStakeTx)
-
-		if err != nil {
-			panic(fmt.Errorf("failed to parse spend stake tx that should be valid: %w", err))
-		}
-
-		spendStakeTxHash := tx.TxHash().String()
-
-		headerHash, err := chainhash.NewHash(u.SpendStakeTxInclusionBlockHash)
-
-		if err != nil {
-			panic(fmt.Errorf("failed to parse header hash that should be valid: %w", err))
-		}
-
-		ev := &types.EventUnexpectedUnbondingTx{
-			StakingTxHash:          btcDel.MustGetStakingTxHash().String(),
-			SpendStakeTxHash:       spendStakeTxHash,
-			SpendStakeTxHeaderHash: headerHash.String(),
-			SpendStakeTxBlockIndex: u.SpendStakeTxInclusionIndex,
-		}
-
-		if err := ctx.EventManager().EmitTypedEvent(ev); err != nil {
-			panic(fmt.Errorf("failed to emit EventUnexpectedUnbondingTx event: %w", err))
-		}
-	}
-
 	if !btcDel.HasInclusionProof() {
 		return
 	}

x/btcstaking/keeper/msg_server.go

@@ -579,9 +579,7 @@ func (ms msgServer) BTCUndelegate(goCtx context.Context, req *types.MsgBTCUndele
 		delegatorUnbondingInfo = &types.DelegatorUnbondingInfo{
 			// if the stake spending tx is the same as the registered unbonding tx,
 			// we do not need to save it in the database
-			SpendStakeTx:                   []byte{},
-			SpendStakeTxInclusionBlockHash: req.StakeSpendingTxInclusionProof.Key.Hash.MustMarshal(),
-			SpendStakeTxInclusionIndex:     req.StakeSpendingTxInclusionProof.Key.Index,
+			SpendStakeTx: []byte{},
 		}
 	} else {
 		// stakeSpendingTx is not unbonding tx, first we need to verify whether it
@@ -598,9 +596,18 @@ func (ms msgServer) BTCUndelegate(goCtx context.Context, req *types.MsgBTCUndele
 		}
 
 		delegatorUnbondingInfo = &types.DelegatorUnbondingInfo{
-			SpendStakeTx:                   req.StakeSpendingTx,
-			SpendStakeTxInclusionBlockHash: req.StakeSpendingTxInclusionProof.Key.Hash.MustMarshal(),
-			SpendStakeTxInclusionIndex:     req.StakeSpendingTxInclusionProof.Key.Index,
+			SpendStakeTx: req.StakeSpendingTx,
+		}
+
+		ev := &types.EventUnexpectedUnbondingTx{
+			StakingTxHash:          btcDel.MustGetStakingTxHash().String(),
+			SpendStakeTxHash:       spendStakeTxHash.String(),
+			SpendStakeTxHeaderHash: req.StakeSpendingTxInclusionProof.Key.Hash.MarshalHex(),
+			SpendStakeTxBlockIndex: req.StakeSpendingTxInclusionProof.Key.Index,
+		}
+
+		if err := ctx.EventManager().EmitTypedEvent(ev); err != nil {
+			panic(fmt.Errorf("failed to emit EventUnexpectedUnbondingTx event: %w", err))
 		}
 	}