BTCPrivate
/
electrum-bitcoinprivate
mirror of https://github.com/BTCPrivate/electrum-bitcoinprivate.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix get_private_key for old addresses

This commit is contained in:
ThomasV 2013-09-02 10:41:50 +02:00
parent b22c42c4f4
commit fe538cc310
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/account.py
View File

@ -95,7 +95,8 @@ class OldAccount(Account):
compressed = False compressed = False
return SecretToASecret( pk, compressed ) return SecretToASecret( pk, compressed )
def get_private_key(self, for_change, n, seed): def get_private_key(self, seed, sequence):
for_change, n = sequence
secexp = self.stretch_key(seed) secexp = self.stretch_key(seed)
return self.get_private_key_from_stretched_exponent(for_change, n, secexp) return self.get_private_key_from_stretched_exponent(for_change, n, secexp)

9
lib/wallet.py
View File

@ -463,6 +463,9 @@ class Wallet:
def get_keyID(self, account, sequence): def get_keyID(self, account, sequence):
if account == 0:
return 'old'
rs = self.rebase_sequence(account, sequence) rs = self.rebase_sequence(account, sequence)
dd = [] dd = []
for root, public_sequence in rs: for root, public_sequence in rs:
@ -489,6 +492,12 @@ class Wallet:
out.append( pw_decode( self.imported_keys[address], password ) ) out.append( pw_decode( self.imported_keys[address], password ) )
else: else:
account, sequence = self.get_address_index(address) account, sequence = self.get_address_index(address)
if account == 0:
seed = self.decode_seed(password)
pk = self.accounts[account].get_private_key(seed, sequence)
out.append(pk)
return out
# assert address == self.accounts[account].get_address(*sequence) # assert address == self.accounts[account].get_address(*sequence)
rs = self.rebase_sequence( account, sequence) rs = self.rebase_sequence( account, sequence)
for root, public_sequence in rs: for root, public_sequence in rs: