Merge branch 'master' of github.com:cryptoadvance/spectrum

Author: Kim Neunert

src/cryptoadvance/specterext/spectrum/bridge_rpc.py

@@ -11,9 +11,11 @@
 from cryptoadvance.specter.helpers import is_ip_private
 from cryptoadvance.specter.specter_error import SpecterError, handle_exception
 from cryptoadvance.specter.rpc import BitcoinRPC
+from cryptoadvance.specter.rpc import RpcError as SpecterRpcError
+from cryptoadvance.spectrum.spectrum import RPCError as SpectrumRpcError
 from cryptoadvance.specter.specter_error import BrokenCoreConnectionException
 
-from cryptoadvance.spectrum.spectrum import RPCError, Spectrum
+from cryptoadvance.spectrum.spectrum import Spectrum
 
 from flask import has_app_context
 
@@ -76,11 +78,27 @@ def multi(self, calls: list, **kwargs):
 
         # Spectrum uses a DB and access to it needs an app-context. In order to keep that implementation
         # detail within spectrum, we're establishing a context as needed.
-        if not has_app_context() and self._app is not None: 
-            with self._app.app_context():
-                return [self.spectrum.jsonrpc(item,wallet_name=self.wallet_name) for item in payload]
-        else:
-            return [self.spectrum.jsonrpc(item,wallet_name=self.wallet_name) for item in payload]
+        try:
+            if not has_app_context() and self._app is not None: 
+                with self._app.app_context():
+                    result = [self.spectrum.jsonrpc(item,wallet_name=self.wallet_name, catch_exceptions=False) for item in payload]
+            else:
+                result = [self.spectrum.jsonrpc(item,wallet_name=self.wallet_name, catch_exceptions=False) for item in payload]
+            return result            
+
+        except ValueError as ve:
+            mock_response = object()
+            mock_response.status_code = 500
+            mock_response.text =ve
+            raise SpecterRpcError(
+                f"Request error: {ve}", mock_response
+            )
+        except SpectrumRpcError as se:
+            mock_response = object()
+            mock_response.status_code = se.code
+            mock_response.text =se.message
+            raise SpecterRpcError(se.message, mock_response)
+             
 
     def __repr__(self) -> str:
         return f"<BridgeRPC {self.spectrum}>"

src/cryptoadvance/spectrum/elsock.py

@@ -6,7 +6,7 @@
 import time
 import threading
 import sys
-from .util import SpectrumException, handle_exception
+from .util import FlaskThread, SpectrumException, handle_exception
 
 # TODO: normal handling of ctrl+C interrupt
 
@@ -33,16 +33,16 @@ def __init__(self, host="127.0.0.1", port=50001, use_ssl=False, callback=None, t
         self._requests = []
         self._notifications = []
         logger.info("Starting ElectrumSocket Threads ...")
-        self._recv_thread = threading.Thread(target=self.recv_loop)
+        self._recv_thread = FlaskThread(target=self.recv_loop)
         self._recv_thread.daemon = True
         self._recv_thread.start()
-        self._write_thread = threading.Thread(target=self.write_loop)
+        self._write_thread = FlaskThread(target=self.write_loop)
         self._write_thread.daemon = True
         self._write_thread.start()
-        self._ping_thread = threading.Thread(target=self.ping_loop)
+        self._ping_thread = FlaskThread(target=self.ping_loop)
         self._ping_thread.daemon = True
         self._ping_thread.start()
-        self._notify_thread = threading.Thread(target=self.notify_loop)
+        self._notify_thread = FlaskThread(target=self.notify_loop)
         self._notify_thread.daemon = True
         self._notify_thread.start()
         logger.info("Finished starting ElectrumSocket Threads")

src/cryptoadvance/spectrum/spectrum.py

@@ -1,4 +1,3 @@
-from decimal import Decimal
 import json
 import logging
 import math
@@ -316,7 +315,7 @@ def get_wallet(self, wallet_name):
             raise RPCError(f"Requested wallet {wallet_name} does not exist or is not loaded", -18)
         return w
 
-    def jsonrpc(self, obj, wallet_name=None):
+    def jsonrpc(self, obj, wallet_name=None, catch_exceptions=True):
         method = obj.get("method")
         id = obj.get("id", 0)
         params = obj.get("params", [])
@@ -345,9 +344,13 @@ def jsonrpc(self, obj, wallet_name=None):
             else:
                 res = m(*args, **kwargs)
         except RPCError as e:
+            if not catch_exceptions:
+                raise e
             logger.error(f"FAIL method: {method} wallet: {wallet_name} args: {args} kwargs: {kwargs} exc {e}")
             return dict(result=None, error=e.to_dict(), id=id)
         except Exception as e:
+            if not catch_exceptions:
+                raise e
             logger.error(f"FAIL method: {method} wallet: {wallet_name} args: {args} kwargs: {kwargs} exc {e}")
             handle_exception(e)
             return dict(result=None, error={"code": -500, "message": str(e)}, id=id)

src/cryptoadvance/spectrum/util.py

@@ -25,17 +25,13 @@ def sat_to_btc(sat):
         If we do it, also have a look at:
         https://github.com/relativisticelectron/specter-desktop/pull/3
     '''
-    if not isinstance(sat, Decimal):
-        sat = Decimal(sat)
-    sat = sat or Decimal(0)  # if None is passed
-    return Decimal(round(sat * Decimal(1e-8), 8))
+    sat = sat or 0  # if None is passed
+    return round(sat * 1e-8, 8)
 
 
 def btc_to_sat(btc):
-    if not isinstance(btc, Decimal):
-        btc = Decimal(btc)
-    btc = btc or Decimal(0)  # if None is passed
-    return round(btc * Decimal(1e8))
+    btc = btc or 0  # if None is passed
+    return round(btc * 1e8)
 
 class SpectrumException(Exception):
     pass

tests/test_spectrum_rpc.py

@@ -15,6 +15,12 @@ def test_root(caplog,client):
     assert result.status_code == 200
     assert json.loads(result.data)["error"]["message"] == "Method not found (None)"
 
+def test_unknownmethod(caplog, client):
+    caplog.set_level(logging.INFO)
+    caplog.set_level(logging.DEBUG, logger="cryptoadvance.spectrum")
+    result = client.post("/", json={"method":"unknownmethod"})
+    assert result.status_code == 200
+
 def test_getmininginfo(caplog,client):
     caplog.set_level(logging.INFO)
     caplog.set_level(logging.DEBUG, logger="cryptoadvance.spectrum")