Skip to content
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

Jump to bottom

treat addr_type multisig_ as a descriptor containing one of our xpub #19

Merged
merged 1 commit into from
May 28, 2024
Merged

treat addr_type multisig_ as a descriptor containing one of our xpub #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
17 changes: 9 additions & 8 deletions validate_reserves.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,8 @@ def compile_proofs(proof_data):

# Lastly, addresses
for addr_info in addrs:
if addr_info["addr_type"] == "unspendable":
addr_type = addr_info["addr_type"]
if addr_type == "unspendable":
logging.warning(
"Address {} is marked as unspendable, skipping this value".format(
addr_info["addr"]
Expand All @@ -119,9 +120,9 @@ def compile_proofs(proof_data):
unspendable += int(addr_info["balance"])
continue

elif addr_info["addr_type"] in ("sh", "sh_wsh", "wsh"):
elif addr_type in ("sh", "sh_wsh", "wsh"):
# Each address should have n compressed or uncompressed keys in this set
if addr_info["addr_type"] in ("wsh", "sh_wsh"):
if addr_type in ("wsh", "sh_wsh"):
pubkeys = pubkeys_compressed
else:
pubkeys = pubkeys_uncompressed
Expand Down Expand Up @@ -165,16 +166,16 @@ def compile_proofs(proof_data):

# Lastly, construct the descriptor for querying
ordered_join = ",".join(ordered_pubkeys)
if addr_info["addr_type"] == "sh":
if addr_type == "sh":
descriptor = "sh(multi({},{}))".format(m_sigs, ordered_join)
elif addr_info["addr_type"] == "sh_wsh":
elif addr_type == "sh_wsh":
descriptor = "sh(wsh(multi({},{})))".format(m_sigs, ordered_join)
elif addr_info["addr_type"] == "wsh":
elif addr_type == "wsh":
descriptor = "wsh(multi({},{}))".format(m_sigs, ordered_join)
else:
raise Exception("Unexpected addr_type")

elif addr_info["addr_type"] in ("wpkh"):
elif addr_type == "wpkh" or addr_type.startswith("multisig_"):
# check xpub, then we present descriptor as script
for xp in xpubs:
if xp in addr_info["script"]:
Expand All @@ -187,7 +188,7 @@ def compile_proofs(proof_data):
)
)
else:
raise Exception("Unknown address type {}".format(addr_info["addr_type"]))
raise Exception("Unknown address type {}".format(addr_type))
addr_balance = int(addr_info["balance"])
claimed += addr_balance
descriptors.append((descriptor, addr_balance, addr_info["addr"]))
Expand Down
Loading