docs: codify paykit issuer contract

Bitkit/Services/PaykitIssuerInterop.swift

@@ -0,0 +1,45 @@
+import Foundation
+import LDKNode
+
+enum PaykitIssuerInterop {
+    static let bitcoinAsset = "btc"
+
+    struct EndpointPayload: Equatable {
+        let value: String
+        let min: String?
+        let max: String?
+    }
+
+    static func supportedEndpointIdentifiers(_ identifiers: [String], network: LDKNode.Network) -> [String] {
+        var seen = Set<String>()
+        return identifiers.filter { identifier in
+            guard seen.insert(identifier).inserted,
+                  let methodId = PublicPaykitService.MethodId(rawValue: identifier)
+            else { return false }
+
+            if let onchainNetwork = methodId.onchainNetwork {
+                return onchainNetwork == network
+            }
+
+            return methodId == .bitcoinLightningBolt11 || methodId == .bitcoinLightningLnurl
+        }
+    }
+
+    static func parseEndpointPayload(_ endpointData: String) -> EndpointPayload? {
+        let trimmedPayload = endpointData.trimmingCharacters(in: .whitespacesAndNewlines)
+        guard !trimmedPayload.isEmpty,
+              let data = trimmedPayload.data(using: .utf8),
+              let payloadObject = try? JSONSerialization.jsonObject(with: data) as? [String: Any],
+              let value = (payloadObject["value"] as? String)?.trimmingCharacters(in: .whitespacesAndNewlines),
+              !value.isEmpty,
+              payloadObject["min"] == nil || payloadObject["min"] is String || payloadObject["min"] is NSNull,
+              payloadObject["max"] == nil || payloadObject["max"] is String || payloadObject["max"] is NSNull
+        else { return nil }
+
+        return EndpointPayload(
+            value: value,
+            min: payloadObject["min"] as? String,
+            max: payloadObject["max"] as? String
+        )
+    }
+}

Bitkit/Services/PaykitPaymentRequestService.swift

@@ -1,4 +1,5 @@
 import Foundation
+import LDKNode
 import Paykit
 
 struct PaykitPaymentRequest: Identifiable, Hashable {
@@ -59,15 +60,15 @@ struct PaykitPaymentRequest: Identifiable, Hashable {
         )
     }
 
-    init?(record: Paykit.PaymentRequestRecord, now: Date) {
-        self.init(record: record, expectedRole: .payer, now: now, requiresActionableRequest: true)
+    init?(record: Paykit.PaymentRequestRecord, now: Date, network: LDKNode.Network = Env.network) {
+        self.init(record: record, expectedRole: .payer, now: now, network: network, requiresActionableRequest: true)
     }
 
-    init?(historyRecord: Paykit.PaymentRequestRecord, now: Date) {
+    init?(historyRecord: Paykit.PaymentRequestRecord, now: Date, network: LDKNode.Network = Env.network) {
         guard let localRole = historyRecord.localRole else { return nil }
         switch localRole {
         case .payer, .payee:
-            self.init(record: historyRecord, expectedRole: localRole, now: now, requiresActionableRequest: false)
+            self.init(record: historyRecord, expectedRole: localRole, now: now, network: network, requiresActionableRequest: false)
         case .unknown:
             return nil
         }
@@ -77,13 +78,14 @@ struct PaykitPaymentRequest: Identifiable, Hashable {
         record: Paykit.PaymentRequestRecord,
         expectedRole: Paykit.PaymentRequestLocalRole,
         now: Date,
+        network: LDKNode.Network,
         requiresActionableRequest: Bool
     ) {
         guard record.localRole == expectedRole,
               record.state != .activeRecurring,
               let terms = record.terms,
               terms.recurrence == nil,
-              terms.amount.asset == "btc",
+              terms.amount.asset == PaykitIssuerInterop.bitcoinAsset,
               let amountSats = Self.sats(fromBitcoinAmount: terms.amount.value),
               amountSats <= UInt64.max / 1000
         else { return nil }
@@ -92,8 +94,9 @@ struct PaykitPaymentRequest: Identifiable, Hashable {
             return nil
         }
 
-        let acceptedPaymentEndpointIdentifiers = Self.supportedEndpointIdentifiers(
-            terms.acceptedPaymentEndpointIdentifiers
+        let acceptedPaymentEndpointIdentifiers = PaykitIssuerInterop.supportedEndpointIdentifiers(
+            terms.acceptedPaymentEndpointIdentifiers,
+            network: network
         )
         if requiresActionableRequest, acceptedPaymentEndpointIdentifiers.isEmpty {
             return nil
@@ -255,21 +258,6 @@ struct PaykitPaymentRequest: Identifiable, Hashable {
             counterpartyReceiverPath == subscription.counterpartyReceiverPath
     }
 
-    static func supportedEndpointIdentifiers(_ identifiers: [String]) -> [String] {
-        var seen = Set<String>()
-        return identifiers.filter { identifier in
-            guard seen.insert(identifier).inserted,
-                  let methodId = PublicPaykitService.MethodId(rawValue: identifier)
-            else { return false }
-
-            if let network = methodId.onchainNetwork {
-                return network == Env.network
-            }
-
-            return methodId == .bitcoinLightningBolt11 || methodId == .bitcoinLightningLnurl
-        }
-    }
-
     static func sats(fromBitcoinAmount amount: String) -> UInt64? {
         let components = amount.split(separator: ".", maxSplits: 1, omittingEmptySubsequences: false)
         let digits = components.joined()
@@ -509,7 +497,10 @@ struct PaykitPaymentRequestService {
         let metadataData = try JSONSerialization.data(withJSONObject: ["note": draft.note])
         let metadataText = String(decoding: metadataData, as: UTF8.self)
         let terms = try Paykit.PaymentRequestTerms(
-            amount: Paykit.PaymentRequestAmount(value: WalletViewModel.formatBitcoinAmount(sats: draft.amountSats), asset: "btc"),
+            amount: Paykit.PaymentRequestAmount(
+                value: WalletViewModel.formatBitcoinAmount(sats: draft.amountSats),
+                asset: PaykitIssuerInterop.bitcoinAsset
+            ),
             paymentReference: Paykit.PaymentReference(text: "bitkit-\(UUID().uuidString)"),
             proposalExpiresAt: Self.timestamp(draft.expiresAt),
             recurrence: nil,

Bitkit/Services/PaykitSubscription.swift

@@ -457,7 +457,7 @@ struct PaykitSubscription: Identifiable, Hashable {
         guard record.localRole == .payer,
               let terms = record.terms,
               let recurrence = terms.recurrence.flatMap(PaykitSubscriptionRecurrence.init),
-              terms.amount.asset == "btc",
+              terms.amount.asset == PaykitIssuerInterop.bitcoinAsset,
               let amountSats = PaykitPaymentRequest.sats(fromBitcoinAmount: terms.amount.value),
               amountSats <= UInt64.max / 1000
         else { return nil }
@@ -475,8 +475,9 @@ struct PaykitSubscription: Identifiable, Hashable {
         self.proposalExpiresAt = proposalExpiresAt
         self.recurrence = recurrence
         metadata = PaykitSubscriptionMetadata(terms.metadata)
-        acceptedPaymentEndpointIdentifiers = PaykitPaymentRequest.supportedEndpointIdentifiers(
-            terms.acceptedPaymentEndpointIdentifiers
+        acceptedPaymentEndpointIdentifiers = PaykitIssuerInterop.supportedEndpointIdentifiers(
+            terms.acceptedPaymentEndpointIdentifiers,
+            network: Env.network
         )
         wasAccepted = record.acceptedEventId != nil || record.state == .activeRecurring || !record.paymentProofs.isEmpty
         lifecycleState = record.state

Bitkit/Services/PrivatePaykitService+Payments.swift

@@ -69,7 +69,7 @@ extension PrivatePaykitService {
         let consumedVersion = state.contacts[publicKey]?.consumedPrivatePaymentListVersionsByReceiverPath[receiverPath]
         let previousPaymentListVersion = consumedVersion.map(String.init) ?? "none"
         let amount = paymentRequest.map {
-            PaymentAmountContext(value: $0.amountValue, asset: "btc")
+            PaymentAmountContext(value: $0.amountValue, asset: PaykitIssuerInterop.bitcoinAsset)
         }
 
         do {

Bitkit/Services/PublicPaykitService.swift

@@ -218,12 +218,19 @@ enum PublicPaykitService {
         return MethodId.payablePreferenceOrder.compactMap { endpointsByMethodId[$0] }
     }
 
-    static func parseEndpoint(methodId rawMethodId: String, endpointData: String) -> Endpoint? {
+    static func parseEndpoint(
+        methodId rawMethodId: String,
+        endpointData: String,
+        network: LDKNode.Network = Env.network
+    ) -> Endpoint? {
         guard let methodId = MethodId(rawValue: rawMethodId) else {
             return nil
         }
+        if let onchainNetwork = methodId.onchainNetwork, onchainNetwork != network {
+            return nil
+        }
 
-        guard let payload = parsePayload(endpointData) else {
+        guard let payload = PaykitIssuerInterop.parseEndpointPayload(endpointData) else {
             return nil
         }
 
@@ -394,33 +401,6 @@ enum PublicPaykitService {
         return invoice.routeHints().contains { !$0.isEmpty }
     }
 
-    private struct ParsedPayload {
-        let value: String
-        let min: String?
-        let max: String?
-    }
-
-    private static func parsePayload(_ endpointData: String) -> ParsedPayload? {
-        let trimmedPayload = endpointData.trimmingCharacters(in: .whitespacesAndNewlines)
-        guard !trimmedPayload.isEmpty else {
-            return nil
-        }
-
-        if let data = trimmedPayload.data(using: .utf8),
-           let payloadObject = try? JSONSerialization.jsonObject(with: data) as? [String: Any],
-           let value = (payloadObject["value"] as? String)?.trimmingCharacters(in: .whitespacesAndNewlines),
-           !value.isEmpty
-        {
-            return ParsedPayload(
-                value: value,
-                min: payloadObject["min"] as? String,
-                max: payloadObject["max"] as? String
-            )
-        }
-
-        return nil
-    }
-
     private static func applyPublishedEndpoints(_ desiredEndpoints: [Endpoint]) async throws {
         try await endpointLock.withLock {
             let report = try await PaykitSdkService.shared.syncPublicEndpoints(desiredEndpoints)

Bitkit/Views/PaymentRequests/PaymentRequestsView.swift

@@ -82,6 +82,7 @@ struct PaymentRequestCard: View {
                         await onReject?()
                         isRejecting = false
                     }
+                    .accessibilityIdentifier("PaymentRequestDismiss-\(request.paymentRequestId)")
 
                     CustomButton(
                         title: t("common__pay"),
@@ -92,6 +93,7 @@ struct PaymentRequestCard: View {
                     ) {
                         onPay?()
                     }
+                    .accessibilityIdentifier("PaymentRequestPay-\(request.paymentRequestId)")
                 }
                 .padding(16)
                 .background(Color.gray5)

Bitkit/Views/Wallets/Send/SendConfirmationView.swift

@@ -33,7 +33,9 @@ struct SendConfirmationView: View {
     @State private var requiresPaymentConfirmation = false
 
     var accentColor: Color {
-        if hwSend.isActive { return .blueAccent }
+        if hwSend.isActive {
+            return .blueAccent
+        }
         return app.selectedWalletToPayFrom == .lightning ? .purpleAccent : .brandAccent
     }
 
@@ -246,6 +248,8 @@ struct SendConfirmationView: View {
         .padding(.horizontal, 16)
         .sheetBackground()
         .frame(maxWidth: .infinity, maxHeight: .infinity)
+        .accessibilityElement(children: .contain)
+        .accessibilityIdentifier(app.contactPaymentContext?.incomingPaymentRequest == nil ? "SendConfirm" : "PaymentRequestConfirm")
         .task {
             ensureSendAmountFromScannedInvoicesIfNeeded()
             if app.contactPaymentContext?.isInitialSubscriptionPayment == true, !shouldAutomaticallyPay {