AaronFiore/electrum
1
0
Fork 0
Code Activity

parse pubkey in segwit_script

Browse Source
This commit is contained in:
ThomasV
2017-04-12 16:33:35 +02:00
parent 615a5b3f8e
commit 65bef5e228
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/transaction.py
View File

@@ -293,6 +293,12 @@ def parse_sig(x_sig):
return s return s
def safe_parse_pubkey(x):
try:
return xpubkey_to_pubkey(x)
except:
return x
def parse_scriptSig(d, bytes): def parse_scriptSig(d, bytes):
try: try:
@@ -363,12 +369,7 @@ def parse_scriptSig(d, bytes):
print_error("cannot find address in input script", bytes.encode('hex')) print_error("cannot find address in input script", bytes.encode('hex'))
return return
x_pubkeys = map(lambda x: x[1].encode('hex'), dec2[1:-2]) x_pubkeys = map(lambda x: x[1].encode('hex'), dec2[1:-2])
def safe_parse(x): pubkeys = [safe_parse_pubkey(x) for x in x_pubkeys]
try:
return xpubkey_to_pubkey(x)
except:
return x
pubkeys = [safe_parse(x) for x in x_pubkeys]
redeemScript = multisig_script(pubkeys, m) redeemScript = multisig_script(pubkeys, m)
# write result in d # write result in d
d['type'] = 'p2sh' d['type'] = 'p2sh'
@@ -486,6 +487,7 @@ def get_scriptPubKey(addr):
return script return script
def segwit_script(pubkey): def segwit_script(pubkey):
pubkey = safe_parse_pubkey(pubkey)
pkh = hash_160(pubkey.decode('hex')).encode('hex') pkh = hash_160(pubkey.decode('hex')).encode('hex')
return '00' + push_script(pkh) return '00' + push_script(pkh)