From fd6923d90f9b224ab7470474336a886dbc401c2c Mon Sep 17 00:00:00 2001 From: philemon Date: Sat, 20 May 2017 21:05:09 +0300 Subject: [PATCH] modified: mmgen/globalvars.py modified: mmgen/tx.py --- mmgen/globalvars.py | 2 +- mmgen/tx.py | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/mmgen/globalvars.py b/mmgen/globalvars.py index 19824125..6753a1c7 100755 --- a/mmgen/globalvars.py +++ b/mmgen/globalvars.py @@ -100,7 +100,7 @@ class g(object): ) required_opts = ( 'quiet','verbose','debug','outdir','echo_passphrase','passwd_file','stdout', - 'show_hash_presets','label','keep_passphrase','keep_hash_preset', + 'show_hash_presets','label','keep_passphrase','keep_hash_preset','yes', 'brain_params','b16','usr_randchars' ) incompatible_opts = ( diff --git a/mmgen/tx.py b/mmgen/tx.py index 051b675a..f454d152 100755 --- a/mmgen/tx.py +++ b/mmgen/tx.py @@ -320,6 +320,10 @@ class MMGenTX(MMGenObject): return ret def send(self,c,prompt_user=True): + + if self.get_fee() > g.max_tx_fee: + die(2,'Transaction fee ({}) greater than max_tx_fee ({})!'.format(self.get_fee(),g.max_tx_fee)) + if prompt_user: m1 = ("Once this transaction is sent, there's no taking it back!",'')[bool(opt.quiet)] m2 = 'broadcast this transaction to the network'