AaronFiore/electrum
1
0
Fork 0
Code Activity

fix issue #1061: normalize trezor passphrases. Add passphrases to restore from seed with trezor.

Browse Source
This commit is contained in:
ThomasV
2015-03-05 17:09:39 +01:00
parent c56fe45ad7
commit 15636282e4
2 changed files with 29 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/wallet.py
View File

@@ -1321,9 +1321,9 @@ class BIP32_Wallet(Deterministic_Wallet):
seed = self.get_seed(password)
self.add_cosigner_seed(seed, self.root_name, password)
def add_cosigner_seed(self, seed, name, password):
def add_cosigner_seed(self, seed, name, password, passphrase=''):
# we don't store the seed, only the master xpriv
xprv, xpub = bip32_root(self.mnemonic_to_seed(seed,''))
xprv, xpub = bip32_root(self.mnemonic_to_seed(seed, passphrase))
xprv, xpub = bip32_private_derivation(xprv, "m/", self.root_derivation)
self.add_master_public_key(name, xpub)
self.add_master_private_key(name, xprv, password)