fix: offramp watcher

espresso-cash · Jan 11, 2024 · 29e9aff · 29e9aff
1 parent 3e56d3e
commit 29e9aff
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 36 deletions.
diff --git a/packages/espressocash_app/lib/data/db/db.dart b/packages/espressocash_app/lib/data/db/db.dart
@@ -29,7 +29,7 @@ class OutgoingTransferRows extends Table {
   Set<Column<Object>> get primaryKey => {id};
 }
 
-const int latestVersion = 46;
+const int latestVersion = 47;
 
 const _tables = [
   OutgoingTransferRows,
@@ -203,6 +203,9 @@ class MyDatabase extends _$MyDatabase {
           if (from >= 39 && from < 46) {
             await m.addColumn(iLPRows, iLPRows.feeAmount);
           }
+          if (from >= 40 && from < 47) {
+            await m.addColumn(offRampOrderRows, offRampOrderRows.txId);
+          }
         },
       );
 
@@ -259,6 +262,7 @@ class OffRampOrderRows extends Table with AmountMixin, EntityMixin {
   TextColumn get humanStatus => text()();
   TextColumn get machineStatus => text()();
   TextColumn get partnerOrderId => text()();
+  TextColumn get txId => text().nullable()();
   TextColumn get transaction => text()();
   TextColumn get depositAddress => text()();
   Int64Column get slot => int64()();

diff --git a/packages/espressocash_app/lib/features/activities/data/transaction_repository.dart b/packages/espressocash_app/lib/features/activities/data/transaction_repository.dart
@@ -92,7 +92,7 @@ class TransactionRepository {
     );
 
     final offRamp = _db.offRampOrderRows.findActivityOrNull(
-      where: (row) => row.transaction.contains(txId),
+      where: (row) => row.txId.equals(txId),
       builder: (pr) => Activity.offRamp(id: pr.id, created: pr.created),
       ignoreWhen: (row) => const [
         OffRampOrderStatus.completed,

diff --git a/...espressocash_app/lib/features/ramp/coinflow/services/coinflow_off_ramp_order_watcher.dart b/...espressocash_app/lib/features/ramp/coinflow/services/coinflow_off_ramp_order_watcher.dart
@@ -38,11 +38,7 @@ class CoinflowOffRampOrderWatcher implements RampWatcher {
         )
         .listen((event) async {
       final statement = _db.update(_db.offRampOrderRows)
-        ..where(
-          (tbl) =>
-              tbl.id.equals(orderId) &
-              tbl.status.equals(OffRampOrderStatus.waitingForPartner.name),
-        );
+        ..where((tbl) => tbl.id.equals(orderId));
 
       final status = switch (event?.status) {
         CoinflowOrderStatus.completed => OffRampOrderStatus.completed,

diff --git a/packages/espressocash_app/lib/features/ramp/screens/off_ramp_order_screen.dart b/packages/espressocash_app/lib/features/ramp/screens/off_ramp_order_screen.dart
@@ -164,20 +164,21 @@ class OffRampOrderScreenContent extends StatelessWidget {
       OffRampOrderStatus.cancelled => CpTimelineStatus.neutral,
     };
 
-    final animated = timelineStatus == CpTimelineStatus.inProgress &&
-        order.status != OffRampOrderStatus.waitingForPartner;
+    final animated = timelineStatus == CpTimelineStatus.inProgress;
 
     final int activeItem = switch (order.status) {
       OffRampOrderStatus.depositTxRequired ||
       OffRampOrderStatus.creatingDepositTx ||
       OffRampOrderStatus.depositTxReady ||
       OffRampOrderStatus.sendingDepositTx ||
-      OffRampOrderStatus.waitingForPartner ||
       OffRampOrderStatus.depositError ||
       OffRampOrderStatus.depositTxConfirmError ||
       OffRampOrderStatus.cancelled =>
         1,
-      OffRampOrderStatus.failure || OffRampOrderStatus.completed => 2,
+      OffRampOrderStatus.waitingForPartner ||
+      OffRampOrderStatus.failure ||
+      OffRampOrderStatus.completed =>
+        2,
     };
 
     final withdrawInitiated = CpTimelineItem(

diff --git a/packages/espressocash_app/lib/features/ramp/services/off_ramp_order_service.dart b/packages/espressocash_app/lib/features/ramp/services/off_ramp_order_service.dart
@@ -16,13 +16,18 @@ import '../../../config.dart';
 import '../../../core/amount.dart';
 import '../../../core/currency.dart';
 import '../../../data/db/db.dart';
+import '../../../di.dart';
 import '../../accounts/models/ec_wallet.dart';
 import '../../authenticated/auth_scope.dart';
 import '../../tokens/token_list.dart';
 import '../../transactions/models/tx_results.dart';
 import '../../transactions/services/resign_tx.dart';
 import '../../transactions/services/tx_sender.dart';
+import '../coinflow/services/coinflow_off_ramp_order_watcher.dart';
+import '../kado/services/kado_off_ramp_order_watcher.dart';
 import '../models/ramp_partner.dart';
+import '../scalex/services/scalex_off_ramp_order_watcher.dart';
+import '../src/models/ramp_watcher.dart';
 
 typedef OffRampOrder = ({
   String id,
@@ -46,6 +51,7 @@ class OffRampOrderService implements Disposable {
   );
 
   final Map<String, StreamSubscription<void>> _subscriptions = {};
+  final Map<String, RampWatcher> _watchers = {};
 
   final ECWallet _account;
   final CryptopleaseClient _client;
@@ -64,6 +70,7 @@ class OffRampOrderService implements Disposable {
 
     for (final order in orders) {
       _subscribe(order.id);
+      await _watch(order.id);
     }
   }
 
@@ -200,6 +207,7 @@ class OffRampOrderService implements Disposable {
             humanStatus: '',
             machineStatus: '',
             partnerOrderId: partnerOrderId,
+            txId: transaction?.$1.id,
             transaction: transaction?.$1.encode() ?? '',
             slot: transaction?.$2 ?? BigInt.zero,
             status: transaction == null
@@ -213,6 +221,7 @@ class OffRampOrderService implements Disposable {
 
           await _db.into(_db.offRampOrderRows).insert(order);
           _subscribe(order.id);
+          await _watch(order.id);
 
           return order.id;
         }
@@ -241,6 +250,23 @@ class OffRampOrderService implements Disposable {
         }
       });
 
+  Future<void> _watch(String orderId) async {
+    final query = _db.select(_db.offRampOrderRows)
+      ..where((tbl) => tbl.id.equals(orderId));
+
+    final order = await query.getSingle();
+
+    _watchers[orderId] = switch (order.partner) {
+      RampPartner.kado => sl<KadoOffRampOrderWatcher>(),
+      RampPartner.scalex => sl<ScalexOffRampOrderWatcher>(),
+      RampPartner.coinflow => sl<CoinflowOffRampOrderWatcher>(),
+      RampPartner.rampNetwork ||
+      RampPartner.guardarian =>
+        throw ArgumentError('Not implemented'),
+    }
+      ..watch(orderId);
+  }
+
   void _subscribe(String orderId) {
     _subscriptions[orderId] = (_db.select(_db.offRampOrderRows)
           ..where((tbl) => tbl.id.equals(orderId)))
@@ -280,6 +306,9 @@ class OffRampOrderService implements Disposable {
           _subscriptions[orderId]?.cancel();
           _subscriptions.remove(orderId);
 
+          _watchers[orderId]?.close();
+          _watchers.remove(orderId);
+
           return const Stream.empty();
       }
     }).listen(
@@ -292,6 +321,7 @@ class OffRampOrderService implements Disposable {
   @override
   Future<void> onDispose() async {
     await Future.wait(_subscriptions.values.map((it) => it.cancel()));
+    _watchers.values.map((it) => it.close());
     await _db.delete(_db.offRampOrderRows).go();
   }
 

diff --git a/packages/espressocash_app/lib/features/ramp/widgets/off_ramp_order_details.dart b/packages/espressocash_app/lib/features/ramp/widgets/off_ramp_order_details.dart
@@ -1,12 +1,7 @@
 import 'package:flutter/widgets.dart';
 
 import '../../../di.dart';
-import '../coinflow/services/coinflow_off_ramp_order_watcher.dart';
-import '../kado/services/kado_off_ramp_order_watcher.dart';
-import '../models/ramp_partner.dart';
-import '../scalex/services/scalex_off_ramp_order_watcher.dart';
 import '../services/off_ramp_order_service.dart';
-import '../src/models/ramp_watcher.dart';
 
 typedef OffRampOrderDetailsBuilder = Widget Function(
   BuildContext context,
@@ -29,35 +24,15 @@ class OffRampOrderDetails extends StatefulWidget {
 
 class _OffRampOrderDetailsState extends State<OffRampOrderDetails> {
   late final Stream<OffRampOrder> _stream;
-  RampWatcher? _watcher;
 
   @override
   void initState() {
     super.initState();
     _stream = sl<OffRampOrderService>().watch(widget.orderId);
-
-    _initWatcher();
-  }
-
-  Future<void> _initWatcher() async {
-    if (_watcher != null) return;
-
-    final ramp = await _stream.first;
-
-    _watcher = switch (ramp.partner) {
-      RampPartner.kado => sl<KadoOffRampOrderWatcher>(),
-      RampPartner.scalex => sl<ScalexOffRampOrderWatcher>(),
-      RampPartner.coinflow => sl<CoinflowOffRampOrderWatcher>(),
-      RampPartner.rampNetwork ||
-      RampPartner.guardarian =>
-        throw ArgumentError('Not implemented'),
-    }
-      ..watch(widget.orderId);
   }
 
   @override
   void dispose() {
-    _watcher?.close();
     super.dispose();
   }