From 09856a52cb1f731f9b319f9783ae414f0d4095a3 Mon Sep 17 00:00:00 2001 From: The MMGen Project Date: Fri, 18 Oct 2024 10:32:05 +0000 Subject: [PATCH] proto.btc.tx: rel fee display cleanup --- mmgen/proto/btc/tx/base.py | 6 +++--- mmgen/proto/btc/tx/info.py | 2 +- mmgen/tx/new.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mmgen/proto/btc/tx/base.py b/mmgen/proto/btc/tx/base.py index 50aa6e75..283511f9 100755 --- a/mmgen/proto/btc/tx/base.py +++ b/mmgen/proto/btc/tx/base.py @@ -254,12 +254,12 @@ class Base(TxBase.Base): return int(ret * (self.cfg.vsize_adj or 1)) - # convert absolute CoinAmt fee to sat/byte using estimated size + # convert absolute CoinAmt fee to sat/byte for display using estimated size def fee_abs2rel(self, abs_fee, to_unit='satoshi'): - return int( + return str(int( abs_fee / getattr(self.proto.coin_amt, to_unit) / - self.estimate_size()) + self.estimate_size())) @property def deserialized(self): diff --git a/mmgen/proto/btc/tx/info.py b/mmgen/proto/btc/tx/info.py index 8f9206bb..ffd58215 100755 --- a/mmgen/proto/btc/tx/info.py +++ b/mmgen/proto/btc/tx/info.py @@ -31,7 +31,7 @@ class TxInfo(TxInfo): def format_rel_fee(self): tx = self.tx return ' ({} {}, {} of spend amount)'.format( - pink(str(tx.fee_abs2rel(tx.fee))), + pink(tx.fee_abs2rel(tx.fee)), tx.rel_fee_disp, pink('{:0.6f}%'.format( tx.fee / tx.send_amt * 100 )) ) diff --git a/mmgen/tx/new.py b/mmgen/tx/new.py index 26999e00..8f5c4ab0 100755 --- a/mmgen/tx/new.py +++ b/mmgen/tx/new.py @@ -137,7 +137,7 @@ class New(Base): c = ('', '≈')[self.fee_is_approximate], d = abs_fee.hl(), e = self.coin, - f = pink(str(self.fee_abs2rel(abs_fee))), + f = pink(self.fee_abs2rel(abs_fee)), g = self.rel_fee_disp) from ..ui import keypress_confirm if self.cfg.yes or keypress_confirm(self.cfg, prompt+'OK?', default_yes=True):