AaronFiore/electrum
1
0
Fork 0
Code Activity

Merge pull request #5584 from JeremyRand/lnaddr-bech32

Browse Source 
lnaddr: Pull in Bech32 and Base58 prefixes from constants
This commit is contained in:
ThomasV
2019-08-25 18:58:47 +02:00
committed by GitHub
parent 2b52ee26e6 8be94a9919
commit d766ded8d4
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
electrum/lnaddr.py
View File

@@ -78,7 +78,7 @@ def bitarray_to_u5(barr):
def encode_fallback(fallback, currency): def encode_fallback(fallback, currency):
""" Encode all supported fallback addresses. """ 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) fbhrp, witness = bech32_decode(fallback, ignore_long_length=True)
if fbhrp: if fbhrp:
if fbhrp != currency: if fbhrp != currency:
@@ -101,7 +101,7 @@ def encode_fallback(fallback, currency):
raise NotImplementedError("Support for currency {} not implemented".format(currency)) raise NotImplementedError("Support for currency {} not implemented".format(currency))
def parse_fallback(fallback, 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 wver = fallback[0:5].uint
if wver == 17: if wver == 17:
addr=hash160_to_b58_address(fallback[5:].tobytes(), base58_prefix_map[currency][0]) addr=hash160_to_b58_address(fallback[5:].tobytes(), base58_prefix_map[currency][0])
@@ -118,8 +118,8 @@ def parse_fallback(fallback, currency):
# Map of classical and witness address prefixes # Map of classical and witness address prefixes
base58_prefix_map = { base58_prefix_map = {
'bc' : (0, 5), constants.BitcoinMainnet.SEGWIT_HRP : (constants.BitcoinMainnet.ADDRTYPE_P2PKH, constants.BitcoinMainnet.ADDRTYPE_P2SH),
'tb' : (111, 196) constants.BitcoinTestnet.SEGWIT_HRP : (constants.BitcoinTestnet.ADDRTYPE_P2PKH, constants.BitcoinTestnet.ADDRTYPE_P2SH)
} }
def is_p2pkh(currency, prefix): def is_p2pkh(currency, prefix):