Re-work publishing of wrapped events

packages/util/__tests__/Events.test.ts

@@ -105,7 +105,7 @@ describe("Events", () => {
     it("should validate TrustedEvent", () => {
       const unwrapped = {
         ...createHashedEvent(),
-        wrap: createSignedEvent(),
+        wraps: [createSignedEvent()],
       }
       expect(Events.isTrustedEvent(createHashedEvent())).toBe(false)
       expect(Events.isTrustedEvent(createSignedEvent())).toBe(true)
@@ -115,7 +115,7 @@ describe("Events", () => {
     it("should validate UnwrappedEvent", () => {
       const unwrapped = {
         ...createHashedEvent(),
-        wrap: createSignedEvent(),
+        wraps: [createSignedEvent()],
       }
       expect(Events.isUnwrappedEvent(unwrapped)).toBe(true)
       expect(Events.isUnwrappedEvent(createHashedEvent())).toBe(false)
@@ -152,10 +152,10 @@ describe("Events", () => {
       const trustedEvent = {
         ...createHashedEvent(),
         sig: sig,
-        wrap: createSignedEvent(),
+        wraps: [createSignedEvent()],
       }
       const result = Events.asSignedEvent(trustedEvent)
-      expect(result).not.toHaveProperty("wrap")
+      expect(result).not.toHaveProperty("wraps")
       expect(result).toHaveProperty("sig")
     })
 
@@ -163,10 +163,10 @@ describe("Events", () => {
       const trustedEvent = {
         ...createHashedEvent(),
         sig: sig,
-        wrap: createSignedEvent(),
+        wraps: [createSignedEvent()],
       }
       const result = Events.asUnwrappedEvent(trustedEvent)
-      expect(result).toHaveProperty("wrap")
+      expect(result).toHaveProperty("wraps")
       expect(result).not.toHaveProperty("sig")
     })
 
@@ -174,11 +174,11 @@ describe("Events", () => {
       const trustedEvent = {
         ...createHashedEvent(),
         sig: sig,
-        wrap: createSignedEvent(),
+        wraps: [createSignedEvent()],
       }
       const result = Events.asTrustedEvent(trustedEvent)
       expect(result).toHaveProperty("sig")
-      expect(result).toHaveProperty("wrap")
+      expect(result).toHaveProperty("wraps")
     })
   })
 

packages/util/__tests__/Filters.test.ts

@@ -185,7 +185,7 @@ describe("Filters", () => {
 
     it("should handle wrapped events", () => {
       const event = createEvent({
-        wrap: createEvent(),
+        wraps: [createEvent()],
       })
       const result = getReplyFilters([event])
       expect((result[0] as any)["#e"]).toHaveLength(2)

packages/util/src/Events.ts

@@ -41,12 +41,12 @@ export type SignedEvent = HashedEvent & {
 }
 
 export type UnwrappedEvent = HashedEvent & {
-  wrap: SignedEvent
+  wraps: SignedEvent[]
 }
 
 export type TrustedEvent = HashedEvent & {
   sig?: string
-  wrap?: SignedEvent
+  wraps?: SignedEvent[]
   [verifiedSymbol]?: boolean
 }
 
@@ -111,7 +111,7 @@ export const isSignedEvent = (e: TrustedEvent): e is SignedEvent =>
   Boolean(isHashedEvent(e) && typeof e.sig === "string" && e.sig.length > 0)
 
 export const isUnwrappedEvent = (e: TrustedEvent): e is UnwrappedEvent =>
-  Boolean(isHashedEvent(e) && e.wrap && isSignedEvent(e.wrap))
+  Boolean(isHashedEvent(e) && e.wraps?.every(isSignedEvent))
 
 export const isTrustedEvent = (e: TrustedEvent): e is TrustedEvent =>
   isSignedEvent(e) || isUnwrappedEvent(e)
@@ -134,10 +134,10 @@ export const asSignedEvent = (e: SignedEvent): SignedEvent =>
   pick(["kind", "tags", "content", "created_at", "pubkey", "id", "sig"], e)
 
 export const asUnwrappedEvent = (e: UnwrappedEvent): UnwrappedEvent =>
-  pick(["kind", "tags", "content", "created_at", "pubkey", "id", "wrap"], e)
+  pick(["kind", "tags", "content", "created_at", "pubkey", "id", "wraps"], e)
 
 export const asTrustedEvent = (e: TrustedEvent): TrustedEvent =>
-  pick(["kind", "tags", "content", "created_at", "pubkey", "id", "sig", "wrap"], e)
+  pick(["kind", "tags", "content", "created_at", "pubkey", "id", "sig", "wraps"], e)
 
 // Utilities for working with events
 

packages/util/src/Filters.ts

@@ -179,9 +179,7 @@ export const getReplyFilters = (events: TrustedEvent[], filter: Filter = {}) =>
       a.push(getAddress(event))
     }
 
-    if (event.wrap) {
-      e.push(event.wrap.id)
-    }
+    event.wraps?.forEach(wrap => e.push(wrap.id))
   }
 
   const filters = []

packages/util/src/Kinds.ts

@@ -197,3 +197,8 @@ export const FOLLOW_PACK = 39089
 export const DEPRECATED_RELAY_RECOMMENDATION = 2
 export const DEPRECATED_DIRECT_MESSAGE = 4
 export const DEPRECATED_NAMED_GENERIC = 30001
+
+export const WRAPPED_KINDS = [
+  DIRECT_MESSAGE,
+  DIRECT_MESSAGE_FILE,
+]