applesauce-core 4.4.1 → 4.4.2

package/dist/helpers/event.d.ts

@@ -1,4 +1,4 @@
-import { NostrEvent, VerifiedEvent } from "nostr-tools";
+import { NostrEvent, VerifiedEvent } from "nostr-tools/pure";
 import { IEventStore } from "../event-store/interface.js";
 export { NostrEvent, EventTemplate, UnsignedEvent, verifiedSymbol, verifyEvent, VerifiedEvent } from "nostr-tools/pure";
 export { bytesToHex, hexToBytes, insertEventIntoAscendingList, insertEventIntoDescendingList, binarySearch, } from "nostr-tools/utils";
@@ -36,6 +36,12 @@ export declare function getReplaceableAddress(event: NostrEvent): string;
 export declare function createReplaceableAddress(kind: number, pubkey: string, identifier?: string): string;
 /** @deprecated use createReplaceableAddress instead */
 export declare const getReplaceableUID: typeof createReplaceableAddress;
+/** Method used to verify an events signature */
+export type VerifyEventMethod = (event: NostrEvent) => event is VerifiedEvent;
+/** Sets the internal method used to verify events in helpers (zaps, gift-wraps, etc) */
+export declare function setVerifyWrappedEventMethod(method: VerifyEventMethod): void;
+/** Verifies an internal (wrapped) event using the set internal verification method */
+export declare function verifyWrappedEvent(event: NostrEvent): event is VerifiedEvent;
 /** Sets events verified flag without checking anything */
 export declare function fakeVerifyEvent(event: NostrEvent): event is VerifiedEvent;
 /** Marks an event as being from a cache */

package/dist/helpers/event.js

@@ -1,4 +1,4 @@
-import { verifiedSymbol } from "nostr-tools";
+import { verifiedSymbol, verifyEvent } from "nostr-tools/pure";
 import { isAddressableKind, isReplaceableKind } from "nostr-tools/kinds";
 import { getOrComputeCachedValue } from "./cache.js";
 // Re-export types from nostr-tools
@@ -65,6 +65,16 @@ export function createReplaceableAddress(kind, pubkey, identifier) {
 }
 /** @deprecated use createReplaceableAddress instead */
 export const getReplaceableUID = createReplaceableAddress;
+// Internal method for verifying events (used by zaps, gift-wraps, etc)
+let verifyWrappedEventMethod = verifyEvent;
+/** Sets the internal method used to verify events in helpers (zaps, gift-wraps, etc) */
+export function setVerifyWrappedEventMethod(method) {
+    verifyWrappedEventMethod = method;
+}
+/** Verifies an internal (wrapped) event using the set internal verification method */
+export function verifyWrappedEvent(event) {
+    return verifyWrappedEventMethod(event);
+}
 /** Sets events verified flag without checking anything */
 export function fakeVerifyEvent(event) {
     event[verifiedSymbol] = true;

package/dist/helpers/gift-wraps.js

@@ -1,7 +1,7 @@
-import { kinds, verifyEvent } from "nostr-tools";
+import { kinds } from "nostr-tools";
 import { EventMemory } from "../event-store/event-memory.js";
 import { getEncryptedContent, isEncryptedContentUnlocked, lockEncryptedContent, unlockEncryptedContent, } from "./encrypted-content.js";
-import { notifyEventUpdate } from "./event.js";
+import { notifyEventUpdate, verifyWrappedEvent } from "./event.js";
 /**
  * An internal event set to keep track of seals and rumors
  * This is intentionally isolated from the main applications event store so to prevent seals and rumors from being leaked
@@ -130,7 +130,7 @@ export function getGiftWrapSeal(gift) {
     }
     else {
         // Verify the seal event
-        verifyEvent(seal);
+        verifyWrappedEvent(seal);
         // Add to the internal event set
         internalGiftWrapEvents.add(seal);
         // Set the reference to the parent gift wrap event (upstream)

package/dist/helpers/zap.js

@@ -1,7 +1,8 @@
-import { kinds, nip57 } from "nostr-tools";
+import { kinds, validateEvent } from "nostr-tools";
 import { parseBolt11 } from "./bolt11.js";
 import { getOrComputeCachedValue } from "./cache.js";
 import { getTagValue } from "./event-tags.js";
+import { verifyWrappedEvent } from "./index.js";
 import { getAddressPointerFromATag, getEventPointerFromETag } from "./pointers.js";
 import { isATag, isETag } from "./tags.js";
 export const ZapRequestSymbol = Symbol.for("zap-request");
@@ -60,10 +61,30 @@ export function getZapRequest(zap) {
             return;
         // Attempt to parse the zap request
         try {
-            const error = nip57.validateZapRequest(description);
-            if (error)
-                return;
-            return JSON.parse(description);
+            // Copied from nostr-tools/nip57 and modified to use the internal verifyZap method and return the zap request event
+            let zapRequest;
+            try {
+                zapRequest = JSON.parse(description);
+            }
+            catch (err) {
+                throw new Error("Invalid zap request JSON.");
+            }
+            if (!validateEvent(zapRequest))
+                throw new Error("Zap request is not a valid Nostr event.");
+            if (!verifyWrappedEvent(zapRequest))
+                throw new Error("Invalid signature on zap request.");
+            let p = zapRequest.tags.find(([t, v]) => t === "p" && v);
+            if (!p)
+                throw new Error("Zap request doesn't have a 'p' tag.");
+            if (!p[1].match(/^[a-f0-9]{64}$/))
+                throw new Error("Zap request 'p' tag is not valid hex.");
+            let e = zapRequest.tags.find(([t, v]) => t === "e" && v);
+            if (e && !e[1].match(/^[a-f0-9]{64}$/))
+                throw new Error("Zap request 'e' tag is not valid hex.");
+            let relays = zapRequest.tags.find(([t, v]) => t === "relays" && v);
+            if (!relays)
+                throw new Error("Zap request doesn't have a 'relays' tag.");
+            return zapRequest;
         }
         catch (error) {
             return undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "applesauce-core",
-  "version": "4.4.1",
+  "version": "4.4.2",
   "description": "",
   "type": "module",
   "main": "dist/index.js",