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

Merge pull request #3903 from joostjager/keysend-no-spam

Browse Source 
invoices: streamline key send cltv delta picking and validation
This commit is contained in:
Olaoluwa Osuntokun 2020-01-13 22:12:25 -08:00 committed by GitHub
commit 91e796aed8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
invoices/invoiceregistry.go
View File

@ -736,6 +736,12 @@ func (i *InvoiceRegistry) processKeySend(ctx invoiceUpdateCtx,
// Use the minimum block delta that we require for settling htlcs. // Use the minimum block delta that we require for settling htlcs.
finalCltvDelta := i.cfg.FinalCltvRejectDelta finalCltvDelta := i.cfg.FinalCltvRejectDelta
// Pre-check expiry here to prevent inserting an invoice that will not
// be settled.
if ctx.expiry < uint32(ctx.currentHeight+finalCltvDelta) {
return errors.New("final expiry too soon")
}
// Create placeholder invoice. // Create placeholder invoice.
invoice := &channeldb.Invoice{ invoice := &channeldb.Invoice{
CreationDate: i.cfg.Clock.Now(), CreationDate: i.cfg.Clock.Now(),

6
rpcserver.go
View File

@ -3535,7 +3535,11 @@ func (r *rpcServer) extractPaymentIntent(rpcPayReq *rpcPaymentRequest) (rpcPayme
if rpcPayReq.FinalCltvDelta != 0 { if rpcPayReq.FinalCltvDelta != 0 {
payIntent.cltvDelta = uint16(rpcPayReq.FinalCltvDelta) payIntent.cltvDelta = uint16(rpcPayReq.FinalCltvDelta)
} else { } else {
payIntent.cltvDelta = zpay32.DefaultFinalCLTVDelta // If no final cltv delta is given, assume the default that we
// use when creating an invoice. We do not assume the default of
// 9 blocks that is defined in BOLT-11, because this is never
// enough for other lnd nodes.
payIntent.cltvDelta = uint16(cfg.Bitcoin.TimeLockDelta)
} }
// If the user is manually specifying payment details, then the payment // If the user is manually specifying payment details, then the payment