Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lightning-address.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! /usr/bin/env python3
#!/usr/bin/env python3
from binascii import hexlify, unhexlify
from lnaddr import lnencode, lndecode, LnAddr

Expand Down
10 changes: 5 additions & 5 deletions lnaddr.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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))
Expand All @@ -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(
Expand Down
7 changes: 4 additions & 3 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion test_lnpay.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down