tMerge pull request #5584 from JeremyRand/lnaddr-bech32 - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit d766ded8d4c161e979b0e94785a01007d34141fa
DIR parent 2b52ee26e64b56b364e9dc3ed2150fceef925e08
HTML Author: ThomasV <thomasv@electrum.org>
Date: Sun, 25 Aug 2019 18:58:47 +0200
Merge pull request #5584 from JeremyRand/lnaddr-bech32
lnaddr: Pull in Bech32 and Base58 prefixes from constants
Diffstat:
M electrum/lnaddr.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
---
DIR diff --git a/electrum/lnaddr.py b/electrum/lnaddr.py
t@@ -78,7 +78,7 @@ def bitarray_to_u5(barr):
def encode_fallback(fallback, currency):
""" Encode all supported fallback addresses.
"""
- if currency == 'bc' or currency == 'tb':
+ if currency in [constants.BitcoinMainnet.SEGWIT_HRP, constants.BitcoinTestnet.SEGWIT_HRP]:
fbhrp, witness = bech32_decode(fallback, ignore_long_length=True)
if fbhrp:
if fbhrp != currency:
t@@ -101,7 +101,7 @@ def encode_fallback(fallback, currency):
raise NotImplementedError("Support for currency {} not implemented".format(currency))
def parse_fallback(fallback, currency):
- if currency == 'bc' or currency == 'tb':
+ if currency in [constants.BitcoinMainnet.SEGWIT_HRP, constants.BitcoinTestnet.SEGWIT_HRP]:
wver = fallback[0:5].uint
if wver == 17:
addr=hash160_to_b58_address(fallback[5:].tobytes(), base58_prefix_map[currency][0])
t@@ -118,8 +118,8 @@ def parse_fallback(fallback, currency):
# Map of classical and witness address prefixes
base58_prefix_map = {
- 'bc' : (0, 5),
- 'tb' : (111, 196)
+ constants.BitcoinMainnet.SEGWIT_HRP : (constants.BitcoinMainnet.ADDRTYPE_P2PKH, constants.BitcoinMainnet.ADDRTYPE_P2SH),
+ constants.BitcoinTestnet.SEGWIT_HRP : (constants.BitcoinTestnet.ADDRTYPE_P2PKH, constants.BitcoinTestnet.ADDRTYPE_P2SH)
}
def is_p2pkh(currency, prefix):