chore: add new field to transaction tracked of tx hash of btc delegation

itest/e2e_test.go

@@ -967,7 +967,7 @@ func TestStakeFromPhase1(t *testing.T) {
 	params, err := cl.Params()
 	require.NoError(t, err)
 
-	tm.mineNEmptyBlocks(t, params.ConfirmationTimeBlocks, true)
+	tm.mineNEmptyBlocks(t, params.ConfirmationTimeBlocks+1, true)
 	tm.waitForStakingTxState(t, txHash, proto.TransactionState_SENT_TO_BABYLON)
 
 	pend, err := tm.BabylonClient.QueryPendingBTCDelegations()

itest/manager.go

@@ -1144,6 +1144,8 @@ func (tm *TestManager) insertCovenantSigForDelegation(
 		btcutil.Amount(btcDel.TotalSat),
 		regtestParams,
 	)
+	require.NoError(t, err)
+
 	slashingPathInfo, err := stakingInfo.SlashingPathSpendInfo()
 	require.NoError(t, err)
 
@@ -1159,6 +1161,7 @@ func (tm *TestManager) insertCovenantSigForDelegation(
 	// slash unbonding tx spends unbonding tx
 	unbondingMsgTx, _, err := bbntypes.NewBTCTxFromHex(btcDel.UndelegationResponse.UnbondingTxHex)
 	require.NoError(t, err)
+
 	unbondingInfo, err := staking.BuildUnbondingInfo(
 		btcDel.BtcPk.MustToBTCPK(),
 		fpBTCPKs,

proto/transaction.proto

@@ -67,4 +67,5 @@ message TrackedTransaction {
     bool watched = 11;
    // this data is only filled if tracked transactions state is >= SENT_TO_BABYLON
     UnbondingTxData unbonding_tx_data = 12;
+    string btcDelegationTxHash = 13;
 }

staker/events.go

@@ -40,9 +40,10 @@ func (event *stakingTxBtcConfirmedEvent) EventDesc() string {
 }
 
 type delegationSubmittedToBabylonEvent struct {
-	stakingTxHash chainhash.Hash
-	unbondingTx   *wire.MsgTx
-	unbondingTime uint16
+	stakingTxHash       chainhash.Hash
+	btcDelegationTxHash string
+	unbondingTx         *wire.MsgTx
+	unbondingTime       uint16
 }
 
 func (event *delegationSubmittedToBabylonEvent) EventID() chainhash.Hash {

staker/stakerapp.go

@@ -1389,7 +1389,6 @@ func (app *App) handlePostApprovalCmd(
 	bestBlockHeight := app.currentBestBlockHeight.Load()
 
 	err := app.wc.UnlockWallet(defaultWalletUnlockTimeout)
-
 	if err != nil {
 		return nil, err
 	}
@@ -1575,15 +1574,23 @@ func (app *App) handleStakingCommands() {
 				continue
 			}
 
-			if err := app.txTracker.SetTxSentToBabylon(&stkTxHash, delData.Ud.UnbondingTransaction, delData.Ud.UnbondingTxUnbondingTime); err != nil {
-				cmd.errChan <- err
-				continue
+			err = app.txTracker.SetTxSentToBabylon(&stkTxHash, resp.TxHash, delData.Ud.UnbondingTransaction, delData.Ud.UnbondingTxUnbondingTime)
+			if err != nil {
+				utils.PushOrQuit(
+					cmd.errChan,
+					err,
+					app.quit,
+				)
+			} else {
+				utils.PushOrQuit(
+					cmd.successChanTxHash,
+					resp.TxHash,
+					app.quit,
+				)
 			}
-
 			app.logger.WithFields(logrus.Fields{
 				"consumerBtcDelegationTxHash": resp.TxHash,
 			}).Debugf("Sending BTC delegation was a success")
-			cmd.successChanTxHash <- resp.TxHash
 		case <-app.quit:
 			return
 		}
@@ -1635,7 +1642,7 @@ func (app *App) handleStakingEvents() {
 
 		case ev := <-app.delegationSubmittedToBabylonEvChan:
 			app.logStakingEventReceived(ev)
-			if err := app.txTracker.SetTxSentToBabylon(&ev.stakingTxHash, ev.unbondingTx, ev.unbondingTime); err != nil {
+			if err := app.txTracker.SetTxSentToBabylon(&ev.stakingTxHash, ev.btcDelegationTxHash, ev.unbondingTx, ev.unbondingTime); err != nil {
 				// TODO: handle this error somehow, it means we received confirmation for tx which we do not store
 				// which is seems like programming error. Maybe panic?
 				app.logger.Fatalf("Error setting state for tx %s: %s", ev.stakingTxHash, err)

stakerdb/trackedtranactionstore.go

@@ -974,11 +974,11 @@ func (c *TrackedTransactionStore) SetTxConfirmed(
 
 func (c *TrackedTransactionStore) SetTxSentToBabylon(
 	txHash *chainhash.Hash,
+	btcDelegationTxHash string,
 	unbondingTx *wire.MsgTx,
 	unbondingTime uint16,
 ) error {
 	update, err := newInitialUnbondingTxData(unbondingTx, unbondingTime)
-
 	if err != nil {
 		return err
 	}
@@ -990,6 +990,7 @@ func (c *TrackedTransactionStore) SetTxSentToBabylon(
 
 		tx.State = proto.TransactionState_SENT_TO_BABYLON
 		tx.UnbondingTxData = update
+		tx.BtcDelegationTxHash = btcDelegationTxHash
 		return nil
 	}