Add staking tx to the creation event

proto/babylon/btcstaking/v1/events.proto

@@ -144,33 +144,27 @@ enum FinalityProviderStatus {
 // EventBTCDelegationCreated is the event emitted when a BTC delegation is created
 // on the Babylon chain
 message EventBTCDelegationCreated {
-  // staking_tx_hash is the hash of the staking tx.
-  // It uniquely identifies a BTC delegation
-  string staking_tx_hash = 1 [(amino.dont_omitempty) = true];
-  // staking_output_pk_script is the hex encoded PK script of the staking output
-  string staking_output_pk_script = 2 [(amino.dont_omitempty) = true];
+  // staking_tx_hex is the hex encoded staking tx
+  string staking_tx_hex = 1 [(amino.dont_omitempty) = true];
   // staking_output_index is the index of the staking output in the staking tx
-  string staking_output_index = 3 [(amino.dont_omitempty) = true];
+  string staking_output_index = 2 [(amino.dont_omitempty) = true];
   // version of the params used to validate the delegation
-  string params_version = 4 [(amino.dont_omitempty) = true];
+  string params_version = 3 [(amino.dont_omitempty) = true];
   // finality_provider_btc_pks_hex is the list of hex str of Bitcoin secp256k1 PK of
   // the finality providers that this BTC delegation delegates to
   // the PK follows encoding in BIP-340 spec
-  repeated string finality_provider_btc_pks_hex = 5 [(amino.dont_omitempty) = true];
+  repeated string finality_provider_btc_pks_hex = 4 [(amino.dont_omitempty) = true];
   // staker_btc_pk_hex is the hex str of Bitcoin secp256k1 PK of the staker that
   // creates this BTC delegation the PK follows encoding in BIP-340 spec
-  string staker_btc_pk_hex = 6 [(amino.dont_omitempty) = true];
+  string staker_btc_pk_hex = 5 [(amino.dont_omitempty) = true];
   // staking_time is the timelock of the staking tx specified in the BTC script
-  string staking_time = 7 [(amino.dont_omitempty) = true];
-  // staking_amount is the total amount of BTC stake in this delegation
-  // quantified in satoshi
-  string staking_amount = 8 [(amino.dont_omitempty) = true];
+  string staking_time = 6 [(amino.dont_omitempty) = true];
   // unbonding_time is the time is timelock on unbonding tx chosen by the staker
-  string unbonding_time = 9 [(amino.dont_omitempty) = true];
+  string unbonding_time = 7 [(amino.dont_omitempty) = true];
   // unbonding_tx is hex encoded bytes of the unsigned unbonding tx
-  string unbonding_tx = 10 [(amino.dont_omitempty) = true];
+  string unbonding_tx = 8 [(amino.dont_omitempty) = true];
   // new_state of the BTC delegation
-  string new_state = 11 [(amino.dont_omitempty) = true];
+  string new_state = 9 [(amino.dont_omitempty) = true];
 }
 
 // EventCovenantSignatureReceived is the event emitted when a covenant committee

x/btcstaking/keeper/btc_delegations.go

@@ -53,7 +53,6 @@ func (k Keeper) AddBTCDelegation(
 	k.setBTCDelegation(ctx, btcDel)
 
 	if err := ctx.EventManager().EmitTypedEvents(types.NewBtcDelCreationEvent(
-		stakingTxHash.String(),
 		btcDel,
 	)); err != nil {
 		panic(fmt.Errorf("failed to emit events for the new pending BTC delegation: %w", err))

x/btcstaking/types/events.go

@@ -88,18 +88,15 @@ func NewInclusionProofEvent(
 }
 
 func NewBtcDelCreationEvent(
-	stakingTxHash string,
 	btcDel *BTCDelegation,
 ) *EventBTCDelegationCreated {
 	return &EventBTCDelegationCreated{
-		StakingTxHash:             stakingTxHash,
-		StakingOutputPkScript:     hex.EncodeToString(btcDel.MustGetStakingTx().TxOut[btcDel.StakingOutputIdx].PkScript),
+		StakingTxHex:              hex.EncodeToString(btcDel.StakingTx),
 		StakingOutputIndex:        strconv.FormatUint(uint64(btcDel.StakingOutputIdx), 10),
 		ParamsVersion:             strconv.FormatUint(uint64(btcDel.ParamsVersion), 10),
 		FinalityProviderBtcPksHex: btcDel.FinalityProviderKeys(),
 		StakerBtcPkHex:            btcDel.BtcPk.MarshalHex(),
 		StakingTime:               strconv.FormatUint(uint64(btcDel.StakingTime), 10),
-		StakingAmount:             strconv.FormatUint(btcDel.TotalSat, 10),
 		UnbondingTime:             strconv.FormatUint(uint64(btcDel.UnbondingTime), 10),
 		UnbondingTx:               hex.EncodeToString(btcDel.BtcUndelegation.UnbondingTx),
 		NewState:                  BTCDelegationStatus_PENDING.String(),