Fix batch verify in WASM with error logging

v0l · v0l · commit 79299520c671 · 2026-04-03T19:21:40.000+01:00
- Add verify_batch_with_errors to log detailed verification failures
- Log errors to browser console instead of swallowing them
- Use serde_json for canonical event serialization in make_id
- Add tests for events with special characters and user's failing event
diff --git a/packages/app/src/Utils/wasm.ts b/packages/app/src/Utils/wasm.ts
@@ -6,6 +6,7 @@ import {
   type PowMiner,
   PowWorker,
   type ReqFilter,
+  type TaggedNostrEvent,
 } from "@snort/system"
 import PowWorkerURL from "@snort/system/src/pow-worker.ts?worker&url"
 
@@ -37,9 +38,9 @@ export const WasmOptimizer = {
     return compress(all) as Array<ReqFilter>
   },
   schnorrVerify: ev => {
-    // Fast path: already verified (e.g. by a prior call in the same pipeline)
     if (EventExt.isVerified(ev)) return true
-    const ok = schnorr_verify_event(ev) as boolean
+    const { relays, ...clean } = ev as TaggedNostrEvent
+    const ok = schnorr_verify_event(clean) as boolean
     if (ok) EventExt.markVerified(ev)
     return ok
   },
@@ -56,7 +57,9 @@ export const WasmOptimizer = {
     }
     if (unverified.length > 0) {
       // One JS→WASM call for all unverified events; returns Uint8Array (1=valid, 0=invalid).
-      const raw = schnorr_verify_batch(unverified.map(u => u.ev)) as Uint8Array
+      const raw = schnorr_verify_batch(
+        unverified.map(u => u.ev),
+      ) as Uint8Array
       for (let j = 0; j < unverified.length; j++) {
         const ok = raw[j] === 1
         results[unverified[j].idx] = ok
diff --git a/packages/system-wasm/Cargo.lock b/packages/system-wasm/Cargo.lock
diff --git a/packages/system-wasm/Cargo.toml b/packages/system-wasm/Cargo.toml
@@ -16,6 +16,7 @@ serde-wasm-bindgen = "0.6.5"
 serde_json = { version = "1.0.105", default-features = false, features = ["alloc"] }
 sha256 = { version = "1.6.0", features = [], default-features = false }
 wasm-bindgen = "0.2.114"
+web-sys = { version = "0.3", features = ["console"] }
 
 [dev-dependencies]
 rand = "0.8.5"
diff --git a/packages/system-wasm/pkg/system_wasm.d.ts b/packages/system-wasm/pkg/system_wasm.d.ts
@@ -22,25 +22,6 @@ export function pow(val: any, target: any): any;
  */
 export function schnorr_verify(hash: any, sig: any, pub_key: any): boolean;
 
-/**
- * Verify a batch of Nostr events in a single JS→WASM call.
- *
- * This is the primary performance optimisation for bulk verification.
- * Crossing the JS/WASM boundary has fixed overhead (serialisation, memory
- * copies); calling `schnorr_verify_event` N times pays that cost N times.
- * `schnorr_verify_batch` pays it once regardless of N, then runs the
- * cryptographic work entirely inside WASM.
- *
- * Returns a `Uint8Array` (one byte per event: `1` = valid, `0` = invalid)
- * rather than `Array<boolean>` — typed arrays cross the WASM boundary
- * without per-element boxing overhead.
- *
- * Call-site example (TypeScript):
- * ```ts
- * const results = schnorr_verify_batch(events)  // Uint8Array
- * const valid = Array.from(results).map(b => b === 1)
- * ```
- */
 export function schnorr_verify_batch(events: any): Uint8Array;
 
 /**
diff --git a/packages/system-wasm/pkg/system_wasm.js b/packages/system-wasm/pkg/system_wasm.js
@@ -95,23 +95,6 @@ export function schnorr_verify(hash, sig, pub_key) {
 }
 
 /**
- * Verify a batch of Nostr events in a single JS→WASM call.
- *
- * This is the primary performance optimisation for bulk verification.
- * Crossing the JS/WASM boundary has fixed overhead (serialisation, memory
- * copies); calling `schnorr_verify_event` N times pays that cost N times.
- * `schnorr_verify_batch` pays it once regardless of N, then runs the
- * cryptographic work entirely inside WASM.
- *
- * Returns a `Uint8Array` (one byte per event: `1` = valid, `0` = invalid)
- * rather than `Array<boolean>` — typed arrays cross the WASM boundary
- * without per-element boxing overhead.
- *
- * Call-site example (TypeScript):
- * ```ts
- * const results = schnorr_verify_batch(events)  // Uint8Array
- * const valid = Array.from(results).map(b => b === 1)
- * ```
  * @param {any} events
  * @returns {Uint8Array}
  */
@@ -236,6 +219,9 @@ function __wbg_get_imports() {
                 wasm.__wbindgen_free(deferred0_0, deferred0_1, 1);
             }
         },
+        __wbg_error_cfce0f619500de52: function(arg0, arg1) {
+            console.error(arg0, arg1);
+        },
         __wbg_get_326e41e095fb2575: function() { return handleError(function (arg0, arg1) {
             const ret = Reflect.get(arg0, arg1);
             return ret;
diff --git a/packages/system-wasm/pkg/system_wasm_bg.wasm b/packages/system-wasm/pkg/system_wasm_bg.wasm
diff --git a/packages/system-wasm/src/lib.rs b/packages/system-wasm/src/lib.rs
@@ -103,6 +103,10 @@ pub fn schnorr_verify(hash: JsValue, sig: JsValue, pub_key: JsValue) -> Result<b
     Ok(SECP256K1.verify_schnorr(&sig, &msg_bytes, &key).is_ok())
 }
 
+fn log_error(msg: &str, err: &str) {
+    web_sys::console::error_2(&JsValue::from_str(msg), &JsValue::from_str(err));
+}
+
 /// Verify a single Nostr event.
 ///
 /// Computes the canonical event ID from scratch (does not trust `event.id`)
@@ -112,35 +116,25 @@ pub fn schnorr_verify(hash: JsValue, sig: JsValue, pub_key: JsValue) -> Result<b
 pub fn schnorr_verify_event(event: JsValue) -> Result<bool, JsValue> {
     console_error_panic_hook::set_once();
     let event_obj: Event = serde_wasm_bindgen::from_value(event)?;
-    Ok(verify::verify_event(&event_obj, false).unwrap_or(false))
+    match verify::verify_event(&event_obj, false) {
+        Ok(result) => Ok(result),
+        Err(e) => {
+            log_error("schnorr_verify_event failed", &format!("{:?}", e));
+            Ok(false)
+        }
+    }
 }
 
-/// Verify a batch of Nostr events in a single JS→WASM call.
-///
-/// This is the primary performance optimisation for bulk verification.
-/// Crossing the JS/WASM boundary has fixed overhead (serialisation, memory
-/// copies); calling `schnorr_verify_event` N times pays that cost N times.
-/// `schnorr_verify_batch` pays it once regardless of N, then runs the
-/// cryptographic work entirely inside WASM.
-///
-/// Returns a `Uint8Array` (one byte per event: `1` = valid, `0` = invalid)
-/// rather than `Array<boolean>` — typed arrays cross the WASM boundary
-/// without per-element boxing overhead.
-///
-/// Call-site example (TypeScript):
-/// ```ts
-/// const results = schnorr_verify_batch(events)  // Uint8Array
-/// const valid = Array.from(results).map(b => b === 1)
-/// ```
 #[wasm_bindgen]
 pub fn schnorr_verify_batch(events: JsValue) -> Result<Box<[u8]>, JsValue> {
     console_error_panic_hook::set_once();
     let events_parsed: Vec<Event> = serde_wasm_bindgen::from_value(events)?;
-    let results: Vec<u8> = verify::verify_batch(&events_parsed)
+    let results: Vec<bool> = verify::verify_batch_with_errors(&events_parsed);
+    Ok(results
         .into_iter()
         .map(|b| b as u8)
-        .collect();
-    Ok(results.into_boxed_slice())
+        .collect::<Vec<_>>()
+        .into_boxed_slice())
 }
 
 #[cfg(test)]
diff --git a/packages/system-wasm/src/pow.rs b/packages/system-wasm/src/pow.rs
@@ -1,5 +1,3 @@
-use std::fmt::Write as FmtWrite;
-
 use crate::Event;
 
 pub fn pow(ev: &mut Event, target: u8) {
@@ -17,13 +15,11 @@ pub fn pow(ev: &mut Event, target: u8) {
         }
     };
 
-    // Reuse a single String buffer across iterations to avoid repeated heap allocation.
-    let mut id_buf = String::with_capacity(512);
     loop {
         ev.tags[nonce_tag_idx][1] = ctr.to_string();
 
-        make_id_into(ev, &mut id_buf);
-        let digest = sha256::digest(id_buf.as_bytes());
+        let id_hex = make_id(ev);
+        let digest = sha256::digest(id_hex.as_bytes());
         if count_leading_zeros(&digest) >= target {
             ev.id = Some(digest);
             break;
@@ -62,52 +58,10 @@ fn hex_nibble(c: u8) -> u8 {
     }
 }
 
-/// Write the canonical Nostr event serialisation into `buf`, clearing it first.
-/// Avoids allocating intermediate `Vec<String>` for the tags.
-fn make_id_into(ev: &Event, buf: &mut String) {
-    buf.clear();
-    buf.push_str("[0,\"");
-    buf.push_str(&ev.pubkey);
-    buf.push_str("\",");
-    let _ = write!(buf, "{}", ev.created_at);
-    buf.push(',');
-    let _ = write!(buf, "{}", ev.kind);
-    buf.push_str(",[");
-    for (ti, tag) in ev.tags.iter().enumerate() {
-        if ti > 0 {
-            buf.push(',');
-        }
-        buf.push('[');
-        for (vi, val) in tag.iter().enumerate() {
-            if vi > 0 {
-                buf.push(',');
-            }
-            buf.push('"');
-            for ch in val.chars() {
-                match ch {
-                    '"' => buf.push_str("\\\""),
-                    '\\' => buf.push_str("\\\\"),
-                    '\n' => buf.push_str("\\n"),
-                    '\r' => buf.push_str("\\r"),
-                    '\t' => buf.push_str("\\t"),
-                    c => buf.push(c),
-                }
-            }
-            buf.push('"');
-        }
-        buf.push(']');
-    }
-    buf.push_str("],\"");
-    buf.push_str(&ev.content);
-    buf.push_str("\"]");
-}
-
-/// Compute the canonical Nostr event ID (SHA-256 hex of the serialised commitment).
-/// Public so `verify.rs` and benchmarks can reuse it directly.
+/// Write the canonical Nostr event serialisation using serde_json for correct escaping.
 pub fn make_id(ev: &Event) -> String {
-    let mut buf = String::with_capacity(512);
-    make_id_into(ev, &mut buf);
-    sha256::digest(buf.as_bytes())
+    let payload = serde_json::json!([0, ev.pubkey, ev.created_at, ev.kind, ev.tags, ev.content]);
+    sha256::digest(payload.to_string().as_bytes())
 }
 
 #[cfg(test)]
@@ -137,6 +91,36 @@ mod tests {
         assert_eq!(super::make_id(&ev), ev.id.unwrap())
     }
 
+    #[test]
+    fn make_id_with_special_chars_in_content() {
+        let ev = Event::deserialize(json!({
+          "content": "{\"about\":\"mar - the main character, might be a girl\\n\\ncatoshi - the black cat, definitely a cat\",\"banner\":\"https://mar101xy.com/images/mar101xy-profile-cover.jpg\",\"bot\":false,\"display_name\":\"mar\",\"lud16\":\"mar101xy@walletofsatoshi.com\",\"nip05\":\"mar@mar101xy.com\",\"picture\":\"https://mar101xy.com/images/avatar.jpg\",\"displayName\":\"mar\",\"fields\":[[\"test\",\"testing ditto\"],[\"gender\",\"testing gender\"]],\"name\":\"mar\"}",
+          "created_at": 1775155758,
+          "id": "053516868fe8f94fa180835d3b0be4042aaaddc514c6e6d6d8e0fa9694d3442d",
+          "kind": 0,
+          "pubkey": "c7acabf1fed201a53185e4dc5e0c6bae2bc5db19d73abf840535f305d8f05180",
+          "sig": "c8de210d80a2ad92e1145e9c52177ab077f862acd9857f7e8b6ae24645893b0d81bf585814ececb17b0ecd17529135b39cdd9aaf2a84626509c11c6f0c6ed62f",
+          "tags": [["client","Ditto"]]
+        })).ok().unwrap();
+
+        assert_eq!(super::make_id(&ev), ev.id.unwrap())
+    }
+
+    #[test]
+    fn make_id_with_escaped_backslash_in_content() {
+        let ev = Event::deserialize(json!({
+          "content": "{\"name\":\"TheGrinder\",\"about\":\"Sovereign, creator of bitcoins, future owner of Mars and grinder of many things...\\n0863F34D0311FC550226F06A376B54D5650980FB\",\"picture\":\"https://i.nostr.build/TghNVYXqMe7knx7P.jpg\",\"banner\":\"https://nostr.build/i/094828ef504cb05424a9680db23d37db3cf02f05ede1d33528c5c5f9872db66e.jpg\",\"displayName\":\"TheGrinder\",\"lud16\":\"thegrinder@rizful.com\",\"display_name\":\"TheGrinder\",\"website\":\"https://zap.stream/thegrinder\",\"nip05\":\"thegrinder@nostrplebs.com\"}",
+          "created_at": 1774868231,
+          "id": "2dc93fea65b858e864520687927bb8e83374fff8eeb592c9cfaa8b470fc7b2db",
+          "kind": 0,
+          "pubkey": "6e75f7972397ca3295e0f4ca0fbc6eb9cc79be85bafdd56bd378220ca8eee74e",
+          "sig": "4b2c21ff288b2e4e900f88429a0b4a8c3d6c248cab175b8e984d3251cf67578626583379cef99c73e85df3fc35407f292499df7124c3d854bfbf6ac0421a03ee",
+          "tags": [["client","noStrudel","31990:266815e0c9210dfa324c6cba3573b14bee49da4209a9456f9484e5106cd408a5:1686066542546"]]
+        })).ok().unwrap();
+
+        assert_eq!(super::make_id(&ev), ev.id.unwrap())
+    }
+
     #[test]
     fn count_zeros() {
         assert_eq!(10u8.leading_zeros(), 4);
diff --git a/packages/system-wasm/src/verify.rs b/packages/system-wasm/src/verify.rs
@@ -99,6 +99,26 @@ pub fn verify_batch(events: &[Event]) -> Vec<bool> {
         .collect()
 }
 
+/// Verify a batch of events, logging detailed errors for each failure.
+/// Returns a Vec<bool> where true means valid, false means invalid/error.
+pub fn verify_batch_with_errors(events: &[Event]) -> Vec<bool> {
+    events
+        .iter()
+        .enumerate()
+        .map(|(idx, ev)| match verify_event(ev, false) {
+            Ok(true) => true,
+            Ok(false) => {
+                eprintln!("batch[{}]: signature verification failed", idx);
+                false
+            }
+            Err(e) => {
+                eprintln!("batch[{}]: verification error: {:?}", idx, e);
+                false
+            }
+        })
+        .collect()
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -186,4 +206,57 @@ mod tests {
     fn batch_verify_empty() {
         assert_eq!(verify_batch(&[]), Vec::<bool>::new());
     }
+
+    #[test]
+    fn batch_verify_events_with_special_content() {
+        let profile_with_newlines = Event::deserialize(json!({
+          "content": "{\"about\":\"mar - the main character, might be a girl\\n\\ncatoshi - the black cat, definitely a cat\",\"banner\":\"https://mar101xy.com/images/mar101xy-profile-cover.jpg\",\"bot\":false,\"display_name\":\"mar\",\"lud16\":\"mar101xy@walletofsatoshi.com\",\"nip05\":\"mar@mar101xy.com\",\"picture\":\"https://mar101xy.com/images/avatar.jpg\",\"displayName\":\"mar\",\"fields\":[[\"test\",\"testing ditto\"],[\"gender\",\"testing gender\"]],\"name\":\"mar\"}",
+          "created_at": 1775155758,
+          "id": "053516868fe8f94fa180835d3b0be4042aaaddc514c6e6d6d8e0fa9694d3442d",
+          "kind": 0,
+          "pubkey": "c7acabf1fed201a53185e4dc5e0c6bae2bc5db19d73abf840535f305d8f05180",
+          "sig": "c8de210d80a2ad92e1145e9c52177ab077f862acd9857f7e8b6ae24645893b0d81bf585814ececb17b0ecd17529135b39cdd9aaf2a84626509c11c6f0c6ed62f",
+          "tags": [["client","Ditto"]]
+        })).unwrap();
+
+        let profile_with_escaped_backslash = Event::deserialize(json!({
+          "content": "{\"name\":\"TheGrinder\",\"about\":\"Sovereign, creator of bitcoins, future owner of Mars and grinder of many things...\\n0863F34D0311FC550226F06A376B54D5650980FB\",\"picture\":\"https://i.nostr.build/TghNVYXqMe7knx7P.jpg\",\"banner\":\"https://nostr.build/i/094828ef504cb05424a9680db23d37db3cf02f05ede1d33528c5c5f9872db66e.jpg\",\"displayName\":\"TheGrinder\",\"lud16\":\"thegrinder@rizful.com\",\"display_name\":\"TheGrinder\",\"website\":\"https://zap.stream/thegrinder\",\"nip05\":\"thegrinder@nostrplebs.com\"}",
+          "created_at": 1774868231,
+          "id": "2dc93fea65b858e864520687927bb8e83374fff8eeb592c9cfaa8b470fc7b2db",
+          "kind": 0,
+          "pubkey": "6e75f7972397ca3295e0f4ca0fbc6eb9cc79be85bafdd56bd378220ca8eee74e",
+          "sig": "4b2c21ff288b2e4e900f88429a0b4a8c3d6c248cab175b8e984d3251cf67578626583379cef99c73e85df3fc35407f292499df7124c3d854bfbf6ac0421a03ee",
+          "tags": [["client","noStrudel","31990:266815e0c9210dfa324c6cba3573b14bee49da4209a9456f9484e5106cd408a5:1686066542546"]]
+        })).unwrap();
+
+        let plain = make_valid_event();
+
+        let results = verify_batch(&[profile_with_newlines, profile_with_escaped_backslash, plain]);
+        assert_eq!(results, vec![true, true, true]);
+    }
+
+    #[test]
+    fn batch_verify_user_event() {
+        let ev = Event::deserialize(json!({
+          "kind": 1,
+          "id": "c55e31fe1c93705558d58c8ad309b0b27c2f21dae92f72bfbc8869de872a2616",
+          "pubkey": "06639a386c9c1014217622ccbcf40908c4f1a0c33e23f8d6d68f4abf655f8f71",
+          "created_at": 1774961298,
+          "tags": [
+            ["e", "507c11d1cdb2130c751ff05e7afa0a47079025ba39ef099ae1a25c53c03ae99e", "wss://pyramid.fiatjaf.com/", "root", "63fe6318dc58583cfe16810f86dd09e18bfd76aabc24a0081ce2856f330504ed"],
+            ["e", "0468572f697fa7e399f7a99b0d7f1d640a10ceeab17d31e68e11af37be444b26", "wss://nos.lol/", "reply", "63fe6318dc58583cfe16810f86dd09e18bfd76aabc24a0081ce2856f330504ed"],
+            ["p", "63fe6318dc58583cfe16810f86dd09e18bfd76aabc24a0081ce2856f330504ed"]
+          ],
+          "content": "I'm interested to try it.\nLocally I have qwen3.5 8B running with ollama on a RK1 32GB compute module.",
+          "sig": "c07c9757ebb3e0808077d5876d5c670c0e788d9f92326ff21aae4766e026e722d017c2e9c1229eece8861c308732d920f1bdbb30ceddd4342d2c4c95f4c5fa05"
+        })).unwrap();
+
+        let computed_id = crate::pow::make_id(&ev);
+        println!("computed_id: {}", computed_id);
+        println!("event id: {:?}", ev.id);
+
+        let results = verify_batch(&[ev]);
+        println!("verify result: {:?}", results);
+        assert_eq!(results, vec![true]);
+    }
 }
diff --git a/packages/system/src/background-loader.ts b/packages/system/src/background-loader.ts
@@ -149,7 +149,7 @@ export abstract class BackgroundLoader<T extends { loaded: number; created: numb
    * Get object from cache or fetch if missing
    */
   async fetch(key: string, timeoutMs = 30_000) {
-    const existing = this.cache.get(key)
+    const existing = await this.cache.get(key)
     if (existing) {
       return existing
     } else {
diff --git a/packages/worker-relay/src/interface.ts b/packages/worker-relay/src/interface.ts
@@ -28,7 +28,7 @@ export class WorkerRelayInterface {
       this.#worker = new Worker(sp, { type: "module" })
     }
     this.#worker.onerror = e => {
-      console.error(e.message, e)
+      console.error("Worker Error:", e)
     }
     this.#worker.onmessageerror = e => {
       console.error(e)
