tfix #2961 - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 9f6e174b4ffd5bff6280b205b9168ac765c27c80
DIR parent 91ed74a95ff705265da5f64dadd3c59c71cdd2bb
HTML Author: ThomasV <thomasv@electrum.org>
Date: Wed, 4 Oct 2017 09:24:34 +0200
fix #2961
Diffstat:
M lib/bitcoin.py | 1 -
M lib/transaction.py | 3 ++-
2 files changed, 2 insertions(+), 2 deletions(-)
---
DIR diff --git a/lib/bitcoin.py b/lib/bitcoin.py
t@@ -333,7 +333,6 @@ def script_to_p2wsh(script):
return hash_to_segwit_addr(sha256(bfh(script)))
def p2wpkh_nested_script(pubkey):
- pubkey = safe_parse_pubkey(pubkey)
pkh = bh2u(hash_160(bfh(pubkey)))
return '00' + push_script(pkh)
DIR diff --git a/lib/transaction.py b/lib/transaction.py
t@@ -669,7 +669,8 @@ class Transaction:
elif _type in ['p2wpkh', 'p2wsh']:
return ''
elif _type == 'p2wpkh-p2sh':
- scriptSig = bitcoin.p2wpkh_nested_script(pubkeys[0])
+ pubkey = safe_parse_pubkey(pubkeys[0])
+ scriptSig = bitcoin.p2wpkh_nested_script(pubkey)
return push_script(scriptSig)
elif _type == 'p2wsh-p2sh':
witness_script = self.get_preimage_script(txin)