Skip to content

Accept 35-character testnet P2SH BTC addresses #541

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
Plastic-time wants to merge 1 commit into
base: master
Choose a base branch
from
+13 −2
Open

Accept 35-character testnet P2SH BTC addresses #541

Show file tree
Hide file tree
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
9 changes: 7 additions & 2 deletions src/validators/crypto_addresses/btc_address.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,14 @@ def _decode_base58(addr: str):

def _validate_old_btc_address(addr: str):
"""Validate P2PKH and P2SH type address."""
if len(addr) not in range(25, 35):
# Testnet P2SH addresses (version byte 0xc4) are 35 characters long.
if len(addr) not in range(25, 36):
return False
decoded_bytes = _decode_base58(addr).to_bytes(25, "big")
decoded = _decode_base58(addr)
# Some 35-character strings decode to more than 25 bytes.
if decoded.bit_length() > 200:
return False
decoded_bytes = decoded.to_bytes(25, "big")
header, checksum = decoded_bytes[:-4], decoded_bytes[-4:]
return checksum == sha256(sha256(header).digest()).digest()[:4]

Expand Down
6 changes: 6 additions & 0 deletions tests/crypto_addresses/test_btc_address.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
"1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2",
# P2SH (Pay to script hash) type
"3J98t1WpEZ73CNmQviecrnyiWrnqRhWNLy",
# Testnet P2SH type (35 characters)
"2MzQwSSnBHWHqSAqtTVQ6v47XtaisrJa1Vc",
# Bech32/segwit type
"bc1qar0srrr7xfkvy5l643lydnw9re59gtzzwf5mdq",
"bc1qc7slrfxkknqcq2jevvvkdgvrt8080852dfjewde450xdlk4ugp7szw5tk9",
Expand All @@ -36,6 +38,10 @@ def test_returns_true_on_valid_btc_address(value: str):
"1BvBMsEYstWetqTFn5Au4m4GFg7xJaNVN2",
# incorrect checksum
"3J98t1WpEZ73CNmQviecrnyiWrnqRhWNLz",
# incorrect testnet P2SH checksum
"2MzQwSSnBHWHqSAqtTVQ6v47XtaisrJa1Vd",
# 35 characters that decode to more than 25 bytes
"zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz",
],
)
def test_returns_failed_validation_on_invalid_btc_address(value: str):
Expand Down