From 99a354fed56adedd7c4cc51902e627c1b0d5fa54 Mon Sep 17 00:00:00 2001
From: MMGen <mmgen@tuta.io>
Date: Mon, 27 May 2019 09:30:59 +0000
Subject: [PATCH] re-enable network fee estimation support (fixes py3port
 regression)

---
 mmgen/globalvars.py |  3 ++-
 mmgen/tx.py         | 11 +++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/mmgen/globalvars.py b/mmgen/globalvars.py
index b43ea00c..a34f5d4c 100755
--- a/mmgen/globalvars.py
+++ b/mmgen/globalvars.py
@@ -21,6 +21,7 @@ globalvars.py:  Constants and configuration options for the MMGen suite
 """
 
 import sys,os
+from decimal import Decimal
 
 # Global vars are set to dfl values in class g.
 # They're overridden in this order:
@@ -60,7 +61,7 @@ class g(object):
 	hash_preset    = '3'
 	usr_randchars  = 30
 
-	tx_fee_adj   = 1.0
+	tx_fee_adj   = Decimal('1.0')
 	tx_confs     = 3
 	seed_len     = 256
 
diff --git a/mmgen/tx.py b/mmgen/tx.py
index 8db588c3..36696a33 100755
--- a/mmgen/tx.py
+++ b/mmgen/tx.py
@@ -560,10 +560,13 @@ Selected non-{pnm} inputs: {{}}""".strip().format(pnm=g.proj_name,pnl=g.proj_nam
 	# given network fee estimate in BTC/kB, return absolute fee using estimated tx size
 	def fee_est2abs(self,fee_per_kb,fe_type=None):
 		tx_size = self.estimate_size()
-		ret = g.proto.coin_amt(fee_per_kb) * opt.tx_fee_adj * tx_size // 1024
+		f = fee_per_kb * opt.tx_fee_adj * tx_size / 1024
+		ret = g.proto.coin_amt(f,from_decimal=True)
 		if opt.verbose:
 			msg('{} fee for {} confirmations: {} {}/kB'.format(fe_type.upper(),opt.tx_confs,fee_per_kb,g.coin))
-			msg('TX size (estimated): {}'.format(tx_size))
+			msg('TX size (estimated): {} bytes'.format(tx_size))
+			msg('Fee adjustment factor: {}'.format(opt.tx_fee_adj))
+			msg('Absolute fee (fee_per_kb * adj_factor * tx_size / 1024): {} {}'.format(ret,g.coin))
 		return ret
 
 	def convert_and_check_fee(self,tx_fee,desc='Missing description'):
@@ -611,10 +614,10 @@ Selected non-{pnm} inputs: {{}}""".strip().format(pnm=g.proj_name,pnl=g.proj_nam
 			if tx_fee:
 				abs_fee = self.convert_and_check_fee(tx_fee,desc)
 			if abs_fee:
-				m = ('',' (after {}x adjustment)'.format(opt.tx_fee_adj))[opt.tx_fee_adj != 1]
+				adj_disp = ' (after {}X adjustment)'.format(opt.tx_fee_adj)
 				p = '{} TX fee{}: {}{} {} ({} {})\n'.format(
 						desc,
-						m,
+						adj_disp if opt.tx_fee_adj != 1 and desc == 'Network-estimated' else '',
 						('','≈')[self.fee_is_approximate],
 						abs_fee.hl(),
 						g.coin,