From dff3d485374bb3614b1a1eb60a109fa98667b5f2 Mon Sep 17 00:00:00 2001 From: The MMGen Project Date: Thu, 24 Jun 2021 17:15:24 +0000 Subject: [PATCH] EthereumMMGenTX: add change display to TX view summary --- mmgen/altcoins/eth/tx.py | 9 +++++++++ mmgen/tx.py | 6 +++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/mmgen/altcoins/eth/tx.py b/mmgen/altcoins/eth/tx.py index ff323e5b..96c76ae8 100755 --- a/mmgen/altcoins/eth/tx.py +++ b/mmgen/altcoins/eth/tx.py @@ -221,6 +221,7 @@ class EthereumMMGenTX: txview_ftr_fs = fmt(""" Total in account: {i} {d} Total to spend: {o} {d} + Remaining balance: {C} {d} TX fee: {a} {c}{r} """) fmt_keys = ('from','to','amt','nonce') @@ -233,6 +234,10 @@ class EthereumMMGenTX: def fee(self): return self.fee_gasPrice2abs(self.txobj['gasPrice'].toWei()) + @property + def change(self): + return self.sum_inputs() - self.send_amt - self.fee + def check_txfile_hex_data(self): pass @@ -525,6 +530,10 @@ class EthereumTokenMMGenTX: class Completed(Base,EthereumMMGenTX.Completed): fmt_keys = ('from','token_to','amt','nonce') + @property + def change(self): + return self.sum_inputs() - self.send_amt + def format_view_rel_fee(self,terse): return '' diff --git a/mmgen/tx.py b/mmgen/tx.py index 452276bd..d07180f6 100755 --- a/mmgen/tx.py +++ b/mmgen/tx.py @@ -1084,6 +1084,10 @@ class MMGenTX: def fee(self): return self.sum_inputs() - self.sum_outputs() + @property + def change(self): + return self.sum_outputs() - self.send_amt + def format_view_rel_fee(self,terse): return ' ({} {}, {} of spend amount)'.format( pink(str(self.fee_abs2rel(self.fee))), @@ -1147,7 +1151,7 @@ class MMGenTX: yield self.txview_ftr_fs.format( i = self.sum_inputs().hl(), o = self.sum_outputs().hl(), - C = (self.sum_outputs() - self.send_amt).hl(), + C = self.change.hl(), s = self.send_amt.hl(), a = self.format_view_abs_fee(), r = self.format_view_rel_fee(terse),