AaronFiore/electrum
1
0
Fork 0
Code Activity

Merge pull request #10161 from spesmilo/txbatcher_do_not_remove_local_tx

Browse Source 
txbatcher: be careful when removing local transactions
This commit is contained in:
ThomasV
2025-08-21 19:10:49 +02:00
committed by GitHub
parent 6d99717d5b 5f30f2a0c0
commit 07d69bd876
2 changed files with 30 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
electrum/txbatcher.py
View File

@@ -354,7 +354,7 @@ class TxBatch(Logger):
# todo: require more than one confirmation
return len(self.batch_inputs) == 0 and len(self.batch_payments) == 0 and len(self._batch_txids) == 0
def find_base_tx(self) -> Optional[PartialTransaction]:
async def find_base_tx(self) -> Optional[PartialTransaction]:
if not self._prevout:
return None
prev_txid, index = self._prevout.split(':')
@@ -378,17 +378,16 @@ class TxBatch(Logger):
self.logger.info(f'base tx confirmed {txid}')
self._clear_unconfirmed_sweeps(tx)
self._start_new_batch(tx)
elif tx_mined_status.height in [TX_HEIGHT_LOCAL, TX_HEIGHT_FUTURE]:
# fixme: adb may return TX_HEIGHT_LOCAL when not up to date
if self.wallet.adb.is_up_to_date():
self.logger.info(f'removing local base_tx {txid}')
self.wallet.adb.remove_transaction(txid)
self._start_new_batch(None)
if tx_mined_status.height in [TX_HEIGHT_LOCAL]:
# this may happen if our Electrum server is unresponsive
# server could also be lying to us. Rebroadcasting might
# help, if we have switched to another server.
await self.wallet.network.try_broadcasting(tx, 'batch')
return self._base_tx
async def run_iteration(self) -> None:
base_tx = self.find_base_tx()
base_tx = await self.find_base_tx()
try:
tx = self.create_next_transaction(base_tx)
except NoDynamicFeeEstimates:
@@ -421,15 +420,33 @@ class TxBatch(Logger):
self._new_base_tx(tx)
if not await self.wallet.network.try_broadcasting(tx, 'batch'):
# most likely reason is that base_tx is not replaceable
# this may be the case if it has children (because we don't pay enough fees to replace them)
# or if we are trying to sweep unconfirmed inputs (replacement-adds-unconfirmed error)
self.logger.info(f'cannot broadcast tx {tx.txid()}')
self.wallet.adb.remove_transaction(tx.txid())
if base_tx:
# The most likely cause is that base_tx is not
# replaceable. This may be the case if it has children
# (because we don't pay enough fees to replace them)
# or if we are trying to sweep unconfirmed inputs
# (replacement-adds-unconfirmed error)
# it is OK to remove the transaction, because
# create_next_transaction will create a new tx that is
# incompatible with the one we remove here, so we
# cannot double pay.
self.wallet.adb.remove_transaction(tx.txid())
self.logger.info(f'starting new batch because could not broadcast')
self._start_new_batch(base_tx)
else:
# it is dangerous to remove the transaction if there
# is no base_tx. Indeed, the transaction might have
# been broadcast. So, we just keep the transaction as
# local, and we will try to rebroadcast it later (see
# above).
#
# FIXME: it should be possible to ensure that
# create_next_transaction creates transactions that
# spend the same coins, using self._prevout. This
# would make them incompatible, and safe to broadcast.
pass
async def sign_transaction(self, tx: PartialTransaction) -> Optional[PartialTransaction]:
tx.add_info_from_wallet(self.wallet) # this adds input amounts