Merge branch 'master' into fix/backup-wallet-id-migration

Author: coreyphillips

.github/workflows/ai-device-tests.yml

@@ -22,6 +22,7 @@ on:
 env:
   TERM: xterm-256color
   FORCE_COLOR: 1
+  GIT_LFS_SKIP_SMUDGE: "1"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}-${{ inputs.suite }}

.github/workflows/e2e-tests.yml

@@ -13,6 +13,7 @@ on:
 env:
   TERM: xterm-256color
   FORCE_COLOR: 1
+  GIT_LFS_SKIP_SMUDGE: "1"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

.github/workflows/e2e_migration.yml

@@ -13,6 +13,7 @@ on:
 env:
   TERM: xterm-256color
   FORCE_COLOR: 1
+  GIT_LFS_SKIP_SMUDGE: "1"
   SIMULATOR_NAME: "iPhone 17"
   IOS_VERSION: "26.2"
 

.github/workflows/integration-tests.yml

@@ -8,6 +8,9 @@ on:
     types: [opened, synchronize, reopened, ready_for_review]
   workflow_dispatch:
 
+env:
+  GIT_LFS_SKIP_SMUDGE: "1"
+
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true

.github/workflows/unit-tests.yml

@@ -7,6 +7,9 @@ on:
     types: [opened, synchronize, reopened, ready_for_review]
   workflow_dispatch:
 
+env:
+  GIT_LFS_SKIP_SMUDGE: "1"
+
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true

Bitkit.xcodeproj/project.pbxproj

@@ -1169,7 +1169,7 @@
 			repositoryURL = "https://github.com/pubky/paykit-rs";
 			requirement = {
 				kind = exactVersion;
-				version = "0.1.0-rc8";
+				version = "0.1.0-rc31";
 			};
 		};
 		18D65DFE2EB9649F00252335 /* XCRemoteSwiftPackageReference "vss-rust-client-ffi" */ = {

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

@@ -682,6 +682,19 @@ struct AppScene: View {
     }
 
     private func retryPendingPaykitEndpointRemoval() async {
+        if PublicPaykitService.isCleanupPending {
+            if UserDefaults.standard.bool(forKey: PublicPaykitService.publishingEnabledKey) {
+                PublicPaykitService.setCleanupPending(false)
+            } else {
+                do {
+                    try await PublicPaykitService.removePublishedEndpoints()
+                    PublicPaykitService.setCleanupPending(false)
+                } catch {
+                    Logger.warn("Failed to retry public Paykit endpoint cleanup: \(error)", context: "AppScene")
+                }
+            }
+        }
+
         await PrivatePaykitService.shared.retryPendingEndpointRemoval(
             wallet: wallet,
             savedPublicKeys: contactsManager.contacts.map(\.publicKey)

Bitkit/AppScene.swift

@@ -336,16 +336,6 @@ enum Env {
         }
     }
 
-    /// Pubky/Paykit capabilities — production for mainnet, staging for regtest/testnet/signet.
-    static var pubkyCapabilities: String {
-        switch network {
-        case .bitcoin:
-            return "/pub/bitkit.to/:rw,/pub/pubky.app/:r,/pub/paykit/v0/:rw"
-        default:
-            return "/pub/staging.bitkit.to/:rw,/pub/staging.pubky.app/:r,/pub/paykit/v0/:rw"
-        }
-    }
-
     /// Homegate URL for auto-provisioned identity signup via IP verification.
     static var homegateUrl: String {
         if isLocalE2EBackend {

Bitkit/Constants/Env.swift

@@ -15,13 +15,15 @@ enum PaykitFeatureFlags {
         isUIAvailable && UserDefaults.standard.bool(forKey: uiEnabledKey)
     }
 
-    static func enforceBuildAvailability() {
-        let defaults = UserDefaults.standard
-        let hasPublishedState = defaults.bool(forKey: PublicPaykitService.publishingEnabledKey) ||
-            defaults.bool(forKey: PrivatePaykitService.publishingEnabledKey) ||
+    static func enforceBuildAvailability(defaults: UserDefaults = .standard, isUIEnabled: Bool = Self.isUIEnabled) {
+        let hasPublicPublishedState = defaults.bool(forKey: PublicPaykitService.publishingEnabledKey) ||
             defaults.bool(forKey: "hasConfirmedPublicPaykitEndpoints") ||
             !(defaults.string(forKey: "publicPaykitBolt11") ?? "").isEmpty
-
+        let hasPrivatePublishedState = defaults.bool(forKey: PrivatePaykitService.publishingEnabledKey)
+        let hasPublishedState = hasPublicPublishedState ||
+            hasPrivatePublishedState ||
+            defaults.bool(forKey: PublicPaykitService.cleanupPendingKey) ||
+            defaults.bool(forKey: PrivatePaykitService.cleanupPendingKey)
         guard !isUIEnabled, hasPublishedState else { return }
 
         defaults.set(false, forKey: uiEnabledKey)
@@ -32,6 +34,11 @@ enum PaykitFeatureFlags {
         defaults.removeObject(forKey: "publicPaykitBolt11PaymentHash")
         defaults.removeObject(forKey: "publicPaykitBolt11ExpiresAt")
 
-        PrivatePaykitService.setContactSharingCleanupPending(true)
+        if hasPublicPublishedState {
+            defaults.set(true, forKey: PublicPaykitService.cleanupPendingKey)
+        }
+        if hasPrivatePublishedState {
+            defaults.set(true, forKey: PrivatePaykitService.cleanupPendingKey)
+        }
     }
 }