From da480b1209c92b5a8445d75c47399aa51667956a Mon Sep 17 00:00:00 2001 From: SomberNight Date: Fri, 6 Oct 2017 01:44:42 +0200 Subject: [PATCH] fix: v13 to v14 wallet (with Imported_KeyStore) conversion --- lib/storage.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/storage.py b/lib/storage.py index d3250bf0..c4db454c 100644 --- a/lib/storage.py +++ b/lib/storage.py @@ -345,13 +345,13 @@ class WalletStorage(PrintError): self.put('addresses', addresses) elif self.get('wallet_type') == 'standard': if self.get('keystore').get('type')=='imported': - addresses = self.get('addresses').get('receiving') - pubkeys = self.get('pubkeys').get('receiving') + addresses = set(self.get('addresses').get('receiving')) + pubkeys = self.get('keystore').get('keypairs').keys() assert len(addresses) == len(pubkeys) d = {} - for i in range(len(addresses)): - addr = addresses[i] - pubkey = pubkeys[i] + for pubkey in pubkeys: + addr = bitcoin.pubkey_to_address('p2pkh', pubkey) + assert addr in addresses d[addr] = { 'pubkey':pubkey, 'type':'p2pkh'} self.put('addresses', d) self.put('pubkeys', None)