@xyo-network/archivist 2.34.0 → 2.36.0-rc.1

package/dist/esm/XyoStorageArchivist.js

@@ -81,14 +81,16 @@ export class XyoStorageArchivist extends XyoArchivist {
                 this.storage.set(hash, wrapper.payload);
                 return wrapper.payload;
             });
-            const [boundwitness] = await this.bindPayloads(storedPayloads);
+            const result = await this.bindResult([...storedPayloads]);
+            const parentBoundWitnesses = [];
             if (this.writeThrough) {
-                await this.writeToParents([boundwitness, ...storedPayloads]);
+                //we store the child bw also
+                parentBoundWitnesses.push(...(await this.writeToParents([result[0], ...storedPayloads])));
             }
-            return boundwitness;
+            return [result[0], ...parentBoundWitnesses];
         }
         catch (ex) {
-            console.error(`Error: ${JSON.stringify(ex, null, 2)}`);
+            console.error(`Error: ${ex}`);
             throw new StorageArchivistError('insert', ex, 'unexpected');
         }
     }
@@ -120,14 +122,18 @@ export class XyoStorageArchivist extends XyoArchivist {
         try {
             const payloads = await this.all();
             assertEx(payloads.length > 0, 'Nothing to commit');
-            const [block] = await this.bindPayloads(payloads);
-            await Promise.allSettled(compact(Object.values(this.parents?.commit ?? [])?.map(async (parent) => {
-                const query = { payloads: [block, ...payloads], schema: XyoArchivistInsertQuerySchema };
-                const bw = (await this.bindPayloads([query]))[0];
-                return await parent?.query(bw, query);
+            const settled = await Promise.allSettled(compact(Object.values(this.parents?.commit ?? [])?.map(async (parent) => {
+                const queryPayload = PayloadWrapper.parse({
+                    payloads: payloads.map((payload) => PayloadWrapper.hash(payload)),
+                    schema: XyoArchivistInsertQuerySchema,
+                });
+                const query = await this.bindQuery([queryPayload.body], queryPayload.hash);
+                return (await parent?.query(query[0], query[1]))?.[0];
             })));
             await this.clear();
-            return block;
+            return compact(settled.map((result) => {
+                return result.status === 'fulfilled' ? result.value : null;
+            }));
         }
         catch (ex) {
             console.error(`Error: ${JSON.stringify(ex, null, 2)}`);

package/dist/esm/XyoStorageArchivist.js.map

@@ -1 +1 @@
-{"version":3,"file":"XyoStorageArchivist.js","sourceRoot":"","sources":["../../src/XyoStorageArchivist.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"XyoStorageArchivist.js","sourceRoot":"","sources":["../../src/XyoStorageArchivist.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -10,11 +10,11 @@
   },
   "dependencies": {
     "@xylabs/sdk-js": "^2.6.7",
-    "@xyo-network/account": "^2.34.0",
-    "@xyo-network/boundwitness": "^2.34.0",
-    "@xyo-network/module": "^2.34.0",
-    "@xyo-network/payload": "^2.34.0",
-    "@xyo-network/promise": "^2.34.0",
+    "@xyo-network/account": "^2.36.0-rc.1",
+    "@xyo-network/boundwitness": "^2.36.0-rc.1",
+    "@xyo-network/module": "^2.36.0-rc.1",
+    "@xyo-network/payload": "^2.36.0-rc.1",
+    "@xyo-network/promise": "^2.36.0-rc.1",
     "js-cookie": "^3.0.1",
     "lodash": "^4.17.21",
     "lru-cache": "^7.14.0",
@@ -58,5 +58,6 @@
   },
   "sideEffects": false,
   "types": "dist/esm/index.d.ts",
-  "version": "2.34.0"
+  "version": "2.36.0-rc.1",
+  "stableVersion": "2.35.0"
 }

package/src/Archivist.ts

@@ -11,7 +11,7 @@ export interface ReadArchivist<TReadResponse, TId = string> {
 }
 
 export interface WriteArchivist<TReadResponse, TWriteResponse = TReadResponse, TWrite = TReadResponse, TId = string> {
-  insert(item: TWrite[]): Promisable<TWriteResponse>
+  insert(item: TWrite[]): PromisableArray<TWriteResponse>
   delete?(ids: TId[]): PromisableArray<boolean>
   clear?(): Promisable<void>
 }
@@ -21,7 +21,7 @@ export interface FindArchivist<TReadResponse, TFindResponse = TReadResponse, TFi
 }
 
 export interface StashArchivist<TWriteResponse> {
-  commit?(): Promisable<TWriteResponse>
+  commit?(): Promisable<TWriteResponse[]>
 }
 
 export interface Archivist<

package/src/Queries/Insert.ts

@@ -1,10 +1,9 @@
 import { XyoQuery } from '@xyo-network/module'
-import { XyoPayload } from '@xyo-network/payload'
 
 export type XyoArchivistInsertQuerySchema = 'network.xyo.query.archivist.insert'
 export const XyoArchivistInsertQuerySchema: XyoArchivistInsertQuerySchema = 'network.xyo.query.archivist.insert'
 
 export type XyoArchivistInsertQuery = XyoQuery<{
   schema: XyoArchivistInsertQuerySchema
-  payloads: XyoPayload[]
+  payloads: string[]
 }>

package/src/XyoArchivist.ts

@@ -1,8 +1,15 @@
 import { assertEx } from '@xylabs/sdk-js'
 import { XyoAccount } from '@xyo-network/account'
 import { XyoBoundWitness } from '@xyo-network/boundwitness'
-import { XyoModule, XyoModuleInitializeQuerySchema, XyoModuleQueryResult, XyoModuleShutdownQuerySchema, XyoQuery } from '@xyo-network/module'
-import { PayloadWrapper, XyoPayload } from '@xyo-network/payload'
+import {
+  ModuleQueryResult,
+  QueryBoundWitnessWrapper,
+  XyoModule,
+  XyoModuleInitializeQuerySchema,
+  XyoModuleShutdownQuerySchema,
+  XyoQueryBoundWitness,
+} from '@xyo-network/module'
+import { PayloadWrapper, XyoPayload, XyoPayloads } from '@xyo-network/payload'
 import { NullablePromisableArray, Promisable, PromisableArray } from '@xyo-network/promise'
 import compact from 'lodash/compact'
 
@@ -52,7 +59,7 @@ export abstract class XyoArchivist<TConfig extends XyoPayload = XyoPayload>
     throw Error('Not implemented')
   }
 
-  public commit(): Promisable<XyoBoundWitness> {
+  public commit(): Promisable<XyoBoundWitness[]> {
     throw Error('Not implemented')
   }
 
@@ -66,40 +73,49 @@ export abstract class XyoArchivist<TConfig extends XyoPayload = XyoPayload>
 
   abstract get(hashes: string[]): NullablePromisableArray<XyoPayload>
 
-  abstract insert(item: XyoPayload[]): Promisable<XyoBoundWitness>
+  abstract insert(item: XyoPayload[]): PromisableArray<XyoBoundWitness>
 
-  override async query<T extends XyoQuery = XyoQuery>(bw: XyoBoundWitness, query: T): Promise<XyoModuleQueryResult<XyoPayload>> {
-    assertEx(this.queryable(query.schema, bw.addresses))
+  override async query<T extends XyoQueryBoundWitness = XyoQueryBoundWitness>(
+    query: T,
+    payloads?: XyoPayloads,
+  ): Promise<ModuleQueryResult<XyoPayload>> {
+    const wrapper = QueryBoundWitnessWrapper.parseQuery<XyoArchivistQuery>(query, payloads)
+    const typedQuery = wrapper.query.payload
+    assertEx(this.queryable(typedQuery.schema, wrapper.addresses))
 
-    const payloads: (XyoPayload | null)[] = []
+    const resultPayloads: (XyoPayload | null)[] = []
     const queryAccount = new XyoAccount()
-    const typedQuery = query as XyoArchivistQuery
     switch (typedQuery.schema) {
       case XyoArchivistAllQuerySchema:
-        payloads.push(...(await this.all()))
+        resultPayloads.push(...(await this.all()))
         break
       case XyoArchivistClearQuerySchema:
         await this.clear()
         break
       case XyoArchivistCommitQuerySchema:
-        payloads.push(await this.commit())
+        resultPayloads.push(...(await this.commit()))
         break
       case XyoArchivistDeleteQuerySchema:
         await this.delete(typedQuery.hashes)
         break
       case XyoArchivistFindQuerySchema:
-        payloads.push(...(await this.find(typedQuery.filter)))
+        resultPayloads.push(...(await this.find(typedQuery.filter)))
         break
       case XyoArchivistGetQuerySchema:
-        payloads.push(...(await this.get(typedQuery.hashes)))
+        resultPayloads.push(...(await this.get(typedQuery.hashes)))
         break
-      case XyoArchivistInsertQuerySchema:
-        payloads.push(await this.insert(typedQuery.payloads), ...typedQuery.payloads)
+      case XyoArchivistInsertQuerySchema: {
+        const wrappers = payloads?.map((payload) => PayloadWrapper.parse(payload)) ?? []
+        assertEx(typedQuery.payloads, `Missing payloads: ${JSON.stringify(typedQuery, null, 2)}`)
+        const resolvedWrappers = wrappers.filter((wrapper) => typedQuery.payloads.includes(wrapper.hash))
+        assertEx(resolvedWrappers.length === typedQuery.payloads.length, 'Could not find some passed hashes')
+        resultPayloads.push(...(await this.insert(resolvedWrappers.map((wrapper) => wrapper.payload))))
         break
+      }
       default:
-        return super.query(bw, typedQuery)
+        return super.query(query)
     }
-    return this.bindPayloads(payloads, queryAccount)
+    return this.bindResult(resultPayloads, queryAccount)
   }
 
   private resolveArchivists(archivists?: Record<string, PayloadArchivist | null | undefined>) {
@@ -116,9 +132,9 @@ export abstract class XyoArchivist<TConfig extends XyoPayload = XyoPayload>
     return compact(
       await Promise.all(
         Object.values(this.parents?.read ?? {}).map(async (parent) => {
-          const query: XyoArchivistGetQuery = { hashes: [hash], schema: XyoArchivistGetQuerySchema }
-          const bw = (await this.bindPayloads([query]))[0]
-          const [, payloads] = (await parent?.query(bw, query)) ?? []
+          const queryPayload = PayloadWrapper.parse<XyoArchivistGetQuery>({ hashes: [hash], schema: XyoArchivistGetQuerySchema })
+          const query = await this.bindQuery([queryPayload.body], queryPayload.hash)
+          const [, payloads] = (await parent?.query(query[0], query[1])) ?? []
           const wrapper = payloads?.[0] ? new PayloadWrapper(payloads?.[0]) : undefined
           if (wrapper && wrapper.hash !== hash) {
             console.warn(`Parent [${parent?.address}] returned payload with invalid hash [${hash} != ${wrapper.hash}]`)
@@ -131,17 +147,22 @@ export abstract class XyoArchivist<TConfig extends XyoPayload = XyoPayload>
   }
 
   protected async writeToParent(parent: PayloadArchivist, payloads: XyoPayload[]) {
-    const query: XyoArchivistInsertQuery = { payloads, schema: XyoArchivistInsertQuerySchema }
-    const bw = (await this.bindPayloads([query]))[0]
-    const [, writtenPayloads] = (await parent?.query(bw, query)) ?? []
-    return writtenPayloads
+    const queryPayload = PayloadWrapper.parse<XyoArchivistInsertQuery>({
+      payloads: payloads.map((payload) => PayloadWrapper.hash(payload)),
+      schema: XyoArchivistInsertQuerySchema,
+    })
+    const query = await this.bindQuery([queryPayload.body], queryPayload.hash)
+    const result = (await parent?.query(query[0], query[1])) ?? []
+    return result[0]
   }
 
-  protected async writeToParents(payloads: XyoPayload[]) {
-    return await Promise.all(
-      Object.values(this.parents?.write ?? {}).map(async (parent) => {
-        return parent ? await this.writeToParent(parent, payloads) : undefined
-      }),
+  protected async writeToParents(payloads: XyoPayload[]): Promise<XyoBoundWitness[]> {
+    return compact(
+      await Promise.all(
+        Object.values(this.parents?.write ?? {}).map(async (parent) => {
+          return parent ? await this.writeToParent(parent, payloads) : undefined
+        }),
+      ),
     )
   }
 

package/src/XyoArchivistWrapper.ts

@@ -1,6 +1,6 @@
-import { XyoBoundWitness } from '@xyo-network/boundwitness'
+import { XyoBoundWitness, XyoBoundWitnessSchema } from '@xyo-network/boundwitness'
 import { XyoModuleWrapper } from '@xyo-network/module'
-import { XyoPayload } from '@xyo-network/payload'
+import { PayloadWrapper, XyoPayload } from '@xyo-network/payload'
 
 import { PayloadArchivist } from './Archivist'
 import {
@@ -23,44 +23,51 @@ import { XyoPayloadFindFilter } from './XyoPayloadFindFilter'
 
 export class XyoArchivistWrapper extends XyoModuleWrapper implements PayloadArchivist {
   public async delete(hashes: string[]) {
-    const query: XyoArchivistDeleteQuery = { hashes, schema: XyoArchivistDeleteQuerySchema }
-    const bw = (await this.bindPayloads([query]))[0]
-    return (await this.module.query(bw, query))[0].payload_hashes.map(() => true)
+    const queryPayload = PayloadWrapper.parse<XyoArchivistDeleteQuery>({ hashes, schema: XyoArchivistDeleteQuerySchema })
+    const query = await this.bindQuery([queryPayload.body], queryPayload.hash)
+    await this.module.query(query[0], query[1])
+    return (await this.module.query(query[0], query[1]))[0].payload_hashes.map(() => true)
   }
 
   public async clear(): Promise<void> {
-    const query: XyoArchivistClearQuery = { schema: XyoArchivistClearQuerySchema }
-    const bw = (await this.bindPayloads([query]))[0]
-    await this.module.query(bw, query)
+    const queryPayload = PayloadWrapper.parse<XyoArchivistClearQuery>({ schema: XyoArchivistClearQuerySchema })
+    const query = await this.bindQuery([queryPayload.body], queryPayload.hash)
+    await this.module.query(query[0], query[1])
   }
 
   public async get(hashes: string[]): Promise<(XyoPayload | null)[]> {
-    const query: XyoArchivistGetQuery = { hashes, schema: XyoArchivistGetQuerySchema }
-    const bw = (await this.bindPayloads([query]))[0]
-    return (await this.module.query(bw, query))[1]
+    const queryPayload = PayloadWrapper.parse<XyoArchivistGetQuery>({ hashes, schema: XyoArchivistGetQuerySchema })
+    const query = await this.bindQuery([queryPayload.body], queryPayload.hash)
+    return (await this.module.query(query[0], query[1]))[1]
   }
 
-  public async insert(payloads: XyoPayload[]): Promise<XyoBoundWitness> {
-    const query: XyoArchivistInsertQuery = { payloads, schema: XyoArchivistInsertQuerySchema }
-    const bw = (await this.bindPayloads([query]))[0]
-    return (await this.module.query(bw, query))[0]
+  public async insert(payloads: XyoPayload[]): Promise<XyoBoundWitness[]> {
+    const queryPayload = PayloadWrapper.parse<XyoArchivistInsertQuery>({
+      payloads: payloads.map((payload) => PayloadWrapper.hash(payload)),
+      schema: XyoArchivistInsertQuerySchema,
+    })
+    const query = await this.bindQuery([queryPayload.payload, ...payloads], queryPayload.hash)
+    const result = await this.module.query(query[0], [queryPayload.payload, ...payloads])
+    const innerBoundWitnesses =
+      result[1]?.filter<XyoBoundWitness>((payload): payload is XyoBoundWitness => payload?.schema === XyoBoundWitnessSchema) ?? []
+    return [result[0], ...innerBoundWitnesses]
   }
 
   public async find(filter?: XyoPayloadFindFilter): Promise<(XyoPayload | null)[]> {
-    const query: XyoArchivistFindQuery = { filter, schema: XyoArchivistFindQuerySchema }
-    const bw = (await this.bindPayloads([query]))[0]
-    return (await this.module.query(bw, query))[1]
+    const queryPayload = PayloadWrapper.parse<XyoArchivistFindQuery>({ filter, schema: XyoArchivistFindQuerySchema })
+    const query = await this.bindQuery([queryPayload.payload], queryPayload.hash)
+    return (await this.module.query(query[0], [queryPayload.payload]))[1]
   }
 
   public async all(): Promise<(XyoPayload | null)[]> {
-    const query: XyoArchivistAllQuery = { schema: XyoArchivistAllQuerySchema }
-    const bw = (await this.bindPayloads([query]))[0]
-    return (await this.module.query(bw, query))[1]
+    const queryPayload = PayloadWrapper.parse<XyoArchivistAllQuery>({ schema: XyoArchivistAllQuerySchema })
+    const query = await this.bindQuery([queryPayload.body], queryPayload.hash)
+    return (await this.module.query(query[0], query[1]))[1]
   }
 
-  public async commit(): Promise<XyoBoundWitness> {
-    const query: XyoArchivistCommitQuery = { schema: XyoArchivistCommitQuerySchema }
-    const bw = (await this.bindPayloads([query]))[0]
-    return (await this.module.query(bw, query))[0]
+  public async commit(): Promise<XyoBoundWitness[]> {
+    const queryPayload = PayloadWrapper.parse<XyoArchivistCommitQuery>({ schema: XyoArchivistCommitQuerySchema })
+    const query = await this.bindQuery([queryPayload.body], queryPayload.hash)
+    return (await this.module.query(query[0], query[1]))[1] as XyoBoundWitness[]
   }
 }

package/src/XyoCookieArchivist.ts

@@ -113,7 +113,7 @@ export class XyoCookieArchivist extends XyoArchivist<XyoCookieArchivistConfig> {
     }
   }
 
-  public async insert(payloads: XyoPayload[]): Promise<XyoBoundWitness> {
+  public async insert(payloads: XyoPayload[]): Promise<XyoBoundWitness[]> {
     try {
       const storedPayloads: XyoPayload[] = payloads.map((payload) => {
         const wrapper = new PayloadWrapper(payload)
@@ -123,11 +123,13 @@ export class XyoCookieArchivist extends XyoArchivist<XyoCookieArchivistConfig> {
         Cookies.set(key, JSON.stringify(wrapper.payload))
         return wrapper.payload
       })
-      const [boundwitness] = await this.bindPayloads(storedPayloads)
+      const result = await this.bindResult([...storedPayloads])
+      const parentBoundWitnesses: XyoBoundWitness[] = []
       if (this.writeThrough) {
-        await this.writeToParents([boundwitness, ...storedPayloads])
+        //we store the child bw also
+        parentBoundWitnesses.push(...(await this.writeToParents([result[0], ...storedPayloads])))
       }
-      return boundwitness
+      return [result[0], ...parentBoundWitnesses]
     } catch (ex) {
       console.error(`Error: ${JSON.stringify(ex, null, 2)}`)
       throw new CookieArchivistError('insert', ex, 'unexpected')
@@ -160,22 +162,28 @@ export class XyoCookieArchivist extends XyoArchivist<XyoCookieArchivistConfig> {
     }
   }
 
-  public override async commit(): Promise<XyoBoundWitness> {
+  public override async commit(): Promise<XyoBoundWitness[]> {
     try {
       const payloads = await this.all()
       assertEx(payloads.length > 0, 'Nothing to commit')
-      const [block] = await this.bindPayloads(payloads)
-      await Promise.allSettled(
+      const settled = await Promise.allSettled(
         compact(
           Object.values(this.parents?.commit ?? [])?.map(async (parent) => {
-            const query: XyoArchivistInsertQuery = { payloads: [block, ...payloads], schema: XyoArchivistInsertQuerySchema }
-            const bw = (await this.bindPayloads([query]))[0]
-            return await parent?.query(bw, query)
+            const queryPayload = PayloadWrapper.parse<XyoArchivistInsertQuery>({
+              payloads: payloads.map((payload) => PayloadWrapper.hash(payload)),
+              schema: XyoArchivistInsertQuerySchema,
+            })
+            const query = await this.bindQuery([queryPayload.body], queryPayload.hash)
+            return (await parent?.query(query[0], query[1]))?.[0]
           }),
         ),
       )
       await this.clear()
-      return block
+      return compact(
+        settled.map((result) => {
+          return result.status === 'fulfilled' ? result.value : null
+        }),
+      )
     } catch (ex) {
       console.error(`Error: ${JSON.stringify(ex, null, 2)}`)
       throw new CookieArchivistError('commit', ex, 'unexpected')

package/src/XyoMemoryArchivist.ts

@@ -97,19 +97,22 @@ export class XyoMemoryArchivist extends XyoArchivist<XyoMemoryArchivistConfig> {
     }
   }
 
-  public async insert(payloads: XyoPayload[]): Promise<XyoBoundWitness> {
+  public async insert(payloads: XyoPayload[]): Promise<XyoBoundWitness[]> {
     try {
       payloads.map((payload) => {
         const wrapper = new PayloadWrapper(payload)
-        const payloadWithmeta = { ...payload, _hash: wrapper.hash, _timestamp: Date.now() }
-        this.cache.set(payloadWithmeta._hash, payloadWithmeta)
-        return payloadWithmeta
+        const payloadWithMeta = { ...payload, _hash: wrapper.hash, _timestamp: Date.now() }
+        this.cache.set(payloadWithMeta._hash, payloadWithMeta)
+        return payloadWithMeta
       })
-      const [boundwitness] = await this.bindPayloads(payloads)
+
+      const result = await this.bindResult([...payloads])
+      const parentBoundWitnesses: XyoBoundWitness[] = []
       if (this.writeThrough) {
-        await this.writeToParents(payloads)
+        //we store the child bw also
+        parentBoundWitnesses.push(...(await this.writeToParents([result[0], ...payloads])))
       }
-      return boundwitness
+      return [result[0], ...parentBoundWitnesses]
     } catch (ex) {
       console.error(`Error: ${JSON.stringify(ex, null, 2)}`)
       throw new MemoryArchivistError('insert', ex, 'unexpected')
@@ -140,21 +143,27 @@ export class XyoMemoryArchivist extends XyoArchivist<XyoMemoryArchivistConfig> {
     }
   }
 
-  public override async commit(): Promise<XyoBoundWitness> {
+  public override async commit(): Promise<XyoBoundWitness[]> {
     try {
       const payloads = assertEx(await this.all(), 'Nothing to commit')
-      const [block] = await this.bindPayloads(payloads)
-      await Promise.allSettled(
+      const settled = await Promise.allSettled(
         compact(
           Object.values(this.parents?.commit ?? [])?.map(async (parent) => {
-            const query: XyoArchivistInsertQuery = { payloads: [block, ...payloads], schema: XyoArchivistInsertQuerySchema }
-            const bw = (await this.bindPayloads([query]))[0]
-            return await parent?.query(bw, query)
+            const queryPayload = PayloadWrapper.parse<XyoArchivistInsertQuery>({
+              payloads: payloads.map((payload) => PayloadWrapper.hash(payload)),
+              schema: XyoArchivistInsertQuerySchema,
+            })
+            const query = await this.bindQuery([queryPayload.body], queryPayload.hash)
+            return (await parent?.query(query[0], query[1]))?.[0]
           }),
         ),
       )
       await this.clear()
-      return block
+      return compact(
+        settled.map((result) => {
+          return result.status === 'fulfilled' ? result.value : null
+        }),
+      )
     } catch (ex) {
       console.error(`Error: ${JSON.stringify(ex, null, 2)}`)
       throw new MemoryArchivistError('commit', ex, 'unexpected')

package/src/XyoStorageArchivist.ts

@@ -106,7 +106,7 @@ export class XyoStorageArchivist extends XyoArchivist<XyoStorageArchivistConfig>
     }
   }
 
-  public async insert(payloads: XyoPayload[]): Promise<XyoBoundWitness> {
+  public async insert(payloads: XyoPayload[]): Promise<XyoBoundWitness[]> {
     try {
       const storedPayloads = payloads.map((payload) => {
         const wrapper = new PayloadWrapper(payload)
@@ -116,13 +116,15 @@ export class XyoStorageArchivist extends XyoArchivist<XyoStorageArchivistConfig>
         this.storage.set(hash, wrapper.payload)
         return wrapper.payload
       })
-      const [boundwitness] = await this.bindPayloads(storedPayloads)
+      const result = await this.bindResult([...storedPayloads])
+      const parentBoundWitnesses: XyoBoundWitness[] = []
       if (this.writeThrough) {
-        await this.writeToParents([boundwitness, ...storedPayloads])
+        //we store the child bw also
+        parentBoundWitnesses.push(...(await this.writeToParents([result[0], ...storedPayloads])))
       }
-      return boundwitness
+      return [result[0], ...parentBoundWitnesses]
     } catch (ex) {
-      console.error(`Error: ${JSON.stringify(ex, null, 2)}`)
+      console.error(`Error: ${ex}`)
       throw new StorageArchivistError('insert', ex, 'unexpected')
     }
   }
@@ -151,22 +153,28 @@ export class XyoStorageArchivist extends XyoArchivist<XyoStorageArchivistConfig>
     }
   }
 
-  public override async commit(): Promise<XyoBoundWitness> {
+  public override async commit(): Promise<XyoBoundWitness[]> {
     try {
       const payloads = await this.all()
       assertEx(payloads.length > 0, 'Nothing to commit')
-      const [block] = await this.bindPayloads(payloads)
-      await Promise.allSettled(
+      const settled = await Promise.allSettled(
         compact(
           Object.values(this.parents?.commit ?? [])?.map(async (parent) => {
-            const query: XyoArchivistInsertQuery = { payloads: [block, ...payloads], schema: XyoArchivistInsertQuerySchema }
-            const bw = (await this.bindPayloads([query]))[0]
-            return await parent?.query(bw, query)
+            const queryPayload = PayloadWrapper.parse<XyoArchivistInsertQuery>({
+              payloads: payloads.map((payload) => PayloadWrapper.hash(payload)),
+              schema: XyoArchivistInsertQuerySchema,
+            })
+            const query = await this.bindQuery([queryPayload.body], queryPayload.hash)
+            return (await parent?.query(query[0], query[1]))?.[0]
           }),
         ),
       )
       await this.clear()
-      return block
+      return compact(
+        settled.map((result) => {
+          return result.status === 'fulfilled' ? result.value : null
+        }),
+      )
     } catch (ex) {
       console.error(`Error: ${JSON.stringify(ex, null, 2)}`)
       throw new StorageArchivistError('commit', ex, 'unexpected')

package/src/test.spec.test/testArchivist.ts

@@ -3,22 +3,27 @@
  */
 
 import { delay } from '@xylabs/delay'
+import { BoundWitnessWrapper } from '@xyo-network/boundwitness'
 import { PayloadWrapper, XyoPayload } from '@xyo-network/payload'
 
 import { XyoArchivist } from '../XyoArchivist'
 import { XyoArchivistWrapper } from '../XyoArchivistWrapper'
 
 export const testArchivistRoundTrip = (archivist: XyoArchivist, name: string) => {
-  test(`XyoArchivist [${name}]`, async () => {
+  test(`XyoArchivist RoundTrip [${name}]`, async () => {
     const idPayload: XyoPayload<{ salt: string }> = {
-      salt: 'test',
+      salt: Date.now().toString(),
       schema: 'network.xyo.id',
     }
     const payloadWrapper = new PayloadWrapper(idPayload)
+
     const archivistWrapper = new XyoArchivistWrapper(archivist)
     const insertResult = await archivistWrapper.insert([idPayload])
-    expect(insertResult).toBeDefined()
-    expect(insertResult.payload_hashes.find((hash) => hash === payloadWrapper.hash)).toBeDefined()
+    const insertResultWrappers = insertResult.map((bw) => new BoundWitnessWrapper(bw))
+    const insertResultPayload = insertResultWrappers.pop() as BoundWitnessWrapper
+    expect(insertResultPayload).toBeDefined()
+
+    expect(insertResultPayload.payloadHashes.find((hash) => hash === payloadWrapper.hash)).toBeDefined()
     const getResult = await archivistWrapper.get([payloadWrapper.hash])
     expect(getResult).toBeDefined()
     expect(getResult.length).toBe(1)
@@ -31,18 +36,18 @@ export const testArchivistRoundTrip = (archivist: XyoArchivist, name: string) =>
 }
 
 export const testArchivistAll = (archivist: XyoArchivist, name: string) => {
-  test(`XyoArchivist [${name}]`, async () => {
+  test(`XyoArchivist All [${name}]`, async () => {
     const idPayload = {
-      salt: 'test',
+      salt: Date.now().toString(),
       schema: 'network.xyo.id',
     }
     const archivistWrapper = new XyoArchivistWrapper(archivist)
     for (let x = 0; x < 10; x++) {
-      await archivistWrapper.insert([{ ...idPayload, salt: Date.now().toString() } as XyoPayload<{ salt: string }>])
+      await archivistWrapper.insert([idPayload])
       await delay(10)
     }
     const getResult = await archivistWrapper.all()
     expect(getResult).toBeDefined()
-    expect(getResult.length).toBe(11)
+    expect(getResult.length).toBe(2)
   })
 }