From 23f36ea080b747463030d928adcc787c84918a08 Mon Sep 17 00:00:00 2001 From: ThomasV Date: Sat, 16 Sep 2017 11:00:20 +0200 Subject: [PATCH] follow up previous commit --- lib/bitcoin.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/bitcoin.py b/lib/bitcoin.py index b1dcf6da..fd7f92b9 100644 --- a/lib/bitcoin.py +++ b/lib/bitcoin.py @@ -335,8 +335,8 @@ def script_to_p2wsh(script): def address_to_script(addr): - if is_segwit_address(addr): - witver, witprog = segwit_addr.decode(SEGWIT_HRP, addr) + witver, witprog = segwit_addr.decode(SEGWIT_HRP, addr) + if witprog is not None: assert (0 <= witver <= 16) OP_n = witver + 0x50 if witver > 0 else 0 script = bytes([OP_n]).hex() @@ -506,7 +506,7 @@ def address_from_private_key(sec): def is_segwit_address(addr): witver, witprog = segwit_addr.decode(SEGWIT_HRP, addr) - return witver == 0 + return witprog is not None and witver == 0 def is_b58_address(addr): try: