Merge remote-tracking branch 'refs/remotes/upstream/release/0.6'

# Conflicts:
#	Cargo.toml
#	Package.swift
#	bindings/kotlin/ldk-node-android/gradle.properties

Author: coreyphillips

CHANGELOG.md

@@ -1,3 +1,21 @@
+# 0.6.1 - Jun. 19, 2025
+This patch release fixes minor issues with the recently-exposed `Bolt11Invoice`
+type in bindings.
+
+## Feature and API updates
+- The `Bolt11Invoice::description` method is now exposed as
+  `Bolt11Invoice::invoice_description` in bindings, to avoid collisions with a
+  Swift standard method of same name (#576)
+
+## Bug Fixes and Improvements
+- The `Display` implementation of `Bolt11Invoice` is now exposed in bindings,
+  (re-)allowing to render the invoice as a string. (#574)
+
+In total, this release features 9 files changed, 549 insertions, 83 deletions,
+in 8 commits from 1 author in alphabetical order:
+
+- Elias Rohrer
+
 # 0.6.0 - Jun. 9, 2025
 This sixth minor release mainly fixes an issue that could have left the
 on-chain wallet unable to spend funds if transactions that had previously been

bindings/kotlin/ldk-node-jvm/gradle.properties

@@ -1,3 +1,3 @@
 org.gradle.jvmargs=-Xmx1536m
 kotlin.code.style=official
-libraryVersion=0.6.0
+libraryVersion=0.6.1

bindings/ldk_node.udl

@@ -742,6 +742,7 @@ dictionary RouteHintHop {
 	RoutingFees fees;
 };
 
+[Traits=(Debug, Display, Eq)]
 interface Bolt11Invoice {
 	[Throws=NodeError, Name=from_str]
 	constructor([ByRef] string invoice_str);
@@ -754,7 +755,7 @@ interface Bolt11Invoice {
 	u64 seconds_until_expiry();
 	boolean is_expired();
 	boolean would_expire(u64 at_time_seconds);
-	Bolt11InvoiceDescription description();
+	Bolt11InvoiceDescription invoice_description();
 	u64 min_final_cltv_expiry_delta();
 	Network network();
 	Currency currency();

bindings/python/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ldk_node"
-version = "0.6.0"
+version = "0.6.1"
 authors = [
   { name="Elias Rohrer", email="dev@tnull.de" },
 ]

bindings/swift/Sources/LDKNode/LDKNode.swift

@@ -517,12 +517,12 @@ public protocol Bolt11InvoiceProtocol : AnyObject {
 
     func currency()  -> Currency
 
-    func description()  -> Bolt11InvoiceDescription
-    
     func expiryTimeSeconds()  -> UInt64
 
     func fallbackAddresses()  -> [Address]
 
+    func invoiceDescription()  -> Bolt11InvoiceDescription
+    
     func isExpired()  -> Bool
 
     func minFinalCltvExpiryDelta()  -> UInt64
@@ -548,6 +548,9 @@ public protocol Bolt11InvoiceProtocol : AnyObject {
 }
 
 open class Bolt11Invoice:
+    CustomDebugStringConvertible,
+    CustomStringConvertible,
+    Equatable,
     Bolt11InvoiceProtocol {
     fileprivate let pointer: UnsafeMutableRawPointer!
 
@@ -610,13 +613,6 @@ open func currency() -> Currency {
 })
 }
 
-open func description() -> Bolt11InvoiceDescription {
-    return try!  FfiConverterTypeBolt11InvoiceDescription.lift(try! rustCall() {
-    uniffi_ldk_node_fn_method_bolt11invoice_description(self.uniffiClonePointer(),$0
-    )
-})
-}
-    
 open func expiryTimeSeconds() -> UInt64 {
     return try!  FfiConverterUInt64.lift(try! rustCall() {
     uniffi_ldk_node_fn_method_bolt11invoice_expiry_time_seconds(self.uniffiClonePointer(),$0
@@ -631,6 +627,13 @@ open func fallbackAddresses() -> [Address] {
 })
 }
 
+open func invoiceDescription() -> Bolt11InvoiceDescription {
+    return try!  FfiConverterTypeBolt11InvoiceDescription.lift(try! rustCall() {
+    uniffi_ldk_node_fn_method_bolt11invoice_invoice_description(self.uniffiClonePointer(),$0
+    )
+})
+}
+    
 open func isExpired() -> Bool {
     return try!  FfiConverterBool.lift(try! rustCall() {
     uniffi_ldk_node_fn_method_bolt11invoice_is_expired(self.uniffiClonePointer(),$0
@@ -709,6 +712,31 @@ open func wouldExpire(atTimeSeconds: UInt64) -> Bool {
 })
 }
 
+    open var debugDescription: String {
+        return try!  FfiConverterString.lift(
+            try! rustCall() {
+    uniffi_ldk_node_fn_method_bolt11invoice_uniffi_trait_debug(self.uniffiClonePointer(),$0
+    )
+}
+        )
+    }
+    open var description: String {
+        return try!  FfiConverterString.lift(
+            try! rustCall() {
+    uniffi_ldk_node_fn_method_bolt11invoice_uniffi_trait_display(self.uniffiClonePointer(),$0
+    )
+}
+        )
+    }
+    public static func == (self: Bolt11Invoice, other: Bolt11Invoice) -> Bool {
+        return try!  FfiConverterBool.lift(
+            try! rustCall() {
+    uniffi_ldk_node_fn_method_bolt11invoice_uniffi_trait_eq_eq(self.uniffiClonePointer(),
+        FfiConverterTypeBolt11Invoice.lower(other),$0
+    )
+}
+        )
+    }
 
 }
 
@@ -9717,15 +9745,15 @@ private var initializationResult: InitializationResult {
     if (uniffi_ldk_node_checksum_method_bolt11invoice_currency() != 32179) {
         return InitializationResult.apiChecksumMismatch
     }
-    if (uniffi_ldk_node_checksum_method_bolt11invoice_description() != 9887) {
-        return InitializationResult.apiChecksumMismatch
-    }
     if (uniffi_ldk_node_checksum_method_bolt11invoice_expiry_time_seconds() != 23625) {
         return InitializationResult.apiChecksumMismatch
     }
     if (uniffi_ldk_node_checksum_method_bolt11invoice_fallback_addresses() != 55276) {
         return InitializationResult.apiChecksumMismatch
     }
+    if (uniffi_ldk_node_checksum_method_bolt11invoice_invoice_description() != 395) {
+        return InitializationResult.apiChecksumMismatch
+    }
     if (uniffi_ldk_node_checksum_method_bolt11invoice_is_expired() != 15932) {
         return InitializationResult.apiChecksumMismatch
     }

src/payment/unified_qr.rs

@@ -187,6 +187,7 @@ impl UnifiedQrPayment {
 /// [BIP 21]: https://github.com/bitcoin/bips/blob/master/bip-0021.mediawiki
 /// [`PaymentId`]: lightning::ln::channelmanager::PaymentId
 /// [`Txid`]: bitcoin::hash_types::Txid
+#[derive(Debug)]
 pub enum QrPaymentResult {
 	/// An on-chain payment.
 	Onchain {

src/uniffi_types.rs

@@ -471,7 +471,7 @@ impl From<lightning::routing::router::RouteHintHop> for RouteHintHop {
 /// Represents a syntactically and semantically correct lightning BOLT11 invoice.
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct Bolt11Invoice {
-	pub inner: LdkBolt11Invoice,
+	pub(crate) inner: LdkBolt11Invoice,
 }
 
 impl Bolt11Invoice {
@@ -535,7 +535,7 @@ impl Bolt11Invoice {
 	}
 
 	/// Return the description or a hash of it for longer ones
-	pub fn description(&self) -> Bolt11InvoiceDescription {
+	pub fn invoice_description(&self) -> Bolt11InvoiceDescription {
 		self.inner.description().into()
 	}
 
@@ -731,7 +731,7 @@ mod tests {
 		let (ldk_invoice, wrapped_invoice) = create_test_invoice();
 
 		let ldk_description = ldk_invoice.description();
-		let wrapped_description = wrapped_invoice.description();
+		let wrapped_description = wrapped_invoice.invoice_description();
 
 		match (ldk_description, &wrapped_description) {
 			(