diff --git a/lightning-address.py b/lightning-address.py index 8c0d7fa..cfee0a6 100755 --- a/lightning-address.py +++ b/lightning-address.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python3 +#!/usr/bin/env python3 from binascii import hexlify, unhexlify from lnaddr import lnencode, lndecode, LnAddr diff --git a/lnaddr.py b/lnaddr.py index 2d88a87..d94b04f 100755 --- a/lnaddr.py +++ b/lnaddr.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python3 +#!/usr/bin/env python3 from bech32 import bech32_encode, bech32_decode, CHARSET from binascii import hexlify, unhexlify from bitstring import BitArray @@ -104,10 +104,10 @@ def parse_fallback(fallback, currency): wver = fallback[0:5].uint if wver == 17: addr=base58.b58encode_check(bytes([base58_prefix_map[currency][0]]) - + fallback[5:].tobytes()) + + fallback[5:].tobytes()).decode('ascii') elif wver == 18: addr=base58.b58encode_check(bytes([base58_prefix_map[currency][1]]) - + fallback[5:].tobytes()) + + fallback[5:].tobytes()).decode('ascii') elif wver <= 16: addr=bech32_encode(currency, bitarray_to_u5(fallback)) else: @@ -345,7 +345,7 @@ def lndecode(a, verbose=False): if data_length != 53: addr.unknown_tags.append((tag, tagdata)) continue - addr.pubkey = secp256k1.PublicKey(flags=secp256k1.ALL_FLAGS) + addr.pubkey = secp256k1.PublicKey() addr.pubkey.deserialize(trim_to_bytes(tagdata)) else: addr.unknown_tags.append((tag, tagdata)) @@ -372,7 +372,7 @@ def lndecode(a, verbose=False): if not addr.pubkey.ecdsa_verify(bytearray([ord(c) for c in hrp]) + data.tobytes(), addr.signature): raise ValueError('Invalid signature') else: # Recover pubkey from signature. - addr.pubkey = secp256k1.PublicKey(flags=secp256k1.ALL_FLAGS) + addr.pubkey = secp256k1.PublicKey() addr.signature = addr.pubkey.ecdsa_recoverable_deserialize( sigdecoded[0:64], sigdecoded[64]) addr.pubkey.public_key = addr.pubkey.ecdsa_recover( diff --git a/requirements.txt b/requirements.txt index 567af8a..9711b25 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,4 @@ -base58==0.2.5 -secp256k1==0.13.2 -bitstring==3.1.5 +base58==2.1.1 +secp256k1==0.14.0 +--no-binary=secp256k1 +bitstring==3.1.9 diff --git a/test_lnpay.py b/test_lnpay.py index 985a1c9..b73e705 100755 --- a/test_lnpay.py +++ b/test_lnpay.py @@ -1,4 +1,4 @@ -#! /usr/bin/python3 +#!/usr/bin/env python3 from hashlib import sha256 from lnaddr import shorten_amount, unshorten_amount, LnAddr, lnencode, lndecode, u5_to_bitarray, bitarray_to_u5