Browse Source

modified: mmgen/addr.py
modified: mmgen/bitcoin.py
modified: mmgen/config.py
modified: mmgen/utils.py

philemon 11 years ago
parent
commit
7d4c8bd040
4 changed files with 3 additions and 8 deletions
  1. 0 1
      mmgen/addr.py
  2. 1 1
      mmgen/bitcoin.py
  3. 1 1
      mmgen/config.py
  4. 1 5
      mmgen/utils.py

+ 0 - 1
mmgen/addr.py

@@ -180,7 +180,6 @@ def write_addr_data_to_file(seed, data, start, end, opts):
 	if 'outdir' in opts:
 	if 'outdir' in opts:
 		outfile = "%s/%s" % (opts['outdir'], outfile)
 		outfile = "%s/%s" % (opts['outdir'], outfile)
 
 
-#	print outfile; sys.exit(3)
 	write_to_file(outfile,data)
 	write_to_file(outfile,data)
 
 
 	dtype = "Address" if 'print_addresses_only' in opts else "Key"
 	dtype = "Address" if 'print_addresses_only' in opts else "Key"

+ 1 - 1
mmgen/bitcoin.py

@@ -98,7 +98,7 @@ def numtowif(numpriv):
 
 
 
 
 # The following are mmgen internal (non-bitcoin) b58 functions
 # The following are mmgen internal (non-bitcoin) b58 functions
-#
+
 # Drop-in replacements for b64encode() and b64decode():
 # Drop-in replacements for b64encode() and b64decode():
 # (well, not exactly: they yield numeric but not bytewise equivalence)
 # (well, not exactly: they yield numeric but not bytewise equivalence)
 
 

+ 1 - 1
mmgen/config.py

@@ -39,7 +39,7 @@ salt_len    = 16
 hash_preset = '3'
 hash_preset = '3'
 hash_presets = {
 hash_presets = {
 #   Scrypt params:
 #   Scrypt params:
-#   ID    N      p  r
+#   ID    N   p  r
 # N is a power of two
 # N is a power of two
 	'1': [12, 8, 1],
 	'1': [12, 8, 1],
 	'2': [13, 8, 4],
 	'2': [13, 8, 4],

+ 1 - 5
mmgen/utils.py

@@ -194,7 +194,6 @@ def confirm_or_exit(message, question):
 
 
 def set_if_unset_and_typeconvert(opts,item):
 def set_if_unset_and_typeconvert(opts,item):
 
 
-#		('usr_randlen',usr_randlen,'int'),
 	for opt,var,dtype in item:
 	for opt,var,dtype in item:
 		if   dtype == 'int': f,s = int,"an integer"
 		if   dtype == 'int': f,s = int,"an integer"
 		elif dtype == 'str': f,s = str,"a string"
 		elif dtype == 'str': f,s = str,"a string"
@@ -311,7 +310,7 @@ def _get_seed_from_brain_passphrase(words,opts):
 	seed_len,hash_preset = _get_from_brain_opt_params(opts)
 	seed_len,hash_preset = _get_from_brain_opt_params(opts)
 	if debug: print "Brainwallet l = %s, p = %s" % (seed_len,hash_preset)
 	if debug: print "Brainwallet l = %s, p = %s" % (seed_len,hash_preset)
 	msg_r("Hashing brainwallet data.  Please wait...")
 	msg_r("Hashing brainwallet data.  Please wait...")
-	# Use buflen arg to scrypt.hash() to get seed of desired length
+	# Use buflen arg of scrypt.hash() to get seed of desired length
 	seed = _scrypt_hash_passphrase(bp, "", hash_preset, buflen=seed_len/8)
 	seed = _scrypt_hash_passphrase(bp, "", hash_preset, buflen=seed_len/8)
 	msg("Done")
 	msg("Done")
 	return seed
 	return seed
@@ -557,9 +556,6 @@ def _check_chksum_6(chk,val,desc,infile):
 	 	msg("%s checksum passed: %s" % (desc.capitalize(),chk))
 	 	msg("%s checksum passed: %s" % (desc.capitalize(),chk))
 
 
 
 
-#def bin_pad(bindata,length):
-#	return unhexlify(hexlify(bindata).zfill(length*2))
-
 def get_data_from_wallet(infile,opts):
 def get_data_from_wallet(infile,opts):
 
 
 	msg("Getting {} wallet data from file: {}".format(proj_name,infile))
 	msg("Getting {} wallet data from file: {}".format(proj_name,infile))