From 3f79be6dac3e7cc37373680ae43dd010ae4fcd82 Mon Sep 17 00:00:00 2001 From: The MMGen Project Date: Sat, 26 Nov 2022 18:55:54 +0000 Subject: [PATCH] option rename: --tx-fee-adj -> --fee-adjust This change breaks compatibility. Scripts may need to be adjusted. --- mmgen/data/mmgen.cfg | 2 +- mmgen/globalvars.py | 6 +++--- mmgen/help.py | 2 +- mmgen/main_txcreate.py | 2 +- mmgen/main_txdo.py | 2 +- mmgen/proto/btc/tx/new.py | 4 ++-- mmgen/proto/eth/tx/new.py | 4 ++-- mmgen/tx/new.py | 4 ++-- test/objtest_py_d/ot_btc_mainnet.py | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/mmgen/data/mmgen.cfg b/mmgen/data/mmgen.cfg index 9ef385c9..c224a41f 100644 --- a/mmgen/data/mmgen.cfg +++ b/mmgen/data/mmgen.cfg @@ -65,7 +65,7 @@ # Set the transaction fee adjustment factor. Auto-calculated fees are # multiplied by this value: -# tx_fee_adj 1.0 +# fee_adjust 1.0 # Set the maximum transaction file size: # max_tx_file_size 100000 diff --git a/mmgen/globalvars.py b/mmgen/globalvars.py index dd476e11..9aeb3eb0 100755 --- a/mmgen/globalvars.py +++ b/mmgen/globalvars.py @@ -67,7 +67,7 @@ class GlobalContext(Lockable): dfl_hash_preset = '3' usr_randchars = 30 - tx_fee_adj = 1.0 + fee_adjust = 1.0 fee_estimate_confs = 3 # Constant vars - some of these might be overridden in opts.py, but they don't change thereafter @@ -155,7 +155,7 @@ class GlobalContext(Lockable): 'minconf', 'quiet', 'fee_estimate_confs', - 'tx_fee_adj', + 'fee_adjust', 'use_internal_keccak_module', 'usr_randchars' ) @@ -199,6 +199,7 @@ class GlobalContext(Lockable): 'color', 'daemon_data_dir', 'debug', + 'fee_adjust', 'force_256_color', 'hash_preset', 'http_timeout', @@ -217,7 +218,6 @@ class GlobalContext(Lockable): 'rpc_user', 'subseeds', 'testnet', - 'tx_fee_adj', 'usr_randchars', 'bch_max_tx_fee', 'btc_max_tx_fee', diff --git a/mmgen/help.py b/mmgen/help.py index 61b5dcdd..422cb4b5 100755 --- a/mmgen/help.py +++ b/mmgen/help.py @@ -192,7 +192,7 @@ SPECIFICATION below), it will be calculated dynamically using network fee estimation for the default (or user-specified) number of confirmations. If network fee estimation fails, the user will be prompted for a fee. -Network-estimated fees will be multiplied by the value of --tx-fee-adj, if +Network-estimated fees will be multiplied by the value of --fee-adjust, if specified. To send the value of all inputs (minus TX fee) to a single output, specify diff --git a/mmgen/main_txcreate.py b/mmgen/main_txcreate.py index 5a5850b7..93f3e9a1 100755 --- a/mmgen/main_txcreate.py +++ b/mmgen/main_txcreate.py @@ -31,7 +31,7 @@ opts_data = { 'options': """ -h, --help Print this help message --, --longhelp Print help message for long options (common options) --a, --tx-fee-adj= f Adjust transaction fee by factor 'f' (see below) +-a, --fee-adjust= f Adjust transaction fee by factor 'f' (see below) -B, --no-blank Don't blank screen before displaying unspent outputs -c, --comment-file=f Source the transaction's comment from file 'f' -C, --fee-estimate-confs=c Desired number of confirmations for fee estimation diff --git a/mmgen/main_txdo.py b/mmgen/main_txdo.py index 513033a8..de7b243b 100755 --- a/mmgen/main_txdo.py +++ b/mmgen/main_txdo.py @@ -32,7 +32,7 @@ opts_data = { 'options': """ -h, --help Print this help message --, --longhelp Print help message for long options (common options) --a, --tx-fee-adj= f Adjust transaction fee by factor 'f' (see below) +-a, --fee-adjust= 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 -B, --no-blank Don't blank screen before displaying unspent outputs diff --git a/mmgen/proto/btc/tx/new.py b/mmgen/proto/btc/tx/new.py index 067568c8..282fc78c 100755 --- a/mmgen/proto/btc/tx/new.py +++ b/mmgen/proto/btc/tx/new.py @@ -54,13 +54,13 @@ class New(Base,TxBase.New): from decimal import Decimal tx_size = self.estimate_size() ret = self.proto.coin_amt( - fee_per_kb * Decimal(opt.tx_fee_adj) * tx_size / 1024, + fee_per_kb * Decimal(opt.fee_adjust) * tx_size / 1024, from_decimal = True ) if opt.verbose: msg(fmt(f""" {fe_type.upper()} fee for {opt.fee_estimate_confs} confirmations: {fee_per_kb} {self.coin}/kB TX size (estimated): {tx_size} bytes - Fee adjustment factor: {opt.tx_fee_adj:.2f} + Fee adjustment factor: {opt.fee_adjust:.2f} Absolute fee (fee_per_kb * adj_factor * tx_size / 1024): {ret} {self.coin} """).strip()) return ret diff --git a/mmgen/proto/eth/tx/new.py b/mmgen/proto/eth/tx/new.py index 5a82e902..e64ddd3e 100755 --- a/mmgen/proto/eth/tx/new.py +++ b/mmgen/proto/eth/tx/new.py @@ -116,9 +116,9 @@ class New(Base,TxBase.New): from_unit='wei' ) - # given fee estimate (gas price) in wei, return absolute fee, adjusting by opt.tx_fee_adj + # given fee estimate (gas price) in wei, return absolute fee, adjusting by opt.fee_adjust def fee_est2abs(self,rel_fee,fe_type=None): - ret = self.fee_gasPrice2abs(rel_fee) * opt.tx_fee_adj + ret = self.fee_gasPrice2abs(rel_fee) * opt.fee_adjust if opt.verbose: msg(f'Estimated fee: {ret} ETH') return ret diff --git a/mmgen/tx/new.py b/mmgen/tx/new.py index 93b40abb..97942023 100755 --- a/mmgen/tx/new.py +++ b/mmgen/tx/new.py @@ -117,8 +117,8 @@ class New(Base): if abs_fee: prompt = '{} TX fee{}: {}{} {} ({} {})\n'.format( desc, - (f' (after {opt.tx_fee_adj:.2f}X adjustment)' - if opt.tx_fee_adj != 1 and desc.startswith('Network-estimated') + (f' (after {opt.fee_adjust:.2f}X adjustment)' + if opt.fee_adjust != 1 and desc.startswith('Network-estimated') else ''), ('','≈')[self.fee_is_approximate], abs_fee.hl(), diff --git a/test/objtest_py_d/ot_btc_mainnet.py b/test/objtest_py_d/ot_btc_mainnet.py index 930bc32a..d3bb1633 100755 --- a/test/objtest_py_d/ot_btc_mainnet.py +++ b/test/objtest_py_d/ot_btc_mainnet.py @@ -85,7 +85,7 @@ tests = { {'num':Decimal('1.234'),'from_decimal':True,'ret':Decimal('1.234')}, {'num':Decimal('0.0'),'from_decimal':True,'ret':Decimal('0')}, # emulate network fee estimation: - # BTC/kB tx_fee_adj tx size + # BTC/kB fee_adjust tx size { 'num':Decimal('0.00053249') * Decimal('0.9') * 109 / 1024 , # ≈53 sat/byte 'from_decimal':True, 'ret':Decimal('0.00005101') },