Merge branch 'staging' into issue-171

Merge branch 'main' into staging
Merge pull request #199 from hotfix-remove-loop-9-12 into staging
2024-09-13 10:07:24 +00:00 · 2024-09-12 12:09:40 +00:00 · 2024-09-12 09:32:54 +00:00 · 2024-09-12 11:27:55 +02:00 · 2024-09-12 08:26:59 +00:00 · 2024-09-06 18:59:34 +00:00
2 changed files with 12 additions and 4 deletions
--- a/src/layouts/Main.tsx
+++ b/src/layouts/Main.tsx
@ -109,6 +109,7 @@ export const MainLayout = () => {

      if (pubkey && !hasSubscribed.current) {
        // Call `subscribeForSigits` only if it hasn't been called before
+        // #193 disabled websocket subscribtion, until #194 is done
        subscribeForSigits(pubkey)

        // Mark `subscribeForSigits` as called
--- a/src/utils/nostr.ts
+++ b/src/utils/nostr.ts
@ -859,9 +859,16 @@ export const subscribeForSigits = async (pubkey: string) => {
    '#p': [pubkey]
  }

-  relayController.subscribeForEvents(filter, relaySet.read, (event) => {
-    processReceivedEvent(event) // Process the received event
-  })
+  // Process the received event synchronously
+  const events = await relayController.fetchEvents(filter, relaySet.read)
+  for (const e of events) {
+    await processReceivedEvent(e)
+  }
+
+  // Async processing of the events has a race condition
+  // relayController.subscribeForEvents(filter, relaySet.read, (event) => {
+  //   processReceivedEvent(event)
+  // })
 }

 const processReceivedEvent = async (event: Event, difficulty: number = 5) => {
@ -907,7 +914,7 @@ const processReceivedEvent = async (event: Event, difficulty: number = 5) => {

  if (!meta) return

-  updateUsersAppData(meta)
+  await updateUsersAppData(meta)
 }

 /**
Author	SHA1	Message	Date
b	aa8214d015	Merge branch 'staging' into issue-171 All checks were successful Open PR on Staging / audit_and_check (pull_request) Successful in 34s Details	2024-09-13 10:07:24 +00:00
eugene	bf1b3beb63	Merge branch 'main' into staging All checks were successful Release to Staging / build_and_release (push) Successful in 1m17s Details	2024-09-12 12:09:40 +00:00
enes	32a6f9d7a3	Merge pull request #199 from hotfix-remove-loop-9-12 into staging All checks were successful Release to Staging / build_and_release (push) Successful in 1m16s Details Reviewed-on: #199 Reviewed-by: eugene <eugene@nostrdev.com>	2024-09-12 09:32:54 +00:00
enes	5f0234a358	fix: remove unstable fetch events loop All checks were successful Open PR on Staging / audit_and_check (pull_request) Successful in 34s Details	2024-09-12 11:27:55 +02:00
enes	235e76be4e	fix: processing gift wraps and notifications (#193 ) All checks were successful Release to Staging / build_and_release (push) Successful in 1m16s Details This change will potentially close multiple issues related to the gift-wrapped events processing (#168, #158). Further testing will be required to confirm before closing each. The commented-out code causes the race condition during the processing of the gift wraps with sigits. During the processing we perform checks to see if sigit is outdated. In cases where sigit includes multiple signers it's possible for a signer to receive multiple sigit updates at once (especially noticeable for 3rd, 4th signer). Due to async nature of processing we can have same sigit enter processing flow with different states. Since this code also updates user's app state, which includes uploads to the blossom server it takes time to upload local user state which causes both to check against the stale data and un-updated app state. This results in both sigits being "new" and both proceed to update user state and upload app data. We have no guarantees as in which event will update last, meaning that the final state we end up with could be already stale. The issue is also complicated due to the fact that we mark the gift wraps as processed and it's impossible to update the state without creating a new gift wrap with correct state and processing it last to overwrite stale state. This is temporary solution to stop broken sigit states until proper async implementation is ready. Co-authored-by: b Reviewed-on: #193 Reviewed-by: eugene <eugene@nostrdev.com> Co-authored-by: enes <mulahasanovic@outlook.com> Co-committed-by: enes <mulahasanovic@outlook.com>	2024-09-12 08:26:59 +00:00
b	09229f42c7	Merge pull request 'new release' (#190 ) from staging into main All checks were successful Release to Production / build_and_release (push) Successful in 1m10s Details Reviewed-on: #190 Reviewed-by: enes <enes@noreply.git.nostrdev.com> Reviewed-by: eugene <eugene@nostrdev.com>	2024-09-06 18:59:34 +00:00