highperfocused/lnd
1
0
Fork 0
mirror of https://github.com/lightningnetwork/lnd.git synced 2025-03-29 03:01:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

invoices: fix log entries and add a TODO.

Browse Source 
We need to make sure if we cancel an AMP invoice we also cancel
all remaining HTLCs back.
This commit is contained in:
ziggie 2025-01-29 18:18:28 +01:00 committed by Oliver Gugger
parent 4b2793a815
commit bfbb73ffce
No known key found for this signature in database
GPG Key ID: 8E4256593F177720
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
invoices/invoiceregistry.go
View File

@ -659,8 +659,9 @@ func (i *InvoiceRegistry) cancelSingleHtlc(invoiceRef InvoiceRef,
// Only allow individual htlc cancellation on open invoices. // Only allow individual htlc cancellation on open invoices.
if invoice.State != ContractOpen { if invoice.State != ContractOpen {
log.Debugf("cancelSingleHtlc: invoice %v no longer "+ log.Debugf("CancelSingleHtlc: cannot cancel htlc %v "+
"open", invoiceRef) "on invoice %v, invoice is no longer open", key,
invoiceRef)
return nil, nil return nil, nil
} }
@ -678,13 +679,13 @@ func (i *InvoiceRegistry) cancelSingleHtlc(invoiceRef InvoiceRef,
// Cancellation is only possible if the htlc wasn't already // Cancellation is only possible if the htlc wasn't already
// resolved. // resolved.
if htlcState != HtlcStateAccepted { if htlcState != HtlcStateAccepted {
log.Debugf("cancelSingleHtlc: htlc %v on invoice %v "+ log.Debugf("CancelSingleHtlc: htlc %v on invoice %v "+
"is already resolved", key, invoiceRef) "is already resolved", key, invoiceRef)
return nil, nil return nil, nil
} }
log.Debugf("cancelSingleHtlc: cancelling htlc %v on invoice %v", log.Debugf("CancelSingleHtlc: cancelling htlc %v on invoice %v",
key, invoiceRef) key, invoiceRef)
// Return an update descriptor that cancels htlc and keeps // Return an update descriptor that cancels htlc and keeps
@ -737,8 +738,9 @@ func (i *InvoiceRegistry) cancelSingleHtlc(invoiceRef InvoiceRef,
key, int32(htlc.AcceptHeight), result, key, int32(htlc.AcceptHeight), result,
) )
log.Debugf("Cancelling htlc (%v) of invoice(%v) with "+ log.Debugf("Signaling htlc(%v) cancellation of invoice(%v) "+
"resolution: %v", key, invoiceRef, result) "with resolution(%v) to the link subsystem", key,
invoiceRef, result)
i.notifyHodlSubscribers(resolution) i.notifyHodlSubscribers(resolution)
} }
@ -1453,6 +1455,8 @@ func (i *InvoiceRegistry) cancelInvoiceImpl(ctx context.Context,
} }
invoiceRef := InvoiceRefByHash(payHash) invoiceRef := InvoiceRefByHash(payHash)
// We pass a nil setID which means no HTLCs will be read out.
invoice, err := i.idb.UpdateInvoice(ctx, invoiceRef, nil, updateInvoice) invoice, err := i.idb.UpdateInvoice(ctx, invoiceRef, nil, updateInvoice)
// Implement idempotency by returning success if the invoice was already // Implement idempotency by returning success if the invoice was already
@ -1479,6 +1483,8 @@ func (i *InvoiceRegistry) cancelInvoiceImpl(ctx context.Context,
// that are waiting for resolution. Any htlcs that were already canceled // that are waiting for resolution. Any htlcs that were already canceled
// before, will be notified again. This isn't necessary but doesn't hurt // before, will be notified again. This isn't necessary but doesn't hurt
// either. // either.
//
// TODO(ziggie): Also consider AMP HTLCs here.
for key, htlc := range invoice.Htlcs { for key, htlc := range invoice.Htlcs {
if htlc.State != HtlcStateCanceled { if htlc.State != HtlcStateCanceled {
continue continue