Skip to content

chore: improve key parsing logic and fix premature termination issues #2008

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

chore: improve key parsing logic and fix premature termination issues #2008

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
27 changes: 19 additions & 8 deletions bip-0388/wallet_policies.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ def find_key_end_position(desc: str, start_pos: int) -> int:
else:
key_pos_start = start_pos

# find the earliest occurrence of ",", a ")" or a "/" (it must find at least 1)
end_pos = find_first(desc, key_pos_start, [",", ")", "/"])
# find the earliest occurrence of ",", a ")" (it must find at least 1)
end_pos = find_first(desc, key_pos_start, [",", ")"])
if end_pos == -1:
raise Exception(
"Invalid descriptor: cannot find the end of key expression")
Expand Down Expand Up @@ -95,13 +95,24 @@ def parse_key_expressions(only_first=False, handle_musig=False):

while True:
if handle_musig and descriptor[key_with_orig_pos_start:].startswith("musig"):
closing_parenthesis_pos = find_first(
descriptor, key_with_orig_pos_start, [")"])
# find matching closing parenthesis for musig(...)
open_pos = key_with_orig_pos_start + len("musig")
if open_pos >= len(descriptor) or descriptor[open_pos] != '(':
raise Exception("Invalid descriptor: musig not followed by '('")
depth = 0
closing_parenthesis_pos = -1
for i, ch in enumerate(descriptor[open_pos:], open_pos):
if ch == '(':
depth += 1
elif ch == ')':
depth -= 1
if depth == 0:
closing_parenthesis_pos = i
break
if closing_parenthesis_pos == -1:
raise Exception(
"Invalid descriptor: musig without closing parenthesis")
key_with_orig_pos_start = key_with_orig_pos_start + \
len("musig(")
key_with_orig_pos_start = key_with_orig_pos_start + len("musig(")
parse_key_expressions(
only_first=False, handle_musig=False)

Expand All @@ -112,15 +123,15 @@ def parse_key_expressions(only_first=False, handle_musig=False):
key_expressions.append(
(key_with_orig_pos_start, key_pos_end))

if descriptor[key_pos_end] == '/':
if key_pos_end < len(descriptor) and descriptor[key_pos_end] == '/':
# find the actual end (comma or closing parenthesis)
key_pos_end = find_first(
descriptor, key_pos_end, [",", ")"])
if key_pos_end == -1:
raise Exception(
"Invalid descriptor: unterminated key expression")

if descriptor[key_pos_end] == ',':
if key_pos_end < len(descriptor) and descriptor[key_pos_end] == ',':
# There is another key expression, repeat from after the comma
key_with_orig_pos_start = key_pos_end + 1
else:
Expand Down