fix: bind profile removal to its original owner

Bitkit.xcodeproj/project.pbxproj

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

Bitkit/AppScene.swift

@@ -501,21 +501,24 @@ struct AppScene: View {
     private func configurePrivatePaykitContactResolvers() {
         CoreService.shared.activity.setPrivatePaykitContactResolvers(
             invoice: { paymentHash in
-                await PrivatePaykitService.shared.contactPublicKey(forPrivateInvoicePaymentHash: paymentHash)
+                await PrivatePaykitService.shared.contactPublicKeyForReceipt(paymentHash: paymentHash)
             },
             onchainAddresses: { @MainActor address, outputAddresses in
-                let identity = pubkyProfile.publicKey
-                let contacts = paykitPaymentRequestManager.receivedPaymentContacts
+                guard (try? ProfileOperationAdmission.shared.checkReceiptAttribution()) != nil else { return nil }
                 let reservations = PrivatePaykitAddressReservationStore.shared
-                let reservationRevision = await reservations.attributionRevision
-                guard let combined = try? await contacts.includingReservations(for: outputAddresses, lookup: {
-                    try await reservations.contactPublicKeyForAttribution(forReservedAddress: $0)
-                }), pubkyProfile.authState == .authenticated,
-                      PubkyPublicKeyFormat.matches(identity, pubkyProfile.publicKey),
-                      contacts == paykitPaymentRequestManager.receivedPaymentContacts,
-                      await reservations.attributionRevision == reservationRevision
+                let revision = await reservations.attributionRevision
+                let contacts = pubkyProfile.authState == .authenticated
+                    ? paykitPaymentRequestManager.receivedPaymentContacts : PaykitReceivedPaymentContacts()
+                guard let combined = try? await reservations.contactsForReceipt(
+                    contacts,
+                    outputAddresses: outputAddresses,
+                    expectedRevision: revision
+                )
                 else { return nil }
                 return combined.contact(receivingAddress: address, outputAddresses: outputAddresses)
+            },
+            receiptOperation: { operation in
+                try await ProfileOperationAdmission.shared.withReceiptAttribution(operation)
             }
         )
     }
@@ -541,7 +544,7 @@ struct AppScene: View {
             ) {
                 config in AppUpdateSheet(config: config)
             }
-            .task(priority: .userInitiated, setupTask)
+            .task(id: pubkyProfile.removalRecovery.blocksWalletStartup, priority: .userInitiated, setupTask)
             .task(id: [scenePhase == .active, wallet.walletExists == true, isWalletBackupRestoreRunning, network.isConnected]) {
                 guard scenePhase == .active, wallet.walletExists == true,
                       !isWalletBackupRestoreRunning, !BackupService.shared.hasPendingWalletRestore()
@@ -825,13 +828,15 @@ struct AppScene: View {
     }
 
     private var isLockedForDeepLinks: Bool {
-        settings.pinEnabled && !isPinVerified
+        pubkyProfile.removalRecovery.blocksWalletStartup || (settings.pinEnabled && !isPinVerified)
     }
 
     private var mainContent: some View {
         ZStack {
             if Env.isTrezorEmulatorTesting {
                 trezorEmulatorTestContent
+            } else if pubkyProfile.removalRecovery.blocksWalletStartup && !hasCriticalUpdate {
+                NavigationStack { ProfileRemovalRecoveryView() }
             } else if migrations.isShowingMigrationLoading {
                 migrationLoadingContent
             } else if showRecoveryScreen {
@@ -843,7 +848,7 @@ struct AppScene: View {
                 walletContent
             }
 
-            if !Env.isTrezorEmulatorTesting, !removeSplash, !session.skipSplashOnce {
+            if !Env.isTrezorEmulatorTesting, !pubkyProfile.removalRecovery.blocksWalletStartup, !removeSplash, !session.skipSplashOnce {
                 SplashView()
                     .opacity(hideSplash ? 0 : 1)
             }
@@ -994,7 +999,7 @@ struct AppScene: View {
             }
         }
 
-        guard wallet.walletExists == true else { return }
+        guard wallet.walletExists == true, !pubkyProfile.removalRecovery.blocksWalletStartup else { return }
 
         // Don't start wallet if we're in recovery mode
         guard !showRecoveryScreen else { return }
@@ -1024,6 +1029,7 @@ struct AppScene: View {
     }
 
     private func startWallet(completingBackupRestore: Bool = false, playsErrorHaptic: Bool = true) async {
+        guard !pubkyProfile.removalRecovery.blocksWalletStartup else { return }
         let hasPendingRestore = BackupService.shared.hasPendingWalletRestore()
         guard !WalletBackupRestoreGate.blocksWalletStart(
             isRestoreRunning: isWalletBackupRestoreRunning,
@@ -1109,6 +1115,8 @@ struct AppScene: View {
     private func setupTask() async {
         configurePrivatePaykitContactResolvers()
         AppReset.hardwareWallets = hwWalletManager
+        pubkyProfile.refreshRemovalRecovery()
+        guard !pubkyProfile.removalRecovery.blocksWalletStartup else { return }
         do {
             // Handle orphaned keychain before anything else
             handleOrphanedKeychain()
@@ -1176,26 +1184,32 @@ struct AppScene: View {
     }
 
     private func restoreWalletBackupAndStart() async {
-        guard !isWalletBackupRestoreRunning else { return }
+        guard !isWalletBackupRestoreRunning, !pubkyProfile.removalRecovery.blocksWalletStartup else { return }
         isWalletBackupRestoreRunning = true
         walletIsInitializing = true
         didWalletBackupRestoreFail = false
         defer { isWalletBackupRestoreRunning = false }
 
-        let didRestore: Bool = if BackupService.shared.hasPendingWalletRestore() {
-            await restoreVssBackup()
-        } else {
-            await restoreFromMostRecentBackup()
-        }
-        guard didRestore else {
+        do {
+            let didRestore = try await ProfileOperationAdmission.shared.withWalletRestore {
+                let restored: Bool = if BackupService.shared.hasPendingWalletRestore() {
+                    await restoreVssBackup()
+                } else {
+                    await restoreFromMostRecentBackup()
+                }
+                guard restored else { return false }
+
+                widgets.loadSavedWidgets()
+                widgets.objectWillChange.send()
+                pubkyProfile.scheduleInitializationAfterRestore()
+                await startWallet(completingBackupRestore: true)
+                return true
+            }
+            didWalletBackupRestoreFail = !didRestore
+        } catch {
+            Logger.warn("Wallet backup restore could not complete: \(error)", context: "AppScene")
             didWalletBackupRestoreFail = true
-            return
         }
-
-        widgets.loadSavedWidgets()
-        widgets.objectWillChange.send()
-        pubkyProfile.scheduleInitializationAfterRestore()
-        await startWallet(completingBackupRestore: true)
     }
 
     private func retryWalletStart() async {
@@ -1210,7 +1224,7 @@ struct AppScene: View {
     }
 
     private func retryPendingWalletRestoreIfNeeded() -> Bool {
-        if isWalletBackupRestoreRunning {
+        if pubkyProfile.removalRecovery.blocksWalletStartup || ProfileOperationAdmission.shared.isWalletWiping || isWalletBackupRestoreRunning {
             return true
         }
         guard BackupService.shared.hasPendingWalletRestore() else { return false }
@@ -1249,7 +1263,9 @@ struct AppScene: View {
 
         if shouldRestoreRN {
             do {
-                try await MigrationsService.shared.restoreFromRNRemoteBackup(mnemonic: mnemonic, passphrase: passphrase)
+                try await MigrationsService.shared.restoreFromRNRemoteBackup(mnemonic: mnemonic, passphrase: passphrase) {
+                    try await ProfileOperationAdmission.shared.withWalletRestore($0)
+                }
             } catch {
                 Logger.error("RN remote backup restore failed: \(error)", context: "AppScene")
                 // Fall back to VSS
@@ -2061,35 +2077,37 @@ struct AppScene: View {
     }
 
     private func startAutomaticPaykitSession() {
-        guard let session = pubkyProfile.automaticPaykitSession,
-              !PubkyPublicKeyFormat.matches(session.publicKey, activatedAutomaticPaykitIdentity)
-        else { return }
-        let pk = session.publicKey
-        activatedAutomaticPaykitIdentity = pk
-        Task {
-            await paykitAllowanceManager.activate(identity: pk)
-            await handlePendingPaykitSubscriptionNotification()
-            guard pubkyProfile.automaticPaykitSession == session else {
-                // A deletion or session change cut this start short; let the session's next appearance run it again.
-                if activatedAutomaticPaykitIdentity == pk {
-                    activatedAutomaticPaykitIdentity = nil
+        do {
+            try pubkyProfile.scheduleAutomaticPaykitSession { session in
+                let pk = session.publicKey
+                guard !PubkyPublicKeyFormat.matches(pk, activatedAutomaticPaykitIdentity) else { return }
+                activatedAutomaticPaykitIdentity = pk
+                await paykitAllowanceManager.activate(identity: pk)
+                await handlePendingPaykitSubscriptionNotification()
+                guard pubkyProfile.automaticPaykitSession == session else {
+                    // A deletion or session change cut this start short; let the session's next appearance run it again.
+                    if activatedAutomaticPaykitIdentity == pk {
+                        activatedAutomaticPaykitIdentity = nil
+                    }
+                    // A new session for the same key may already have appeared while this one waited.
+                    startAutomaticPaykitSession()
+                    return
+                }
+                try? await contactsManager.loadContacts(for: pk)
+                if !PaykitFeatureFlags.isUIEnabled, wallet.walletExists == true {
+                    await retryPendingPaykitEndpointRemoval()
+                }
+                guard isPaykitSceneActive, pubkyProfile.authState == .authenticated,
+                      PubkyPublicKeyFormat.matches(pk, pubkyProfile.publicKey)
+                else { return }
+                await refreshPrivateOnlyPaykitApp()
+                await refreshIncomingPaykitPaymentRequests(presentItems: false, onlyWhileActive: true)
+                if PaykitSubscriptionNotificationTargetStore.load() == nil {
+                    await presentNextIncomingPaykitItem()
                 }
-                // A new session for the same key may already have appeared while this one waited.
-                startAutomaticPaykitSession()
-                return
-            }
-            try? await contactsManager.loadContacts(for: pk)
-            if !PaykitFeatureFlags.isUIEnabled, wallet.walletExists == true {
-                await retryPendingPaykitEndpointRemoval()
-            }
-            guard isPaykitSceneActive, pubkyProfile.authState == .authenticated,
-                  PubkyPublicKeyFormat.matches(pk, pubkyProfile.publicKey)
-            else { return }
-            await refreshPrivateOnlyPaykitApp()
-            await refreshIncomingPaykitPaymentRequests(presentItems: false, onlyWhileActive: true)
-            if PaykitSubscriptionNotificationTargetStore.load() == nil {
-                await presentNextIncomingPaykitItem()
             }
+        } catch {
+            Logger.debug("Automatic Paykit startup was not admitted: \(error)", context: "AppScene")
         }
     }
 

Bitkit/MainNavView.swift

@@ -566,7 +566,9 @@ struct MainNavView: View {
                     } else if let profile = contactsManager.pendingImportProfile {
                         ContactImportOverviewView(
                             profile: profile,
-                            contacts: contactsManager.pendingImportContacts
+                            contacts: contactsManager.pendingImportContacts,
+                            importGeneration: contactsManager.importGeneration,
+                            owner: pubkyProfile.removalPresentationOwner
                         )
                     } else {
                         missingPendingImportView(fallbackRoute: .payContacts)
@@ -577,7 +579,11 @@ struct MainNavView: View {
                     } else if let fallbackRoute = fallbackRouteForMissingPendingImport(hasPendingImport: contactsManager.hasPendingImport) {
                         missingPendingImportView(fallbackRoute: fallbackRoute)
                     } else {
-                        ContactImportSelectView(contacts: contactsManager.pendingImportContacts)
+                        ContactImportSelectView(
+                            contacts: contactsManager.pendingImportContacts,
+                            importGeneration: contactsManager.importGeneration,
+                            owner: pubkyProfile.removalPresentationOwner
+                        )
                     }
                 case let .addContact(publicKey):
                     if isPaykitUIActive {
@@ -592,7 +598,9 @@ struct MainNavView: View {
                         paykitDisabledRedirectView
                     }
                 case .profile:
-                    if !isPaykitUIActive {
+                    if pubkyProfile.removalRecovery != .ready {
+                        ProfileRemovalRecoveryView()
+                    } else if !isPaykitUIActive {
                         ComingSoonScreen()
                     } else if let initializationErrorMessage = pubkyProfile.initializationErrorMessage {
                         pubkyInitializationErrorView(message: initializationErrorMessage)
@@ -602,25 +610,33 @@ struct MainNavView: View {
                         ProfileDestinationView(hasSeenIntro: app.hasSeenProfileIntro)
                     }
                 case .profileIntro:
-                    if isPaykitUIActive {
+                    if pubkyProfile.removalRecovery != .ready {
+                        ProfileRemovalRecoveryView()
+                    } else if isPaykitUIActive {
                         ProfileIntroView()
                     } else {
                         ComingSoonScreen()
                     }
                 case .pubkyChoice:
-                    if isPaykitUIActive {
+                    if pubkyProfile.removalRecovery != .ready {
+                        ProfileRemovalRecoveryView()
+                    } else if isPaykitUIActive {
                         PubkyChoiceView()
                     } else {
                         paykitDisabledRedirectView
                     }
                 case .createProfile:
-                    if isPaykitUIActive {
+                    if pubkyProfile.removalRecovery != .ready {
+                        ProfileRemovalRecoveryView()
+                    } else if isPaykitUIActive {
                         CreateProfileView()
                     } else {
                         paykitDisabledRedirectView
                     }
                 case .editProfile:
-                    if isPaykitUIActive {
+                    if pubkyProfile.removalRecovery != .ready {
+                        ProfileRemovalRecoveryView()
+                    } else if isPaykitUIActive {
                         EditProfileView()
                     } else {
                         paykitDisabledRedirectView