fix(cli,http-client,stream-model-instance): encode genesis commit in …

…multiquery (#3172)
ceramicnetwork · Feb 23, 2024 · cb5c2fc · cb5c2fc
1 parent 9c50238
commit cb5c2fc
Show file tree

Hide file tree

Showing 6 changed files with 87 additions and 54 deletions.
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -82,6 +82,7 @@
   "devDependencies": {
     "@ceramicnetwork/common-test-utils": "^3.1.0",
     "@ceramicnetwork/stream-model": "^4.1.0",
+    "@ceramicnetwork/stream-model-instance": "^4.1.0",
     "@ceramicnetwork/stream-tile-handler": "^5.1.0",
     "@stablelib/sha256": "^1.0.1",
     "@types/express": "^4.17.21",

diff --git a/packages/cli/src/__tests__/ceramic-daemon.test.ts b/packages/cli/src/__tests__/ceramic-daemon.test.ts
@@ -26,6 +26,7 @@ import { CommonTestUtils as TestUtils } from '@ceramicnetwork/common-test-utils'
 import { EventSource } from 'cross-eventsource'
 import { AggregationDocument, JsonAsString } from '@ceramicnetwork/codecs'
 import { Model, ModelDefinition } from '@ceramicnetwork/stream-model'
+import { ModelInstanceDocument } from '@ceramicnetwork/stream-model-instance'
 import { decode } from 'codeco'
 
 const seed = 'SEED'
@@ -607,6 +608,35 @@ describe('Ceramic interop: core <> http-client', () => {
       expect(resCore[streamId.toString()].metadata).toEqual(metadata)
       expect(resClient[streamId.toString()].metadata).toEqual(metadata)
     })
+
+    it('handles genesis commit encoding', async () => {
+      const model = await Model.create(client, {
+        name: 'TestModel',
+        version: '2.0',
+        accountRelation: { type: 'set', fields: ['unique'] },
+        interface: false,
+        implements: [],
+        schema: {
+          type: 'object',
+          properties: {
+            unique: { type: 'string' },
+          },
+          required: ['unique'],
+          additionalProperties: false,
+        },
+      })
+
+      const meta = { controller: core.did?.id.toString(), deterministic: true, model: model.id }
+      const genesis = await ModelInstanceDocument.makeGenesis(client, null, meta, ['test'])
+      const streamId = await StreamID.fromGenesis(ModelInstanceDocument.STREAM_TYPE_ID, genesis)
+      const id = streamId.toString()
+
+      const resCore = await core.multiQuery([{ genesis, streamId }])
+      expect(resCore[id]).toBeInstanceOf(ModelInstanceDocument)
+
+      const resClient = await client.multiQuery([{ genesis, streamId }])
+      expect(resClient[id]).toBeInstanceOf(ModelInstanceDocument)
+    })
   })
 
   describeIfV3('pin api', () => {

diff --git a/packages/cli/src/ceramic-daemon.ts b/packages/cli/src/ceramic-daemon.ts
@@ -911,12 +911,13 @@ export class CeramicDaemon {
    * Load multiple streams and paths using an array of multiqueries
    */
   async multiQuery(req: Request, res: Response): Promise<void> {
-    const { queries } = <MultiQueries>req.body
-    const { timeout } = <MultiQueries>req.body
-
-    const results = await this.ceramic.multiQuery(queries, timeout)
-    const response = Object.entries(results).reduce((acc, e) => {
-      const [k, v] = e
+    const body = req.body as MultiQueries
+    const queries = body.queries.map((q) => ({
+      ...q,
+      genesis: q.genesis ? StreamUtils.deserializeCommit(q.genesis) : undefined,
+    }))
+    const results = await this.ceramic.multiQuery(queries, body.timeout)
+    const response = Object.entries(results).reduce((acc, [k, v]) => {
       acc[k] = StreamUtils.serializeState(v.state)
       return acc
     }, {})

diff --git a/packages/http-client/src/ceramic-http-client.ts b/packages/http-client/src/ceramic-http-client.ts
@@ -161,6 +161,7 @@ export class CeramicClient implements StreamReaderWriter {
     const queriesJSON = queries.map((q) => {
       return {
         ...q,
+        genesis: q.genesis ? StreamUtils.serializeCommit(q.genesis) : undefined,
         streamId: typeof q.streamId === 'string' ? q.streamId : q.streamId.toString(),
       }
     })