AaronFiore/electrum
1
0
Fork 0
Code Activity

qt: handle exceptions when pressing "Max" button

Browse Source 
fixes #5783
This commit is contained in:
SomberNight
2019-12-08 03:21:02 +01:00
parent 20bbe85bce
commit 369d972aed
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
electrum/gui/qt/channels_list.py
View File

@@ -6,7 +6,7 @@ from PyQt5 import QtCore, QtGui
from PyQt5.QtCore import Qt from PyQt5.QtCore import Qt
from PyQt5.QtWidgets import QMenu, QHBoxLayout, QLabel, QVBoxLayout, QGridLayout, QLineEdit from PyQt5.QtWidgets import QMenu, QHBoxLayout, QLabel, QVBoxLayout, QGridLayout, QLineEdit
from electrum.util import bh2u from electrum.util import bh2u, NotEnoughFunds, NoDynamicFeeEstimates
from electrum.i18n import _ from electrum.i18n import _
from electrum.lnchannel import Channel from electrum.lnchannel import Channel
from electrum.wallet import Abstract_Wallet from electrum.wallet import Abstract_Wallet
@@ -178,7 +178,13 @@ class ChannelsList(MyTreeView):
if not max_button.isChecked(): if not max_button.isChecked():
return return
make_tx = self.parent.mktx_for_open_channel('!') make_tx = self.parent.mktx_for_open_channel('!')
tx = make_tx(None) try:
tx = make_tx(None)
except (NotEnoughFunds, NoDynamicFeeEstimates) as e:
max_button.setChecked(False)
amount_e.setFrozen(False)
self.main_window.show_error(str(e))
return
amount = tx.output_value() amount = tx.output_value()
amount = min(amount, LN_MAX_FUNDING_SAT) amount = min(amount, LN_MAX_FUNDING_SAT)
amount_e.setAmount(amount) amount_e.setAmount(amount)

13
electrum/gui/qt/main_window.py
View File

@@ -60,7 +60,8 @@ from electrum.util import (format_time, format_satoshis, format_fee_satoshis,
decimal_point_to_base_unit_name, decimal_point_to_base_unit_name,
UnknownBaseUnit, DECIMAL_POINT_DEFAULT, UserFacingException, UnknownBaseUnit, DECIMAL_POINT_DEFAULT, UserFacingException,
get_new_wallet_name, send_exception_to_crash_reporter, get_new_wallet_name, send_exception_to_crash_reporter,
InvalidBitcoinURI, maybe_extract_bolt11_invoice) InvalidBitcoinURI, maybe_extract_bolt11_invoice, NotEnoughFunds,
NoDynamicFeeEstimates)
from electrum.util import PR_TYPE_ONCHAIN, PR_TYPE_LN from electrum.util import PR_TYPE_ONCHAIN, PR_TYPE_LN
from electrum.transaction import (Transaction, PartialTxInput, from electrum.transaction import (Transaction, PartialTxInput,
PartialTransaction, PartialTxOutput) PartialTransaction, PartialTxOutput)
@@ -1293,14 +1294,20 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, Logger):
outputs = self.payto_e.get_outputs(True) outputs = self.payto_e.get_outputs(True)
if not outputs: if not outputs:
return return
self.max_button.setChecked(True)
make_tx = lambda fee_est: self.wallet.make_unsigned_transaction( make_tx = lambda fee_est: self.wallet.make_unsigned_transaction(
coins=self.get_coins(), coins=self.get_coins(),
outputs=outputs, outputs=outputs,
fee=fee_est, fee=fee_est,
is_sweep=False) is_sweep=False)
tx = make_tx(None) try:
tx = make_tx(None)
except (NotEnoughFunds, NoDynamicFeeEstimates) as e:
self.max_button.setChecked(False)
self.show_error(str(e))
return
self.max_button.setChecked(True)
amount = tx.output_value() amount = tx.output_value()
__, x_fee_amount = run_hook('get_tx_extra_fee', self.wallet, tx) or (None, 0) __, x_fee_amount = run_hook('get_tx_extra_fee', self.wallet, tx) or (None, 0)
amount_after_all_fees = amount - x_fee_amount amount_after_all_fees = amount - x_fee_amount