AaronFiore/electrum
1
0
Fork 0
Code Activity

submarine swaps: disable tx batching, because we need

Browse Source 
to handle the case where base_tx gets mined instead of
the replacing tx.

Also, call adb.add_transaction before broadcasting, to
prevent races.
This commit is contained in:
ThomasV
2024-11-07 11:22:52 +01:00
parent 499e02fdcc
commit 69503bbeb4
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
electrum/submarine_swaps.py
View File

@@ -426,11 +426,16 @@ class SwapManager(Logger):
swap = self.swaps[key] swap = self.swaps[key]
if swap.funding_txid is None: if swap.funding_txid is None:
password = self.wallet.get_unlocked_password() password = self.wallet.get_unlocked_password()
for batch_rbf in [True, False]: for batch_rbf in [False]:
# FIXME: tx batching is disabled, because extra logic is needed to handle
# the case where the base tx gets mined.
tx = self.create_funding_tx(swap, None, password=password, batch_rbf=batch_rbf) tx = self.create_funding_tx(swap, None, password=password, batch_rbf=batch_rbf)
self.logger.info(f'adding funding_tx {tx.txid()}')
self.wallet.adb.add_transaction(tx)
try: try:
await self.broadcast_funding_tx(swap, tx) await self.broadcast_funding_tx(swap, tx)
except TxBroadcastError: except TxBroadcastError:
self.wallet.adb.remove_transaction(tx.txid())
continue continue
break break