various firo tweaks

Author: julian-CStack

lib/db/sqlite/firo_cache_coordinator.dart

@@ -157,15 +157,15 @@ abstract class FiroCacheCoordinator {
 
   // ===========================================================================
 
-  static Future<Set<String>> getUsedCoinTags(
+  static Future<List<String>> getUsedCoinTags(
     int startNumber,
     CryptoCurrencyNetwork network,
   ) async {
     final result = await _Reader._getSparkUsedCoinTags(
       startNumber,
       db: _FiroCache.usedTagsCacheDB(network),
     );
-    return result.map((e) => e["tag"] as String).toSet();
+    return result.map((e) => e["tag"] as String).toList();
   }
 
   static Future<int> getUsedCoinTagsCount(CryptoCurrencyNetwork network) async {
@@ -198,15 +198,15 @@ abstract class FiroCacheCoordinator {
         .toList();
   }
 
-  static Future<Set<String>> getUsedCoinTagsFor({
+  static Future<List<String>> getUsedCoinTagsFor({
     required String txid,
     required CryptoCurrencyNetwork network,
   }) async {
     final result = await _Reader._getUsedCoinTagsFor(
       txid,
       db: _FiroCache.usedTagsCacheDB(network),
     );
-    return result.map((e) => e["tag"] as String).toSet();
+    return result.map((e) => e["tag"] as String).toList();
   }
 
   static Future<bool> checkTagIsUsed(

lib/db/sqlite/firo_cache_writer.dart

@@ -13,15 +13,12 @@ class FCResult {
 /// update the sqlite cache
 /// Expected json format:
 /// returns true if successful, otherwise some exception
-FCResult _updateSparkUsedTagsWith(
-  Database db,
-  List<List<dynamic>> tags,
-) {
+FCResult _updateSparkUsedTagsWith(Database db, List<List<dynamic>> tags) {
   // hash the tags here since this function is called in a background isolate
-  final hashedTags = LibSpark.hashTags(
-    base64Tags: tags.map((e) => e[0] as String).toSet(),
-  ).toList();
-
+  final hashedTags =
+      LibSpark.hashTags(
+        base64Tags: tags.map((e) => e[0] as String).toList(),
+      ).toList();
   if (hashedTags.isEmpty) {
     // nothing to add, return early
     return FCResult(success: true);
@@ -70,11 +67,7 @@ FCResult _updateSparkAnonSetCoinsWith(
       FROM SparkSet
       WHERE blockHash = ? AND setHash = ? AND groupId = ?;
     """,
-    [
-      meta.blockHash,
-      meta.setHash,
-      meta.coinGroupId,
-    ],
+    [meta.blockHash, meta.setHash, meta.coinGroupId],
   );
 
   if (checkResult.isNotEmpty) {

lib/electrumx_rpc/electrumx_client.dart

@@ -1129,7 +1129,7 @@ class ElectrumXClient {
         "Duration=${DateTime.now().difference(start)}",
       );
 
-      return tags;
+      return tags.reversed.toList();
     } catch (e, s) {
       Logging.instance.e(e, error: e, stackTrace: s);
       rethrow;

lib/pages/spark_names/buy_spark_name_view.dart

@@ -69,11 +69,22 @@ class _BuySparkNameViewState extends ConsumerState<BuySparkNameView> {
     try {
       final wallet =
           ref.read(pWallets).getWallet(widget.walletId) as SparkInterface;
-      final myAddress = await wallet.getCurrentReceivingSparkAddress();
+      Address? myAddress = await wallet.getCurrentReceivingSparkAddress();
       if (myAddress == null) {
         throw Exception("No spark address found");
       }
-      addressController.text = myAddress.value;
+
+      final db = ref.read(pDrift(widget.walletId));
+      final myNames = await db.select(db.sparkNames).get();
+      while (myNames.where((e) => e.address == myAddress!.value).isNotEmpty) {
+        Logging.instance.t(
+          "Found address that already has a spark name. Generating next address...",
+        );
+        myAddress = await wallet.generateNextSparkAddress();
+        await ref.read(mainDBProvider).updateOrPutAddresses([myAddress]);
+      }
+
+      addressController.text = myAddress!.value;
     } catch (e, s) {
       Logging.instance.e("_fillCurrentReceiving", error: e, stackTrace: s);
     } finally {

lib/pages/spark_names/confirm_spark_name_transaction_view.dart

@@ -16,6 +16,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_svg/svg.dart';
 
+import '../../models/isar/models/blockchain_data/address.dart';
 import '../../models/isar/models/transaction_note.dart';
 import '../../notifications/show_flush_bar.dart';
 import '../../pages_desktop_specific/coin_control/desktop_coin_control_use_dialog.dart';
@@ -128,6 +129,25 @@ class _ConfirmSparkNameTransactionViewState
             );
       }
 
+      final address = txData.sparkNameInfo?.sparkAddress;
+      final currentReceiving = await wallet.getCurrentReceivingSparkAddress();
+      if (currentReceiving?.value == address?.value) {
+        final address = await wallet.generateNextSparkAddress();
+        await ref.read(mainDBProvider).isar.writeTxn(() async {
+          await ref.read(mainDBProvider).isar.addresses.put(address);
+        });
+      }
+
+      final db = ref.read(pDrift(walletId));
+      await db.upsertSparkNames([
+        (
+          name: txData.sparkNameInfo!.name,
+          address: txData.sparkNameInfo!.sparkAddress.value,
+          validUntil: -99999,
+          additionalInfo: txData.sparkNameInfo!.additionalInfo,
+        ),
+      ]);
+
       unawaited(wallet.refresh());
 
       if (mounted) {

lib/pages/spark_names/sub_widgets/buy_spark_name_option_widget.dart

@@ -1,5 +1,6 @@
 import 'dart:async';
 
+import 'package:drift/drift.dart' as drift;
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_libsparkmobile/flutter_libsparkmobile.dart';
@@ -55,6 +56,15 @@ class _BuySparkNameWidgetState extends ConsumerState<BuySparkNameOptionWidget> {
       )) {
         rethrow;
       }
+      final db = ref.read(pDrift(widget.walletId));
+      final results =
+          await (db.select(db.sparkNames)
+            ..where((e) => e.name.lower().equals(name))).get();
+
+      if (results.isNotEmpty) {
+        return false;
+      }
+
       // name not found
       return true;
     }

lib/pages/spark_names/sub_widgets/owned_spark_name_card.dart

@@ -32,7 +32,10 @@ class _OwnedSparkNameCardState extends ConsumerState<OwnedSparkNameCard> {
 
     final remaining = widget.name.validUntil - currentChainHeight;
 
-    if (remaining <= 0) {
+    if (widget.name.validUntil == -99999) {
+      color = theme.accentColorYellow;
+      message = "Pending";
+    } else if (remaining <= 0) {
       color = theme.accentColorRed;
       message = "Expired";
     } else {

lib/pages/spark_names/sub_widgets/spark_name_details.dart

@@ -53,7 +53,10 @@ class _SparkNameDetailsViewState extends ConsumerState<SparkNameDetailsView> {
 
     final remaining = name.validUntil - currentChainHeight;
 
-    if (remaining <= 0) {
+    if (widget.name.validUntil == -99999) {
+      color = theme.accentColorYellow;
+      message = "Pending";
+    } else if (remaining <= 0) {
       color = theme.accentColorRed;
       message = "Expired";
     } else {

lib/wallets/wallet/wallet_mixin_interfaces/spark_interface.dart

@@ -1118,7 +1118,7 @@ mixin SparkInterface<T extends ElectrumXCurrencyInterface>
               .isUsedEqualTo(false)
               .findAll();
 
-      Set<String>? spentCoinTags;
+      List<String>? spentCoinTags;
       // only fetch tags from db if we need them to compare against any items
       // in coinsToCheck
       if (coinsToCheck.isNotEmpty) {

pubspec.lock

@@ -944,8 +944,8 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: f5fd2238fca4ffe82f7e14646a613a04d2c243d6
-      resolved-ref: f5fd2238fca4ffe82f7e14646a613a04d2c243d6
+      ref: "5f0dde009c969bf6425da35382305b2c0b65bc46"
+      resolved-ref: "5f0dde009c969bf6425da35382305b2c0b65bc46"
       url: "https://github.com/cypherstack/flutter_libsparkmobile.git"
     source: git
     version: "0.1.0"