AaronFiore/electrum
1
0
Fork 0
Code Activity

lnwatcher.maybe_redeem: wanted_height should always be absolute

Browse Source 
previously, if prev_height.height was <= 0, lnwatcher was calling adb.set_future_tx()
with weird wanted_height values (with ~sweep_info.csv_delay)
This commit is contained in:
SomberNight
2023-04-04 13:37:10 +00:00
parent 2f9ecf3311
commit 446879ade0
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
electrum/address_synchronizer.py
View File

@@ -79,7 +79,7 @@ class AddressSynchronizer(Logger, EventListener):
# locks: if you need to take multiple ones, acquire them in the order they are defined here! # locks: if you need to take multiple ones, acquire them in the order they are defined here!
self.lock = threading.RLock() self.lock = threading.RLock()
self.transaction_lock = threading.RLock() self.transaction_lock = threading.RLock()
self.future_tx = {} # type: Dict[str, int] # txid -> wanted height self.future_tx = {} # type: Dict[str, int] # txid -> wanted (abs) height
# Txs the server claims are mined but still pending verification: # Txs the server claims are mined but still pending verification:
self.unverified_tx = defaultdict(int) # type: Dict[str, int] # txid -> height. Access with self.lock. self.unverified_tx = defaultdict(int) # type: Dict[str, int] # txid -> height. Access with self.lock.
# Txs the server claims are in the mempool: # Txs the server claims are in the mempool:
@@ -655,7 +655,9 @@ class AddressSynchronizer(Logger, EventListener):
return cached_local_height return cached_local_height
return self.network.get_local_height() if self.network else self.db.get('stored_height', 0) return self.network.get_local_height() if self.network else self.db.get('stored_height', 0)
def set_future_tx(self, txid:str, wanted_height: int): def set_future_tx(self, txid: str, *, wanted_height: int):
# note: wanted_height is always an absolute height, even in case of CSV-locked txs.
# In case of a CSV-locked tx with unconfirmed inputs, the wanted_height is a best-case guess.
with self.lock: with self.lock:
self.future_tx[txid] = wanted_height self.future_tx[txid] = wanted_height

18
electrum/lnwatcher.py
View File

@@ -514,13 +514,18 @@ class LNWalletWatcher(LNWatcher):
wanted_height = sweep_info.cltv_expiry wanted_height = sweep_info.cltv_expiry
if wanted_height - local_height > 0: if wanted_height - local_height > 0:
can_broadcast = False can_broadcast = False
reason = 'waiting for {}: CLTV ({} > {})'.format(name, local_height, sweep_info.cltv_expiry) # self.logger.debug(f"pending redeem for {prevout}. waiting for {name}: CLTV ({local_height=}, {wanted_height=})")
if sweep_info.csv_delay: if sweep_info.csv_delay:
prev_height = self.adb.get_tx_height(prev_txid) prev_height = self.adb.get_tx_height(prev_txid)
wanted_height = sweep_info.csv_delay + prev_height.height - 1 if prev_height.height > 0:
if prev_height.height <= 0 or wanted_height - local_height > 0: wanted_height = prev_height.height + sweep_info.csv_delay - 1
else:
wanted_height = local_height + sweep_info.csv_delay
if wanted_height - local_height > 0:
can_broadcast = False can_broadcast = False
reason = 'waiting for {}: CSV ({} >= {})'.format(name, prev_height.conf, sweep_info.csv_delay) # self.logger.debug(
# f"pending redeem for {prevout}. waiting for {name}: CSV "
# f"({local_height=}, {wanted_height=}, {prev_height.height=}, {sweep_info.csv_delay=})")
if can_broadcast: if can_broadcast:
self.logger.info(f'we can broadcast: {name}') self.logger.info(f'we can broadcast: {name}')
tx_was_added = await self.network.try_broadcasting(new_tx, name) tx_was_added = await self.network.try_broadcasting(new_tx, name)
@@ -536,8 +541,9 @@ class LNWalletWatcher(LNWatcher):
self.logger.info(f'added redeem tx: {name}. prevout: {prevout}') self.logger.info(f'added redeem tx: {name}. prevout: {prevout}')
else: else:
tx_was_added = False tx_was_added = False
# set future tx regardless of tx_was_added, because it is not persisted # set future tx regardless of tx_was_added, because it is not persisted
self.adb.set_future_tx(new_tx.txid(), wanted_height) # (and wanted_height can change if input of CSV was not mined before)
self.adb.set_future_tx(new_tx.txid(), wanted_height=wanted_height)
if tx_was_added: if tx_was_added:
self.lnworker.wallet.set_label(new_tx.txid(), name) self.lnworker.wallet.set_label(new_tx.txid(), name)
if old_tx and old_tx.txid() != new_tx.txid(): if old_tx and old_tx.txid() != new_tx.txid():