lnwallet: fix bugs in ResolutionReq for breach handling

In this commit, we fix three existing bugs in the way we make
`ResolutionReq` for breach handling:

  1. We were passing in the commit blob of the *current* channel state,
     instead of the one stored in the revocation log for this breached
     state.

  2. We were using theirDelay for CsvDelay, when we want ourDelay, which
     in this case will be 1 CSV, as this is a non delayed output.

  3. We also need to pass in the delay for the remote party's to_local
     delayed output.

Author: Roasbeef

lnwallet/aux_resolutions.go

@@ -69,6 +69,12 @@ type ResolutionReq struct {
 	// CsvDelay is the CSV delay for the local output for this commitment.
 	CsvDelay uint32
 
+	// BreachCsvDelay is the CSV delay for the remote output. This is only
+	// set when the CloseType is Breach. This indicates the CSV delay to
+	// use for the remote party's to_local delayed output, that is now
+	// rightfully ours in a breach situation.
+	BreachCsvDelay fn.Option[uint32]
+
 	// CltvDelay is the CLTV delay for the outpoint.
 	CltvDelay fn.Option[uint32]
 }

lnwallet/channel.go

@@ -2235,19 +2235,21 @@ func NewBreachRetribution(chanState *channeldb.OpenChannel, stateNum uint64,
 		resolveBlob := fn.MapOptionZ(
 			auxResolver,
 			func(a AuxContractResolver) fn.Result[tlv.Blob] {
+				//nolint:lll
 				return a.ResolveContract(ResolutionReq{
-					ChanPoint:   chanState.FundingOutpoint,
-					ShortChanID: chanState.ShortChanID(),
-					Initiator:   chanState.IsInitiator,
-					CommitBlob:  chanState.RemoteCommitment.CustomBlob, //nolint:lll
-					FundingBlob: chanState.CustomBlob,
-					Type:        input.TaprootRemoteCommitSpend, //nolint:lll
-					CloseType:   Breach,
-					CommitTx:    spendTx,
-					SignDesc:    *br.LocalOutputSignDesc,
-					KeyRing:     keyRing,
-					CsvDelay:    theirDelay,
-					CommitFee:   chanState.RemoteCommitment.CommitFee, //nolint:lll
+					ChanPoint:      chanState.FundingOutpoint,
+					ShortChanID:    chanState.ShortChanID(),
+					Initiator:      chanState.IsInitiator,
+					CommitBlob:     revokedLog.CustomBlob.ValOpt(),
+					FundingBlob:    chanState.CustomBlob,
+					Type:           input.TaprootRemoteCommitSpend,
+					CloseType:      Breach,
+					CommitTx:       spendTx,
+					SignDesc:       *br.LocalOutputSignDesc,
+					KeyRing:        keyRing,
+					CsvDelay:       ourDelay,
+					BreachCsvDelay: fn.Some(theirDelay),
+					CommitFee:      chanState.RemoteCommitment.CommitFee,
 				})
 			},
 		)
@@ -2309,19 +2311,21 @@ func NewBreachRetribution(chanState *channeldb.OpenChannel, stateNum uint64,
 		resolveBlob := fn.MapOptionZ(
 			auxResolver,
 			func(a AuxContractResolver) fn.Result[tlv.Blob] {
+				//nolint:lll
 				return a.ResolveContract(ResolutionReq{
-					ChanPoint:   chanState.FundingOutpoint,
-					ShortChanID: chanState.ShortChanID(),
-					Initiator:   chanState.IsInitiator,
-					CommitBlob:  chanState.RemoteCommitment.CustomBlob, //nolint:lll
-					FundingBlob: chanState.CustomBlob,
-					Type:        input.TaprootCommitmentRevoke, //nolint:lll
-					CloseType:   Breach,
-					CommitTx:    spendTx,
-					SignDesc:    *br.RemoteOutputSignDesc,
-					KeyRing:     keyRing,
-					CsvDelay:    theirDelay,
-					CommitFee:   chanState.RemoteCommitment.CommitFee, //nolint:lll
+					ChanPoint:      chanState.FundingOutpoint,
+					ShortChanID:    chanState.ShortChanID(),
+					Initiator:      chanState.IsInitiator,
+					CommitBlob:     revokedLog.CustomBlob.ValOpt(),
+					FundingBlob:    chanState.CustomBlob,
+					Type:           input.TaprootCommitmentRevoke,
+					CloseType:      Breach,
+					CommitTx:       spendTx,
+					SignDesc:       *br.RemoteOutputSignDesc,
+					KeyRing:        keyRing,
+					CsvDelay:       theirDelay,
+					BreachCsvDelay: fn.Some(theirDelay),
+					CommitFee:      chanState.RemoteCommitment.CommitFee,
 				})
 			},
 		)