lnrpc: allow payment addr override for AMP invoices
This permits an AMP invoice to be "pseudo-reusable", where the invoice paramters can be used multiple times so long as a new payment address is supplied. This prevents additional round trips between payer and payee to obtain a new invoice, even though the payments/invoices won't be logically associated via the RPC interface like they would when the full reusable invoices are deployed.
This commit is contained in:
parent
a765ba1f3d
commit
d6f88cbe6f
@ -710,6 +710,7 @@ func (r *RouterBackend) extractIntentFromSendRequest(
|
|||||||
payIntent.MaxParts = 1
|
payIntent.MaxParts = 1
|
||||||
}
|
}
|
||||||
|
|
||||||
|
payAddr := payReq.PaymentAddr
|
||||||
if payReq.Features.HasFeature(lnwire.AMPOptional) {
|
if payReq.Features.HasFeature(lnwire.AMPOptional) {
|
||||||
// Generate random SetID and root share.
|
// Generate random SetID and root share.
|
||||||
var setID [32]byte
|
var setID [32]byte
|
||||||
@ -730,6 +731,17 @@ func (r *RouterBackend) extractIntentFromSendRequest(
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// For AMP invoices, we'll allow users to override the
|
||||||
|
// included payment addr to allow the invoice to be
|
||||||
|
// pseudo-reusable, e.g. the invoice parameters are
|
||||||
|
// reused (amt, cltv, hop hints, etc) even though the
|
||||||
|
// payments will share different payment hashes.
|
||||||
|
if len(rpcPayReq.PaymentAddr) > 0 {
|
||||||
|
var addr [32]byte
|
||||||
|
copy(addr[:], rpcPayReq.PaymentAddr)
|
||||||
|
payAddr = &addr
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
err = payIntent.SetPaymentHash(*payReq.PaymentHash)
|
err = payIntent.SetPaymentHash(*payReq.PaymentHash)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -745,7 +757,7 @@ func (r *RouterBackend) extractIntentFromSendRequest(
|
|||||||
payIntent.RouteHints, payReq.RouteHints...,
|
payIntent.RouteHints, payReq.RouteHints...,
|
||||||
)
|
)
|
||||||
payIntent.DestFeatures = payReq.Features
|
payIntent.DestFeatures = payReq.Features
|
||||||
payIntent.PaymentAddr = payReq.PaymentAddr
|
payIntent.PaymentAddr = payAddr
|
||||||
payIntent.PaymentRequest = []byte(rpcPayReq.PaymentRequest)
|
payIntent.PaymentRequest = []byte(rpcPayReq.PaymentRequest)
|
||||||
} else {
|
} else {
|
||||||
// Otherwise, If the payment request field was not specified
|
// Otherwise, If the payment request field was not specified
|
||||||
|
@ -20,6 +20,19 @@ import (
|
|||||||
// testSendPaymentAMPInvoice tests that we can send an AMP payment to a
|
// testSendPaymentAMPInvoice tests that we can send an AMP payment to a
|
||||||
// specified AMP invoice using SendPaymentV2.
|
// specified AMP invoice using SendPaymentV2.
|
||||||
func testSendPaymentAMPInvoice(net *lntest.NetworkHarness, t *harnessTest) {
|
func testSendPaymentAMPInvoice(net *lntest.NetworkHarness, t *harnessTest) {
|
||||||
|
t.t.Run("native payaddr", func(t *testing.T) {
|
||||||
|
tt := newHarnessTest(t, net)
|
||||||
|
testSendPaymentAMPInvoiceCase(net, tt, false)
|
||||||
|
})
|
||||||
|
t.t.Run("external payaddr", func(t *testing.T) {
|
||||||
|
tt := newHarnessTest(t, net)
|
||||||
|
testSendPaymentAMPInvoiceCase(net, tt, true)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func testSendPaymentAMPInvoiceCase(net *lntest.NetworkHarness, t *harnessTest,
|
||||||
|
useExternalPayAddr bool) {
|
||||||
|
|
||||||
ctxb := context.Background()
|
ctxb := context.Background()
|
||||||
|
|
||||||
ctx := newMppTestContext(t, net)
|
ctx := newMppTestContext(t, net)
|
||||||
@ -88,11 +101,28 @@ func testSendPaymentAMPInvoice(net *lntest.NetworkHarness, t *harnessTest) {
|
|||||||
t.Fatalf("dave policy update: %v", err)
|
t.Fatalf("dave policy update: %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Generate an external payment address when attempting to pseudo-reuse
|
||||||
|
// an AMP invoice. When using an external payment address, we'll also
|
||||||
|
// expect an extra invoice to appear in the ListInvoices response, since
|
||||||
|
// a new invoice will be JIT inserted under a different payment address
|
||||||
|
// than the one in the invoice.
|
||||||
|
var (
|
||||||
|
expNumInvoices = 1
|
||||||
|
externalPayAddr []byte
|
||||||
|
)
|
||||||
|
if useExternalPayAddr {
|
||||||
|
expNumInvoices = 2
|
||||||
|
externalPayAddr = make([]byte, 32)
|
||||||
|
_, err = rand.Read(externalPayAddr)
|
||||||
|
require.NoError(t.t, err)
|
||||||
|
}
|
||||||
|
|
||||||
ctxt, _ := context.WithTimeout(context.Background(), 4*defaultTimeout)
|
ctxt, _ := context.WithTimeout(context.Background(), 4*defaultTimeout)
|
||||||
payment := sendAndAssertSuccess(
|
payment := sendAndAssertSuccess(
|
||||||
ctxt, t, ctx.alice,
|
ctxt, t, ctx.alice,
|
||||||
&routerrpc.SendPaymentRequest{
|
&routerrpc.SendPaymentRequest{
|
||||||
PaymentRequest: addInvoiceResp.PaymentRequest,
|
PaymentRequest: addInvoiceResp.PaymentRequest,
|
||||||
|
PaymentAddr: externalPayAddr,
|
||||||
TimeoutSeconds: 60,
|
TimeoutSeconds: 60,
|
||||||
FeeLimitMsat: noFeeLimitMsat,
|
FeeLimitMsat: noFeeLimitMsat,
|
||||||
},
|
},
|
||||||
@ -118,6 +148,14 @@ func testSendPaymentAMPInvoice(net *lntest.NetworkHarness, t *harnessTest) {
|
|||||||
minExpectedShards, succeeded)
|
minExpectedShards, succeeded)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// When an external payment address is supplied, we'll get an extra
|
||||||
|
// notification for the JIT inserted invoice, since it differs from the
|
||||||
|
// original.
|
||||||
|
if useExternalPayAddr {
|
||||||
|
_, err = bobInvoiceSubscription.Recv()
|
||||||
|
require.NoError(t.t, err)
|
||||||
|
}
|
||||||
|
|
||||||
// There should now be a settle event for the invoice.
|
// There should now be a settle event for the invoice.
|
||||||
rpcInvoice, err = bobInvoiceSubscription.Recv()
|
rpcInvoice, err = bobInvoiceSubscription.Recv()
|
||||||
require.NoError(t.t, err)
|
require.NoError(t.t, err)
|
||||||
@ -128,8 +166,8 @@ func testSendPaymentAMPInvoice(net *lntest.NetworkHarness, t *harnessTest) {
|
|||||||
ctxb, &lnrpc.ListInvoiceRequest{},
|
ctxb, &lnrpc.ListInvoiceRequest{},
|
||||||
)
|
)
|
||||||
require.NoError(t.t, err)
|
require.NoError(t.t, err)
|
||||||
require.Equal(t.t, 1, len(invoiceResp.Invoices))
|
require.Equal(t.t, expNumInvoices, len(invoiceResp.Invoices))
|
||||||
assertInvoiceEqual(t.t, rpcInvoice, invoiceResp.Invoices[0])
|
assertInvoiceEqual(t.t, rpcInvoice, invoiceResp.Invoices[expNumInvoices-1])
|
||||||
|
|
||||||
// Assert that the invoice is settled for the total payment amount and
|
// Assert that the invoice is settled for the total payment amount and
|
||||||
// has the correct payment address.
|
// has the correct payment address.
|
||||||
@ -161,6 +199,7 @@ func testSendPaymentAMPInvoice(net *lntest.NetworkHarness, t *harnessTest) {
|
|||||||
validPreimage := childPreimage.Matches(childHash)
|
validPreimage := childPreimage.Matches(childHash)
|
||||||
require.True(t.t, validPreimage)
|
require.True(t.t, validPreimage)
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// testSendPaymentAMP tests that we can send an AMP payment to a specified
|
// testSendPaymentAMP tests that we can send an AMP payment to a specified
|
||||||
|
Loading…
Reference in New Issue
Block a user