AaronFiore/electrum
1
0
Fork 0
Code Activity

logging: (trivial) use repr() of seed_type

Browse Source 
for more obvious empty string

related: https://github.com/spesmilo/electrum/issues/4326#issuecomment-1903747632
This commit is contained in:
SomberNight
2024-02-22 11:45:18 +00:00
parent 4be90eb15a
commit b4712397cc
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
electrum/plugins/trustedcoin/trustedcoin.py
View File

@@ -537,7 +537,7 @@ class TrustedCoinPlugin(BasePlugin):
def make_seed(self, seed_type): def make_seed(self, seed_type):
if not is_any_2fa_seed_type(seed_type): if not is_any_2fa_seed_type(seed_type):
raise Exception(f'unexpected seed type: {seed_type}') raise Exception(f'unexpected seed type: {seed_type!r}')
return Mnemonic('english').make_seed(seed_type=seed_type) return Mnemonic('english').make_seed(seed_type=seed_type)
@hook @hook
@@ -557,7 +557,7 @@ class TrustedCoinPlugin(BasePlugin):
def xkeys_from_seed(self, seed, passphrase): def xkeys_from_seed(self, seed, passphrase):
t = seed_type(seed) t = seed_type(seed)
if not is_any_2fa_seed_type(t): if not is_any_2fa_seed_type(t):
raise Exception(f'unexpected seed type: {t}') raise Exception(f'unexpected seed type: {t!r}')
words = seed.split() words = seed.split()
n = len(words) n = len(words)
if t == '2fa': if t == '2fa':
@@ -578,7 +578,7 @@ class TrustedCoinPlugin(BasePlugin):
xprv1, xpub1 = self.get_xkeys(seed, t, passphrase, "m/0'/") xprv1, xpub1 = self.get_xkeys(seed, t, passphrase, "m/0'/")
xprv2, xpub2 = self.get_xkeys(seed, t, passphrase, "m/1'/") xprv2, xpub2 = self.get_xkeys(seed, t, passphrase, "m/1'/")
else: else:
raise Exception(f'unexpected seed type: {t}') raise Exception(f'unexpected seed type: {t!r}')
return xprv1, xpub1, xprv2, xpub2 return xprv1, xpub1, xprv2, xpub2
@hook @hook

2
electrum/version.py
View File

@@ -19,4 +19,4 @@ def seed_prefix(seed_type):
return SEED_PREFIX_2FA return SEED_PREFIX_2FA
elif seed_type == '2fa_segwit': elif seed_type == '2fa_segwit':
return SEED_PREFIX_2FA_SW return SEED_PREFIX_2FA_SW
raise Exception(f"unknown seed_type: {seed_type}") raise Exception(f"unknown seed_type: {seed_type!r}")

2
electrum/wizard.py
View File

@@ -521,7 +521,7 @@ class NewWalletWizard(AbstractWizard):
elif wallet_type == 'multisig' and seed_type not in ['standard', 'segwit', 'bip39', 'slip39']: elif wallet_type == 'multisig' and seed_type not in ['standard', 'segwit', 'bip39', 'slip39']:
seed_valid = False seed_valid = False
self._logger.debug(f'seed verified: {seed_valid}, type={seed_type}, validation_message={validation_message}') self._logger.debug(f'seed verified: {seed_valid}, type={seed_type!r}, validation_message={validation_message}')
return seed_valid, seed_type, validation_message, can_passphrase return seed_valid, seed_type, validation_message, can_passphrase