Node Auto-reconnect and connectivity enhancements (#1513)

* Add auto-reconnect Enhance connectivity issues * minor enhancement [skip ci] * minor: remove core secrets since it's empty * pending transactions fix * temporary fix for RBF * remove unused hashes from cache key * fix minimum limits check * Add authentication to services api * update polyseed * override hashlib package
cake-tech · Jul 6, 2024 · f902a64 · f902a64
1 parent 0335702
commit f902a64
Show file tree

Hide file tree

Showing 19 changed files with 128 additions and 219 deletions.
diff --git a/.github/workflows/pr_test_build.yml b/.github/workflows/pr_test_build.yml
@@ -80,7 +80,7 @@ jobs:
             /opt/android/cake_wallet/cw_monero/ios/External
             /opt/android/cake_wallet/cw_shared_external/ios/External
             /opt/android/cake_wallet/scripts/monero_c/release
-          key: ${{ hashFiles('**/prepare_moneroc.sh' ,'**/build_monero_all.sh', '**/build_haven.sh', '**/monero_api.cpp') }}
+          key: ${{ hashFiles('**/prepare_moneroc.sh' ,'**/build_monero_all.sh') }}
 
       - if: ${{ steps.cache-externals.outputs.cache-hit != 'true' }}
         name: Generate Externals

diff --git a/assets/litecoin_electrum_server_list.yml b/assets/litecoin_electrum_server_list.yml
@@ -1,2 +1,4 @@
 -
-  uri: ltc-electrum.cakewallet.com:50002
+  uri: ltc-electrum.cakewallet.com:50002
+  useSSL: true
+  isDefault: true
diff --git a/cw_bitcoin/lib/electrum_wallet.dart b/cw_bitcoin/lib/electrum_wallet.dart
@@ -97,26 +97,7 @@ abstract class ElectrumWalletBase
     this.walletInfo = walletInfo;
     transactionHistory = ElectrumTransactionHistory(walletInfo: walletInfo, password: password);
 
-    reaction((_) => syncStatus, (SyncStatus syncStatus) async {
-      if (syncStatus is! AttemptingSyncStatus && syncStatus is! SyncedTipSyncStatus) {
-        silentPaymentsScanningActive = syncStatus is SyncingSyncStatus;
-      }
-
-      if (syncStatus is NotConnectedSyncStatus) {
-        // Needs to re-subscribe to all scripthashes when reconnected
-        _scripthashesUpdateSubject = {};
-
-        // TODO: double check this and make sure it doesn't cause any un-necessary calls
-        // await this.electrumClient.connectToUri(node!.uri, useSSL: node!.useSSL);
-      }
-
-      // Message is shown on the UI for 3 seconds, revert to synced
-      if (syncStatus is SyncedTipSyncStatus) {
-        Timer(Duration(seconds: 3), () {
-          if (this.syncStatus is SyncedTipSyncStatus) this.syncStatus = SyncedSyncStatus();
-        });
-      }
-    });
+    reaction((_) => syncStatus, _syncStatusReaction);
   }
 
   static bitcoin.HDWallet getAccountHDWallet(
@@ -201,6 +182,8 @@ abstract class ElectrumWalletBase
   @observable
   bool silentPaymentsScanningActive = false;
 
+  bool _isTryingToConnect = false;
+
   @action
   Future<void> setSilentPaymentsScanning(bool active, bool usingElectrs) async {
     silentPaymentsScanningActive = active;
@@ -1830,6 +1813,38 @@ abstract class ElectrumWalletBase
       syncStatus = NotConnectedSyncStatus();
     }
   }
+
+  void _syncStatusReaction(SyncStatus syncStatus) async {
+    if (syncStatus is! AttemptingSyncStatus && syncStatus is! SyncedTipSyncStatus) {
+      silentPaymentsScanningActive = syncStatus is SyncingSyncStatus;
+    }
+
+    if (syncStatus is NotConnectedSyncStatus) {
+      // Needs to re-subscribe to all scripthashes when reconnected
+      _scripthashesUpdateSubject = {};
+
+      if (_isTryingToConnect) return;
+
+      _isTryingToConnect = true;
+
+      Future.delayed(Duration(seconds: 10), () {
+        if (this.syncStatus is! SyncedSyncStatus && this.syncStatus is! SyncedTipSyncStatus) {
+          this.electrumClient.connectToUri(
+                node!.uri,
+                useSSL: node!.useSSL ?? false,
+              );
+        }
+        _isTryingToConnect = false;
+      });
+    }
+
+    // Message is shown on the UI for 3 seconds, revert to synced
+    if (syncStatus is SyncedTipSyncStatus) {
+      Timer(Duration(seconds: 3), () {
+        if (this.syncStatus is SyncedTipSyncStatus) this.syncStatus = SyncedSyncStatus();
+      });
+    }
+  }
 }
 
 class ScanNode {

diff --git a/cw_bitcoin/pubspec.lock b/cw_bitcoin/pubspec.lock
@@ -866,10 +866,10 @@ packages:
     dependency: transitive
     description:
       name: unorm_dart
-      sha256: "5b35bff83fce4d76467641438f9e867dc9bcfdb8c1694854f230579d68cd8f4b"
+      sha256: "23d8bf65605401a6a32cff99435fed66ef3dab3ddcad3454059165df46496a3b"
       url: "https://pub.dev"
     source: hosted
-    version: "0.2.0"
+    version: "0.3.0"
   vector_math:
     dependency: transitive
     description:

diff --git a/cw_core/lib/node.dart b/cw_core/lib/node.dart
@@ -227,6 +227,9 @@ class Node extends HiveObject with Keyable {
     }
   }
 
+  // TODO: this will return true most of the time, even if the node has useSSL set to true while
+  // it doesn't support SSL or vice versa, because it will connect normally, but it will fail if
+  // you try to communicate with it
   Future<bool> requestElectrumServer() async {
     try {
       if (useSSL == true) {

diff --git a/cw_haven/pubspec.lock b/cw_haven/pubspec.lock
@@ -655,6 +655,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.3.1"
+  unorm_dart:
+    dependency: transitive
+    description:
+      name: unorm_dart
+      sha256: "23d8bf65605401a6a32cff99435fed66ef3dab3ddcad3454059165df46496a3b"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.3.0"
   vector_math:
     dependency: transitive
     description:

diff --git a/cw_monero/pubspec.lock b/cw_monero/pubspec.lock
@@ -543,10 +543,10 @@ packages:
     dependency: "direct main"
     description:
       name: polyseed
-      sha256: a340962242d7917b0f3e6bd02c4acc3f90eae8ff766f1244f793ae7a6414dd68
+      sha256: edf28042e7b0b28f97a0469aa98e6e4015937cef6b9340cd6ad2822139c95217
       url: "https://pub.dev"
     source: hosted
-    version: "0.0.4"
+    version: "0.0.5"
   pool:
     dependency: transitive
     description:
@@ -696,6 +696,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.3.1"
+  unorm_dart:
+    dependency: transitive
+    description:
+      name: unorm_dart
+      sha256: "23d8bf65605401a6a32cff99435fed66ef3dab3ddcad3454059165df46496a3b"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.3.0"
   vector_math:
     dependency: transitive
     description:

diff --git a/cw_nano/pubspec.lock b/cw_nano/pubspec.lock
@@ -805,6 +805,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.3.2"
+  unorm_dart:
+    dependency: transitive
+    description:
+      name: unorm_dart
+      sha256: "23d8bf65605401a6a32cff99435fed66ef3dab3ddcad3454059165df46496a3b"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.3.0"
   vector_math:
     dependency: transitive
     description:

diff --git a/cw_wownero/pubspec.lock b/cw_wownero/pubspec.lock
@@ -543,10 +543,10 @@ packages:
     dependency: "direct main"
     description:
       name: polyseed
-      sha256: a340962242d7917b0f3e6bd02c4acc3f90eae8ff766f1244f793ae7a6414dd68
+      sha256: edf28042e7b0b28f97a0469aa98e6e4015937cef6b9340cd6ad2822139c95217
       url: "https://pub.dev"
     source: hosted
-    version: "0.0.4"
+    version: "0.0.5"
   pool:
     dependency: transitive
     description:
@@ -696,6 +696,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.3.1"
+  unorm_dart:
+    dependency: transitive
+    description:
+      name: unorm_dart
+      sha256: "23d8bf65605401a6a32cff99435fed66ef3dab3ddcad3454059165df46496a3b"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.3.0"
   vector_math:
     dependency: transitive
     description:

diff --git a/cw_wownero/pubspec.yaml b/cw_wownero/pubspec.yaml
@@ -19,7 +19,7 @@ dependencies:
   flutter_mobx: ^2.0.6+1
   intl: ^0.18.0
   encrypt: ^5.0.1
-  polyseed: ^0.0.4
+  polyseed: ^0.0.5
   cw_core:
     path: ../cw_core
   monero:

diff --git a/lib/bitcoin/cw_bitcoin.dart b/lib/bitcoin/cw_bitcoin.dart
@@ -438,7 +438,7 @@ class CWBitcoin extends Bitcoin {
   @override
   int getMaxCustomFeeRate(Object wallet) {
     final bitcoinWallet = wallet as ElectrumWallet;
-    return (bitcoinWallet.feeRate(BitcoinTransactionPriority.fast) * 1.1).round();
+    return (bitcoinWallet.feeRate(BitcoinTransactionPriority.fast) * 10).round();
   }
 
   @override

diff --git a/lib/entities/default_settings_migration.dart b/lib/entities/default_settings_migration.dart
@@ -242,6 +242,7 @@ Future<void> defaultSettingsMigration(
           await fixBtcDerivationPaths(walletInfoSource);
           break;
         case 39:
+          _fixNodesUseSSLFlag(nodes);
           await changeDefaultNanoNode(nodes, sharedPreferences);
           break;
         default:
@@ -258,6 +259,17 @@ Future<void> defaultSettingsMigration(
   await sharedPreferences.setInt(PreferencesKey.currentDefaultSettingsMigrationVersion, version);
 }
 
+void _fixNodesUseSSLFlag(Box<Node> nodes) {
+  for (Node node in nodes.values) {
+    switch (node.uriRaw) {
+      case cakeWalletLitecoinElectrumUri:
+      case cakeWalletBitcoinElectrumUri:
+        node.useSSL = true;
+        break;
+    }
+  }
+}
+
 Future<void> updateNanoNodeList({required Box<Node> nodes}) async {
   final nodeList = await loadDefaultNanoNodes();
   var listOfNewEndpoints = <String>[