Merge pull request #10395 from ffranr/backport/v0.20.x-branch-add-field-committxblockheight-to-resolutionreq

yyforyongyu · web-flow · commit f8b5cb0e8918 · 2025-11-27T09:41:18.000+08:00
backport: lnwallet: add field `CommitTxBlockHeight` to ResolutionReq
diff --git a/contractcourt/chain_watcher.go b/contractcourt/chain_watcher.go
@@ -1061,7 +1061,8 @@ func (c *chainWatcher) dispatchLocalForceClose(
 		"detected", c.cfg.chanState.FundingOutpoint)
 
 	forceClose, err := lnwallet.NewLocalForceCloseSummary(
-		c.cfg.chanState, c.cfg.signer, commitSpend.SpendingTx, stateNum,
+		c.cfg.chanState, c.cfg.signer, commitSpend.SpendingTx,
+		uint32(commitSpend.SpendingHeight), stateNum,
 		c.cfg.auxLeafStore, c.cfg.auxResolver,
 	)
 	if err != nil {
diff --git a/lnwallet/aux_resolutions.go b/lnwallet/aux_resolutions.go
@@ -77,6 +77,10 @@ type ResolutionReq struct {
 	// CommitTx is the force close commitment transaction.
 	CommitTx *wire.MsgTx
 
+	// CommitTxBlockHeight is the block height where the commitment
+	// transaction confirmed. It is 0 if unknown or not confirmed yet.
+	CommitTxBlockHeight uint32
+
 	// CommitFee is the fee that was paid for the commitment transaction.
 	CommitFee btcutil.Amount
 
diff --git a/lnwallet/channel.go b/lnwallet/channel.go

Original file line number	Diff line number	Diff line change
`@@ -1061,7 +1061,8 @@ func (c *chainWatcher) dispatchLocalForceClose(`
`1061`	`1061`	`"detected", c.cfg.chanState.FundingOutpoint)`
`1062`	`1062`
`1063`	`1063`	`forceClose, err := lnwallet.NewLocalForceCloseSummary(`
`1064`		`- c.cfg.chanState, c.cfg.signer, commitSpend.SpendingTx, stateNum,`
	`1064`	`+ c.cfg.chanState, c.cfg.signer, commitSpend.SpendingTx,`
	`1065`	`+ uint32(commitSpend.SpendingHeight), stateNum,`
`1065`	`1066`	`c.cfg.auxLeafStore, c.cfg.auxResolver,`
`1066`	`1067`	`)`
`1067`	`1068`	`if err != nil {`