Browse Source

modified: mmgen/globalvars.py
modified: mmgen/tx.py

philemon 8 years ago
parent
commit
fd6923d90f
2 changed files with 5 additions and 1 deletions
  1. 1 1
      mmgen/globalvars.py
  2. 4 0
      mmgen/tx.py

+ 1 - 1
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 = (

+ 4 - 0
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'