Merge pull request #9447 from yyforyongyu/yy-sweeper-fix

sweep: start tracking input spending status in the fee bumper

chainntnfs/mempool.go

@@ -211,7 +211,7 @@ func (m *MempoolNotifier) findRelevantInputs(tx *btcutil.Tx) (inputsWithTx,
 
 		// If found, save it to watchedInputs to notify the
 		// subscriber later.
-		Log.Infof("Found input %s, spent in %s", op, txid)
+		Log.Debugf("Found input %s, spent in %s", op, txid)
 
 		// Construct the spend details.
 		details := &SpendDetail{

contractcourt/anchor_resolver.go

@@ -98,17 +98,21 @@ func (c *anchorResolver) Resolve() (ContractResolver, error) {
 
 	select {
 	case sweepRes := <-c.sweepResultChan:
-		switch sweepRes.Err {
+		err := sweepRes.Err
+
+		switch {
 		// Anchor was swept successfully.
-		case nil:
+		case err == nil:
 			sweepTxID := sweepRes.Tx.TxHash()
 
 			spendTx = &sweepTxID
 			outcome = channeldb.ResolverOutcomeClaimed
 
 		// Anchor was swept by someone else. This is possible after the
 		// 16 block csv lock.
-		case sweep.ErrRemoteSpend:
+		case errors.Is(err, sweep.ErrRemoteSpend),
+			errors.Is(err, sweep.ErrInputMissing):
+
 			c.log.Warnf("our anchor spent by someone else")
 			outcome = channeldb.ResolverOutcomeUnclaimed
 

docs/release-notes/release-notes-0.19.0.md

@@ -344,6 +344,11 @@ The underlying functionality between those two options remain the same.
 * A code refactor that [replaces min/max helpers with built-in min/max
   functions](https://github.com/lightningnetwork/lnd/pull/9451).
 
+* [Unified](https://github.com/lightningnetwork/lnd/pull/9447) the monitoring
+  inputs spending logic in the sweeper so it can properly handle missing inputs
+  and recover from restart.
+
+
 ## Tooling and Documentation
 
 * [Improved `lncli create` command help text](https://github.com/lightningnetwork/lnd/pull/9077)

itest/list_on_test.go

@@ -662,6 +662,10 @@ var allTestCases = []*lntest.TestCase{
 		Name:     "invoice migration",
 		TestFunc: testInvoiceMigration,
 	},
+	{
+		Name:     "fee replacement",
+		TestFunc: testFeeReplacement,
+	},
 }
 
 // appendPrefixed is used to add a prefix to each test name in the subtests