Merge branch 'master' into fix/reimport-channel-monitor

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: jvsena42

.github/workflows/claude-code-review.yml

@@ -2,7 +2,7 @@ name: Claude Code Review
 
 on:
   pull_request:
-    types: [opened, synchronize, ready_for_review, reopened]
+    types: [opened, synchronize, reopened, ready_for_review]
     # Optional: Only run on specific file changes
     # paths:
     #   - "src/**/*.ts"

.github/workflows/e2e-tests.yml

@@ -8,6 +8,7 @@ on:
         required: false
         default: "default-feature-branch"
   pull_request:
+    types: [opened, synchronize, reopened, ready_for_review]
 
 env:
   TERM: xterm-256color

.github/workflows/integration-tests.yml

@@ -5,7 +5,7 @@ on:
     branches: [master]
   pull_request:
     branches: [master]
-
+    types: [opened, synchronize, reopened, ready_for_review]
   workflow_dispatch:
 
 concurrency:

.github/workflows/unit-tests.yml

@@ -4,7 +4,7 @@ on:
   push:
     branches: [master]
   pull_request:
-
+    types: [opened, synchronize, reopened, ready_for_review]
   workflow_dispatch:
 
 concurrency:

.github/workflows/validate-translations.yml

@@ -5,6 +5,7 @@ on:
     branches: [master]
   pull_request:
     branches: [master]
+    types: [opened, synchronize, reopened, ready_for_review]
 
 jobs:
   validate:

Bitkit.xcodeproj/project.pbxproj

@@ -498,7 +498,7 @@
 			buildSettings = {
 				CODE_SIGN_ENTITLEMENTS = BitkitNotification/BitkitNotification.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 178;
+				CURRENT_PROJECT_VERSION = 180;
 				DEVELOPMENT_TEAM = KYH47R284B;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = BitkitNotification/Info.plist;
@@ -510,7 +510,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2.0.5;
+				MARKETING_VERSION = 2.0.6;
 				PRODUCT_BUNDLE_IDENTIFIER = to.bitkit.notification;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
@@ -526,7 +526,7 @@
 			buildSettings = {
 				CODE_SIGN_ENTITLEMENTS = BitkitNotification/BitkitNotification.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 178;
+				CURRENT_PROJECT_VERSION = 180;
 				DEVELOPMENT_TEAM = KYH47R284B;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = BitkitNotification/Info.plist;
@@ -538,7 +538,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2.0.5;
+				MARKETING_VERSION = 2.0.6;
 				PRODUCT_BUNDLE_IDENTIFIER = to.bitkit.notification;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
@@ -672,7 +672,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = Bitkit/Bitkit.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 178;
+				CURRENT_PROJECT_VERSION = 180;
 				DEVELOPMENT_ASSET_PATHS = "\"Bitkit/Preview Content\"";
 				DEVELOPMENT_TEAM = KYH47R284B;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -697,7 +697,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
 				"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 14.0;
-				MARKETING_VERSION = 2.0.5;
+				MARKETING_VERSION = 2.0.6;
 				PRODUCT_BUNDLE_IDENTIFIER = to.bitkit;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = auto;
@@ -715,7 +715,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = Bitkit/Bitkit.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 178;
+				CURRENT_PROJECT_VERSION = 180;
 				DEVELOPMENT_ASSET_PATHS = "\"Bitkit/Preview Content\"";
 				DEVELOPMENT_TEAM = KYH47R284B;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -740,7 +740,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
 				"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 14.0;
-				MARKETING_VERSION = 2.0.5;
+				MARKETING_VERSION = 2.0.6;
 				PRODUCT_BUNDLE_IDENTIFIER = to.bitkit;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = auto;

Bitkit/Services/MigrationsService.swift

@@ -337,6 +337,7 @@ class MigrationsService: ObservableObject {
     private static let rnPendingBlocktankOrderIdsKey = "rnPendingBlocktankOrderIds"
     private static let rnDidAttemptPeerRecoveryKey = "rnDidAttemptMigrationPeerRecovery"
     private static let rnChannelRecoveryCheckedKey = "rnChannelRecoveryChecked"
+    private static let didCleanupInvalidTransfersKey = "didCleanupInvalidMigrationTransfers"
 
     @Published var isShowingMigrationLoading = false {
         didSet {
@@ -766,6 +767,47 @@ extension MigrationsService {
         return true
     }
 
+    /// One-time cleanup for transfers created from unpaid/expired Blocktank orders during migration.
+    /// The RN backup's paidOrders map could contain orders that were never actually paid.
+    func cleanupInvalidMigrationTransfers() async {
+        guard !UserDefaults.standard.bool(forKey: Self.didCleanupInvalidTransfersKey) else { return }
+        guard rnMigrationCompleted else { return }
+
+        guard let transfers = try? TransferStorage.shared.getActiveTransfers() else { return }
+        let orderTransfers = transfers.filter { $0.type.isToSpending() && $0.lspOrderId != nil }
+
+        guard !orderTransfers.isEmpty else {
+            UserDefaults.standard.set(true, forKey: Self.didCleanupInvalidTransfersKey)
+            return
+        }
+
+        let orderIds = orderTransfers.compactMap(\.lspOrderId)
+
+        guard let orders = try? await CoreService.shared.blocktank.orders(orderIds: orderIds, filter: nil, refresh: true) else {
+            // Don't mark as done if we can't reach Blocktank — retry next launch
+            Logger.warn("Cannot cleanup migration transfers: Blocktank unreachable", context: "Migration")
+            return
+        }
+
+        let now = UInt64(Date().timeIntervalSince1970)
+        for transfer in orderTransfers {
+            guard let orderId = transfer.lspOrderId,
+                  let order = orders.first(where: { $0.id == orderId })
+            else { continue }
+
+            if order.state2 != .paid {
+                try? TransferStorage.shared.markSettled(id: transfer.id, settledAt: now)
+                Logger.info(
+                    "Cleanup: settled invalid migration transfer \(transfer.id) for order \(orderId) (state: \(order.state2))",
+                    context: "Migration"
+                )
+            }
+        }
+
+        UserDefaults.standard.set(true, forKey: Self.didCleanupInvalidTransfersKey)
+        Logger.info("Migration transfer cleanup completed", context: "Migration")
+    }
+
     /// Clears all persisted pending migration data from UserDefaults
     private func clearPendingMigrationData() {
         pendingChannelMigration = nil
@@ -2293,14 +2335,16 @@ extension MigrationsService {
                 continue
             }
 
-            if order.state2 == .executed {
+            // Only create transfers for orders actually paid and awaiting channel
+            guard order.state2 == .paid else {
+                Logger.debug("Skipping order \(orderId) with state \(order.state2) for transfer creation", context: "Migration")
                 continue
             }
 
             let transfer = Transfer(
                 id: txId,
                 type: .toSpending,
-                amountSats: order.clientBalanceSat + order.feeSat,
+                amountSats: order.clientBalanceSat,
                 channelId: nil,
                 fundingTxId: nil,
                 lspOrderId: orderId,

Bitkit/Services/TransferService.swift

@@ -135,7 +135,17 @@ class TransferService {
                     Logger.debug("Channel \(channelId) exists but not yet usable for transfer: \(transfer.id)", context: "TransferService")
                 }
             } else {
-                // No channel ID resolved - check if we should timeout this transfer
+                // No channel ID resolved - check if order is expired/terminal
+                if let orderId = transfer.lspOrderId {
+                    if let orders = try? await blocktankService.orders(orderIds: [orderId], filter: nil, refresh: false),
+                       let order = orders.first,
+                       order.state2 == .expired
+                    {
+                        try await markSettled(id: transfer.id)
+                        Logger.info("Order \(orderId) expired, settled transfer: \(transfer.id)", context: "TransferService")
+                        continue
+                    }
+                }
                 Logger.debug(
                     "Could not resolve channel for transfer: \(transfer.id) orderId: \(transfer.lspOrderId ?? "none")",
                     context: "TransferService"

Bitkit/ViewModels/WalletViewModel.swift

@@ -731,6 +731,7 @@ class WalletViewModel: ObservableObject {
         await lightningService.refreshCache()
 
         do {
+            await MigrationsService.shared.cleanupInvalidMigrationTransfers()
             try? await transferService.syncTransferStates()
             let state = try await balanceManager.deriveBalanceState()
             balanceInTransferToSavings = Int(state.balanceInTransferToSavings)