AaronFiore/electrum
1
0
Fork 0
Code Activity

updates for python3

Browse Source
This commit is contained in:
ThomasV
2017-03-15 12:13:20 +01:00
parent 65aeb0bd3c
commit ab15ff3a00
27 changed files with 50 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/transaction.py
View File

@@ -286,7 +286,7 @@ def match_decoded(decoded, to_match):
def parse_sig(x_sig):
return map(lambda x: None if x == NO_SIGNATURE else x, x_sig)
return [None if x == NO_SIGNATURE else x for x in x_sig]
def safe_parse_pubkey(x):
try:
@@ -488,7 +488,7 @@ def multisig_script(public_keys, m):
assert m <= n
op_m = format(opcodes.OP_1 + m - 1, 'x')
op_n = format(opcodes.OP_1 + n - 1, 'x')
keylist = [op_push(len(k)/2) + k for k in public_keys]
keylist = [op_push(len(k)//2) + k for k in public_keys]
return op_m + ''.join(keylist) + op_n + 'ae'