Support custom expiry when requesting a new payment invoice (#250)

Author: dpad85

src/commonMain/kotlin/fr/acinq/eclair/io/Peer.kt

@@ -41,7 +41,7 @@ data class WrappedChannelEvent(val channelId: ByteVector32, val channelEvent: Ch
 object Disconnected : PeerEvent()
 
 sealed class PaymentEvent : PeerEvent()
-data class ReceivePayment(val paymentPreimage: ByteVector32, val amount: MilliSatoshi?, val description: String, val result: CompletableDeferred<PaymentRequest>) : PaymentEvent()
+data class ReceivePayment(val paymentPreimage: ByteVector32, val amount: MilliSatoshi?, val description: String, val expirySeconds: Long? = null, val result: CompletableDeferred<PaymentRequest>) : PaymentEvent()
 object CheckPaymentsTimeout : PaymentEvent()
 data class PayToOpenResponseEvent(val payToOpenResponse: PayToOpenResponse) : PeerEvent()
 data class SendPayment(val paymentId: UUID, val amount: MilliSatoshi, val recipient: PublicKey, val details: OutgoingPayment.Details.Normal) : PaymentEvent() {
@@ -669,7 +669,7 @@ class Peer(
                         )
                     )
                 )
-                val pr = incomingPaymentHandler.createInvoice(event.paymentPreimage, event.amount, event.description, extraHops)
+                val pr = incomingPaymentHandler.createInvoice(event.paymentPreimage, event.amount, event.description, extraHops, event.expirySeconds)
                 listenerEventChannel.send(PaymentRequestGenerated(event, pr.write()))
                 event.result.complete(pr)
             }

src/commonTest/kotlin/fr/acinq/eclair/io/peer/PeerTest.kt

@@ -168,6 +168,22 @@ class PeerTest : EclairTestSuite() {
         newPeers(this, Pair(alice0.staticParams.nodeParams, bob0.staticParams.nodeParams), Pair(TestConstants.Alice.walletParams, TestConstants.Bob.walletParams), listOf(alice0 to bob0))
     }
 
+    @Test
+    fun `invoice parameters`() = runSuspendTest {
+        val nodeParams = TestConstants.Alice.nodeParams
+        val walletParams = TestConstants.Alice.walletParams
+        val bob = newPeer(nodeParams, walletParams)
+
+        run {
+            val deferredInvoice = CompletableDeferred<PaymentRequest>()
+            bob.send(ReceivePayment(randomBytes32(), 1.msat, "A description: \uD83D\uDE2C", 3600 * 3, deferredInvoice))
+            val invoice = deferredInvoice.await()
+            assertEquals(1.msat, invoice.amount)
+            assertEquals(3600 * 3, invoice.expirySeconds)
+            assertEquals("A description: \uD83D\uDE2C", invoice.description)
+        }
+    }
+
     @Test
     fun `invoice routing hints`() = runSuspendTest {
         val (alice0, bob0) = TestsHelper.reachNormal()
@@ -181,7 +197,7 @@ class PeerTest : EclairTestSuite() {
 
         run {
             val deferredInvoice = CompletableDeferred<PaymentRequest>()
-            bob.send(ReceivePayment(randomBytes32(), 15_000_000.msat, "default routing hints", deferredInvoice))
+            bob.send(ReceivePayment(randomBytes32(), 15_000_000.msat, "default routing hints", null, deferredInvoice))
             val invoice = deferredInvoice.await()
             // The routing hint uses default values since no channel update has been sent by Alice yet.
             assertEquals(1, invoice.routingInfo.size)
@@ -194,7 +210,7 @@ class PeerTest : EclairTestSuite() {
             bob.forward(aliceUpdate)
 
             val deferredInvoice = CompletableDeferred<PaymentRequest>()
-            bob.send(ReceivePayment(randomBytes32(), 5_000_000.msat, "updated routing hints", deferredInvoice))
+            bob.send(ReceivePayment(randomBytes32(), 5_000_000.msat, "updated routing hints", null, deferredInvoice))
             val invoice = deferredInvoice.await()
             // The routing hint uses values from Alice's channel update.
             assertEquals(1, invoice.routingInfo.size)
@@ -218,7 +234,7 @@ class PeerTest : EclairTestSuite() {
         val (alice, bob, alice2bob, bob2alice) = newPeers(this, nodeParams, walletParams, listOf(alice0 to bob0), automateMessaging = false)
 
         val deferredInvoice = CompletableDeferred<PaymentRequest>()
-        bob.send(ReceivePayment(randomBytes32(), 15_000_000.msat, "test invoice", deferredInvoice))
+        bob.send(ReceivePayment(randomBytes32(), 15_000_000.msat, "test invoice", null, deferredInvoice))
         val invoice = deferredInvoice.await()
 
         alice.send(SendPayment(UUID.randomUUID(), invoice.amount!!, alice.remoteNodeId, OutgoingPayment.Details.Normal(invoice)))
@@ -264,7 +280,7 @@ class PeerTest : EclairTestSuite() {
         val (alice, bob) = newPeers(this, nodeParams, walletParams, listOf(alice0 to bob0))
 
         val deferredInvoice = CompletableDeferred<PaymentRequest>()
-        bob.send(ReceivePayment(randomBytes32(), 15_000_000.msat, "test invoice", deferredInvoice))
+        bob.send(ReceivePayment(randomBytes32(), 15_000_000.msat, "test invoice", null, deferredInvoice))
         val invoice = deferredInvoice.await()
 
         alice.send(SendPayment(UUID.randomUUID(), invoice.amount!!, alice.remoteNodeId, OutgoingPayment.Details.Normal(invoice)))

src/jvmTest/kotlin/fr/acinq/eclair/Node.kt

@@ -233,7 +233,7 @@ object Node {
                         val paymentPreimage = Eclair.randomBytes32()
                         val amount = MilliSatoshi(request.amount ?: 50000L)
                         val result = CompletableDeferred<PaymentRequest>()
-                        peer.send(ReceivePayment(paymentPreimage, amount, request.description.orEmpty(), result))
+                        peer.send(ReceivePayment(paymentPreimage, amount, request.description.orEmpty(), null, result))
                         call.respond(CreateInvoiceResponse(result.await().write()))
                     }
                     post("/invoice/pay") {