AaronFiore/electrum
1
0
Fork 0
Code Activity

fix #1907

Browse Source
This commit is contained in:
ThomasV
2016-08-21 21:09:00 +02:00
parent ca69b20327
commit c63a0f2198
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/keystore.py
View File

@@ -137,7 +137,8 @@ class Imported_KeyStore(Software_KeyStore):
for k, v in self.keypairs.items(): for k, v in self.keypairs.items():
b = pw_decode(v, old_password) b = pw_decode(v, old_password)
c = pw_encode(b, new_password) c = pw_encode(b, new_password)
self.keypairs[k] = b self.keypairs[k] = c
print self.keypairs
class Deterministic_KeyStore(Software_KeyStore): class Deterministic_KeyStore(Software_KeyStore):

16
lib/storage.py
View File

@@ -231,6 +231,8 @@ class WalletStorage(PrintError):
xpubs = self.get('master_public_keys') xpubs = self.get('master_public_keys')
xprvs = self.get('master_private_keys') xprvs = self.get('master_private_keys')
mpk = self.get('master_public_key') mpk = self.get('master_public_key')
keypairs = self.get('keypairs')
key_type = self.get('key_type')
if seed_version == OLD_SEED_VERSION or wallet_type == 'old': if seed_version == OLD_SEED_VERSION or wallet_type == 'old':
d = { d = {
'type': 'old', 'type': 'old',
@@ -240,9 +242,17 @@ class WalletStorage(PrintError):
self.put('wallet_type', 'standard') self.put('wallet_type', 'standard')
self.put('keystore', d) self.put('keystore', d)
elif key_type == 'imported':
d = {
'type': 'imported',
'keypairs': keypairs,
}
self.put('wallet_type', 'standard')
self.put('keystore', d)
elif wallet_type == 'standard': elif wallet_type == 'standard':
xpub = self.get('master_public_keys')["x/"] xpub = xpubs["x/"]
xprv = self.get('master_private_keys')["x/"] xprv = xprvs["x/"]
d = { d = {
'type': 'bip32', 'type': 'bip32',
'xpub': xpub, 'xpub': xpub,
@@ -278,6 +288,8 @@ class WalletStorage(PrintError):
self.put('master_public_keys', None) self.put('master_public_keys', None)
self.put('master_private_keys', None) self.put('master_private_keys', None)
self.put('seed', None) self.put('seed', None)
self.put('keypairs', None)
self.put('key_type', None)
def convert_imported(self, test): def convert_imported(self, test):