AaronFiore/electrum
1
0
Fork 0
Code Activity

Fixes for TrustedCoin plugin:

Browse Source 
- reset billing_info after broadcast
- when bumping tx fee, do not use Trustedcoin output
This commit is contained in:
ThomasV
2017-07-06 16:03:21 +02:00
parent 6b872b68bd
commit 777a3aa8bf
4 changed files with 33 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gui/qt/main_window.py
View File

@@ -1340,9 +1340,10 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
_("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) )
x_fee = run_hook('get_tx_extra_fee', self.wallet, tx)
if x_fee:
x_fee_address, x_fee_amount = x_fee
msg.append( _("Additional fees") + ": " + self.format_amount_and_units(x_fee_amount) )
confirm_rate = 2 * self.config.max_fee_rate()
if fee > confirm_rate * tx.estimated_size() / 1000: