AaronFiore/electrum
1
0
Fork 0
Code Activity

plugins: psbt_nostr: start processing PSBTs after wallet is_up_to_date

Browse Source 
also don't break the receive loop when an invalid tx is received.
This commit is contained in:
Sander van Grieken
2025-04-16 09:07:27 +02:00
parent 9d42505eec
commit eb52090fee
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
electrum/plugins/psbt_nostr/psbt_nostr.py
View File

@@ -38,7 +38,7 @@ from electrum.i18n import _
from electrum.logging import Logger from electrum.logging import Logger
from electrum.plugin import BasePlugin from electrum.plugin import BasePlugin
from electrum.transaction import PartialTransaction, tx_from_any from electrum.transaction import PartialTransaction, tx_from_any
from electrum.util import log_exceptions, OldTaskGroup, ca_path, trigger_callback from electrum.util import log_exceptions, OldTaskGroup, ca_path, trigger_callback, event_listener
from electrum.wallet import Multisig_Wallet from electrum.wallet import Multisig_Wallet
if TYPE_CHECKING: if TYPE_CHECKING:
@@ -84,7 +84,10 @@ class CosignerWallet(Logger):
self.network = wallet.network self.network = wallet.network
self.config = self.wallet.config self.config = self.wallet.config
self.pending = asyncio.Event() self.pending = asyncio.Event()
self.wallet_uptodate = asyncio.Event()
self.known_events = wallet.db.get_dict('cosigner_events') self.known_events = wallet.db.get_dict('cosigner_events')
for k, v in list(self.known_events.items()): for k, v in list(self.known_events.items()):
@@ -114,10 +117,17 @@ class CosignerWallet(Logger):
if self.network and self.nostr_pubkey: if self.network and self.nostr_pubkey:
asyncio.run_coroutine_threadsafe(self.main_loop(), self.network.asyncio_loop) asyncio.run_coroutine_threadsafe(self.main_loop(), self.network.asyncio_loop)
@event_listener
def on_event_wallet_updated(self, wallet):
if self.wallet == wallet and wallet.is_up_to_date() and not self.wallet_uptodate.is_set():
self.logger.debug('starting handling of PSBTs')
self.wallet_uptodate.set()
@log_exceptions @log_exceptions
async def main_loop(self): async def main_loop(self):
self.logger.info("starting taskgroup.") self.logger.info("starting taskgroup.")
try: try:
await self.wallet_uptodate.wait() # start processing PSBTs only after wallet is_up_to_date
async with self.taskgroup as group: async with self.taskgroup as group:
await group.spawn(self.check_direct_messages()) await group.spawn(self.check_direct_messages())
except Exception as e: except Exception as e:
@@ -189,7 +199,7 @@ class CosignerWallet(Logger):
except Exception as e: except Exception as e:
self.logger.info(_("Unable to deserialize the transaction:") + "\n" + str(e)) self.logger.info(_("Unable to deserialize the transaction:") + "\n" + str(e))
self.known_events[event.id] = now() self.known_events[event.id] = now()
return continue
self.logger.info(f"received PSBT from {event.pubkey}") self.logger.info(f"received PSBT from {event.pubkey}")
trigger_callback('psbt_nostr_received', self.wallet, event.pubkey, event.id, tx) trigger_callback('psbt_nostr_received', self.wallet, event.pubkey, event.id, tx)
await self.pending.wait() await self.pending.wait()