From 6a06b54ffea04d640e6c8e2fea77fcd9bce5bed4 Mon Sep 17 00:00:00 2001 From: philemon Date: Wed, 4 Oct 2017 11:05:33 +0300 Subject: [PATCH] Version 0.9.4 --- README.md | 3 +++ mmgen/globalvars.py | 1 - mmgen/main_txdo.py | 5 ----- mmgen/main_txsign.py | 5 ----- mmgen/tx.py | 4 ++-- 5 files changed, 5 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 0d9a440f..f885c32e 100644 --- a/README.md +++ b/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 diff --git a/mmgen/globalvars.py b/mmgen/globalvars.py index f3d8bc2a..ad4a9da1 100755 --- a/mmgen/globalvars.py +++ b/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 = ( diff --git a/mmgen/main_txdo.py b/mmgen/main_txdo.py index 23493418..1ea0a9a9 100755 --- a/mmgen/main_txdo.py +++ b/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() diff --git a/mmgen/main_txsign.py b/mmgen/main_txsign.py index 9547fea0..af5321b3 100755 --- a/mmgen/main_txsign.py +++ b/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) diff --git a/mmgen/tx.py b/mmgen/tx.py index 4e6115e9..6e293e0d 100755 --- a/mmgen/tx.py +++ b/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))