tMerge pull request #3024 from SomberNight/fix_convert_v14_redeem - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 6a876775c442b261442b0b6ba2b76383d642824c
DIR parent 2b6c848ed9a157ff58659c048cd2161e914bf535
HTML Author: ThomasV <thomasv@electrum.org>
Date: Fri, 13 Oct 2017 04:37:39 +0200
Merge pull request #3024 from SomberNight/fix_convert_v14_redeem
fix: storage.convert_version_14() is missing redeem_scripts
Diffstat:
M lib/storage.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
---
DIR diff --git a/lib/storage.py b/lib/storage.py
t@@ -352,7 +352,11 @@ class WalletStorage(PrintError):
for pubkey in pubkeys:
addr = bitcoin.pubkey_to_address('p2pkh', pubkey)
assert addr in addresses
- d[addr] = { 'pubkey':pubkey, 'type':'p2pkh'}
+ d[addr] = {
+ 'pubkey': pubkey,
+ 'redeem_script': None,
+ 'type': 'p2pkh'
+ }
self.put('addresses', d)
self.put('pubkeys', None)
self.put('wallet_type', 'imported')