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

trustedcoin: fix get_xkeys

Browse source
This commit is contained in:
ThomasV 2018-12-11 09:59:39 +01:00
parent 84519752c3
commit 040b5b3f88
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
electrum/plugins/trustedcoin/trustedcoin.py
View file

@ -516,8 +516,7 @@ class TrustedCoinPlugin(BasePlugin):
wizard.show_seed_dialog(run_next=f, seed_text=seed) wizard.show_seed_dialog(run_next=f, seed_text=seed)
@classmethod @classmethod
def get_xkeys(self, seed, passphrase, derivation): def get_xkeys(self, seed, t, passphrase, derivation):
t = seed_type(seed)
assert is_any_2fa_seed_type(t) assert is_any_2fa_seed_type(t)
xtype = 'standard' if t == '2fa' else 'p2wsh' xtype = 'standard' if t == '2fa' else 'p2wsh'
bip32_seed = Mnemonic.mnemonic_to_seed(seed, passphrase) bip32_seed = Mnemonic.mnemonic_to_seed(seed, passphrase)
@ -539,11 +538,11 @@ class TrustedCoinPlugin(BasePlugin):
# the probability of it being < 20 words is about 2^(-(256+12-19*11)) = 2^(-59) # the probability of it being < 20 words is about 2^(-(256+12-19*11)) = 2^(-59)
if passphrase != '': if passphrase != '':
raise Exception('old 2fa seed cannot have passphrase') raise Exception('old 2fa seed cannot have passphrase')
xprv1, xpub1 = self.get_xkeys(' '.join(words[0:12]), '', "m/") xprv1, xpub1 = self.get_xkeys(' '.join(words[0:12]), t, '', "m/")
xprv2, xpub2 = self.get_xkeys(' '.join(words[12:]), '', "m/") xprv2, xpub2 = self.get_xkeys(' '.join(words[12:]), t, '', "m/")
elif not t == '2fa' or n == 12: elif not t == '2fa' or n == 12:
xprv1, xpub1 = self.get_xkeys(seed, passphrase, "m/0'/") xprv1, xpub1 = self.get_xkeys(seed, t, passphrase, "m/0'/")
xprv2, xpub2 = self.get_xkeys(seed, passphrase, "m/1'/") xprv2, xpub2 = self.get_xkeys(seed, t, passphrase, "m/1'/")
else: else:
raise Exception('unrecognized seed length: {} words'.format(n)) raise Exception('unrecognized seed length: {} words'.format(n))
return xprv1, xpub1, xprv2, xpub2 return xprv1, xpub1, xprv2, xpub2