AaronFiore/electrum
1
0
Fork 0
Code Activity

Revert "follow bip45 derivation with hardware multisig"

Browse Source 
This reverts commit c24d38cd97.
This commit is contained in:
ThomasV
2016-08-31 09:35:27 +02:00
parent c24d38cd97
commit dd39931833
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/keystore.py
View File

@@ -635,9 +635,8 @@ is_any_key = lambda x: is_old_mpk(x) or is_xprv(x) or is_xpub(x) or is_address_l
is_private_key = lambda x: is_xprv(x) or is_private_key_list(x)
is_bip32_key = lambda x: is_xprv(x) or is_xpub(x)
def bip44_derivation(account_id, multisig=False):
n = 45 if multisig else 44
return "m/%d'/0'/%d'"% (n, account_id)
def bip44_derivation(account_id):
return "m/44'/0'/%d'"% int(account_id)
def from_seed(seed, passphrase):
if is_old_seed(seed):