bip21

LDKNodeMonday.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 56;
+	objectVersion = 60;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -32,7 +32,6 @@
 		AE17E8E129A402E40058C9C9 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = AE17E8E029A402E40058C9C9 /* Preview Assets.xcassets */; };
 		AE17E90D29A42D430058C9C9 /* LightningNodeService.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE17E90C29A42D430058C9C9 /* LightningNodeService.swift */; };
 		AE186B8E2A1540B700338463 /* StartView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE186B8D2A1540B700338463 /* StartView.swift */; };
-		AE1AED452C25C94D00B467EF /* LDKNode in Frameworks */ = {isa = PBXBuildFile; productRef = AE1AED442C25C94D00B467EF /* LDKNode */; };
 		AE1D9BEC2B2A1FFD00620748 /* BitcoinUI in Frameworks */ = {isa = PBXBuildFile; productRef = AE1D9BEB2B2A1FFD00620748 /* BitcoinUI */; };
 		AE1D9C0B2B2A251500620748 /* ChannelDetails+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE1D9C0A2B2A251500620748 /* ChannelDetails+Extensions.swift */; };
 		AE3815362B6A9705006B2952 /* LightningNodesService.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE3815352B6A9705006B2952 /* LightningNodesService.swift */; };
@@ -70,6 +69,9 @@
 		AE7D3FAD2A4263C100EAE730 /* PaymentsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE7D3FAC2A4263C100EAE730 /* PaymentsViewModel.swift */; };
 		AE80116B29A59976009B9967 /* NodeIDView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE80116A29A59976009B9967 /* NodeIDView.swift */; };
 		AE80116D29A59AF4009B9967 /* ChannelAddView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE80116C29A59AF4009B9967 /* ChannelAddView.swift */; };
+		AE80C2002C4AB360006E7193 /* BIP21View.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE80C1FF2C4AB360006E7193 /* BIP21View.swift */; };
+		AE80C2022C4AB38D006E7193 /* BIP21ViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE80C2012C4AB38D006E7193 /* BIP21ViewModel.swift */; };
+		AE80C2052C4AB5E4006E7193 /* LDKNode in Frameworks */ = {isa = PBXBuildFile; productRef = AE80C2042C4AB5E4006E7193 /* LDKNode */; };
 		AE94226A2A007D6C007E4F12 /* ChannelsListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE9422692A007D6C007E4F12 /* ChannelsListView.swift */; };
 		AEA057E92B912C3C00DB1096 /* ZeroInvoiceView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AEA057E82B912C3C00DB1096 /* ZeroInvoiceView.swift */; };
 		AEA057EB2B912E1800DB1096 /* AmountInvoiceView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AEA057EA2B912E1800DB1096 /* AmountInvoiceView.swift */; };
@@ -154,6 +156,8 @@
 		AE7D3FAC2A4263C100EAE730 /* PaymentsViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PaymentsViewModel.swift; sourceTree = "<group>"; };
 		AE80116A29A59976009B9967 /* NodeIDView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NodeIDView.swift; sourceTree = "<group>"; };
 		AE80116C29A59AF4009B9967 /* ChannelAddView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChannelAddView.swift; sourceTree = "<group>"; };
+		AE80C1FF2C4AB360006E7193 /* BIP21View.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BIP21View.swift; sourceTree = "<group>"; };
+		AE80C2012C4AB38D006E7193 /* BIP21ViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BIP21ViewModel.swift; sourceTree = "<group>"; };
 		AE8D877429B145F100F2B918 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
 		AE9422692A007D6C007E4F12 /* ChannelsListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChannelsListView.swift; sourceTree = "<group>"; };
 		AEA057E82B912C3C00DB1096 /* ZeroInvoiceView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ZeroInvoiceView.swift; sourceTree = "<group>"; };
@@ -189,7 +193,7 @@
 				AEE5B7652A09B1FC001E5E59 /* CodeScanner in Frameworks */,
 				AE51BEFD2B37A5DC00BAE452 /* SimpleToast in Frameworks */,
 				AE7C4A082B406D590061189D /* SimpleToast in Frameworks */,
-				AE1AED452C25C94D00B467EF /* LDKNode in Frameworks */,
+				AE80C2052C4AB5E4006E7193 /* LDKNode in Frameworks */,
 				AE01C5B02AB3BEED00F28C7E /* KeychainAccess in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -283,6 +287,7 @@
 				AEAAD9D22C23399700765F5B /* Bolt12ZeroInvoiceViewModel.swift */,
 				AE5BFE852C0B9D7B003B467C /* Bolt12InvoiceViewModel.swift */,
 				AE028A272B96325700B336E7 /* AmountInvoiceViewModel.swift */,
+				AE80C2012C4AB38D006E7193 /* BIP21ViewModel.swift */,
 				AE028A292B96328600B336E7 /* JITInvoiceViewModel.swift */,
 				AE49E8552A253674002623E8 /* AddressViewModel.swift */,
 			);
@@ -378,6 +383,7 @@
 				AE5BFE832C0B9D06003B467C /* Bolt12InvoiceView.swift */,
 				AEAAD9D02C23394D00765F5B /* Bolt12ZeroInvoiceView.swift */,
 				AEA057EA2B912E1800DB1096 /* AmountInvoiceView.swift */,
+				AE80C1FF2C4AB360006E7193 /* BIP21View.swift */,
 				AEA057EC2B912FEA00DB1096 /* JITInvoiceView.swift */,
 				AE17E8DB29A402E30058C9C9 /* AddressView.swift */,
 			);
@@ -555,7 +561,7 @@
 				AE51BEFC2B37A5DC00BAE452 /* SimpleToast */,
 				AE7C4A072B406D590061189D /* SimpleToast */,
 				AE060C372C051B59006724F1 /* LDKNode */,
-				AE1AED442C25C94D00B467EF /* LDKNode */,
+				AE80C2042C4AB5E4006E7193 /* LDKNode */,
 			);
 			productName = LDKNodeMonday;
 			productReference = AE17E8D629A402E30058C9C9 /* LDKNodeMonday.app */;
@@ -590,7 +596,7 @@
 				AE01C5AE2AB3BEED00F28C7E /* XCRemoteSwiftPackageReference "KeychainAccess" */,
 				AE1D9BEA2B2A1FFD00620748 /* XCRemoteSwiftPackageReference "BitcoinUI" */,
 				AE7C4A062B406D590061189D /* XCRemoteSwiftPackageReference "SimpleToast" */,
-				AE1AED432C25C94D00B467EF /* XCRemoteSwiftPackageReference "ldk-node" */,
+				AE80C2032C4AB5E4006E7193 /* XCLocalSwiftPackageReference "../ldk-node/bindings/swift" */,
 			);
 			productRefGroup = AE17E8D729A402E30058C9C9 /* Products */;
 			projectDirPath = "";
@@ -626,6 +632,7 @@
 				AE0055162B4A0E0100100797 /* Logger+Extensions.swift in Sources */,
 				AEA057EB2B912E1800DB1096 /* AmountInvoiceView.swift in Sources */,
 				AE70963C2B5C22270038BE56 /* CurrencyCode.swift in Sources */,
+				AE80C2002C4AB360006E7193 /* BIP21View.swift in Sources */,
 				AE01C5B22AB3BF3C00F28C7E /* KeyService.swift in Sources */,
 				AE49E8642A2537B3002623E8 /* PeersListViewModel.swift in Sources */,
 				AE49E8542A253647002623E8 /* BitcoinViewModel.swift in Sources */,
@@ -685,6 +692,7 @@
 				AE6BB56F2A008CBA009E16E3 /* UInt64+Extensions.swift in Sources */,
 				AE49E85A2A2536D4002623E8 /* ChannelAddViewModel.swift in Sources */,
 				AE0055142B4895B500100797 /* SeedViewModel.swift in Sources */,
+				AE80C2022C4AB38D006E7193 /* BIP21ViewModel.swift in Sources */,
 				AE7D3FAB2A4263AE00EAE730 /* PaymentsView.swift in Sources */,
 				AE80116D29A59AF4009B9967 /* ChannelAddView.swift in Sources */,
 				AE551D472B8ECE7D0034B61E /* Payment.swift in Sources */,
@@ -906,6 +914,13 @@
 		};
 /* End XCConfigurationList section */
 
+/* Begin XCLocalSwiftPackageReference section */
+		AE80C2032C4AB5E4006E7193 /* XCLocalSwiftPackageReference "../ldk-node/bindings/swift" */ = {
+			isa = XCLocalSwiftPackageReference;
+			relativePath = "../ldk-node/bindings/swift";
+		};
+/* End XCLocalSwiftPackageReference section */
+
 /* Begin XCRemoteSwiftPackageReference section */
 		AE01C5AE2AB3BEED00F28C7E /* XCRemoteSwiftPackageReference "KeychainAccess" */ = {
 			isa = XCRemoteSwiftPackageReference;
@@ -915,14 +930,6 @@
 				version = 4.2.2;
 			};
 		};
-		AE1AED432C25C94D00B467EF /* XCRemoteSwiftPackageReference "ldk-node" */ = {
-			isa = XCRemoteSwiftPackageReference;
-			repositoryURL = "https://github.com/lightningdevkit/ldk-node.git";
-			requirement = {
-				kind = exactVersion;
-				version = 0.3.0;
-			};
-		};
 		AE1D9BEA2B2A1FFD00620748 /* XCRemoteSwiftPackageReference "BitcoinUI" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/reez/BitcoinUI.git";
@@ -959,11 +966,6 @@
 			isa = XCSwiftPackageProductDependency;
 			productName = LDKNode;
 		};
-		AE1AED442C25C94D00B467EF /* LDKNode */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = AE1AED432C25C94D00B467EF /* XCRemoteSwiftPackageReference "ldk-node" */;
-			productName = LDKNode;
-		};
 		AE1D9BEB2B2A1FFD00620748 /* BitcoinUI */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = AE1D9BEA2B2A1FFD00620748 /* XCRemoteSwiftPackageReference "BitcoinUI" */;
@@ -978,6 +980,10 @@
 			package = AE7C4A062B406D590061189D /* XCRemoteSwiftPackageReference "SimpleToast" */;
 			productName = SimpleToast;
 		};
+		AE80C2042C4AB5E4006E7193 /* LDKNode */ = {
+			isa = XCSwiftPackageProductDependency;
+			productName = LDKNode;
+		};
 		AEE5B7642A09B1FC001E5E59 /* CodeScanner */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = AEE5B7632A09B1FC001E5E59 /* XCRemoteSwiftPackageReference "CodeScanner" */;

LDKNodeMonday.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -1,5 +1,5 @@
 {
-  "originHash" : "3c4f831e3e2d84e3d749572be35ef446cf04910008de67451a51af6ca58e22b3",
+  "originHash" : "2d457a0d145c5ec561d10ae3f13d805b262d5bfda9ebf0868311848416a25b6e",
   "pins" : [
     {
       "identity" : "bitcoinui",
@@ -28,15 +28,6 @@
         "version" : "4.2.2"
       }
     },
-    {
-      "identity" : "ldk-node",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/lightningdevkit/ldk-node.git",
-      "state" : {
-        "revision" : "bd9bd683201c1597d8930ac4118fa950cedfd56c",
-        "version" : "0.3.0"
-      }
-    },
     {
       "identity" : "simpletoast",
       "kind" : "remoteSourceControl",

LDKNodeMonday/Extensions/String+Extensions.swift

@@ -165,10 +165,8 @@ extension String {
 
         if let lightningAddress = queryParams["lightning"], !lightningAddress.isEmpty {
             return processLightningAddress(lightningAddress)
-        } else if self.isLightningAddress && !self.starts(with: "lnurl") {
-            return processLightningAddress(self)
         } else if self.isBitcoinAddress {
-            return processBitcoinAddress(spendableBalance)
+            return processBitcoinAddress(spendableBalance)  // Modified to handle BIP21
         } else if self.starts(with: "lnurl") {
             return ("LNURL not supported yet", "0", .isLightningURL)
         } else {
@@ -177,10 +175,11 @@ extension String {
     }
 
     private func processBitcoinAddress(_ spendableBalance: UInt64) -> (String, String, Payment) {
-        let address = self.extractBitcoinAddress()
+        let address = self.extractBitcoinAddress()  // Modified for BIP21 extraction
         let queryParams = self.queryParameters()
-        let amount = queryParams["amount"] ?? "0"
+        let amount = queryParams["amount"] ?? "0"  // Modified: Handling BIP21 amount only
 
+        // Validate the amount against the spendable balance
         if let amountValue = UInt64(amount), amountValue <= spendableBalance {
             return (address, amount, .isBitcoin)
         } else {
@@ -201,7 +200,11 @@ extension String {
 
     private func extractBitcoinAddress() -> String {
         if self.lowercased().hasPrefix("bitcoin:") {
+            // Extract the address from the "bitcoin:" URI, ignoring any query parameters
             let address = self.replacingOccurrences(of: "bitcoin:", with: "")
+            if let addressEnd = address.range(of: "?")?.lowerBound {  // New: Handles query parameters in BIP21
+                return String(address[..<addressEnd]).uppercased()
+            }
             return address.uppercased()
         }
         return self.uppercased()

LDKNodeMonday/Model/ReceiveOption.swift

@@ -8,23 +8,24 @@
 import Foundation
 
 enum ReceiveOption: String, CaseIterable, Identifiable {
-    case bolt11Zero = "Bolt11 0"
-    case bolt11 = "Bolt11"
+    //    case bolt11Zero = "Bolt11 0"
+    //    case bolt11 = "Bolt11"
     case bolt11JIT = "Bolt11 JIT"
     //    case bolt12Zero = "Bolt12 0"
-    case bolt12 = "Bolt12"
-    case bitcoin = "Address"
+    //    case bolt12 = "Bolt12"
+    //    case bitcoin = "Address"
+    case bip21 = "BIP21"
 
     var id: Self { self }
 }
 
 extension ReceiveOption {
     var systemImageName: String {
         switch self {
-        case .bitcoin:
-            return "bitcoinsign"
-        default:
+        case .bolt11JIT:
             return "bolt"
+        default:
+            return "qrcode"
         }
     }
 }

LDKNodeMonday/Service/Lightning Service/LightningNodeService.swift

@@ -186,6 +186,12 @@ class LightningNodeService {
         return paymentId
     }
 
+    // Parses a URI string, attempts to pay a BOLT12 offer, BOLT11 invoice, then falls back to the on-chain address if the offer and invoice fail.
+    func send(uriStr: String) async throws -> QrPaymentResult {
+        let qrPaymentResult = try ldkNode.unifiedQrPayment().send(uriStr: uriStr)
+        return qrPaymentResult
+    }
+
     func sendUsingAmount(bolt11Invoice: Bolt11Invoice, amountMsat: UInt64) async throws
         -> PaymentHash
     {
@@ -227,6 +233,16 @@ class LightningNodeService {
         return offer
     }
 
+    // Generates a BIP21 URI string with an on the address and BOLT11 invoice.
+    func receive(amountSat: UInt64, message: String, expirySec: UInt32) async throws -> String {
+        let bip21UriString = try ldkNode.unifiedQrPayment().receive(
+            amountSats: amountSat,
+            message: message,
+            expirySec: expirySec
+        )
+        return bip21UriString
+    }
+
     func receiveVariableAmount(description: String, expirySecs: UInt32) async throws
         -> Bolt11Invoice
     {

LDKNodeMonday/Service/Lightning Service/LightningServiceError.swift

@@ -155,6 +155,12 @@ func handleNodeError(_ error: NodeError) -> MondayError {
     case .GossipUpdateTimeout(let message):
         return .init(title: "GossipUpdateTimeout", detail: message)
 
+    case .UriParameterParsingFailed(let message):
+        return .init(title: "UriParameterParsingFailed", detail: message)
+
+    case .InvalidUri(let message):
+        return .init(title: "InvalidUri", detail: message)
+
     }
 
 }

LDKNodeMonday/View Model/Home/Receive/BIP21ViewModel.swift

@@ -0,0 +1,55 @@
+//
+//  BIP21ViewModel.swift
+//  LDKNodeMonday
+//
+//  Created by Matthew Ramsden on 7/19/24.
+//
+
+import BitcoinUI
+import Foundation
+import LDKNode
+import SwiftUI
+
+class BIP21ViewModel: ObservableObject {
+    @Published var unified: String = ""
+    @Published var receiveViewError: MondayError?
+    @Published var networkColor = Color.gray
+    @Published var amountSat: String = ""
+
+    func receivePayment(amountSat: UInt64, message: String, expirySecs: UInt32) async {
+        do {
+            let unified = try await LightningNodeService.shared.receive(
+                amountSat: amountSat,
+                message: message,
+                expirySec: expirySecs
+            )
+            DispatchQueue.main.async {
+                self.unified = unified
+            }
+        } catch let error as NodeError {
+            let errorString = handleNodeError(error)
+            DispatchQueue.main.async {
+                self.receiveViewError = .init(title: errorString.title, detail: errorString.detail)
+            }
+        } catch {
+            DispatchQueue.main.async {
+                self.receiveViewError = .init(
+                    title: "Unexpected error",
+                    detail: error.localizedDescription
+                )
+            }
+        }
+    }
+
+    func clearInvoice() {
+        self.unified = ""
+    }
+
+    func getColor() {
+        let color = LightningNodeService.shared.networkColor
+        DispatchQueue.main.async {
+            self.networkColor = color
+        }
+    }
+
+}