firo spark coin instantsend isLocked addition to local model

Author: julian-CStack

lib/electrumx_rpc/electrumx_client.dart

@@ -1036,7 +1036,7 @@ class ElectrumXClient {
     }
   }
 
-  /// Returns the txids of the current transactions found in the mempool
+  /// Returns the txids of the current spark transactions found in the mempool
   Future<Set<String>> getMempoolTxids({String? requestID}) async {
     try {
       final start = DateTime.now();
@@ -1089,6 +1089,7 @@ class ElectrumXClient {
             // the space after lTags is required lol
             lTags: List<String>.from(entry.value["lTags "] as List),
             coins: List<String>.from(entry.value["coins"] as List),
+            isLocked: entry.value["isLocked"] as bool,
           ),
         );
       }

lib/models/electrumx_response/spark_models.dart

@@ -3,12 +3,14 @@ class SparkMempoolData {
   final List<String> serialContext;
   final List<String> lTags;
   final List<String> coins;
+  final bool isLocked;
 
   SparkMempoolData({
     required this.txid,
     required this.serialContext,
     required this.lTags,
     required this.coins,
+    required this.isLocked,
   });
 
   @override
@@ -17,7 +19,8 @@ class SparkMempoolData {
         "txid: $txid, "
         "serialContext: $serialContext, "
         "lTags: $lTags, "
-        "coins: $coins"
+        "coins: $coins, "
+        "isLocked: $isLocked"
         "}";
   }
 }

lib/pages_desktop_specific/spark_coins/spark_coins_view.dart

@@ -26,10 +26,7 @@ import '../../widgets/desktop/desktop_scaffold.dart';
 import '../../widgets/isar_collection_watcher_list.dart';
 
 class SparkCoinsView extends ConsumerWidget {
-  const SparkCoinsView({
-    super.key,
-    required this.walletId,
-  });
+  const SparkCoinsView({super.key, required this.walletId});
 
   static const title = "Spark coins";
   static const String routeName = "/sparkCoinsView";
@@ -47,43 +44,35 @@ class SparkCoinsView extends ConsumerWidget {
             leading: Expanded(
               child: Row(
                 children: [
-                  const SizedBox(
-                    width: 32,
-                  ),
+                  const SizedBox(width: 32),
                   AppBarIconButton(
                     size: 32,
-                    color: Theme.of(context)
-                        .extension<StackColors>()!
-                        .textFieldDefaultBG,
+                    color:
+                        Theme.of(
+                          context,
+                        ).extension<StackColors>()!.textFieldDefaultBG,
                     shadows: const [],
                     icon: SvgPicture.asset(
                       Assets.svg.arrowLeft,
                       width: 18,
                       height: 18,
-                      color: Theme.of(context)
-                          .extension<StackColors>()!
-                          .topNavIconPrimary,
+                      color:
+                          Theme.of(
+                            context,
+                          ).extension<StackColors>()!.topNavIconPrimary,
                     ),
                     onPressed: Navigator.of(context).pop,
                   ),
-                  const SizedBox(
-                    width: 12,
-                  ),
-                  Text(
-                    title,
-                    style: STextStyles.desktopH3(context),
-                  ),
+                  const SizedBox(width: 12),
+                  Text(title, style: STextStyles.desktopH3(context)),
                   const Spacer(),
                 ],
               ),
             ),
             useSpacers: false,
             isCompactHeight: true,
           ),
-          body: Padding(
-            padding: const EdgeInsets.all(24),
-            child: child,
-          ),
+          body: Padding(padding: const EdgeInsets.all(24), child: child),
         );
       },
       child: ConditionalParent(
@@ -98,26 +87,23 @@ class SparkCoinsView extends ConsumerWidget {
                 leading: AppBarBackButton(
                   onPressed: () => Navigator.of(context).pop(),
                 ),
-                title: Text(
-                  title,
-                  style: STextStyles.navBarTitle(context),
-                ),
-              ),
-              body: SafeArea(
-                child: child,
+                title: Text(title, style: STextStyles.navBarTitle(context)),
               ),
+              body: SafeArea(child: child),
             ),
           );
         },
         child: IsarCollectionWatcherList(
           itemName: title,
-          queryBuilder: () => ref
-              .read(mainDBProvider)
-              .isar
-              .sparkCoins
-              .where()
-              .walletIdEqualToAnyLTagHash(walletId)
-              .sortByHeightDesc(),
+          queryBuilder:
+              () =>
+                  ref
+                      .read(mainDBProvider)
+                      .isar
+                      .sparkCoins
+                      .where()
+                      .walletIdEqualToAnyLTagHash(walletId)
+                      .sortByHeightDesc(),
           itemBuilder: (SparkCoin? coin) {
             return [
               ("TXID", coin?.txHash ?? "", 9),
@@ -129,6 +115,7 @@ class SparkCoinsView extends ConsumerWidget {
               ("Group ID", coin?.groupId.toString() ?? "", 2),
               ("Type", coin?.type.name ?? "", 2),
               ("Used", coin?.isUsed.toString() ?? "", 2),
+              ("Locked", coin?.isLocked.toString() ?? "", 2),
             ];
           },
         ),

lib/wallets/isar/models/spark_coin.dart

@@ -17,13 +17,7 @@ enum SparkCoinType {
 class SparkCoin {
   Id id = Isar.autoIncrement;
 
-  @Index(
-    unique: true,
-    replace: true,
-    composite: [
-      CompositeIndex("lTagHash"),
-    ],
-  )
+  @Index(unique: true, replace: true, composite: [CompositeIndex("lTagHash")])
   final String walletId;
 
   @enumerated
@@ -55,6 +49,10 @@ class SparkCoin {
   final String? serializedCoinB64;
   final String? contextB64;
 
+  // prefix name with zzz to ensure serialization order remains unchanged
+  @Name("zzzIsLocked")
+  final bool? isLocked;
+
   @ignore
   BigInt get value => BigInt.parse(valueIntString);
 
@@ -66,10 +64,7 @@ class SparkCoin {
     return max(0, currentChainHeight - (height! - 1));
   }
 
-  bool isConfirmed(
-    int currentChainHeight,
-    int minimumConfirms,
-  ) {
+  bool isConfirmed(int currentChainHeight, int minimumConfirms) {
     final confirmations = getConfirmations(currentChainHeight);
     return confirmations >= minimumConfirms;
   }
@@ -93,6 +88,7 @@ class SparkCoin {
     this.height,
     this.serializedCoinB64,
     this.contextB64,
+    this.isLocked,
   });
 
   SparkCoin copyWith({
@@ -113,6 +109,7 @@ class SparkCoin {
     int? height,
     String? serializedCoinB64,
     String? contextB64,
+    bool? isLocked,
   }) {
     return SparkCoin(
       walletId: walletId,
@@ -134,6 +131,7 @@ class SparkCoin {
       height: height ?? this.height,
       serializedCoinB64: serializedCoinB64 ?? this.serializedCoinB64,
       contextB64: contextB64 ?? this.contextB64,
+      isLocked: isLocked ?? this.isLocked,
     );
   }
 
@@ -158,6 +156,7 @@ class SparkCoin {
         ', height: $height'
         ', serializedCoinB64: $serializedCoinB64'
         ', contextB64: $contextB64'
+        ', isLocked: $isLocked'
         ')';
   }
 }

lib/wallets/isar/models/spark_coin.g.dart

@@ -880,7 +880,12 @@ mixin SparkInterface<T extends ElectrumXCurrencyInterface>
         // add checked txids after identification
         _mempoolTxidsChecked.addAll(checkedTxids);
 
-        result.addAll(myCoins);
+        for (final coin in myCoins) {
+          final match = sparkDataToCheck.firstWhere(
+            (e) => e.serialContext.contains(coin.contextB64!),
+          );
+          result.add(coin.copyWith(isLocked: match.isLocked));
+        }
       }
 
       return result;