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

Revert "segwit: add purpose to derivation" 

This reverts commit f706fa07078fd01f24ded2dada7ad66eae8ff485.
This commit is contained in:
ThomasV 2017-09-06 12:47:16 +02:00
parent 7f9b473a98
commit 93e577e0cb
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/base_wizard.py
View File

@ -293,7 +293,7 @@ class BaseWizard(object):
self.derivation_dialog(f) self.derivation_dialog(f)
def create_keystore(self, seed, passphrase): def create_keystore(self, seed, passphrase):
k = keystore.from_seed(seed, passphrase, self.wallet_type=='multisig') k = keystore.from_seed(seed, passphrase)
self.on_keystore(k) self.on_keystore(k)
def on_bip44(self, seed, passphrase, derivation): def on_bip44(self, seed, passphrase, derivation):

6
lib/keystore.py
View File

@ -685,7 +685,7 @@ def bip44_derivation(account_id, segwit=False):
coin = 1 if bitcoin.TESTNET else 0 coin = 1 if bitcoin.TESTNET else 0
return "m/%d'/%d'/%d'" % (bip, coin, int(account_id)) return "m/%d'/%d'/%d'" % (bip, coin, int(account_id))
def from_seed(seed, passphrase, is_multisig): def from_seed(seed, passphrase):
t = seed_type(seed) t = seed_type(seed)
if t == 'old': if t == 'old':
keystore = Old_KeyStore({}) keystore = Old_KeyStore({})
@ -695,9 +695,7 @@ def from_seed(seed, passphrase, is_multisig):
keystore.add_seed(seed) keystore.add_seed(seed)
keystore.passphrase = passphrase keystore.passphrase = passphrase
bip32_seed = Mnemonic.mnemonic_to_seed(seed, passphrase) bip32_seed = Mnemonic.mnemonic_to_seed(seed, passphrase)
purpose = 1 if is_multisig else 0 keystore.add_xprv_from_seed(bip32_seed, t, "m/")
der = "m/" if t == 'standard' else ("m/%d'/"%purpose)
keystore.add_xprv_from_seed(bip32_seed, t, der)
else: else:
raise BaseException(t) raise BaseException(t)
return keystore return keystore