LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-08-23 17:47:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix xtype of ypub keys in plugins and bip39 seeds

Browse source
This commit is contained in:
ThomasV 2017-10-26 17:24:50 +02:00
parent 0af700bda0
commit a10e6b6436
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/keystore.py
View file

@ -576,7 +576,7 @@ def bip39_is_checksum_valid(mnemonic):
def from_bip39_seed(seed, passphrase, derivation): def from_bip39_seed(seed, passphrase, derivation):
k = BIP32_KeyStore({}) k = BIP32_KeyStore({})
bip32_seed = bip39_to_seed(seed, passphrase) bip32_seed = bip39_to_seed(seed, passphrase)
t = 'segwit_p2sh' if derivation.startswith("m/49'") else 'standard' # bip43 t = 'p2wpkh-p2sh' if derivation.startswith("m/49'") else 'standard' # bip43
k.add_xprv_from_seed(bip32_seed, t, derivation) k.add_xprv_from_seed(bip32_seed, t, derivation)
return k return k

2
plugins/ledger/ledger.py
View file

@ -65,7 +65,7 @@ class Ledger_Client():
elif bip32_path.startswith("m/49'/"): elif bip32_path.startswith("m/49'/"):
if not self.supports_segwit(): if not self.supports_segwit():
raise Exception("Firmware version too old for Segwit support. Please update at https://www.ledgerwallet.com") raise Exception("Firmware version too old for Segwit support. Please update at https://www.ledgerwallet.com")
xtype = 'segwit_p2sh' xtype = 'p2wpkh-p2sh'
else: else:
xtype = 'standard' xtype = 'standard'
splitPath = bip32_path.split('/') splitPath = bip32_path.split('/')

2
plugins/trezor/clientbase.py
View file

@ -151,7 +151,7 @@ class TrezorClientBase(GuiMixin, PrintError):
address_n = self.expand_path(bip32_path) address_n = self.expand_path(bip32_path)
creating = False #self.next_account_number() == 0 creating = False #self.next_account_number() == 0
node = self.get_public_node(address_n, creating).node node = self.get_public_node(address_n, creating).node
xtype = 'segwit_p2sh' if bip32_path.startswith("m/49'/") else 'standard' xtype = 'p2wpkh-p2sh' if bip32_path.startswith("m/49'/") else 'standard'
return serialize_xpub(xtype, node.chain_code, node.public_key, node.depth, self.i4b(node.fingerprint), self.i4b(node.child_num)) return serialize_xpub(xtype, node.chain_code, node.public_key, node.depth, self.i4b(node.fingerprint), self.i4b(node.child_num))
#def address_from_derivation(self, derivation): #def address_from_derivation(self, derivation):