AaronFiore/electrum
1
0
Fork 0
Code Activity

gui: cpfp: use wallet.relayfee() instead of hardcoded 1 sat/byte

Browse Source
This commit is contained in:
SomberNight
2025-08-01 18:16:11 +00:00
parent 5432228d17
commit db52ec7798
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -888,10 +888,12 @@ class QETxCpfpFeeBumper(TxFeeSlider, TxMonMixin):
if fee_per_kb is None:
return None
package_fee = FeePolicy.estimate_fee_for_feerate(fee_per_kb=fee_per_kb, size=self._total_size)
fee = package_fee - self._parent_fee
fee = min(self._max_fee, fee)
fee = max(self._total_size, fee) # pay at least 1 sat/byte for combined size
return fee
child_fee = package_fee - self._parent_fee
child_fee = min(self._max_fee, child_fee)
# pay at least minrelayfee for combined size:
min_child_fee = FeePolicy.estimate_fee_for_feerate(fee_per_kb=self._wallet.wallet.relayfee(), size=self._total_size)
child_fee = max(min_child_fee, child_fee)
return child_fee
def tx_verified(self):
self._valid = False

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

@@ -2875,10 +2875,12 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, Logger, QtEventListener):
if fee_per_kb is None:
return None
package_fee = FeePolicy.estimate_fee_for_feerate(fee_per_kb=fee_per_kb, size=total_size)
fee = package_fee - parent_fee
fee = min(max_fee, fee)
fee = max(total_size, fee) # pay at least 1 sat/byte for combined size
return fee
child_fee = package_fee - parent_fee
child_fee = min(max_fee, child_fee)
# pay at least minrelayfee for combined size:
min_child_fee = FeePolicy.estimate_fee_for_feerate(fee_per_kb=self.wallet.relayfee(), size=total_size)
child_fee = max(min_child_fee, child_fee)
return child_fee
fee_policy = FeePolicy(self.config.FEE_POLICY)
suggested_feerate = fee_policy.fee_per_kb(self.network)
fee = get_child_fee_from_total_feerate(suggested_feerate)