AaronFiore/electrum
1
0
Fork 0
Code Activity

make xpub/xprv version information user-visible

Browse Source
This commit is contained in:
ThomasV
2017-09-04 11:04:59 +02:00
parent bd16e20a4d
commit 63a1db1172
5 changed files with 49 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/keystore.py
View File

@@ -76,8 +76,6 @@ class KeyStore(PrintError):
return False
return bool(self.get_tx_derivations(tx))
def is_segwit(self):
return False
class Software_KeyStore(KeyStore):
@@ -335,8 +333,6 @@ class BIP32_KeyStore(Deterministic_KeyStore, Xpub):
pk = bip32_private_key(sequence, k, c)
return pk
def is_segwit(self):
return bool(deserialize_xpub(self.xpub)[0])
class Old_KeyStore(Deterministic_KeyStore):
@@ -699,8 +695,7 @@ def from_seed(seed, passphrase):
keystore.add_seed(seed)
keystore.passphrase = passphrase
bip32_seed = Mnemonic.mnemonic_to_seed(seed, passphrase)
xtype = 0 if t == 'standard' else 1
keystore.add_xprv_from_seed(bip32_seed, xtype, "m/")
keystore.add_xprv_from_seed(bip32_seed, t, "m/")
else:
raise BaseException(t)
return keystore