Browse Source

Squashed commit of the following:

Remove --brain-params from addrgen,walletconv
philemon 8 years ago
parent
commit
b96d6528e7
3 changed files with 8 additions and 7 deletions
  1. 0 2
      mmgen/main_addrgen.py
  2. 0 2
      mmgen/main_wallet.py
  3. 8 3
      mmgen/seed.py

+ 0 - 2
mmgen/main_addrgen.py

@@ -48,8 +48,6 @@ opts_data = {
 	'options': """
 -h, --help            Print this help message.
 -A, --no-addresses    Print only secret keys, no addresses.
--b, --brain-params=l,p Use seed length 'l' and hash preset 'p' for brain-
-                      wallet input.
 -c, --print-checksum  Print address list checksum and exit.
 -d, --outdir=      d  Output files to directory 'd' instead of working dir.
 -e, --echo-passphrase Echo passphrase or mnemonic to screen upon entry.

+ 0 - 2
mmgen/main_wallet.py

@@ -63,8 +63,6 @@ opts_data = {
 	'usage': usage,
 	'options': """
 -h, --help            Print this help message.
--b, --brain-params=l,p Use seed length 'l' and hash preset 'p' for brain-
-                      wallet input.
 -d, --outdir=      d  Output files to directory 'd' instead of working dir.
 -e, --echo-passphrase Echo passphrases and other user input to screen.
 -i, --in-fmt=      f  {iaction} from wallet format 'f' (see FMT CODES below).

+ 8 - 3
mmgen/seed.py

@@ -708,12 +708,14 @@ class Brainwallet (SeedSourceEnc):
 
 	def _decrypt(self):
 		d = self.ssdata
+		# Don't set opt.seed_len! In txsign, BW seed len might differ from other seed srcs
 		if opt.brain_params:
 			seed_len,d.hash_preset = self.get_bw_params()
 		else:
-			m1 = 'Warning: using default seed length of %s'
-			m2 = 'If this is not what you want, use the --brain-params option'
-			qmsg((m1+'\n'+m2) % opt.seed_len)
+			if 'seed_len' not in opt.set_by_user:
+				m1 = 'Using default seed length of %s bits'
+				m2 = 'If this is not what you want, use the --seed-len option'
+				qmsg((m1+'\n'+m2) % yellow(str(opt.seed_len)))
 			self._get_hash_preset()
 			seed_len = opt.seed_len
 		qmsg_r('Hashing brainwallet data.  Please wait...')
@@ -969,6 +971,9 @@ harder to find, you're advised to choose a much larger file size than this.
 		k = ('output','input')[self.op=='pwchg_new']
 		fn,d.hincog_offset = self._get_hincog_params(k)
 
+		if opt.outdir and not os.path.dirname(fn):
+			fn = os.path.join(opt.outdir,fn)
+
 		check_offset = True
 		try:
 			os.stat(fn)