akovalenko/lnd.xprv
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

invoices: filter HTLC set by set id from AMP payload

Browse Source
This commit is contained in:
Conner Fromknecht 2021-03-03 09:59:29 -08:00
parent 5f34880040
commit 9da3e7fc90
No known key found for this signature in database
GPG Key ID: E7D737B67FA592C7
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
invoices/update.go
View File

@ -33,6 +33,17 @@ func (i *invoiceUpdateCtx) invoiceRef() channeldb.InvoiceRef {
return channeldb.InvoiceRefByHash(i.hash) return channeldb.InvoiceRefByHash(i.hash)
} }
// setID returns an identifier that identifies other possible HTLCs that this
// particular one is related to. If nil is returned this means the HTLC is an
// MPP or legacy payment, otherwise the HTLC belongs AMP payment.
func (i invoiceUpdateCtx) setID() *[32]byte {
if i.amp != nil {
setID := i.amp.SetID()
return &setID
}
return nil
}
// log logs a message specific to this update context. // log logs a message specific to this update context.
func (i *invoiceUpdateCtx) log(s string) { func (i *invoiceUpdateCtx) log(s string) {
log.Debugf("Invoice%v: %v, amt=%v, expiry=%v, circuit=%v, mpp=%v, "+ log.Debugf("Invoice%v: %v, amt=%v, expiry=%v, circuit=%v, mpp=%v, "+
@ -108,6 +119,8 @@ func updateMpp(ctx *invoiceUpdateCtx,
inv *channeldb.Invoice) (*channeldb.InvoiceUpdateDesc, inv *channeldb.Invoice) (*channeldb.InvoiceUpdateDesc,
HtlcResolution, error) { HtlcResolution, error) {
setID := ctx.setID()
// Start building the accept descriptor. // Start building the accept descriptor.
acceptDesc := &channeldb.HtlcAcceptDesc{ acceptDesc := &channeldb.HtlcAcceptDesc{
Amt: ctx.amtPaid, Amt: ctx.amtPaid,
@ -143,7 +156,7 @@ func updateMpp(ctx *invoiceUpdateCtx,
// Check whether total amt matches other htlcs in the set. // Check whether total amt matches other htlcs in the set.
var newSetTotal lnwire.MilliSatoshi var newSetTotal lnwire.MilliSatoshi
for _, htlc := range inv.HTLCSet(nil) { for _, htlc := range inv.HTLCSet(setID) {
if ctx.mpp.TotalMsat() != htlc.MppTotalAmt { if ctx.mpp.TotalMsat() != htlc.MppTotalAmt {
return nil, ctx.failRes(ResultHtlcSetTotalMismatch), nil return nil, ctx.failRes(ResultHtlcSetTotalMismatch), nil
} }
@ -188,6 +201,7 @@ func updateMpp(ctx *invoiceUpdateCtx,
if inv.HodlInvoice { if inv.HodlInvoice {
update.State = &channeldb.InvoiceStateUpdateDesc{ update.State = &channeldb.InvoiceStateUpdateDesc{
NewState: channeldb.ContractAccepted, NewState: channeldb.ContractAccepted,
SetID: setID,
} }
return &update, ctx.acceptRes(resultAccepted), nil return &update, ctx.acceptRes(resultAccepted), nil
} }
@ -195,6 +209,7 @@ func updateMpp(ctx *invoiceUpdateCtx,
update.State = &channeldb.InvoiceStateUpdateDesc{ update.State = &channeldb.InvoiceStateUpdateDesc{
NewState: channeldb.ContractSettled, NewState: channeldb.ContractSettled,
Preimage: inv.Terms.PaymentPreimage, Preimage: inv.Terms.PaymentPreimage,
SetID: setID,
} }
return &update, ctx.settleRes( return &update, ctx.settleRes(