From eb41e23f39e9c84415d6d5373aec008c3ccde36a Mon Sep 17 00:00:00 2001 From: neocogent Date: Thu, 8 Dec 2016 12:03:55 +0700 Subject: [PATCH] Add more fee info to tx details, update tx estimated_size method. --- gui/qt/transaction_dialog.py | 3 +++ lib/transaction.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/gui/qt/transaction_dialog.py b/gui/qt/transaction_dialog.py index d19e8802f..59b0b7419 100644 --- a/gui/qt/transaction_dialog.py +++ b/gui/qt/transaction_dialog.py @@ -204,6 +204,9 @@ class TxDialog(QDialog, MessageBoxMixin): else: amount_str = _("Amount sent:") + ' %s'% format_amount(-amount) + ' ' + base_unit fee_str = _("Transaction fee") + ': %s'% (format_amount(fee) + ' ' + base_unit if fee is not None else _('unknown')) + if fee is not None: + size = self.tx.estimated_size() + fee_str += ' ( %d bytes @ %s ' % (size, format_amount(fee * 1000 / size)) + base_unit + '/kB, %.0d sat/byte )' % (fee/size) self.amount_label.setText(amount_str) self.fee_label.setText(fee_str) run_hook('transaction_dialog_update', self) diff --git a/lib/transaction.py b/lib/transaction.py index 039c69f70..403d0079f 100644 --- a/lib/transaction.py +++ b/lib/transaction.py @@ -670,7 +670,7 @@ class Transaction: @profiler def estimated_size(self): '''Return an estimated tx size in bytes.''' - return len(self.serialize(-1)) / 2 # ASCII hex string + return len(self.serialize(-1)) / 2 if not self.is_complete() or self.raw is None else len(self.raw) / 2 # ASCII hex string @classmethod def estimated_input_size(self, txin):