Skip to content

Commit

Permalink
Fix some internal dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
kristapsk committed Sep 13, 2023
1 parent a6b13c2 commit e184940
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
3 changes: 2 additions & 1 deletion jmbase/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
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)
5 changes: 2 additions & 3 deletions jmclient/jmclient/fidelity_bond.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
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):
Expand Down Expand Up @@ -114,9 +113,9 @@ def _verify_signature(message, signature, pubkey):

@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)
if len(decoded_data) != 252:
raise ValueError("invalid length")

unpacked_data = struct.unpack(cls.SER_STUCT_FMT, decoded_data)
try:
Expand Down
3 changes: 1 addition & 2 deletions jmdaemon/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@
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'],
Expand Down

0 comments on commit e184940

Please sign in to comment.