X-Git-Url: https://git.novaco.in/?p=electrum-server.git;a=blobdiff_plain;f=backends%2Fbitcoind%2Fdeserialize.py;h=93ad4d42479a0d6301fcb2013884f0acc807c610;hp=7e010d6033c26d8d3b11b527be526833a2eaa4f6;hb=cbcd7ba2e6a8cf6b64b032f974445f107aff8ad1;hpb=4d29c30f4782abb7b5eb663e17d82b3f51831d21 diff --git a/backends/bitcoind/deserialize.py b/backends/bitcoind/deserialize.py index 7e010d6..93ad4d4 100644 --- a/backends/bitcoind/deserialize.py +++ b/backends/bitcoind/deserialize.py @@ -391,7 +391,7 @@ def get_address_from_output_script(bytes): try: decoded = [ x for x in script_GetOp(bytes) ] except: - return "None" + return None # The Genesis Block, self-payments, and pay-by-IP-address payments look like: # 65 BYTES:... CHECKSIG @@ -403,7 +403,7 @@ def get_address_from_output_script(bytes): # DUP HASH160 20 BYTES:... EQUALVERIFY CHECKSIG match = [opcodes.OP_DUP, opcodes.OP_HASH160, opcodes.OP_0, opcodes.OP_EQUALVERIFY, opcodes.OP_CHECKSIG] if match_decoded(decoded, match): - return "None" + return None # Pay-by-Bitcoin-address TxOuts look like: # DUP HASH160 20 BYTES:... EQUALVERIFY CHECKSIG @@ -422,4 +422,4 @@ def get_address_from_output_script(bytes): addr = hash_160_to_bc_address(decoded[1][1],5) return addr - return "None" + return None