tfix #3011 - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit b1cc81a6f640d43bfeabdca87b1e91ea83ebaad1
DIR parent 5480b7dff50eaac8a10af9fc7d17c8e0a6f410c9
HTML Author: ThomasV <thomasv@electrum.org>
Date: Mon, 9 Oct 2017 10:42:43 +0200
fix #3011
Diffstat:
M lib/keystore.py | 2 +-
M lib/transaction.py | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
---
DIR diff --git a/lib/keystore.py b/lib/keystore.py
t@@ -105,7 +105,7 @@ class Software_KeyStore(KeyStore):
# Add private keys
keypairs = self.get_tx_derivations(tx)
for k, v in keypairs.items():
- keypairs[k] = self.get_private_key(v, password)[0]
+ keypairs[k] = self.get_private_key(v, password)
# Sign
if keypairs:
tx.sign(keypairs)
DIR diff --git a/lib/transaction.py b/lib/transaction.py
t@@ -883,8 +883,7 @@ class Transaction:
break
if x_pubkey in keypairs.keys():
print_error("adding signature for", x_pubkey)
- sec = keypairs.get(x_pubkey)
- compressed = True
+ sec, compressed = keypairs.get(x_pubkey)
pubkey = public_key_from_private_key(sec, compressed)
# add signature
pre_hash = Hash(bfh(self.serialize_preimage(i)))