Browse Source

Version 0.9.4

philemon 7 years ago
parent
commit
6a06b54ffe
5 changed files with 5 additions and 13 deletions
  1. 3 0
      README.md
  2. 0 1
      mmgen/globalvars.py
  3. 0 5
      mmgen/main_txdo.py
  4. 0 5
      mmgen/main_txsign.py
  5. 2 2
      mmgen/tx.py

+ 3 - 0
README.md

@@ -107,6 +107,8 @@ future use in an address file, which addresses may safely be made public.
 
 > #### [Recovering your keys without the MMGen software][r]
 
+> #### [Bitcoin Cash (BCH) support][x]
+
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 [**Forum**][4] |
@@ -126,3 +128,4 @@ Donate: 15TLdmi5NYLdqmtCqczUs5pBPkJDXRs83w
 [8]: https://github.com/mmgen/MMGenLive
 [9]: https://cloud.githubusercontent.com/assets/6071028/20677261/6ccab1bc-b58a-11e6-8ab6-094f88befef2.jpg
 [r]: https://github.com/mmgen/mmgen/wiki/Recovering-Your-Keys-Without-the-MMGen-Software
+[x]: https://github.com/mmgen/mmgen/wiki/Getting-Started-with-MMGen#a_bch

+ 0 - 1
mmgen/globalvars.py

@@ -123,7 +123,6 @@ class g(object):
 		('label','keep_label'),
 		('tx_id','info'),
 		('tx_id','terse_info'),
-		('aug1hf','rbf'), # TODO: remove in 0.9.4
 		('batch','rescan') # still incompatible as of Core 0.15.0
 	)
 	cfg_file_opts = (

+ 0 - 5
mmgen/main_txdo.py

@@ -30,7 +30,6 @@ opts_data = lambda: {
 	'options': """
 -h, --help             Print this help message
 --, --longhelp         Print help message for long options (common options)
--A, --aug1hf           Sign transaction for the Aug. 1 2017 UAHF chain
 -a, --tx-fee-adj=    f Adjust transaction fee by factor 'f' (see below)
 -b, --brain-params=l,p Use seed length 'l' and hash preset 'p' for
                        brainwallet input
@@ -79,10 +78,6 @@ opts_data = lambda: {
 
 cmd_args = opts.init(opts_data)
 
-if opt.aug1hf: # TODO: remove in 0.9.4
-	msg(yellow('The --aug1hf option is deprecated. Please use --coin=bch instead'))
-	g.coin = 'BCH'
-
 seed_files = get_seed_files(opt,cmd_args)
 c = rpc_connection()
 do_license_msg()

+ 0 - 5
mmgen/main_txsign.py

@@ -30,7 +30,6 @@ opts_data = lambda: {
 	'options': """
 -h, --help            Print this help message
 --, --longhelp        Print help message for long options (common options)
--A, --aug1hf          Sign transaction for the Aug. 1 2017 UAHF chain
 -b, --brain-params=l,p Use seed length 'l' and hash preset 'p' for
                       brainwallet input
 -d, --outdir=      d  Specify an alternate directory 'd' for output
@@ -71,10 +70,6 @@ opts_data = lambda: {
 
 infiles = opts.init(opts_data,add_opts=['b16'])
 
-if opt.aug1hf: # TODO: remove in 0.9.4
-	msg(yellow('The --aug1hf option is deprecated. Please use --coin=bch instead'))
-	g.coin = 'BCH'
-
 if not infiles: opts.usage()
 for i in infiles: check_infile(i)
 

+ 2 - 2
mmgen/tx.py

@@ -465,7 +465,7 @@ class MMGenTX(MMGenObject):
 			errmsg = rpc_errmsg(ret)
 			if 'Invalid sighash param' in errmsg:
 				m  = 'This is not the BCH chain.'
-				m += "\nRe-run the script without the --aug1hf or --coin=bch option."
+				m += "\nRe-run the script without the --coin=bch option."
 			else:
 				m = errmsg
 			msg(yellow(m))
@@ -585,7 +585,7 @@ class MMGenTX(MMGenObject):
 				m += "\nRe-run the script with the --coin=bch option."
 			elif 'Illegal use of SIGHASH_FORKID' in errmsg:
 				m  = 'The Aug. 1 2017 UAHF is not yet active on this chain.'
-				m += "\nRe-run the script without the --aug1hf or --coin=bch option."
+				m += "\nRe-run the script without the --coin=bch option."
 			else:
 				m = errmsg
 			msg(yellow(m))