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

Partially revert prior

This commit is contained in:
Neil Booth 2015-12-26 12:23:35 +09:00
parent c298860e11
commit 96c7f9e7cb
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/keepkey/keepkey.py
View File

@ -93,9 +93,15 @@ class KeepKeyWallet(BIP32_HD_Wallet):
return pbkdf2.PBKDF2(mnemonic, 'mnemonic' + passphrase, iterations = PBKDF2_ROUNDS, macmodule = hmac, digestmodule = hashlib.sha512).read(64) return pbkdf2.PBKDF2(mnemonic, 'mnemonic' + passphrase, iterations = PBKDF2_ROUNDS, macmodule = hmac, digestmodule = hashlib.sha512).read(64)
def derive_xkeys(self, root, derivation, password): def derive_xkeys(self, root, derivation, password):
derivation = derivation.replace(self.root_name,"44'/0'/") x = self.master_private_keys.get(root)
xpub = self.get_public_key(derivation) if x:
return xpub, None root_xprv = pw_decode(x, password)
xprv, xpub = bip32_private_derivation(root_xprv, root, derivation)
return xpub, xprv
else:
derivation = derivation.replace(self.root_name,"44'/0'/")
xpub = self.get_public_key(derivation)
return xpub, None
def get_public_key(self, bip32_path): def get_public_key(self, bip32_path):
address_n = self.plugin.get_client().expand_path(bip32_path) address_n = self.plugin.get_client().expand_path(bip32_path)

12
plugins/trezor/trezor.py
View File

@ -92,9 +92,15 @@ class TrezorWallet(BIP32_HD_Wallet):
return pbkdf2.PBKDF2(mnemonic, 'mnemonic' + passphrase, iterations = PBKDF2_ROUNDS, macmodule = hmac, digestmodule = hashlib.sha512).read(64) return pbkdf2.PBKDF2(mnemonic, 'mnemonic' + passphrase, iterations = PBKDF2_ROUNDS, macmodule = hmac, digestmodule = hashlib.sha512).read(64)
def derive_xkeys(self, root, derivation, password): def derive_xkeys(self, root, derivation, password):
derivation = derivation.replace(self.root_name,"44'/0'/") x = self.master_private_keys.get(root)
xpub = self.get_public_key(derivation) if x:
return xpub, None root_xprv = pw_decode(x, password)
xprv, xpub = bip32_private_derivation(root_xprv, root, derivation)
return xpub, xprv
else:
derivation = derivation.replace(self.root_name,"44'/0'/")
xpub = self.get_public_key(derivation)
return xpub, None
def get_public_key(self, bip32_path): def get_public_key(self, bip32_path):
address_n = self.plugin.get_client().expand_path(bip32_path) address_n = self.plugin.get_client().expand_path(bip32_path)