tremove custom entropy option; nobody uses it - electrum - Electrum Bitcoin wallet (HTM) git clone https://git.parazyd.org/electrum (DIR) Log (DIR) Files (DIR) Refs (DIR) Submodules --- (DIR) commit e0c38b31b40b42138527e9fd3f4bad78e0b12802 (DIR) parent 19cee0e6c0cffcb685b84151dcdd675ea3c56c5e (HTM) Author: ThomasV <thomasv@electrum.org> Date: Sat, 1 Oct 2016 20:38:05 +0200 remove custom entropy option; nobody uses it Diffstat: M lib/commands.py | 12 ++---------- M lib/mnemonic.py | 14 +++----------- 2 files changed, 5 insertions(+), 21 deletions(-) --- (DIR) diff --git a/lib/commands.py b/lib/commands.py t@@ -150,18 +150,12 @@ class Commands: return True @command('') - def make_seed(self, nbits=128, entropy=1, language=None): + def make_seed(self, nbits=128, language=None): """Create a seed""" from mnemonic import Mnemonic - s = Mnemonic(language).make_seed(nbits, custom_entropy=entropy) + s = Mnemonic(language).make_seed(nbits) return s.encode('utf8') - @command('') - def check_seed(self, seed, entropy=1, language=None): - """Check that a seed was generated with given entropy""" - from mnemonic import Mnemonic - return Mnemonic(language).check_seed(seed, entropy) - @command('n') def getaddresshistory(self, address): """Return the transaction history of any address. Note: This is a t@@ -671,7 +665,6 @@ command_options = { 'from_addr': ("-F", "--from", "Source address. If it isn't in the wallet, it will ask for the private key unless supplied in the format public_key:private_key. It's not saved in the wallet."), 'change_addr': ("-c", "--change", "Change address. Default is a spare address, or the source address if it's not in the wallet"), 'nbits': (None, "--nbits", "Number of bits of entropy"), - 'entropy': (None, "--entropy", "Custom entropy"), 'language': ("-L", "--lang", "Default language for wordlist"), 'gap_limit': ("-G", "--gap", "Gap limit"), 'privkey': (None, "--privkey", "Private key. Set to '?' to get a prompt."), t@@ -694,7 +687,6 @@ json_loads = lambda x: json.loads(x, parse_float=lambda x: str(Decimal(x))) arg_types = { 'num': int, 'nbits': int, - 'entropy': long, 'tx': tx_from_str, 'pubkeys': json_loads, 'jsontx': json_loads, (DIR) diff --git a/lib/mnemonic.py b/lib/mnemonic.py t@@ -154,24 +154,16 @@ class Mnemonic(object): i = i*n + k return i - def check_seed(self, seed, custom_entropy): - assert is_new_seed(seed) - i = self.mnemonic_decode(seed) - return i % custom_entropy == 0 - - def make_seed(self, num_bits=128, prefix=version.SEED_PREFIX, custom_entropy=1): + def make_seed(self, num_bits=128, prefix=version.SEED_PREFIX): # increase num_bits in order to obtain a uniform distibution for the last word bpw = math.log(len(self.wordlist), 2) - num_bits = int(math.ceil(num_bits/bpw)) * bpw - # handle custom entropy; make sure we add at least 16 bits - n_custom = int(math.ceil(math.log(custom_entropy, 2))) - n = max(16, num_bits - n_custom) + n = int(math.ceil(num_bits/bpw)) * bpw print_error("make_seed", prefix, "adding %d bits"%n) my_entropy = ecdsa.util.randrange(pow(2, n)) nonce = 0 while True: nonce += 1 - i = custom_entropy * (my_entropy + nonce) + i = my_entropy + nonce seed = self.mnemonic_encode(i) assert i == self.mnemonic_decode(seed) if is_old_seed(seed):