From 4c26aefe80e00de9e8e0e10ef8d0d7529c3f1bbb Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
Date: Fri, 4 Apr 2025 23:49:53 -0300
Subject: [PATCH] sweepbatcher: fix height hint for confirmations

Previously, we passed the current best block height as the height hint to
RegisterConfirmationsNtfn. If Loop was shut down when a sweep was confirmed
and restarted later, it would use the current best height as the hint. This
caused the confirmation to be missed, since it had already occurred before
that height.

This commit fixes the issue by passing the initiation height of the swap as the
height hint instead. This is consistent with what we do in other places where
we use RegisterConfirmationsNtfn.

Since LND caches previously passed height hints for RegisterConfirmationsNtfn
and uses maximum passed value, to actually recover in such a condition, one has
to restart LND passing the option --height-hint-cache-query-disable and then
restart Loop applying this fix. If a pruned bitcoind backend is used, this might
not work.
---
 sweepbatcher/sweep_batch.go        |  9 ++++++++-
 sweepbatcher/sweep_batcher_test.go | 18 ++++++++++++------
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/sweepbatcher/sweep_batch.go b/sweepbatcher/sweep_batch.go
index 7497ec3da..e9f74add7 100644
--- a/sweepbatcher/sweep_batch.go
+++ b/sweepbatcher/sweep_batch.go
@@ -1707,13 +1707,20 @@ func (b *batch) monitorSpend(ctx context.Context, primarySweep sweep) error {
 
 // monitorConfirmations monitors the batch transaction for confirmations.
 func (b *batch) monitorConfirmations(ctx context.Context) error {
+	// Find initiationHeight.
+	primarySweep, ok := b.sweeps[b.primarySweepID]
+	if !ok {
+		return fmt.Errorf("can't find primarySweep")
+	}
+
 	reorgChan := make(chan struct{})
 
 	confCtx, cancel := context.WithCancel(ctx)
 
 	confChan, errChan, err := b.chainNotifier.RegisterConfirmationsNtfn(
 		confCtx, b.batchTxid, b.batchPkScript, batchConfHeight,
-		b.currentHeight, lndclient.WithReOrgChan(reorgChan),
+		primarySweep.initiationHeight,
+		lndclient.WithReOrgChan(reorgChan),
 	)
 	if err != nil {
 		cancel()
diff --git a/sweepbatcher/sweep_batcher_test.go b/sweepbatcher/sweep_batcher_test.go
index 12c9261e9..0fada5979 100644
--- a/sweepbatcher/sweep_batcher_test.go
+++ b/sweepbatcher/sweep_batcher_test.go
@@ -781,12 +781,15 @@ func testSweepBatcherSimpleLifecycle(t *testing.T, store testStore,
 		Notifier: &dummyNotifier,
 	}
 
+	const initiationHeight = 550
+
 	swap1 := &loopdb.LoopOutContract{
 		SwapContract: loopdb.SwapContract{
-			CltvExpiry:      111,
-			AmountRequested: 111,
-			ProtocolVersion: loopdb.ProtocolVersionMuSig2,
-			HtlcKeys:        htlcKeys,
+			CltvExpiry:       111,
+			AmountRequested:  111,
+			ProtocolVersion:  loopdb.ProtocolVersionMuSig2,
+			HtlcKeys:         htlcKeys,
+			InitiationHeight: initiationHeight,
 		},
 
 		DestAddr:        destAddr,
@@ -871,14 +874,17 @@ func testSweepBatcherSimpleLifecycle(t *testing.T, store testStore,
 		SpendingTx:        spendingTx,
 		SpenderTxHash:     &spendingTxHash,
 		SpenderInputIndex: 0,
-		SpendingHeight:    601,
 	}
 
 	// We notify the spend.
 	lnd.SpendChannel <- spendDetail
 
 	// After receiving the spend, the batch is now monitoring for confs.
-	<-lnd.RegisterConfChannel
+	confReg := <-lnd.RegisterConfChannel
+
+	// Make sure the confirmation has proper height hint. It should pass
+	// the swap initiation height, not the current height.
+	require.Equal(t, int32(initiationHeight), confReg.HeightHint)
 
 	// The batch should eventually read the spend notification and progress
 	// its state to closed.