Merge branch 'staging' into monero_changes

lib/electrumx_rpc/rpc.dart

@@ -80,18 +80,32 @@ class JsonRPC {
   void _sendNextAvailableRequest() {
     _requestQueue.nextIncompleteReq.then((req) {
       if (req != null) {
-        // \r\n required by electrumx server
-        if (_socket != null) {
-          _socket!.write('${req.jsonRequest}\r\n');
+        if (!Prefs.instance.useTor) {
+          if (_socket == null) {
+            Logging.instance.log(
+              "JsonRPC _sendNextAvailableRequest attempted with"
+              " _socket=null on $host:$port",
+              level: LogLevel.Error,
+            );
           }
-        if (_socksSocket != null) {
-          _socksSocket!.write('${req.jsonRequest}\r\n');
+          // \r\n required by electrumx server
+          _socket!.write('${req.jsonRequest}\r\n');
+        } else {
+          if (_socksSocket == null) {
+            Logging.instance.log(
+              "JsonRPC _sendNextAvailableRequest attempted with"
+              " _socksSocket=null on $host:$port",
+              level: LogLevel.Error,
+            );
+          }
+          // \r\n required by electrumx server
+          _socksSocket?.write('${req.jsonRequest}\r\n');
         }
 
         // TODO different timeout length?
         req.initiateTimeout(
           onTimedOut: () {
-            _requestQueue.remove(req);
+            _onReqCompleted(req);
           },
         );
       }
@@ -109,7 +123,7 @@ class JsonRPC {
             "JsonRPC request: opening socket $host:$port",
             level: LogLevel.Info,
           );
-          await connect().timeout(requestTimeout, onTimeout: () {
+          await _connect().timeout(requestTimeout, onTimeout: () {
             throw Exception("Request timeout: $jsonRpcRequest");
           });
         }
@@ -119,7 +133,7 @@ class JsonRPC {
             "JsonRPC request: opening SOCKS socket to $host:$port",
             level: LogLevel.Info,
           );
-          await connect().timeout(requestTimeout, onTimeout: () {
+          await _connect().timeout(requestTimeout, onTimeout: () {
             throw Exception("Request timeout: $jsonRpcRequest");
           });
         }
@@ -156,8 +170,21 @@ class JsonRPC {
     return future;
   }
 
-  Future<void> disconnect({required String reason}) async {
+  /// DO NOT set [ignoreMutex] to true unless fully aware of the consequences
+  Future<void> disconnect({
+    required String reason,
+    bool ignoreMutex = false,
+  }) async {
+    if (ignoreMutex) {
+      await _disconnectHelper(reason: reason);
+    } else {
       await _requestMutex.protect(() async {
+        await _disconnectHelper(reason: reason);
+      });
+    }
+  }
+
+  Future<void> _disconnectHelper({required String reason}) async {
     await _subscription?.cancel();
     _subscription = null;
     _socket?.destroy();
@@ -169,10 +196,16 @@ class JsonRPC {
     await _requestQueue.completeRemainingWithError(
       "JsonRPC disconnect() called with reason: \"$reason\"",
     );
-    });
   }
 
-  Future<void> connect() async {
+  Future<void> _connect() async {
+    // ignore mutex is set to true here as _connect is already called within
+    // the mutex.protect block. Setting to false here leads to a deadlock
+    await disconnect(
+      reason: "New connection requested",
+      ignoreMutex: true,
+    );
+
     if (!Prefs.instance.useTor) {
       if (useSSL) {
         _socket = await SecureSocket.connect(
@@ -352,17 +385,20 @@ class _JsonRPCRequest {
   }
 
   void initiateTimeout({
-    VoidCallback? onTimedOut,
+    required VoidCallback onTimedOut,
   }) {
     Future<void>.delayed(requestTimeout).then((_) {
       if (!isComplete) {
-        try {
-          throw JsonRpcException("_JsonRPCRequest timed out: $jsonRequest");
-        } catch (e, s) {
-          completer.completeError(e, s);
-          onTimedOut?.call();
-        }
+        completer.complete(
+          JsonRPCResponse(
+            data: null,
+            exception: JsonRpcException(
+              "_JsonRPCRequest timed out: $jsonRequest",
+            ),
+          ),
+        );
       }
+      onTimedOut.call();
     });
   }
 
@@ -375,14 +411,3 @@ class JsonRPCResponse {
 
   JsonRPCResponse({this.data, this.exception});
 }
-
-bool isIpAddress(String host) {
-  try {
-    // if the string can be parsed into an InternetAddress, it's an IP.
-    InternetAddress(host);
-    return true;
-  } catch (e) {
-    // if parsing fails, it's not an IP.
-    return false;
-  }
-}

lib/wallets/wallet/wallet.dart

@@ -482,6 +482,11 @@ abstract class Wallet<T extends CryptoCurrency> {
         ),
       );
 
+      // add some small buffer before making calls.
+      // this can probably be removed in the future but was added as a
+      // debugging feature
+      await Future<void>.delayed(const Duration(milliseconds: 300));
+
       // TODO: [prio=low] handle this differently. Extra modification of this file for coin specific functionality should be avoided.
       final Set<String> codesToCheck = {};
       if (this is PaynymInterface) {

lib/wallets/wallet/wallet_mixin_interfaces/electrumx_interface.dart

@@ -1702,7 +1702,7 @@ mixin ElectrumXInterface<T extends Bip39HDCurrency> on Bip39HDWallet<T> {
     try {
       final features = await electrumXClient
           .getServerFeatures()
-          .timeout(const Duration(seconds: 4));
+          .timeout(const Duration(seconds: 5));
 
       Logging.instance.log("features: $features", level: LogLevel.Info);
 
@@ -1715,8 +1715,8 @@ mixin ElectrumXInterface<T extends Bip39HDCurrency> on Bip39HDWallet<T> {
     } catch (e, s) {
       // do nothing, still allow user into wallet
       Logging.instance.log(
-        "$runtimeType init() failed: $e\n$s",
-        level: LogLevel.Error,
+        "$runtimeType init() did not complete: $e\n$s",
+        level: LogLevel.Warning,
       );
     }
 

test/electrumx_test.mocks.dart

@@ -140,20 +140,18 @@ class MockJsonRPC extends _i1.Mock implements _i2.JsonRPC {
         )),
       ) as _i5.Future<_i2.JsonRPCResponse>);
   @override
-  _i5.Future<void> disconnect({required String? reason}) => (super.noSuchMethod(
+  _i5.Future<void> disconnect({
+    required String? reason,
+    bool? ignoreMutex = false,
+  }) =>
+      (super.noSuchMethod(
         Invocation.method(
           #disconnect,
           [],
-          {#reason: reason},
-        ),
-        returnValue: _i5.Future<void>.value(),
-        returnValueForMissingStub: _i5.Future<void>.value(),
-      ) as _i5.Future<void>);
-  @override
-  _i5.Future<void> connect() => (super.noSuchMethod(
-        Invocation.method(
-          #connect,
-          [],
+          {
+            #reason: reason,
+            #ignoreMutex: ignoreMutex,
+          },
         ),
         returnValue: _i5.Future<void>.value(),
         returnValueForMissingStub: _i5.Future<void>.value(),