AaronFiore/electrum
1
0
Fork 0
Code Activity

txbatcher: fix wanted_height shown in GUI

Browse Source 
if an input has both CSV and CLTV, we must display the highest value
This commit is contained in:
ThomasV
2025-05-12 13:36:18 +02:00
parent 8c31ed648a
commit 7d6c21f233
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
electrum/txbatcher.py
View File

@@ -540,21 +540,26 @@ class TxBatch(Logger):
name = sweep_info.name name = sweep_info.name
prev_txid, index = prevout.split(':') prev_txid, index = prevout.split(':')
can_broadcast = True can_broadcast = True
wanted_height = None wanted_height_cltv = None
wanted_height_csv = None
local_height = self.wallet.network.get_local_height() local_height = self.wallet.network.get_local_height()
if sweep_info.cltv_abs: if sweep_info.cltv_abs:
wanted_height = sweep_info.cltv_abs wanted_height_cltv = sweep_info.cltv_abs
if wanted_height - local_height > 0: if wanted_height_cltv - local_height > 0:
can_broadcast = False can_broadcast = False
prev_height = self.wallet.adb.get_tx_height(prev_txid).height prev_height = self.wallet.adb.get_tx_height(prev_txid).height
if sweep_info.csv_delay: if sweep_info.csv_delay:
if prev_height > 0: if prev_height > 0:
wanted_height = prev_height + sweep_info.csv_delay - 1 wanted_height_csv = prev_height + sweep_info.csv_delay - 1
if wanted_height - local_height > 0: if wanted_height_csv - local_height > 0:
can_broadcast = False can_broadcast = False
else: else:
can_broadcast = False can_broadcast = False
wanted_height = local_height + sweep_info.csv_delay wanted_height_csv = local_height + sweep_info.csv_delay
if not can_broadcast:
wanted_height = max((wanted_height_csv or 0), (wanted_height_cltv or 0))
else:
wanted_height = None
if base_tx and prev_height <= 0: if base_tx and prev_height <= 0:
# we cannot add unconfirmed inputs to existing base_tx (per RBF rules) # we cannot add unconfirmed inputs to existing base_tx (per RBF rules)
# thus, we will wait until the current batch is confirmed # thus, we will wait until the current batch is confirmed