feat: offramp updates (#1143)

Author: justinenerio

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 = 41;
+const int latestVersion = 42;
 
 const _tables = [
   OutgoingTransferRows,
@@ -176,6 +176,9 @@ class MyDatabase extends _$MyDatabase {
           if (from >= 37 && from < 41) {
             await m.addColumn(onRampOrderRows, onRampOrderRows.partner);
           }
+          if (from >= 40 && from < 42) {
+            await m.addColumn(offRampOrderRows, offRampOrderRows.partner);
+          }
         },
       );
 
@@ -229,6 +232,8 @@ class OffRampOrderRows extends Table with AmountMixin, EntityMixin {
   TextColumn get transaction => text()();
   TextColumn get depositAddress => text()();
   Int64Column get slot => int64()();
+  TextColumn get partner =>
+      textEnum<RampPartner>().withDefault(const Constant('kado'))();
 }
 
 enum OffRampOrderStatus {

packages/espressocash_app/lib/features/activities/services/pending_activities_repository.dart

@@ -10,7 +10,7 @@ import '../../outgoing_direct_payments/data/repository.dart';
 import '../../outgoing_link_payments/data/repository.dart';
 import '../../payment_request/data/repository.dart';
 import '../../ramp/data/on_ramp_order_service.dart';
-import '../../ramp/services/kado_off_ramp_order_service.dart';
+import '../../ramp/services/off_ramp_order_service.dart';
 import '../../swap/data/swap_repository.dart';
 import '../data/activity_builder.dart';
 import '../models/activity.dart';
@@ -27,7 +27,7 @@ class PendingActivitiesRepository {
   final MyDatabase _db;
   final TokenList _tokens;
   final OnRampOrderService _onRampOrderService;
-  final KadoOffRampOrderService _offRampOrderService;
+  final OffRampOrderService _offRampOrderService;
 
   Stream<IList<Activity>> watchAll() {
     final opr = _db.select(_db.paymentRequestRows)

packages/espressocash_app/lib/features/activities/widgets/off_ramp_tile.dart

@@ -10,7 +10,7 @@ import '../../../gen/assets.gen.dart';
 import '../../../l10n/device_locale.dart';
 import '../../../l10n/l10n.dart';
 import '../../ramp/screens/off_ramp_order_screen.dart';
-import '../../ramp/services/kado_off_ramp_order_service.dart';
+import '../../ramp/services/off_ramp_order_service.dart';
 import '../models/activity.dart';
 import 'activity_tile.dart';
 
@@ -24,7 +24,7 @@ class OffRampTile extends StatefulWidget {
 }
 
 class _OffRampTileState extends State<OffRampTile> {
-  late final _stream = sl<KadoOffRampOrderService>().watch(widget.activity.id);
+  late final _stream = sl<OffRampOrderService>().watch(widget.activity.id);
 
   @override
   Widget build(BuildContext context) => StreamBuilder<OffRampOrder>(

packages/espressocash_app/lib/features/ramp/kado/services/off_ramp_order_watcher.dart

@@ -0,0 +1,70 @@
+import 'dart:async';
+
+import 'package:drift/drift.dart';
+import 'package:injectable/injectable.dart';
+import 'package:rxdart/rxdart.dart';
+
+import '../../../../data/db/db.dart';
+import '../../src/models/ramp_watcher.dart';
+import '../data/kado_api_client.dart';
+
+@injectable
+class KadoOffRampOrderWatcher implements RampWatcher {
+  KadoOffRampOrderWatcher(this._db, this._client);
+
+  final MyDatabase _db;
+  final KadoApiClient _client;
+
+  StreamSubscription<void>? _subscription;
+
+  @override
+  void watch(String orderId) {
+    _subscription = Stream<void>.periodic(const Duration(seconds: 10))
+        .asyncMap(
+          (_) {
+            final query = _db.select(_db.offRampOrderRows)
+              ..where(
+                (tbl) =>
+                    tbl.id.equals(orderId) &
+                    tbl.status
+                        .equals(OffRampOrderStatus.waitingForPartner.name),
+              );
+
+            return query.getSingleOrNull();
+          },
+        )
+        .whereNotNull()
+        .asyncMap((order) => _client.getOrderStatus(order.partnerOrderId))
+        .listen((event) async {
+          // ignore: prefer-early-return, cannot use
+          if (event.data case final data?) {
+            final statement = _db.update(_db.offRampOrderRows)
+              ..where(
+                (tbl) =>
+                    tbl.id.equals(orderId) &
+                    tbl.status
+                        .equals(OffRampOrderStatus.waitingForPartner.name),
+              );
+            final isCompleted =
+                data.machineStatusField == MachineStatus.settled;
+
+            if (isCompleted) await _subscription?.cancel();
+
+            await statement.write(
+              OffRampOrderRowsCompanion(
+                machineStatus: Value(data.machineStatusField.name),
+                humanStatus: Value(data.humanStatusField),
+                status: isCompleted
+                    ? const Value(OffRampOrderStatus.completed)
+                    : const Value(OffRampOrderStatus.waitingForPartner),
+              ),
+            );
+          }
+        });
+  }
+
+  @override
+  void close() {
+    _subscription?.cancel();
+  }
+}

packages/espressocash_app/lib/features/ramp/screens/off_ramp_order_screen.dart

@@ -8,7 +8,10 @@ import '../../../routes.gr.dart';
 import '../../../ui/button.dart';
 import '../../../ui/status_screen.dart';
 import '../../../ui/status_widget.dart';
-import '../services/kado_off_ramp_order_service.dart';
+import '../kado/services/off_ramp_order_watcher.dart';
+import '../models/ramp_partner.dart';
+import '../services/off_ramp_order_service.dart';
+import '../src/models/ramp_watcher.dart';
 
 @RoutePage()
 class OffRampOrderScreen extends StatefulWidget {
@@ -23,7 +26,37 @@ class OffRampOrderScreen extends StatefulWidget {
 }
 
 class _OffRampOrderScreenState extends State<OffRampOrderScreen> {
-  late final _stream = sl<KadoOffRampOrderService>().watch(widget.orderId);
+  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 onRamp = await _stream.first;
+
+    _watcher = switch (onRamp.partner) {
+      RampPartner.kado => sl<KadoOffRampOrderWatcher>(),
+      RampPartner.rampNetwork ||
+      RampPartner.coinflow ||
+      RampPartner.guardarian =>
+        throw ArgumentError('Not implemented'),
+    }
+      ..watch(widget.orderId);
+  }
+
+  @override
+  void dispose() {
+    _watcher?.close();
+    super.dispose();
+  }
 
   @override
   Widget build(BuildContext context) => StreamBuilder(
@@ -49,7 +82,7 @@ class _OffRampOrderScreenState extends State<OffRampOrderScreen> {
                       width: double.infinity,
                       text: context.l10n.retry,
                       onPressed: () {
-                        sl<KadoOffRampOrderService>().retry(widget.orderId);
+                        sl<OffRampOrderService>().retry(widget.orderId);
                       },
                     ),
                   if (order?.status == OffRampOrderStatus.depositTxRequired)
@@ -58,7 +91,7 @@ class _OffRampOrderScreenState extends State<OffRampOrderScreen> {
                       width: double.infinity,
                       text: 'Create deposit tx',
                       onPressed: () {
-                        sl<KadoOffRampOrderService>().retry(widget.orderId);
+                        sl<OffRampOrderService>().retry(widget.orderId);
                       },
                     ),
                 ],

packages/espressocash_app/lib/features/ramp/services/kado_off_ramp_order_service.dart renamed to packages/espressocash_app/lib/features/ramp/services/off_ramp_order_service.dart

@@ -22,24 +22,24 @@ import '../../authenticated/auth_scope.dart';
 import '../../transactions/models/tx_sender.dart';
 import '../../transactions/services/resign_tx.dart';
 import '../../transactions/services/tx_sender.dart';
-import '../kado/data/kado_api_client.dart';
+import '../models/ramp_partner.dart';
 
 typedef OffRampOrder = ({
   String id,
   DateTime created,
   OffRampOrderStatus status,
   CryptoAmount amount,
+  RampPartner partner,
 });
 
 @Singleton(scope: authScope)
-class KadoOffRampOrderService implements Disposable {
-  KadoOffRampOrderService(
+class OffRampOrderService implements Disposable {
+  OffRampOrderService(
     this._account,
     this._client,
     this._sender,
     this._db,
     this._tokens,
-    this._kadoApi,
   );
 
   final Map<String, StreamSubscription<void>> _subscriptions = {};
@@ -49,7 +49,6 @@ class KadoOffRampOrderService implements Disposable {
   final TxSender _sender;
   final MyDatabase _db;
   final TokenList _tokens;
-  final KadoApiClient _kadoApi;
 
   @PostConstruct()
   Future<void> init() async {
@@ -94,6 +93,7 @@ class KadoOffRampOrderService implements Disposable {
         created: row.created,
         status: row.status,
         amount: amount,
+        partner: row.partner,
       );
     });
   }
@@ -142,16 +142,11 @@ class KadoOffRampOrderService implements Disposable {
   AsyncResult<String> create({
     required String partnerOrderId,
     required CryptoAmount amount,
+    required RampPartner partner,
+    required String depositAddress,
   }) =>
       tryEitherAsync((_) async {
         {
-          final partnerOrder = await _kadoApi.getOrderStatus(partnerOrderId);
-          final depositAddress = partnerOrder.data?.depositAddress;
-
-          if (depositAddress == null) {
-            throw Exception('No deposit address');
-          }
-
           final order = OffRampOrderRow(
             id: const Uuid().v4(),
             amount: amount.value,
@@ -164,6 +159,7 @@ class KadoOffRampOrderService implements Disposable {
             slot: BigInt.zero,
             status: OffRampOrderStatus.depositTxRequired,
             depositAddress: depositAddress,
+            partner: partner,
           );
 
           await _db.into(_db.offRampOrderRows).insert(order);
@@ -181,6 +177,7 @@ class KadoOffRampOrderService implements Disposable {
       switch (order.status) {
         case OffRampOrderStatus.depositTxRequired:
         case OffRampOrderStatus.depositError:
+        case OffRampOrderStatus.waitingForPartner:
           return const Stream.empty();
         case OffRampOrderStatus.creatingDepositTx:
           return Stream.fromFuture(
@@ -204,9 +201,6 @@ class KadoOffRampOrderService implements Disposable {
               status: Value(OffRampOrderStatus.sendingDepositTx),
             ),
           );
-        case OffRampOrderStatus.waitingForPartner:
-          return Stream<void>.periodic(const Duration(seconds: 10))
-              .asyncMap((_) => _checkPartnerStatus(order.partnerOrderId));
         case OffRampOrderStatus.failure:
         case OffRampOrderStatus.completed:
           _subscriptions[orderId]?.cancel();
@@ -291,18 +285,6 @@ class KadoOffRampOrderService implements Disposable {
     }
   }
 
-  Future<OffRampOrderRowsCompanion> _checkPartnerStatus(String orderId) async {
-    final partnerOrder = await _kadoApi.getOrderStatus(orderId);
-
-    return OffRampOrderRowsCompanion(
-      machineStatus: Value(partnerOrder.data?.machineStatusField.name ?? ''),
-      humanStatus: Value(partnerOrder.data?.humanStatusField ?? ''),
-      status: partnerOrder.data?.machineStatusField == MachineStatus.settled
-          ? const Value(OffRampOrderStatus.completed)
-          : const Value(OffRampOrderStatus.waitingForPartner),
-    );
-  }
-
   static const _depositError =
       OffRampOrderRowsCompanion(status: Value(OffRampOrderStatus.depositError));
 }

packages/espressocash_app/lib/features/ramp/src/widgets/partners/kado.dart

@@ -10,9 +10,10 @@ import '../../../../../core/currency.dart';
 import '../../../../../di.dart';
 import '../../../../../ui/web_view_screen.dart';
 import '../../../data/on_ramp_order_service.dart';
+import '../../../kado/data/kado_api_client.dart';
 import '../../../models/ramp_partner.dart';
 import '../../../screens/off_ramp_order_screen.dart';
-import '../../../services/kado_off_ramp_order_service.dart';
+import '../../../services/off_ramp_order_service.dart';
 import '../../models/profile_data.dart';
 import '../../models/ramp_type.dart';
 import '../../screens/ramp_amount_screen.dart';
@@ -134,18 +135,26 @@ window.addEventListener("message", (event) => {
     Future<void> handleLoaded(InAppWebViewController controller) async {
       controller.addJavaScriptHandler(
         handlerName: 'kado',
-        callback: (args) {
+        callback: (args) async {
           if (orderWasCreated) return;
 
           if (args.firstOrNull
               case <String, dynamic>{
                 'type': 'RAMP_ORDER_ID',
                 'payload': {'orderId': final String orderId}
               }) {
-            sl<KadoOffRampOrderService>()
+            final partnerOrder =
+                await sl<KadoApiClient>().getOrderStatus(orderId);
+            final depositAddress = partnerOrder.data?.depositAddress;
+
+            if (depositAddress == null) return;
+
+            await sl<OffRampOrderService>()
                 .create(
               partnerOrderId: orderId,
               amount: submittedAmount,
+              partner: RampPartner.kado,
+              depositAddress: depositAddress,
             )
                 .then((order) {
               switch (order) {