Bolt12Invoice

src/commonMain/kotlin/fr/acinq/lightning/Features.kt

@@ -7,7 +7,7 @@ import fr.acinq.lightning.utils.or
 import kotlinx.serialization.Serializable
 
 /** Feature scope as defined in Bolt 9. */
-enum class FeatureScope { Init, Node, Invoice }
+enum class FeatureScope { Init, Node, Invoice, Bolt12 }
 
 enum class FeatureSupport {
     Mandatory {
@@ -88,7 +88,7 @@ sealed class Feature {
     object BasicMultiPartPayment : Feature() {
         override val rfcName get() = "basic_mpp"
         override val mandatory get() = 16
-        override val scopes: Set<FeatureScope> get() = setOf(FeatureScope.Init, FeatureScope.Node, FeatureScope.Invoice)
+        override val scopes: Set<FeatureScope> get() = setOf(FeatureScope.Init, FeatureScope.Node, FeatureScope.Invoice, FeatureScope.Bolt12)
     }
 
     @Serializable
@@ -105,6 +105,13 @@ sealed class Feature {
         override val scopes: Set<FeatureScope> get() = setOf(FeatureScope.Init, FeatureScope.Node)
     }
 
+    @Serializable
+    object RouteBlinding : Feature() {
+        override val rfcName get() = "option_route_blinding"
+        override val mandatory get() = 24
+        override val scopes: Set<FeatureScope> get() = setOf(FeatureScope.Init, FeatureScope.Node, FeatureScope.Invoice)
+    }
+
     @Serializable
     object ShutdownAnySegwit : Feature() {
         override val rfcName get() = "option_shutdown_anysegwit"
@@ -261,6 +268,8 @@ data class Features(val activated: Map<Feature, FeatureSupport>, val unknown: Se
 
     fun invoiceFeatures(): Features = Features(activated.filter { it.key.scopes.contains(FeatureScope.Invoice) }, unknown)
 
+    fun bolt12Features(): Features = Features(activated.filter { it.key.scopes.contains(FeatureScope.Bolt12) }, unknown)
+
     /** NB: this method is not reflexive, see [[Features.areCompatible]] if you want symmetric validation. */
     fun areSupported(remoteFeatures: Features): Boolean {
         // we allow unknown odd features (it's ok to be odd)

src/commonMain/kotlin/fr/acinq/lightning/db/PaymentsDb.kt

@@ -4,6 +4,7 @@ import fr.acinq.bitcoin.*
 import fr.acinq.lightning.MilliSatoshi
 import fr.acinq.lightning.ShortChannelId
 import fr.acinq.lightning.channel.ChannelException
+import fr.acinq.lightning.payment.Bolt11Invoice
 import fr.acinq.lightning.payment.FinalFailure
 import fr.acinq.lightning.payment.PaymentRequest
 import fr.acinq.lightning.utils.*
@@ -145,7 +146,7 @@ data class IncomingPayment(val preimage: ByteVector32, val origin: Origin, val r
 
     sealed class Origin {
         /** A normal, invoice-based lightning payment. */
-        data class Invoice(val paymentRequest: PaymentRequest) : Origin()
+        data class Invoice(val paymentRequest: Bolt11Invoice) : Origin()
 
         /** KeySend payments are spontaneous donations for which we didn't create an invoice. */
         object KeySend : Origin()
@@ -247,7 +248,7 @@ data class LightningOutgoingPayment(
 ) : OutgoingPayment() {
 
     /** Create an outgoing payment in a pending status, without any parts yet. */
-    constructor(id: UUID, amount: MilliSatoshi, recipient: PublicKey, invoice: PaymentRequest) : this(id, amount, recipient, Details.Normal(invoice), listOf(), Status.Pending)
+    constructor(id: UUID, amount: MilliSatoshi, recipient: PublicKey, invoice: Bolt11Invoice) : this(id, amount, recipient, Details.Normal(invoice), listOf(), Status.Pending)
 
     val paymentHash: ByteVector32 = details.paymentHash
 
@@ -282,7 +283,7 @@ data class LightningOutgoingPayment(
         abstract val paymentHash: ByteVector32
 
         /** A normal lightning payment. */
-        data class Normal(val paymentRequest: PaymentRequest) : Details() {
+        data class Normal(val paymentRequest: Bolt11Invoice) : Details() {
             override val paymentHash: ByteVector32 = paymentRequest.paymentHash
         }
 

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

@@ -65,7 +65,7 @@ object Disconnected : PeerCommand()
 sealed class PaymentCommand : PeerCommand()
 private object CheckPaymentsTimeout : PaymentCommand()
 data class PayToOpenResponseCommand(val payToOpenResponse: PayToOpenResponse) : PeerCommand()
-data class SendPayment(val paymentId: UUID, val amount: MilliSatoshi, val recipient: PublicKey, val paymentRequest: PaymentRequest, val trampolineFeesOverride: List<TrampolineFees>? = null) : PaymentCommand() {
+data class SendPayment(val paymentId: UUID, val amount: MilliSatoshi, val recipient: PublicKey, val paymentRequest: Bolt11Invoice, val trampolineFeesOverride: List<TrampolineFees>? = null) : PaymentCommand() {
     val paymentHash: ByteVector32 = paymentRequest.paymentHash
 }
 
@@ -571,7 +571,7 @@ class Peer(
             }
     }
 
-    suspend fun createInvoice(paymentPreimage: ByteVector32, amount: MilliSatoshi?, description: Either<String, ByteVector32>, expirySeconds: Long? = null): PaymentRequest {
+    suspend fun createInvoice(paymentPreimage: ByteVector32, amount: MilliSatoshi?, description: Either<String, ByteVector32>, expirySeconds: Long? = null): Bolt11Invoice {
         // we add one extra hop which uses a virtual channel with a "peer id", using the highest remote fees and expiry across all
         // channels to maximize the likelihood of success on the first payment attempt
         val remoteChannelUpdates = _channels.values.mapNotNull { channelState ->
@@ -584,7 +584,7 @@ class Peer(
         }
         val extraHops = listOf(
             listOf(
-                PaymentRequest.TaggedField.ExtraHop(
+                Bolt11Invoice.TaggedField.ExtraHop(
                     nodeId = walletParams.trampolineNode.id,
                     shortChannelId = ShortChannelId.peerId(nodeParams.nodeId),
                     feeBase = remoteChannelUpdates.maxOfOrNull { it.feeBaseMsat } ?: walletParams.invoiceDefaultRoutingFees.feeBase,