Merge pull request #2290 from SatoshiPortal/swap-review

chore: clean up swaps

Author: i5hi

.gitignore

@@ -116,3 +116,6 @@ CLAUDE.md
 
 # Generated integration-test aggregator (see tool/gen_all_test.dart)
 integration_test/all_test.dart
+
+# Generated swap debug log export (written during test runs)
+bull_logs.tsv

lib/core/background_tasks/handler.dart

@@ -1,6 +1,6 @@
 import 'package:bb_mobile/core/background_tasks/tasks.dart';
 import 'package:bb_mobile/core/storage/sqlite_database.dart';
-import 'package:bb_mobile/core/swaps/domain/usecases/restart_swap_watcher_usecase.dart';
+import 'package:bb_mobile/core/swaps/domain/usecases/process_ongoing_swaps_usecase.dart';
 import 'package:bb_mobile/core/utils/logger.dart' show log;
 import 'package:bb_mobile/core/wallet/domain/usecases/get_wallets_usecase.dart';
 import 'package:bb_mobile/core/wallet/domain/usecases/sync_wallet_usecase.dart';
@@ -42,7 +42,7 @@ Future<bool> tasksHandler(String task) async {
 
     final syncWalletUsecase = locator<SyncWalletUsecase>();
     final getWalletsUsecase = locator<GetWalletsUsecase>();
-    final restartSwapWatcherUsecase = locator<RestartSwapWatcherUsecase>();
+    final processOngoingSwapsUsecase = locator<ProcessOngoingSwapsUsecase>();
 
     final backgroundTask = BackgroundTask.fromName(task);
 
@@ -64,7 +64,14 @@ Future<bool> tasksHandler(String task) async {
         if (wallets.isEmpty) {
           log.warning('No wallets to sync');
         } else {
-          await restartSwapWatcherUsecase.execute();
+          // Poll + act to completion: the BG isolate dies right after this
+          // returns, so a websocket-based restart would never see an event.
+          // Bounded to respect the iOS background budget.
+          await processOngoingSwapsUsecase.execute().timeout(
+            const Duration(seconds: 25),
+            onTimeout: () =>
+                log.warning('Swaps background processing hit time budget'),
+          );
         }
       case BackgroundTask.logsPrune:
         await log.prune();

lib/core/storage/migrations/migrations.dart

@@ -1,6 +1,7 @@
 export 'package:bb_mobile/core/storage/migrations/schema_0_to_1.dart';
 export 'package:bb_mobile/core/storage/migrations/schema_10_to_11.dart';
 export 'package:bb_mobile/core/storage/migrations/schema_11_to_12.dart';
+export 'package:bb_mobile/core/storage/migrations/schema_12_to_13.dart';
 export 'package:bb_mobile/core/storage/migrations/schema_1_to_2.dart';
 export 'package:bb_mobile/core/storage/migrations/schema_2_to_3.dart';
 export 'package:bb_mobile/core/storage/migrations/schema_3_to_4.dart';

lib/core/storage/migrations/schema_12_to_13.dart

@@ -0,0 +1,32 @@
+import 'package:bb_mobile/core/storage/sqlite_database.steps.dart';
+import 'package:drift/drift.dart';
+
+/// Migration from version 12 to 13
+///
+/// Changes to swaps table:
+/// - Adds 'refund_fees' column: network fees actually paid by a refund
+///   transaction (previously misrecorded into 'claim_fees')
+/// - Adds 'was_direct_payment' column: marks reverse swaps settled by a
+///   Magic Routing Hint direct payment (no lockup existed, nothing to claim)
+/// - Backfills status 'refunded' for swaps stored as 'completed' that have a
+///   refund txid: a refunded swap is a failed payment, not a successful one
+class Schema12To13 {
+  static Future<void> migrate(Migrator m, Schema13 schema13) async {
+    try {
+      await m.addColumn(schema13.swaps, schema13.swaps.refundFees);
+    } catch (e) {
+      if (!e.toString().contains('duplicate column')) rethrow;
+    }
+
+    try {
+      await m.addColumn(schema13.swaps, schema13.swaps.wasDirectPayment);
+    } catch (e) {
+      if (!e.toString().contains('duplicate column')) rethrow;
+    }
+
+    await m.database.customStatement(
+      "UPDATE swaps SET status = 'refunded' "
+      "WHERE status = 'completed' AND refund_txid IS NOT NULL",
+    );
+  }
+}