electrum

commit 77d5450081972e9300422396ae8a550e358e702a
parent 46c3fe4efaeba48644729969160cb2ed1ad96a53
Author: ThomasV <thomasv@electrum.org>
Date:   Tue, 13 Dec 2016 10:32:24 +0100

Merge pull request #2071 from neocogent/tx_fee_info

Add fee rate to transaction details dialog.
Diffstat:
M
gui/qt/transaction_dialog.py
 | 
3
+++
M
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
@@ -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
@@ -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):