Restore orders feature

lib/core/app.dart

@@ -16,6 +16,7 @@ import 'package:mostro_mobile/shared/providers/app_init_provider.dart';
 import 'package:mostro_mobile/features/settings/settings_provider.dart';
 import 'package:mostro_mobile/shared/notifiers/locale_notifier.dart';
 import 'package:mostro_mobile/features/walkthrough/providers/first_run_provider.dart';
+import 'package:mostro_mobile/features/restore/restore_overlay.dart';
 
 class MostroApp extends ConsumerStatefulWidget {
   const MostroApp({super.key});
@@ -163,6 +164,14 @@ class _MostroAppState extends ConsumerState<MostroApp> {
           theme: AppTheme.theme,
           darkTheme: AppTheme.theme,
           routerConfig: _router!,
+          builder: (context, child) {
+            return Stack(
+              children: [
+                if (child != null) child,
+                const RestoreOverlay(),
+              ],
+            );
+          },
           // Use language override from settings if available, otherwise let callback handle detection
           locale: settings.selectedLanguage != null
               ? Locale(settings.selectedLanguage!)

lib/data/models/enums/action.dart

@@ -38,7 +38,10 @@ enum Action {
   paymentFailed('payment-failed'),
   invoiceUpdated('invoice-updated'),
   sendDm('send-dm'),
-  tradePubkey('trade-pubkey');
+  tradePubkey('trade-pubkey'),
+  restore('restore-session'),
+  orders('orders'),
+  lastTradeIndex('last-trade-index');
 
   final String value;
 

lib/data/models/last_trade_index_response.dart

@@ -0,0 +1,21 @@
+import 'package:mostro_mobile/data/models/payload.dart';
+
+class LastTradeIndexResponse implements Payload {
+  final int tradeIndex;
+
+  const LastTradeIndexResponse({required this.tradeIndex});
+
+  @override
+  String get type => 'last-trade-index';
+
+  factory LastTradeIndexResponse.fromJson(Map<String, dynamic> json) {
+    return LastTradeIndexResponse(
+      tradeIndex: json['trade_index'] as int,
+    );
+  }
+
+  @override
+  Map<String, dynamic> toJson() => {
+        'trade_index': tradeIndex,
+      };
+}

lib/data/models/mostro_message.dart

@@ -36,13 +36,15 @@ class MostroMessage<T extends Payload> {
       json['id'] = id;
     }
     json['action'] = action.value;
-    json['payload'] = _payload?.toJson();
+    // Serialize EmptyPayload as null to match protocol specification
+    json['payload'] = (_payload is EmptyPayload) ? null :_payload?.toJson();
     return json;
   }
 
   factory MostroMessage.fromJson(Map<String, dynamic> json) {
     final timestamp = json['timestamp'];
-    json = json['order'] ?? json['cant-do'] ?? json;
+    // IMPORTANT : Use 'order', 'restore' or 'cant-do' key as per protocol
+    json = json['order'] ?? json['restore'] ?? json['cant-do'] ?? json;
     final num requestId = json['request_id'] ?? 0;
 
     return MostroMessage(
@@ -97,7 +99,9 @@ class MostroMessage<T extends Payload> {
   }
 
   String sign(NostrKeyPairs keyPair) {
-    final message = {'order': toJson()};
+    //IMPORTANT : Use 'restore' key for restore and last-trade-index actions, 'order' for everything else, as per protocol
+    final wrapperKey = action == Action.restore || action == Action.lastTradeIndex ? 'restore' : 'order';
+    final message = {wrapperKey: toJson()};
     final serializedEvent = jsonEncode(message);
     final bytes = utf8.encode(serializedEvent);
     final digest = sha256.convert(bytes);
@@ -107,7 +111,9 @@ class MostroMessage<T extends Payload> {
   }
 
   String serialize({NostrKeyPairs? keyPair}) {
-    final message = {'order': toJson()};
+    //IMPORTANT : Use 'restore' key for restore and last-trade-index actions, 'order' for everything else, as per protocol
+    final wrapperKey = action == Action.restore || action == Action.lastTradeIndex ? 'restore' : 'order';
+    final message = {wrapperKey: toJson()};
     final serializedEvent = jsonEncode(message);
     final signature = (keyPair != null) ? '"${sign(keyPair)}"' : null;
     final content = '[$serializedEvent, $signature]';

lib/data/models/orders_request.dart

@@ -0,0 +1,21 @@
+import 'package:mostro_mobile/data/models/payload.dart';
+
+class OrdersPayload implements Payload {
+  final List<String> ids;
+
+  const OrdersPayload({required this.ids});
+
+  @override
+  String get type => 'orders';
+
+  factory OrdersPayload.fromJson(Map<String, dynamic> json) {
+    return OrdersPayload(
+      ids: (json['ids'] as List<dynamic>).map((e) => e as String).toList(),
+    );
+  }
+
+  @override
+  Map<String, dynamic> toJson() => {
+        'ids': ids,
+      };
+}

lib/data/models/orders_response.dart

@@ -0,0 +1,95 @@
+import 'package:mostro_mobile/data/models/payload.dart';
+
+
+class OrdersResponse implements Payload {
+  final List<OrderDetail> orders;
+
+  OrdersResponse({required this.orders});
+
+  @override
+  String get type => 'orders';
+
+  factory OrdersResponse.fromJson(Map<String, dynamic> json) {
+    return OrdersResponse(
+      orders: (json['orders'] as List<dynamic>?)
+              ?.map((o) => OrderDetail.fromJson(o as Map<String, dynamic>))
+              .toList() ??
+          [],
+    );
+  }
+
+  @override
+  Map<String, dynamic> toJson() => {
+        'orders': orders.map((o) => o.toJson()).toList(),
+      };
+}
+
+class OrderDetail {
+  final String id;
+  final String kind;
+  final String status;
+  final int amount;
+  final String fiatCode;
+  final int? minAmount;
+  final int? maxAmount;
+  final int fiatAmount;
+  final String paymentMethod;
+  final int premium;
+  final String? buyerTradePubkey;
+  final String? sellerTradePubkey;
+  final int? createdAt;
+  final int? expiresAt;
+
+  OrderDetail({
+    required this.id,
+    required this.kind,
+    required this.status,
+    required this.amount,
+    required this.fiatCode,
+    this.minAmount,
+    this.maxAmount,
+    required this.fiatAmount,
+    required this.paymentMethod,
+    required this.premium,
+    this.buyerTradePubkey,
+    this.sellerTradePubkey,
+    this.createdAt,
+    this.expiresAt,
+  });
+
+  factory OrderDetail.fromJson(Map<String, dynamic> json) {
+    return OrderDetail(
+      id: json['id'] as String,
+      kind: json['kind'] as String,
+      status: json['status'] as String,
+      amount: json['amount'] as int,
+      fiatCode: json['fiat_code'] as String,
+      minAmount: json['min_amount'] != null ? json['min_amount'] as int : null,
+      maxAmount: json['max_amount'] != null ? json['max_amount'] as int : null,
+      fiatAmount: json['fiat_amount'] as int,
+      paymentMethod: json['payment_method'] as String,
+      premium: json['premium'] as int,
+      buyerTradePubkey: json['buyer_trade_pubkey'] != null ? json['buyer_trade_pubkey'] as String : null,
+      sellerTradePubkey: json['seller_trade_pubkey'] != null ? json['seller_trade_pubkey'] as String : null,
+      createdAt: json['created_at'] != null ? json['created_at'] as int : null,
+      expiresAt: json['expires_at'] != null ? json['expires_at'] as int : null,
+    );
+  }
+
+  Map<String, dynamic> toJson() => {
+        'id': id,
+        'kind': kind,
+        'status': status,
+        'amount': amount,
+        'fiat_code': fiatCode,
+        'min_amount': minAmount,
+        'max_amount': maxAmount,
+        'fiat_amount': fiatAmount,
+        'payment_method': paymentMethod,
+        'premium': premium,
+        'buyer_trade_pubkey': buyerTradePubkey,
+        'seller_trade_pubkey': sellerTradePubkey,
+        'created_at': createdAt,
+        'expires_at': expiresAt,
+      };
+}

lib/data/models/payload.dart

@@ -36,3 +36,14 @@ abstract class Payload {
     }
   }
 }
+
+/// Empty payload for actions that don't require payload data
+class EmptyPayload implements Payload {
+  const EmptyPayload();
+
+  @override
+  String get type => 'empty';
+
+  @override
+  Map<String, dynamic> toJson() => {};
+}

lib/data/models/restore_response.dart

@@ -0,0 +1,91 @@
+import 'package:mostro_mobile/data/models/payload.dart';
+
+class RestoreData implements Payload {
+  final List<RestoredOrder> orders;
+  final List<RestoredDispute> disputes;
+
+  RestoreData({
+    required this.orders,
+    required this.disputes,
+  });
+
+  @override
+  String get type => 'restore_data';
+
+  factory RestoreData.fromJson(Map<String, dynamic> json) {
+    final restoreData = json['restore_data'] as Map<String, dynamic>;
+
+    return RestoreData(
+      orders: (restoreData['orders'] as List<dynamic>?)
+          ?.map((o) => RestoredOrder.fromJson(o as Map<String, dynamic>))
+          .toList() ?? [],
+      disputes: (restoreData['disputes'] as List<dynamic>?)
+          ?.map((d) => RestoredDispute.fromJson(d as Map<String, dynamic>))
+          .toList() ?? [],
+    );
+  }
+
+  @override
+  Map<String, dynamic> toJson() => {
+    'restore_data': {
+      'orders': orders.map((o) => o.toJson()).toList(),
+      'disputes': disputes.map((d) => d.toJson()).toList(),
+    }
+  };
+}
+
+class RestoredOrder {
+  final String id;
+  final int tradeIndex;
+  final String status;
+
+  RestoredOrder({
+    required this.id,
+    required this.tradeIndex,
+    required this.status,
+  });
+
+  factory RestoredOrder.fromJson(Map<String, dynamic> json) {
+    return RestoredOrder(
+      id: json['order_id'] as String,
+      tradeIndex: json['trade_index'] as int,
+      status: json['status'] as String,
+    );
+  }
+
+  Map<String, dynamic> toJson() => {
+    'order_id': id,
+    'trade_index': tradeIndex,
+    'status': status,
+  };
+}
+
+class RestoredDispute {
+  final String disputeId;
+  final String orderId;
+  final int tradeIndex;
+  final String status;
+
+  RestoredDispute({
+    required this.disputeId,
+    required this.orderId,
+    required this.tradeIndex,
+    required this.status,
+  });
+
+  factory RestoredDispute.fromJson(Map<String, dynamic> json) {
+    return RestoredDispute(
+      disputeId: json['dispute_id'] as String,
+      orderId: json['order_id'] as String,
+      tradeIndex: json['trade_index'] as int,
+      status: json['status'] as String,
+    );
+  }
+
+  Map<String, dynamic> toJson() => {
+    'dispute_id': disputeId,
+    'order_id': orderId,
+    'trade_index': tradeIndex,
+    'status': status,
+  };
+}

lib/data/repositories/open_orders_repository.dart

@@ -137,4 +137,11 @@ class OpenOrdersRepository implements OrderRepository<NostrEvent> {
     _subscribeToOrders();
     _emitEvents();
   }
+
+  /// Clear in-memory order cache and reload from relays (used during account restore)
+  void clearCache() {
+    _logger.i('Clearing order cache and reloading');
+    _events.clear();
+    _subscribeToOrders(); // Resubscribe to reload orders from relays
+  }
 }