Merge JoinMarket-Org/joinmarket-clientserver#1549: Fix some internal dependencies (alternative approach)

47bc77fd6b Fix some internal dependencies (Kristaps Kaupe)

Pull request description:

  Alternative to #1543 (see [this comment](https://github.com/JoinMarket-Org/joinmarket-clientserver/issues/1541#issuecomment-1699409791)).

  * `txtorcon` is used by `jmbase` too, not only `jmdaemon`;
  * get rid of `jmdaemon` dependency in `jmclient`.

  Fixes #1540.

  Fixes #1541.

ACKs for top commit:
  AdamISZ:
    utACK 47bc77fd6b

Tree-SHA512: f0c60172d286d5b8baeb46288291d3a7ade1a7ed4d7945cd4f11a7ed04aa118a665dee0c6da0ee346b6a8c5270d2616ad3a31bb37dcbcf027b0d844566793bcc

jmbase/setup.py

@@ -10,6 +10,7 @@ setup(name='joinmarketbase',
       license='GPL',
       packages=['jmbase'],
       install_requires=['twisted==22.4.0', 'service-identity==21.1.0',
-                        'chromalog==1.0.5', 'pyaes==1.6.1'],
+                        'chromalog==1.0.5', 'pyaes==1.6.1',
+                        'txtorcon==22.0.0'],
       python_requires='>=3.7',
       zip_safe=False)

jmclient/jmclient/fidelity_bond.py

@@ -2,7 +2,6 @@ import struct
 import base64
 import json
 from jmbitcoin import ecdsa_sign, ecdsa_verify
-from jmdaemon import fidelity_bond_sanity_check
 import binascii
 
 def assert_is_utxo(utxo):
@@ -114,9 +113,12 @@ class FidelityBondProof:
 
     @classmethod
     def parse_and_verify_proof_msg(cls, maker_nick, taker_nick, data):
-        if not fidelity_bond_sanity_check.fidelity_bond_sanity_check(data):
-            raise ValueError("sanity check failed")
-        decoded_data = base64.b64decode(data)
+        try:
+            decoded_data = base64.b64decode(data, validate=True)
+        except binascii.Error:
+            raise ValueError("decode error")
+        if len(decoded_data) != 252:
+            raise ValueError("invalid length")
 
         unpacked_data = struct.unpack(cls.SER_STUCT_FMT, decoded_data)
         try:

jmdaemon/setup.py

@@ -9,8 +9,7 @@ setup(name='joinmarketdaemon',
       author_email='',
       license='GPL',
       packages=['jmdaemon'],
-      install_requires=['txtorcon==22.0.0',
-                        'cryptography==3.3.2; platform_machine != "aarch64" and platform_machine != "amd64" and platform_machine != "x86_64"',
+      install_requires=['cryptography==3.3.2; platform_machine != "aarch64" and platform_machine != "amd64" and platform_machine != "x86_64"',
                         'cryptography==41.0.2; platform_machine == "aarch64" or platform_machine == "amd64" or platform_machine == "x86_64"',
                         'pyopenssl==23.2.0', 'libnacl==1.8.0',
                         'joinmarketbase==0.9.11dev'],