Skip to content

Patch to handle cases where ALL_FLAGS, FLAGS_VERIFY, or no flags are defined #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MPins wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Patch to handle cases where ALL_FLAGS, FLAGS_VERIFY, or no flags are defined #19

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 12 additions & 2 deletions lnaddr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,16 @@ def __str__(self):
)

def lndecode(a, verbose=False):
# When calling secp256k1:
# Uses ALL_FLAGS if available.
# Falls back to FLAG_VERIFY if ALL_FLAGS is missing.
# Falls back to no flags (safe default) if neither constant exists.
flags = None
if hasattr(secp256k1, "ALL_FLAGS"):
flags = secp256k1.ALL_FLAGS
elif hasattr(secp256k1, "FLAG_VERIFY"):
flags = secp256k1.FLAG_VERIFY

hrp, data = bech32_decode(a)
if not hrp:
raise ValueError("Bad bech32 checksum")
Expand Down Expand Up @@ -345,7 +355,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(flags)
addr.pubkey.deserialize(trim_to_bytes(tagdata))
else:
addr.unknown_tags.append((tag, tagdata))
Expand All @@ -372,7 +382,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(flags)
addr.signature = addr.pubkey.ecdsa_recoverable_deserialize(
sigdecoded[0:64], sigdecoded[64])
addr.pubkey.public_key = addr.pubkey.ecdsa_recover(
Expand Down