ttrustedcoin: restore the display of fees - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 5aa0a87d7a796c78af180c46408f2f3a362a695f
DIR parent eb36884c6685ef87a262d10524771692ba93faf6
HTML Author: ThomasV <thomasv@electrum.org>
Date: Tue, 2 Feb 2016 16:26:47 +0100
ttrustedcoin: restore the display of fees
Diffstat:
M gui/qt/main_window.py | 8 +++++++-
M plugins/trustedcoin/trustedcoin.py | 7 +++++++
2 files changed, 14 insertions(+), 1 deletion(-)
---
DIR diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py
t@@ -1245,12 +1245,18 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
confirm_amount = self.config.get('confirm_amount', COIN)
msg = [
_("Amount to be sent") + ": " + self.format_amount_and_units(amount),
- _("Transaction fee") + ": " + self.format_amount_and_units(fee),
+ _("Mining fee") + ": " + self.format_amount_and_units(fee),
]
+
+ extra_fee = run_hook('get_additional_fee', self.wallet, tx)
+ if extra_fee:
+ msg.append( _("Additional fees") + ": " + self.format_amount_and_units(extra_fee) )
+
if tx.get_fee() >= self.config.get('confirm_fee', 100000):
msg.append(_('Warning')+ ': ' + _("The fee for this transaction seems unusually high."))
if self.wallet.use_encryption:
+ msg.append("")
msg.append(_("Enter your password to proceed"))
password = self.password_dialog('\n'.join(msg))
if not password:
DIR diff --git a/plugins/trustedcoin/trustedcoin.py b/plugins/trustedcoin/trustedcoin.py
t@@ -307,6 +307,13 @@ class TrustedCoinPlugin(BasePlugin):
def is_enabled(self):
return True
+ @hook
+ def get_additional_fee(self, wallet, tx):
+ address = wallet.billing_info['billing_address']
+ for _type, addr, amount in tx.outputs():
+ if _type == TYPE_ADDRESS and addr == address:
+ return amount
+
def request_billing_info(self, wallet):
billing_info = server.get(wallet.get_user_id()[1])
billing_address = make_billing_address(wallet, billing_info['billing_index'])