Merge branch 'electrum_adapter' into testing

lib/electrumx_rpc/cached_electrumx_client.dart

@@ -22,22 +22,40 @@ import 'package:string_validator/string_validator.dart';
 
 class CachedElectrumXClient {
   final ElectrumXClient electrumXClient;
-  final ElectrumClient electrumAdapterClient;
+  ElectrumClient electrumAdapterClient;
+  final Future<ElectrumClient> Function() electrumAdapterUpdateCallback;
 
   static const minCacheConfirms = 30;
 
-  const CachedElectrumXClient({
+  CachedElectrumXClient({
     required this.electrumXClient,
     required this.electrumAdapterClient,
+    required this.electrumAdapterUpdateCallback,
   });
 
   factory CachedElectrumXClient.from({
     required ElectrumXClient electrumXClient,
     required ElectrumClient electrumAdapterClient,
+    required Future<ElectrumClient> Function() electrumAdapterUpdateCallback,
   }) =>
       CachedElectrumXClient(
-          electrumXClient: electrumXClient,
+        electrumXClient: electrumXClient,
-          electrumAdapterClient: electrumAdapterClient);
+        electrumAdapterClient: electrumAdapterClient,
+        electrumAdapterUpdateCallback: electrumAdapterUpdateCallback,
+      );
+
+  /// If the client is closed, use the callback to update it.
+  _checkElectrumAdapterClient() async {
+    if (electrumAdapterClient.peer.isClosed) {
+      Logging.instance.log(
+        "ElectrumAdapterClient is closed, reopening it...",
+        level: LogLevel.Info,
+      );
+      ElectrumClient? _electrumAdapterClient =
+          await electrumAdapterUpdateCallback.call();
+      electrumAdapterClient = _electrumAdapterClient;
+    }
+  }
 
   Future<Map<String, dynamic>> getAnonymitySet({
     required String groupId,
@@ -62,6 +80,8 @@ class CachedElectrumXClient {
         set = Map<String, dynamic>.from(cachedSet);
       }
 
+      await _checkElectrumAdapterClient();
+
       final newSet = await (electrumAdapterClient as FiroElectrumClient)
           .getLelantusAnonymitySet(
         groupId: groupId,
@@ -137,6 +157,8 @@ class CachedElectrumXClient {
         set = Map<String, dynamic>.from(cachedSet);
       }
 
+      await _checkElectrumAdapterClient();
+
       final newSet = await (electrumAdapterClient as FiroElectrumClient)
           .getSparkAnonymitySet(
         coinGroupId: groupId,
@@ -196,6 +218,8 @@ class CachedElectrumXClient {
 
       final cachedTx = box.get(txHash) as Map?;
       if (cachedTx == null) {
+        await _checkElectrumAdapterClient();
+
         final Map<String, dynamic> result =
             await electrumAdapterClient.getTransaction(txHash);
 
@@ -239,6 +263,8 @@ class CachedElectrumXClient {
         cachedSerials.length - 100, // 100 being some arbitrary buffer
       );
 
+      await _checkElectrumAdapterClient();
+
       final serials = await (electrumAdapterClient as FiroElectrumClient)
           .getLelantusUsedCoinSerials(
         startNumber: startNumber,
@@ -288,6 +314,8 @@ class CachedElectrumXClient {
         cachedTags.length - 100, // 100 being some arbitrary buffer
       );
 
+      await _checkElectrumAdapterClient();
+
       final tags =
           await (electrumAdapterClient as FiroElectrumClient).getUsedCoinsTags(
         startNumber: startNumber,

lib/electrumx_rpc/electrumx_client.dart

@@ -290,6 +290,13 @@ class ElectrumXClient {
     //   );
     // }
 
+    // If the current ElectrumAdapterClient is closed, create a new one.
+    if (_electrumAdapterClient != null &&
+        _electrumAdapterClient!.peer.isClosed) {
+      _electrumAdapterChannel = null;
+      _electrumAdapterClient = null;
+    }
+
     if (currentFailoverIndex == -1) {
       _electrumAdapterChannel ??= await electrum_adapter.connect(
         host,

lib/wallets/wallet/wallet_mixin_interfaces/electrumx_interface.dart

@@ -996,6 +996,7 @@ mixin ElectrumXInterface<T extends Bip39HDCurrency> on Bip39HDWallet<T> {
     electrumXCachedClient = CachedElectrumXClient.from(
       electrumXClient: electrumXClient,
       electrumAdapterClient: electrumAdapterClient,
+      electrumAdapterUpdateCallback: updateClient,
     );
     subscribableElectrumXClient = SubscribableElectrumXClient.from(
       node: newNode,
@@ -1307,6 +1308,13 @@ mixin ElectrumXInterface<T extends Bip39HDCurrency> on Bip39HDWallet<T> {
     await updateElectrumX(newNode: node);
   }
 
+  Future<ElectrumClient> updateClient() async {
+    Logging.instance.log("Updating electrum node and ElectrumAdapterClient.",
+        level: LogLevel.Info);
+    await updateNode();
+    return electrumAdapterClient;
+  }
+
   FeeObject? _cachedFees;
 
   @override