AaronFiore/electrum
1
0
Fork 0
Code Activity

Merge pull request #9275 from SomberNight/20241022_tx_fee_warnings

Browse Source 
qml: qetxfinalizer: use wallet.get_tx_fee_warning in all subclasses
This commit is contained in:
ghost43
2024-10-23 12:56:43 +00:00
committed by GitHub
parent 71d8f8b33c c648cd1bae
commit 82a29b7b86
1 changed files with 17 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
electrum/gui/qml/qetxfinalizer.py
View File

@@ -267,6 +267,19 @@ class TxFeeSlider(FeeSlider):
})
self.outputs = outputs
def update_fee_warning_from_tx(self, *, tx: PartialTransaction, invoice_amt: Optional[int]):
if invoice_amt is None:
invoice_amt = sum([txo.value for txo in tx.outputs() if not txo.is_mine])
if invoice_amt == 0:
invoice_amt = tx.output_value()
fee_warning_tuple = self._wallet.wallet.get_tx_fee_warning(
invoice_amt=invoice_amt, tx_size=tx.estimated_size(), fee=tx.get_fee())
if fee_warning_tuple:
allow_send, long_warning, short_warning = fee_warning_tuple
self.warning = _('Warning') + ': ' + long_warning
else:
self.warning = ''
class QETxFinalizer(TxFeeSlider):
_logger = get_logger(__name__)
@@ -385,13 +398,7 @@ class QETxFinalizer(TxFeeSlider):
x_fee_address, x_fee_amount = x_fee
self.extraFee = QEAmount(amount_sat=x_fee_amount)
fee_warning_tuple = self._wallet.wallet.get_tx_fee_warning(
invoice_amt=amount, tx_size=tx.estimated_size(), fee=tx.get_fee())
if fee_warning_tuple:
allow_send, long_warning, short_warning = fee_warning_tuple
self.warning = _('Warning') + ': ' + long_warning
else:
self.warning = ''
self.update_fee_warning_from_tx(tx=tx, invoice_amt=amount)
self._valid = True
self.validChanged.emit()
@@ -603,16 +610,7 @@ class QETxRbfFeeBumper(TxFeeSlider, TxMonMixin):
self._tx.set_rbf(self.rbf)
self.update_from_tx(self._tx)
# TODO: deduce amount sent?
# TODO: we don't handle send-max txs correctly yet
# fee_warning_tuple = self._wallet.wallet.get_tx_fee_warning(
# invoice_amt=amount, tx_size=tx.estimated_size(), fee=tx.get_fee())
# if fee_warning_tuple:
# allow_send, long_warning, short_warning = fee_warning_tuple
# self.warning = long_warning
# else:
# self.warning = ''
self.update_fee_warning_from_tx(tx=self._tx, invoice_amt=None)
self._valid = True
self.validChanged.emit()
@@ -709,6 +707,7 @@ class QETxCanceller(TxFeeSlider, TxMonMixin):
self._tx.set_rbf(self.rbf)
self.update_from_tx(self._tx)
self.update_fee_warning_from_tx(tx=self._tx, invoice_amt=None)
self._valid = True
self.validChanged.emit()
@@ -952,14 +951,7 @@ class QETxSweepFinalizer(QETxFinalizer):
self.effectiveAmountChanged.emit()
self.update_from_tx(tx)
fee_warning_tuple = self._wallet.wallet.get_tx_fee_warning(
invoice_amt=amount, tx_size=tx.estimated_size(), fee=tx.get_fee())
if fee_warning_tuple:
allow_send, long_warning, short_warning = fee_warning_tuple
self.warning = _('Warning') + ': ' + long_warning
else:
self.warning = ''
self.update_fee_warning_from_tx(tx=self._tx, invoice_amt=amount)
self._valid = True
self.validChanged.emit()