BTCPrivate
/
-WIP-electrum-btcp
mirror of https://github.com/BTCPrivate/-WIP-electrum-btcp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add more fee info to tx details, update tx estimated_size method.

This commit is contained in:
neocogent 2016-12-08 12:03:55 +07:00
parent 46c3fe4efa
commit eb41e23f39
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gui/qt/transaction_dialog.py
View File

@ -204,6 +204,9 @@ class TxDialog(QDialog, MessageBoxMixin):
else: else:
amount_str = _("Amount sent:") + ' %s'% format_amount(-amount) + ' ' + base_unit 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')) 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.amount_label.setText(amount_str)
self.fee_label.setText(fee_str) self.fee_label.setText(fee_str)
run_hook('transaction_dialog_update', self) run_hook('transaction_dialog_update', self)

2
lib/transaction.py
View File

@ -670,7 +670,7 @@ class Transaction:
@profiler @profiler
def estimated_size(self): def estimated_size(self):
'''Return an estimated tx size in bytes.''' '''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 @classmethod
def estimated_input_size(self, txin): def estimated_input_size(self, txin):