tMerge branch 'master' of github.com:spesmilo/electrum - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 91ed74a95ff705265da5f64dadd3c59c71cdd2bb
DIR parent 4273c607b7ef991aad28a80ec63dc9627fffc653
HTML Author: ThomasV <thomasv@electrum.org>
Date: Tue, 3 Oct 2017 14:16:55 +0200
Merge branch 'master' of github.com:spesmilo/electrum
Diffstat:
M lib/transaction.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
DIR diff --git a/lib/transaction.py b/lib/transaction.py
t@@ -363,7 +363,7 @@ def parse_redeemScript(s):
op_n = opcodes.OP_1 + n - 1
match_multisig = [ op_m ] + [opcodes.OP_PUSHDATA4]*n + [ op_n, opcodes.OP_CHECKMULTISIG ]
if not match_decoded(dec2, match_multisig):
- print_error("cannot find address in input script", bh2u(_bytes))
+ print_error("cannot find address in input script", bh2u(s))
return
x_pubkeys = [bh2u(x[1]) for x in dec2[1:-2]]
pubkeys = [safe_parse_pubkey(x) for x in x_pubkeys]