@xyo-network/api 2.22.4 → 2.22.5

package/dist/cjs/Archivist/Account/Api.d.ts

@@ -13,6 +13,6 @@ export interface XyoAccountVerify {
     token?: string;
 }
 export declare class XyoAccountApi extends XyoApiBase {
-    get challenge(): XyoApiSimple<XyoAccountChallenge, XyoAccountChallenge, Record<string, never>, import("../../models/Api/Config").XyoApiConfig>;
-    get verify(): XyoApiSimple<XyoAccountVerify, XyoAccountVerify, Record<string, never>, import("../../models/Api/Config").XyoApiConfig>;
+    get challenge(): XyoApiSimple<XyoAccountChallenge, XyoAccountChallenge, import("@xyo-network/payload").XyoPayloadBase, import("../../models/Api/Config").XyoApiConfig>;
+    get verify(): XyoApiSimple<XyoAccountVerify, XyoAccountVerify, import("@xyo-network/payload").XyoPayloadBase, import("../../models/Api/Config").XyoApiConfig>;
 }

package/dist/cjs/Archivist/Api.d.ts

@@ -13,14 +13,14 @@ export declare class XyoArchivistApi extends XyoApiBase {
     private _archives?;
     get archives(): XyoArchivistArchivesApi;
     private _stats?;
-    get stats(): XyoApiSimple<unknown[], unknown[], Record<string, never>, import("../models/Api/Config").XyoApiConfig>;
+    get stats(): XyoApiSimple<unknown[], unknown[], import("@xyo-network/payload").XyoPayloadBase, import("../models/Api/Config").XyoApiConfig>;
     private _user?;
     get user(): XyoUserApi;
     archive(archive?: string): XyoArchivistArchiveApi;
     /** @deprecated use account instead */
     wallet(address: XyoDataLike): XyoAccountApi;
     account(address: XyoDataLike): XyoAccountApi;
-    huri(huri: Huri | string): XyoApiSimple<import("@xyo-network/payload").XyoPayloadBase, import("@xyo-network/payload").XyoPayloadBase, Record<string, never>, import("../models/Api/Config").XyoApiConfig>;
+    huri(huri: Huri | string): XyoApiSimple<import("@xyo-network/payload").XyoPayloadBase, import("@xyo-network/payload").XyoPayloadBase, import("@xyo-network/payload").XyoPayloadBase, import("../models/Api/Config").XyoApiConfig>;
     /**
      * Issues commands/queries as XyoBoundWitness wrapped XyoPayloads against a Node in the network
      * @param archive Optional, the archive to issue the requests against

package/dist/cjs/Archivist/Archive/Settings/Key/Api.d.ts

@@ -1,5 +1,5 @@
 import { XyoArchiveKey } from '../../../../models';
 import { XyoApiSimple } from '../../../../Simple';
 export declare class XyoArchivistArchiveSettingsKeyApi extends XyoApiSimple<XyoArchiveKey[]> {
-    key(key: string): XyoApiSimple<XyoArchiveKey, XyoArchiveKey, Record<string, never>, import("../../../../models/Api/Config").XyoApiConfig>;
+    key(key: string): XyoApiSimple<XyoArchiveKey, XyoArchiveKey, import("@xyo-network/payload").XyoPayloadBase, import("../../../../models/Api/Config").XyoApiConfig>;
 }

package/dist/cjs/Archivist/Payload/Api.js

@@ -44,25 +44,25 @@ class XyoArchivistPayloadApi extends Simple_1.XyoApiSimple {
     /** @deprecated use find */
     findBefore(timestamp, limit = 20) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            return yield this.find({ limit, order: 'desc', timestamp });
+            return yield this.find({ limit, order: 'desc', schema: 'network.xyo.query', timestamp });
         });
     }
     /** @deprecated use findBefore */
     getBefore(timestamp, limit = 20) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            return yield this.find({ limit, order: 'desc', timestamp });
+            return yield this.find({ limit, order: 'desc', schema: 'network.xyo.query', timestamp });
         });
     }
     /** @deprecated use find */
     findAfter(timestamp, limit = 20) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            return yield this.find({ limit, order: 'asc', timestamp });
+            return yield this.find({ limit, order: 'asc', schema: 'network.xyo.query', timestamp });
         });
     }
     /** @deprecated use find */
     getAfter(timestamp, limit = 20) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            return yield this.find({ limit, order: 'asc', timestamp });
+            return yield this.find({ limit, order: 'asc', schema: 'network.xyo.query', timestamp });
         });
     }
     /** @deprecated use find */
@@ -70,13 +70,13 @@ class XyoArchivistPayloadApi extends Simple_1.XyoApiSimple {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             (0, sdk_js_1.assertEx)(limit > 0, 'min limit = 1');
             (0, sdk_js_1.assertEx)(limit <= 100, 'max limit = 100');
-            return yield this.find({ limit, order: 'desc', timestamp: 999999999999 });
+            return yield this.find({ limit, order: 'desc', schema: 'network.xyo.query', timestamp: 999999999999 });
         });
     }
     /** @deprecated use find */
     getMostRecent(limit = 20) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            return yield this.find({ limit, order: 'desc', timestamp: 999999999999 });
+            return yield this.find({ limit, order: 'desc', schema: 'network.xyo.query', timestamp: 999999999999 });
         });
     }
 }

package/dist/cjs/Archivist/Payload/Api.js.map

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

package/dist/cjs/Archivist/Payload/Schema/Api.d.ts

@@ -4,5 +4,5 @@ export interface XyoArchivistArchivePayloadSchemaStats {
 }
 export declare class XyoArchivistArchivePayloadSchemaApi extends XyoApiSimple<string[]> {
     private _stats?;
-    get stats(): XyoApiSimple<XyoArchivistArchivePayloadSchemaStats, XyoArchivistArchivePayloadSchemaStats, Record<string, never>, import("../../../models/Api/Config").XyoApiConfig>;
+    get stats(): XyoApiSimple<XyoArchivistArchivePayloadSchemaStats, XyoArchivistArchivePayloadSchemaStats, import("@xyo-network/payload").XyoPayloadBase, import("../../../models/Api/Config").XyoApiConfig>;
 }

package/dist/cjs/Archivist/XyoApiArchivist.d.ts

@@ -1,12 +1,12 @@
 import { XyoAccount } from '@xyo-network/account';
-import { XyoArchivist, XyoBoundWitnessArchivist, XyoPayloadFindFilter } from '@xyo-network/archivist';
-import { XyoBoundWitnessWithPartialMeta } from '@xyo-network/boundwitness';
+import { XyoArchivist, XyoArchivistBase, XyoPayloadFindFilter } from '@xyo-network/archivist';
+import { XyoPayload } from '@xyo-network/payload';
 import { XyoArchivistApi } from './Api';
-export declare class XyoApiArchivist extends XyoBoundWitnessArchivist {
+export declare class XyoApiArchivist extends XyoArchivistBase {
     protected api: XyoArchivistApi;
     protected archive: string;
     constructor(api: XyoArchivistApi, archive: string, parent?: XyoArchivist, account?: XyoAccount);
-    get(hash: string): Promise<import("@xyo-network/payload").XyoPayloadBase[] | undefined>;
-    insert(payload: XyoBoundWitnessWithPartialMeta): Promise<string[]>;
+    get(hash: string): Promise<import("@xyo-network/payload").XyoPayloadBase | undefined>;
+    insert(payloads: XyoPayload[]): Promise<import("@xyo-network/payload").XyoPayloadBase[]>;
     find(filter: XyoPayloadFindFilter): Promise<import("@xyo-network/payload").XyoPayloadWithPartialMeta<import("@xyo-network/core").EmptyObject>[]>;
 }

package/dist/cjs/Archivist/XyoApiArchivist.js

@@ -4,7 +4,8 @@ exports.XyoApiArchivist = void 0;
 const tslib_1 = require("tslib");
 const sdk_js_1 = require("@xylabs/sdk-js");
 const archivist_1 = require("@xyo-network/archivist");
-class XyoApiArchivist extends archivist_1.XyoBoundWitnessArchivist {
+const payload_1 = require("@xyo-network/payload");
+class XyoApiArchivist extends archivist_1.XyoArchivistBase {
     constructor(api, archive, parent, account) {
         super(parent, account);
         this.api = api;
@@ -13,13 +14,31 @@ class XyoApiArchivist extends archivist_1.XyoBoundWitnessArchivist {
     get(hash) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const [payloads] = yield this.api.archive(this.archive).payload.hash(hash).get('tuple');
-            return payloads;
+            return payloads === null || payloads === void 0 ? void 0 : payloads.pop();
         });
     }
-    insert(payload) {
-        var _a, _b;
+    insert(payloads) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            return (_b = (_a = (yield this.api.archive(this.archive).block.post([payload]))) === null || _a === void 0 ? void 0 : _a.map((value) => (0, sdk_js_1.assertEx)(value._hash))) !== null && _b !== void 0 ? _b : [];
+            const boundwitnesses = payloads.filter((payload) => payload.schema === 'network.xyo.payload');
+            boundwitnesses.forEach((boundwitness) => {
+                boundwitness._payloads ===
+                    payloads.filter((payload) => {
+                        const hash = new payload_1.XyoPayloadWrapper(payload).hash;
+                        return boundwitness.payload_hashes.includes(hash);
+                    });
+            });
+            payloads.forEach((payload) => {
+                let found = false;
+                const hash = new payload_1.XyoPayloadWrapper(payload).hash;
+                boundwitnesses.forEach((boundwitnesses) => {
+                    if (boundwitnesses.payload_hashes.includes(hash)) {
+                        found = true;
+                    }
+                });
+                (0, sdk_js_1.assertEx)(found, 'Payload not in Boundwitness received');
+            });
+            yield this.api.archive(this.archive).block.post(boundwitnesses);
+            return payloads;
         });
     }
     find(filter) {

package/dist/cjs/Archivist/XyoApiArchivist.js.map

@@ -1 +1 @@
-{"version":3,"file":"XyoApiArchivist.js","sourceRoot":"","sources":["../../../src/Archivist/XyoApiArchivist.ts"],"names":[],"mappings":";;;;AAAA,2CAAyC;AAEzC,sDAAqG;AAKrG,MAAa,eAAgB,SAAQ,oCAAwB;IAG3D,YAAY,GAAoB,EAAE,OAAe,EAAE,MAAqB,EAAE,OAAoB;QAC5F,KAAK,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;QACtB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;QACd,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IACxB,CAAC;IAEY,GAAG,CAAC,IAAY;;YAC3B,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;YACvF,OAAO,QAAQ,CAAA;QACjB,CAAC;KAAA;IAEY,MAAM,CAAC,OAAuC;;;YACzD,OAAO,MAAA,MAAA,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,0CAAE,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAA,iBAAQ,EAAC,KAAK,CAAC,KAAK,CAAC,CAAC,mCAAI,EAAE,CAAA;;KACjH;IAEY,IAAI,CAAC,MAA4B;;;YAC5C,MAAM,CAAC,QAAQ,GAAG,EAAE,CAAC,GAAG,MAAA,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,mCAAI,EAAE,CAAA;YAClG,MAAM,CAAC,MAAM,GAAG,EAAE,CAAC,GAAG,MAAA,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,mCAAI,EAAE,CAAA;YAC9F,OAAO,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;;KAC/B;CACF;AAvBD,0CAuBC"}
+{"version":3,"file":"XyoApiArchivist.js","sourceRoot":"","sources":["../../../src/Archivist/XyoApiArchivist.ts"],"names":[],"mappings":";;;;AAAA,2CAAyC;AAEzC,sDAA6F;AAE7F,kDAAoE;AAIpE,MAAa,eAAgB,SAAQ,4BAAgB;IAGnD,YAAY,GAAoB,EAAE,OAAe,EAAE,MAAqB,EAAE,OAAoB;QAC5F,KAAK,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;QACtB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;QACd,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IACxB,CAAC;IAEY,GAAG,CAAC,IAAY;;YAC3B,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;YACvF,OAAO,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,GAAG,EAAE,CAAA;QACxB,CAAC;KAAA;IAEY,MAAM,CAAC,QAAsB;;YACxC,MAAM,cAAc,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,KAAK,qBAAqB,CAAqC,CAAA;YACjI,cAAc,CAAC,OAAO,CAAC,CAAC,YAAY,EAAE,EAAE;gBACtC,YAAY,CAAC,SAAS;oBACpB,QAAQ,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE;wBAC1B,MAAM,IAAI,GAAG,IAAI,2BAAiB,CAAC,OAAO,CAAC,CAAC,IAAI,CAAA;wBAChD,OAAO,YAAY,CAAC,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;oBACnD,CAAC,CAAC,CAAA;YACN,CAAC,CAAC,CAAA;YACF,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;gBAC3B,IAAI,KAAK,GAAG,KAAK,CAAA;gBACjB,MAAM,IAAI,GAAG,IAAI,2BAAiB,CAAC,OAAO,CAAC,CAAC,IAAI,CAAA;gBAChD,cAAc,CAAC,OAAO,CAAC,CAAC,cAAc,EAAE,EAAE;oBACxC,IAAI,cAAc,CAAC,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;wBAChD,KAAK,GAAG,IAAI,CAAA;qBACb;gBACH,CAAC,CAAC,CAAA;gBACF,IAAA,iBAAQ,EAAC,KAAK,EAAE,sCAAsC,CAAC,CAAA;YACzD,CAAC,CAAC,CAAA;YACF,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,CAAA;YAC/D,OAAO,QAAQ,CAAA;QACjB,CAAC;KAAA;IAEY,IAAI,CAAC,MAA4B;;;YAC5C,MAAM,CAAC,QAAQ,GAAG,EAAE,CAAC,GAAG,MAAA,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,mCAAI,EAAE,CAAA;YAClG,MAAM,CAAC,MAAM,GAAG,EAAE,CAAC,GAAG,MAAA,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,mCAAI,EAAE,CAAA;YAC9F,OAAO,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;;KAC/B;CACF;AA1CD,0CA0CC"}

package/dist/cjs/Archivist/XyoRemoteArchivist.d.ts

@@ -0,0 +1,12 @@
+import { XyoAccount } from '@xyo-network/account';
+import { XyoArchivist, XyoArchivistBase, XyoPayloadFindFilter } from '@xyo-network/archivist';
+import { XyoPayload } from '@xyo-network/payload';
+import { XyoArchivistApi } from './Api';
+export declare class XyoRemoteArchivist extends XyoArchivistBase {
+    protected api: XyoArchivistApi;
+    protected archive: string;
+    constructor(api: XyoArchivistApi, archive: string, parent?: XyoArchivist, account?: XyoAccount);
+    get(hash: string): Promise<import("@xyo-network/payload").XyoPayloadBase | undefined>;
+    insert(payloads: XyoPayload[]): Promise<import("@xyo-network/payload").XyoPayloadBase[]>;
+    find(filter: XyoPayloadFindFilter): Promise<import("@xyo-network/payload").XyoPayloadWithPartialMeta<import("@xyo-network/core").EmptyObject>[]>;
+}

package/dist/cjs/Archivist/XyoRemoteArchivist.js

@@ -0,0 +1,54 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.XyoRemoteArchivist = void 0;
+const tslib_1 = require("tslib");
+const sdk_js_1 = require("@xylabs/sdk-js");
+const archivist_1 = require("@xyo-network/archivist");
+const payload_1 = require("@xyo-network/payload");
+class XyoRemoteArchivist extends archivist_1.XyoArchivistBase {
+    constructor(api, archive, parent, account) {
+        super(parent, account);
+        this.api = api;
+        this.archive = archive;
+    }
+    get(hash) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const [payloads] = yield this.api.archive(this.archive).payload.hash(hash).get('tuple');
+            return payloads === null || payloads === void 0 ? void 0 : payloads.pop();
+        });
+    }
+    insert(payloads) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const boundwitnesses = payloads.filter((payload) => payload.schema === 'network.xyo.payload');
+            boundwitnesses.forEach((boundwitness) => {
+                boundwitness._payloads ===
+                    payloads.filter((payload) => {
+                        const hash = new payload_1.XyoPayloadWrapper(payload).hash;
+                        return boundwitness.payload_hashes.includes(hash);
+                    });
+            });
+            payloads.forEach((payload) => {
+                let found = false;
+                const hash = new payload_1.XyoPayloadWrapper(payload).hash;
+                boundwitnesses.forEach((boundwitnesses) => {
+                    if (boundwitnesses.payload_hashes.includes(hash)) {
+                        found = true;
+                    }
+                });
+                (0, sdk_js_1.assertEx)(found, 'Payload not in Boundwitness received');
+            });
+            yield this.api.archive(this.archive).block.post(boundwitnesses);
+            return payloads;
+        });
+    }
+    find(filter) {
+        var _a, _b;
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const [payloads = []] = (_a = (yield this.api.archive(this.archive).payload.find(filter, 'tuple'))) !== null && _a !== void 0 ? _a : [];
+            const [blocks = []] = (_b = (yield this.api.archive(this.archive).block.find(filter, 'tuple'))) !== null && _b !== void 0 ? _b : [];
+            return payloads.concat(blocks);
+        });
+    }
+}
+exports.XyoRemoteArchivist = XyoRemoteArchivist;
+//# sourceMappingURL=XyoRemoteArchivist.js.map

package/dist/cjs/Archivist/XyoRemoteArchivist.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"XyoRemoteArchivist.js","sourceRoot":"","sources":["../../../src/Archivist/XyoRemoteArchivist.ts"],"names":[],"mappings":";;;;AAAA,2CAAyC;AAEzC,sDAA6F;AAE7F,kDAAoE;AAIpE,MAAa,kBAAmB,SAAQ,4BAAgB;IAGtD,YAAY,GAAoB,EAAE,OAAe,EAAE,MAAqB,EAAE,OAAoB;QAC5F,KAAK,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;QACtB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;QACd,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IACxB,CAAC;IAEY,GAAG,CAAC,IAAY;;YAC3B,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;YACvF,OAAO,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,GAAG,EAAE,CAAA;QACxB,CAAC;KAAA;IAEY,MAAM,CAAC,QAAsB;;YACxC,MAAM,cAAc,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,KAAK,qBAAqB,CAAqC,CAAA;YACjI,cAAc,CAAC,OAAO,CAAC,CAAC,YAAY,EAAE,EAAE;gBACtC,YAAY,CAAC,SAAS;oBACpB,QAAQ,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE;wBAC1B,MAAM,IAAI,GAAG,IAAI,2BAAiB,CAAC,OAAO,CAAC,CAAC,IAAI,CAAA;wBAChD,OAAO,YAAY,CAAC,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;oBACnD,CAAC,CAAC,CAAA;YACN,CAAC,CAAC,CAAA;YACF,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;gBAC3B,IAAI,KAAK,GAAG,KAAK,CAAA;gBACjB,MAAM,IAAI,GAAG,IAAI,2BAAiB,CAAC,OAAO,CAAC,CAAC,IAAI,CAAA;gBAChD,cAAc,CAAC,OAAO,CAAC,CAAC,cAAc,EAAE,EAAE;oBACxC,IAAI,cAAc,CAAC,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;wBAChD,KAAK,GAAG,IAAI,CAAA;qBACb;gBACH,CAAC,CAAC,CAAA;gBACF,IAAA,iBAAQ,EAAC,KAAK,EAAE,sCAAsC,CAAC,CAAA;YACzD,CAAC,CAAC,CAAA;YACF,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,CAAA;YAC/D,OAAO,QAAQ,CAAA;QACjB,CAAC;KAAA;IAEY,IAAI,CAAC,MAA4B;;;YAC5C,MAAM,CAAC,QAAQ,GAAG,EAAE,CAAC,GAAG,MAAA,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,mCAAI,EAAE,CAAA;YAClG,MAAM,CAAC,MAAM,GAAG,EAAE,CAAC,GAAG,MAAA,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,mCAAI,EAAE,CAAA;YAC9F,OAAO,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;;KAC/B;CACF;AA1CD,gDA0CC"}

package/dist/cjs/Archivist/index.d.ts

@@ -4,4 +4,4 @@ export * from './Archive';
 export * from './Archives';
 export * from './Block';
 export * from './Payload';
-export * from './XyoApiArchivist';
+export * from './XyoRemoteArchivist';

package/dist/cjs/Archivist/index.js

@@ -7,5 +7,5 @@ tslib_1.__exportStar(require("./Archive"), exports);
 tslib_1.__exportStar(require("./Archives"), exports);
 tslib_1.__exportStar(require("./Block"), exports);
 tslib_1.__exportStar(require("./Payload"), exports);
-tslib_1.__exportStar(require("./XyoApiArchivist"), exports);
+tslib_1.__exportStar(require("./XyoRemoteArchivist"), exports);
 //# sourceMappingURL=index.js.map

package/dist/cjs/Archivist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/Archivist/index.ts"],"names":[],"mappings":";;;AAAA,oDAAyB;AACzB,gDAAqB;AACrB,oDAAyB;AACzB,qDAA0B;AAC1B,kDAAuB;AACvB,oDAAyB;AACzB,4DAAiC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/Archivist/index.ts"],"names":[],"mappings":";;;AAAA,oDAAyB;AACzB,gDAAqB;AACrB,oDAAyB;AACzB,qDAA0B;AAC1B,kDAAuB;AACvB,oDAAyB;AACzB,+DAAoC"}

package/dist/cjs/Simple.d.ts

@@ -1,8 +1,9 @@
+import { EmptyObject } from '@xyo-network/core';
 import { XyoPayload } from '@xyo-network/payload';
 import { XyoApiBase } from './Base';
 import { XyoApiConfig, XyoApiResponseBody, XyoApiResponseTuple } from './models';
-export declare type XyoApiSimpleQuery = Record<string, unknown>;
-export declare class XyoApiSimple<T = XyoPayload, D = T, Q extends XyoApiSimpleQuery = Record<string, never>, C extends XyoApiConfig = XyoApiConfig> extends XyoApiBase<C> {
+export declare type XyoApiSimpleQuery<T extends EmptyObject = EmptyObject> = XyoPayload<T>;
+export declare class XyoApiSimple<T = XyoPayload, D = T, Q extends XyoApiSimpleQuery = XyoApiSimpleQuery, C extends XyoApiConfig = XyoApiConfig> extends XyoApiBase<C> {
     get(): Promise<XyoApiResponseBody<T>>;
     get(responseType?: 'body'): Promise<XyoApiResponseBody<T>>;
     get(responseType?: 'tuple'): Promise<XyoApiResponseTuple<T>>;

package/dist/cjs/Simple.js.map

@@ -1 +1 @@
-{"version":3,"file":"Simple.js","sourceRoot":"","sources":["../../src/Simple.ts"],"names":[],"mappings":";;;;AAEA,iCAAmC;AAEnC,6CAAyC;AAIzC,MAAa,YAAgI,SAAQ,iBAAa;IAInJ,GAAG,CAAC,YAAiC;;YAChD,QAAQ,YAAY,EAAE;gBACpB,KAAK,OAAO;oBACV,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;gBACnD;oBACE,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAA;aAC3C;QACH,CAAC;KAAA;IAKY,IAAI,CAAC,KAAK,GAAG,EAAE,EAAE,YAAiC;;YAC7D,QAAQ,YAAY,EAAE;gBACpB,KAAK,OAAO;oBACV,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,IAAA,uBAAU,EAAC,KAAK,CAAC,EAAE,OAAO,CAAC,CAAA;gBAC3D;oBACE,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,IAAA,uBAAU,EAAC,KAAK,CAAC,CAAC,CAAA;aACnD;QACH,CAAC;KAAA;IAKY,IAAI,CAAC,IAAQ,EAAE,YAAiC;;YAC3D,QAAQ,YAAY,EAAE;gBACpB,KAAK,OAAO;oBACV,OAAO,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;gBAC1D;oBACE,OAAO,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,IAAI,CAAC,CAAA;aAClD;QACH,CAAC;KAAA;IAKY,GAAG,CAAC,IAAQ,EAAE,YAAiC;;YAC1D,QAAQ,YAAY,EAAE;gBACpB,KAAK,OAAO;oBACV,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;gBACzD;oBACE,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,IAAI,CAAC,CAAA;aACjD;QACH,CAAC;KAAA;IAKY,MAAM,CAAC,YAAiC;;YACnD,QAAQ,YAAY,EAAE;gBACpB,KAAK,OAAO;oBACV,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;gBACtD;oBACE,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,CAAA;aAC9C;QACH,CAAC;KAAA;CACF;AA5DD,oCA4DC"}
+{"version":3,"file":"Simple.js","sourceRoot":"","sources":["../../src/Simple.ts"],"names":[],"mappings":";;;;AAGA,iCAAmC;AAEnC,6CAAyC;AAIzC,MAAa,YAA4H,SAAQ,iBAAa;IAI/I,GAAG,CAAC,YAAiC;;YAChD,QAAQ,YAAY,EAAE;gBACpB,KAAK,OAAO;oBACV,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;gBACnD;oBACE,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAA;aAC3C;QACH,CAAC;KAAA;IAKY,IAAI,CAAC,KAAK,GAAG,EAAE,EAAE,YAAiC;;YAC7D,QAAQ,YAAY,EAAE;gBACpB,KAAK,OAAO;oBACV,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,IAAA,uBAAU,EAAC,KAAK,CAAC,EAAE,OAAO,CAAC,CAAA;gBAC3D;oBACE,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,IAAA,uBAAU,EAAC,KAAK,CAAC,CAAC,CAAA;aACnD;QACH,CAAC;KAAA;IAKY,IAAI,CAAC,IAAQ,EAAE,YAAiC;;YAC3D,QAAQ,YAAY,EAAE;gBACpB,KAAK,OAAO;oBACV,OAAO,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;gBAC1D;oBACE,OAAO,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,IAAI,CAAC,CAAA;aAClD;QACH,CAAC;KAAA;IAKY,GAAG,CAAC,IAAQ,EAAE,YAAiC;;YAC1D,QAAQ,YAAY,EAAE;gBACpB,KAAK,OAAO;oBACV,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;gBACzD;oBACE,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,IAAI,CAAC,CAAA;aACjD;QACH,CAAC;KAAA;IAKY,MAAM,CAAC,YAAiC;;YACnD,QAAQ,YAAY,EAAE;gBACpB,KAAK,OAAO;oBACV,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;gBACtD;oBACE,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,CAAA;aAC9C;QACH,CAAC;KAAA;CACF;AA5DD,oCA4DC"}

package/dist/cjs/User/Api.d.ts

@@ -11,8 +11,8 @@ export interface XyoUserLogin {
 export declare class XyoUserApi extends XyoApiBase {
     get authenticated(): boolean;
     get headers(): Record<string, string>;
-    get login(): XyoApiSimple<XyoUserLogin, XyoUserLogin, Record<string, never>, import("../models/Api/Config").XyoApiConfig>;
-    get profile(): XyoApiSimple<import("@xyo-network/payload").XyoPayloadBase, import("@xyo-network/payload").XyoPayloadBase, Record<string, never>, {
+    get login(): XyoApiSimple<XyoUserLogin, XyoUserLogin, import("@xyo-network/payload").XyoPayloadBase, import("../models/Api/Config").XyoApiConfig>;
+    get profile(): XyoApiSimple<import("@xyo-network/payload").XyoPayloadBase, import("@xyo-network/payload").XyoPayloadBase, import("@xyo-network/payload").XyoPayloadBase, {
         root: string;
         apiDomain: string; /** @field Password of the user [in] */
         userid?: string | undefined;

package/dist/esm/Archivist/Account/Api.d.ts

@@ -13,6 +13,6 @@ export interface XyoAccountVerify {
     token?: string;
 }
 export declare class XyoAccountApi extends XyoApiBase {
-    get challenge(): XyoApiSimple<XyoAccountChallenge, XyoAccountChallenge, Record<string, never>, import("../../models/Api/Config").XyoApiConfig>;
-    get verify(): XyoApiSimple<XyoAccountVerify, XyoAccountVerify, Record<string, never>, import("../../models/Api/Config").XyoApiConfig>;
+    get challenge(): XyoApiSimple<XyoAccountChallenge, XyoAccountChallenge, import("@xyo-network/payload").XyoPayloadBase, import("../../models/Api/Config").XyoApiConfig>;
+    get verify(): XyoApiSimple<XyoAccountVerify, XyoAccountVerify, import("@xyo-network/payload").XyoPayloadBase, import("../../models/Api/Config").XyoApiConfig>;
 }

package/dist/esm/Archivist/Api.d.ts

@@ -13,14 +13,14 @@ export declare class XyoArchivistApi extends XyoApiBase {
     private _archives?;
     get archives(): XyoArchivistArchivesApi;
     private _stats?;
-    get stats(): XyoApiSimple<unknown[], unknown[], Record<string, never>, import("../models/Api/Config").XyoApiConfig>;
+    get stats(): XyoApiSimple<unknown[], unknown[], import("@xyo-network/payload").XyoPayloadBase, import("../models/Api/Config").XyoApiConfig>;
     private _user?;
     get user(): XyoUserApi;
     archive(archive?: string): XyoArchivistArchiveApi;
     /** @deprecated use account instead */
     wallet(address: XyoDataLike): XyoAccountApi;
     account(address: XyoDataLike): XyoAccountApi;
-    huri(huri: Huri | string): XyoApiSimple<import("@xyo-network/payload").XyoPayloadBase, import("@xyo-network/payload").XyoPayloadBase, Record<string, never>, import("../models/Api/Config").XyoApiConfig>;
+    huri(huri: Huri | string): XyoApiSimple<import("@xyo-network/payload").XyoPayloadBase, import("@xyo-network/payload").XyoPayloadBase, import("@xyo-network/payload").XyoPayloadBase, import("../models/Api/Config").XyoApiConfig>;
     /**
      * Issues commands/queries as XyoBoundWitness wrapped XyoPayloads against a Node in the network
      * @param archive Optional, the archive to issue the requests against

package/dist/esm/Archivist/Archive/Settings/Key/Api.d.ts

@@ -1,5 +1,5 @@
 import { XyoArchiveKey } from '../../../../models';
 import { XyoApiSimple } from '../../../../Simple';
 export declare class XyoArchivistArchiveSettingsKeyApi extends XyoApiSimple<XyoArchiveKey[]> {
-    key(key: string): XyoApiSimple<XyoArchiveKey, XyoArchiveKey, Record<string, never>, import("../../../../models/Api/Config").XyoApiConfig>;
+    key(key: string): XyoApiSimple<XyoArchiveKey, XyoArchiveKey, import("@xyo-network/payload").XyoPayloadBase, import("../../../../models/Api/Config").XyoApiConfig>;
 }

package/dist/esm/Archivist/Payload/Api.js

@@ -40,29 +40,29 @@ export class XyoArchivistPayloadApi extends XyoApiSimple {
     }
     /** @deprecated use find */
     async findBefore(timestamp, limit = 20) {
-        return await this.find({ limit, order: 'desc', timestamp });
+        return await this.find({ limit, order: 'desc', schema: 'network.xyo.query', timestamp });
     }
     /** @deprecated use findBefore */
     async getBefore(timestamp, limit = 20) {
-        return await this.find({ limit, order: 'desc', timestamp });
+        return await this.find({ limit, order: 'desc', schema: 'network.xyo.query', timestamp });
     }
     /** @deprecated use find */
     async findAfter(timestamp, limit = 20) {
-        return await this.find({ limit, order: 'asc', timestamp });
+        return await this.find({ limit, order: 'asc', schema: 'network.xyo.query', timestamp });
     }
     /** @deprecated use find */
     async getAfter(timestamp, limit = 20) {
-        return await this.find({ limit, order: 'asc', timestamp });
+        return await this.find({ limit, order: 'asc', schema: 'network.xyo.query', timestamp });
     }
     /** @deprecated use find */
     async findMostRecent(limit = 20) {
         assertEx(limit > 0, 'min limit = 1');
         assertEx(limit <= 100, 'max limit = 100');
-        return await this.find({ limit, order: 'desc', timestamp: 999999999999 });
+        return await this.find({ limit, order: 'desc', schema: 'network.xyo.query', timestamp: 999999999999 });
     }
     /** @deprecated use find */
     async getMostRecent(limit = 20) {
-        return await this.find({ limit, order: 'desc', timestamp: 999999999999 });
+        return await this.find({ limit, order: 'desc', schema: 'network.xyo.query', timestamp: 999999999999 });
     }
 }
 //# sourceMappingURL=Api.js.map

package/dist/esm/Archivist/Payload/Api.js.map

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

package/dist/esm/Archivist/Payload/Schema/Api.d.ts

@@ -4,5 +4,5 @@ export interface XyoArchivistArchivePayloadSchemaStats {
 }
 export declare class XyoArchivistArchivePayloadSchemaApi extends XyoApiSimple<string[]> {
     private _stats?;
-    get stats(): XyoApiSimple<XyoArchivistArchivePayloadSchemaStats, XyoArchivistArchivePayloadSchemaStats, Record<string, never>, import("../../../models/Api/Config").XyoApiConfig>;
+    get stats(): XyoApiSimple<XyoArchivistArchivePayloadSchemaStats, XyoArchivistArchivePayloadSchemaStats, import("@xyo-network/payload").XyoPayloadBase, import("../../../models/Api/Config").XyoApiConfig>;
 }

package/dist/esm/Archivist/XyoApiArchivist.d.ts

@@ -1,12 +1,12 @@
 import { XyoAccount } from '@xyo-network/account';
-import { XyoArchivist, XyoBoundWitnessArchivist, XyoPayloadFindFilter } from '@xyo-network/archivist';
-import { XyoBoundWitnessWithPartialMeta } from '@xyo-network/boundwitness';
+import { XyoArchivist, XyoArchivistBase, XyoPayloadFindFilter } from '@xyo-network/archivist';
+import { XyoPayload } from '@xyo-network/payload';
 import { XyoArchivistApi } from './Api';
-export declare class XyoApiArchivist extends XyoBoundWitnessArchivist {
+export declare class XyoApiArchivist extends XyoArchivistBase {
     protected api: XyoArchivistApi;
     protected archive: string;
     constructor(api: XyoArchivistApi, archive: string, parent?: XyoArchivist, account?: XyoAccount);
-    get(hash: string): Promise<import("@xyo-network/payload").XyoPayloadBase[] | undefined>;
-    insert(payload: XyoBoundWitnessWithPartialMeta): Promise<string[]>;
+    get(hash: string): Promise<import("@xyo-network/payload").XyoPayloadBase | undefined>;
+    insert(payloads: XyoPayload[]): Promise<import("@xyo-network/payload").XyoPayloadBase[]>;
     find(filter: XyoPayloadFindFilter): Promise<import("@xyo-network/payload").XyoPayloadWithPartialMeta<import("@xyo-network/core").EmptyObject>[]>;
 }

package/dist/esm/Archivist/XyoApiArchivist.js

@@ -1,6 +1,7 @@
 import { assertEx } from '@xylabs/sdk-js';
-import { XyoBoundWitnessArchivist } from '@xyo-network/archivist';
-export class XyoApiArchivist extends XyoBoundWitnessArchivist {
+import { XyoArchivistBase } from '@xyo-network/archivist';
+import { XyoPayloadWrapper } from '@xyo-network/payload';
+export class XyoApiArchivist extends XyoArchivistBase {
     constructor(api, archive, parent, account) {
         super(parent, account);
         this.api = api;
@@ -8,10 +9,29 @@ export class XyoApiArchivist extends XyoBoundWitnessArchivist {
     }
     async get(hash) {
         const [payloads] = await this.api.archive(this.archive).payload.hash(hash).get('tuple');
-        return payloads;
+        return payloads?.pop();
     }
-    async insert(payload) {
-        return (await this.api.archive(this.archive).block.post([payload]))?.map((value) => assertEx(value._hash)) ?? [];
+    async insert(payloads) {
+        const boundwitnesses = payloads.filter((payload) => payload.schema === 'network.xyo.payload');
+        boundwitnesses.forEach((boundwitness) => {
+            boundwitness._payloads ===
+                payloads.filter((payload) => {
+                    const hash = new XyoPayloadWrapper(payload).hash;
+                    return boundwitness.payload_hashes.includes(hash);
+                });
+        });
+        payloads.forEach((payload) => {
+            let found = false;
+            const hash = new XyoPayloadWrapper(payload).hash;
+            boundwitnesses.forEach((boundwitnesses) => {
+                if (boundwitnesses.payload_hashes.includes(hash)) {
+                    found = true;
+                }
+            });
+            assertEx(found, 'Payload not in Boundwitness received');
+        });
+        await this.api.archive(this.archive).block.post(boundwitnesses);
+        return payloads;
     }
     async find(filter) {
         const [payloads = []] = (await this.api.archive(this.archive).payload.find(filter, 'tuple')) ?? [];

package/dist/esm/Archivist/XyoApiArchivist.js.map

@@ -1 +1 @@
-{"version":3,"file":"XyoApiArchivist.js","sourceRoot":"","sources":["../../../src/Archivist/XyoApiArchivist.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAEzC,OAAO,EAAgB,wBAAwB,EAAwB,MAAM,wBAAwB,CAAA;AAKrG,MAAM,OAAO,eAAgB,SAAQ,wBAAwB;IAG3D,YAAY,GAAoB,EAAE,OAAe,EAAE,MAAqB,EAAE,OAAoB;QAC5F,KAAK,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;QACtB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;QACd,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IACxB,CAAC;IAEM,KAAK,CAAC,GAAG,CAAC,IAAY;QAC3B,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;QACvF,OAAO,QAAQ,CAAA;IACjB,CAAC;IAEM,KAAK,CAAC,MAAM,CAAC,OAAuC;QACzD,OAAO,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,CAAA;IAClH,CAAC;IAEM,KAAK,CAAC,IAAI,CAAC,MAA4B;QAC5C,MAAM,CAAC,QAAQ,GAAG,EAAE,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,IAAI,EAAE,CAAA;QAClG,MAAM,CAAC,MAAM,GAAG,EAAE,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,IAAI,EAAE,CAAA;QAC9F,OAAO,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;IAChC,CAAC;CACF"}
+{"version":3,"file":"XyoApiArchivist.js","sourceRoot":"","sources":["../../../src/Archivist/XyoApiArchivist.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAEzC,OAAO,EAAgB,gBAAgB,EAAwB,MAAM,wBAAwB,CAAA;AAE7F,OAAO,EAAc,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AAIpE,MAAM,OAAO,eAAgB,SAAQ,gBAAgB;IAGnD,YAAY,GAAoB,EAAE,OAAe,EAAE,MAAqB,EAAE,OAAoB;QAC5F,KAAK,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;QACtB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;QACd,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IACxB,CAAC;IAEM,KAAK,CAAC,GAAG,CAAC,IAAY;QAC3B,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;QACvF,OAAO,QAAQ,EAAE,GAAG,EAAE,CAAA;IACxB,CAAC;IAEM,KAAK,CAAC,MAAM,CAAC,QAAsB;QACxC,MAAM,cAAc,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,KAAK,qBAAqB,CAAqC,CAAA;QACjI,cAAc,CAAC,OAAO,CAAC,CAAC,YAAY,EAAE,EAAE;YACtC,YAAY,CAAC,SAAS;gBACpB,QAAQ,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE;oBAC1B,MAAM,IAAI,GAAG,IAAI,iBAAiB,CAAC,OAAO,CAAC,CAAC,IAAI,CAAA;oBAChD,OAAO,YAAY,CAAC,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;gBACnD,CAAC,CAAC,CAAA;QACN,CAAC,CAAC,CAAA;QACF,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC3B,IAAI,KAAK,GAAG,KAAK,CAAA;YACjB,MAAM,IAAI,GAAG,IAAI,iBAAiB,CAAC,OAAO,CAAC,CAAC,IAAI,CAAA;YAChD,cAAc,CAAC,OAAO,CAAC,CAAC,cAAc,EAAE,EAAE;gBACxC,IAAI,cAAc,CAAC,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;oBAChD,KAAK,GAAG,IAAI,CAAA;iBACb;YACH,CAAC,CAAC,CAAA;YACF,QAAQ,CAAC,KAAK,EAAE,sCAAsC,CAAC,CAAA;QACzD,CAAC,CAAC,CAAA;QACF,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,CAAA;QAC/D,OAAO,QAAQ,CAAA;IACjB,CAAC;IAEM,KAAK,CAAC,IAAI,CAAC,MAA4B;QAC5C,MAAM,CAAC,QAAQ,GAAG,EAAE,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,IAAI,EAAE,CAAA;QAClG,MAAM,CAAC,MAAM,GAAG,EAAE,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,IAAI,EAAE,CAAA;QAC9F,OAAO,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;IAChC,CAAC;CACF"}

package/dist/esm/Archivist/XyoRemoteArchivist.d.ts

@@ -0,0 +1,12 @@
+import { XyoAccount } from '@xyo-network/account';
+import { XyoArchivist, XyoArchivistBase, XyoPayloadFindFilter } from '@xyo-network/archivist';
+import { XyoPayload } from '@xyo-network/payload';
+import { XyoArchivistApi } from './Api';
+export declare class XyoRemoteArchivist extends XyoArchivistBase {
+    protected api: XyoArchivistApi;
+    protected archive: string;
+    constructor(api: XyoArchivistApi, archive: string, parent?: XyoArchivist, account?: XyoAccount);
+    get(hash: string): Promise<import("@xyo-network/payload").XyoPayloadBase | undefined>;
+    insert(payloads: XyoPayload[]): Promise<import("@xyo-network/payload").XyoPayloadBase[]>;
+    find(filter: XyoPayloadFindFilter): Promise<import("@xyo-network/payload").XyoPayloadWithPartialMeta<import("@xyo-network/core").EmptyObject>[]>;
+}

package/dist/esm/Archivist/XyoRemoteArchivist.js

@@ -0,0 +1,42 @@
+import { assertEx } from '@xylabs/sdk-js';
+import { XyoArchivistBase } from '@xyo-network/archivist';
+import { XyoPayloadWrapper } from '@xyo-network/payload';
+export class XyoRemoteArchivist extends XyoArchivistBase {
+    constructor(api, archive, parent, account) {
+        super(parent, account);
+        this.api = api;
+        this.archive = archive;
+    }
+    async get(hash) {
+        const [payloads] = await this.api.archive(this.archive).payload.hash(hash).get('tuple');
+        return payloads?.pop();
+    }
+    async insert(payloads) {
+        const boundwitnesses = payloads.filter((payload) => payload.schema === 'network.xyo.payload');
+        boundwitnesses.forEach((boundwitness) => {
+            boundwitness._payloads ===
+                payloads.filter((payload) => {
+                    const hash = new XyoPayloadWrapper(payload).hash;
+                    return boundwitness.payload_hashes.includes(hash);
+                });
+        });
+        payloads.forEach((payload) => {
+            let found = false;
+            const hash = new XyoPayloadWrapper(payload).hash;
+            boundwitnesses.forEach((boundwitnesses) => {
+                if (boundwitnesses.payload_hashes.includes(hash)) {
+                    found = true;
+                }
+            });
+            assertEx(found, 'Payload not in Boundwitness received');
+        });
+        await this.api.archive(this.archive).block.post(boundwitnesses);
+        return payloads;
+    }
+    async find(filter) {
+        const [payloads = []] = (await this.api.archive(this.archive).payload.find(filter, 'tuple')) ?? [];
+        const [blocks = []] = (await this.api.archive(this.archive).block.find(filter, 'tuple')) ?? [];
+        return payloads.concat(blocks);
+    }
+}
+//# sourceMappingURL=XyoRemoteArchivist.js.map

package/dist/esm/Archivist/XyoRemoteArchivist.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"XyoRemoteArchivist.js","sourceRoot":"","sources":["../../../src/Archivist/XyoRemoteArchivist.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAEzC,OAAO,EAAgB,gBAAgB,EAAwB,MAAM,wBAAwB,CAAA;AAE7F,OAAO,EAAc,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AAIpE,MAAM,OAAO,kBAAmB,SAAQ,gBAAgB;IAGtD,YAAY,GAAoB,EAAE,OAAe,EAAE,MAAqB,EAAE,OAAoB;QAC5F,KAAK,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;QACtB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;QACd,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IACxB,CAAC;IAEM,KAAK,CAAC,GAAG,CAAC,IAAY;QAC3B,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;QACvF,OAAO,QAAQ,EAAE,GAAG,EAAE,CAAA;IACxB,CAAC;IAEM,KAAK,CAAC,MAAM,CAAC,QAAsB;QACxC,MAAM,cAAc,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,KAAK,qBAAqB,CAAqC,CAAA;QACjI,cAAc,CAAC,OAAO,CAAC,CAAC,YAAY,EAAE,EAAE;YACtC,YAAY,CAAC,SAAS;gBACpB,QAAQ,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE;oBAC1B,MAAM,IAAI,GAAG,IAAI,iBAAiB,CAAC,OAAO,CAAC,CAAC,IAAI,CAAA;oBAChD,OAAO,YAAY,CAAC,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;gBACnD,CAAC,CAAC,CAAA;QACN,CAAC,CAAC,CAAA;QACF,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC3B,IAAI,KAAK,GAAG,KAAK,CAAA;YACjB,MAAM,IAAI,GAAG,IAAI,iBAAiB,CAAC,OAAO,CAAC,CAAC,IAAI,CAAA;YAChD,cAAc,CAAC,OAAO,CAAC,CAAC,cAAc,EAAE,EAAE;gBACxC,IAAI,cAAc,CAAC,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;oBAChD,KAAK,GAAG,IAAI,CAAA;iBACb;YACH,CAAC,CAAC,CAAA;YACF,QAAQ,CAAC,KAAK,EAAE,sCAAsC,CAAC,CAAA;QACzD,CAAC,CAAC,CAAA;QACF,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,CAAA;QAC/D,OAAO,QAAQ,CAAA;IACjB,CAAC;IAEM,KAAK,CAAC,IAAI,CAAC,MAA4B;QAC5C,MAAM,CAAC,QAAQ,GAAG,EAAE,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,IAAI,EAAE,CAAA;QAClG,MAAM,CAAC,MAAM,GAAG,EAAE,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,IAAI,EAAE,CAAA;QAC9F,OAAO,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;IAChC,CAAC;CACF"}

package/dist/esm/Archivist/index.d.ts

@@ -4,4 +4,4 @@ export * from './Archive';
 export * from './Archives';
 export * from './Block';
 export * from './Payload';
-export * from './XyoApiArchivist';
+export * from './XyoRemoteArchivist';

package/dist/esm/Archivist/index.js

@@ -4,5 +4,5 @@ export * from './Archive';
 export * from './Archives';
 export * from './Block';
 export * from './Payload';
-export * from './XyoApiArchivist';
+export * from './XyoRemoteArchivist';
 //# sourceMappingURL=index.js.map

package/dist/esm/Archivist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/Archivist/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAA;AACzB,cAAc,OAAO,CAAA;AACrB,cAAc,WAAW,CAAA;AACzB,cAAc,YAAY,CAAA;AAC1B,cAAc,SAAS,CAAA;AACvB,cAAc,WAAW,CAAA;AACzB,cAAc,mBAAmB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/Archivist/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAA;AACzB,cAAc,OAAO,CAAA;AACrB,cAAc,WAAW,CAAA;AACzB,cAAc,YAAY,CAAA;AAC1B,cAAc,SAAS,CAAA;AACvB,cAAc,WAAW,CAAA;AACzB,cAAc,sBAAsB,CAAA"}

package/dist/esm/Simple.d.ts

@@ -1,8 +1,9 @@
+import { EmptyObject } from '@xyo-network/core';
 import { XyoPayload } from '@xyo-network/payload';
 import { XyoApiBase } from './Base';
 import { XyoApiConfig, XyoApiResponseBody, XyoApiResponseTuple } from './models';
-export declare type XyoApiSimpleQuery = Record<string, unknown>;
-export declare class XyoApiSimple<T = XyoPayload, D = T, Q extends XyoApiSimpleQuery = Record<string, never>, C extends XyoApiConfig = XyoApiConfig> extends XyoApiBase<C> {
+export declare type XyoApiSimpleQuery<T extends EmptyObject = EmptyObject> = XyoPayload<T>;
+export declare class XyoApiSimple<T = XyoPayload, D = T, Q extends XyoApiSimpleQuery = XyoApiSimpleQuery, C extends XyoApiConfig = XyoApiConfig> extends XyoApiBase<C> {
     get(): Promise<XyoApiResponseBody<T>>;
     get(responseType?: 'body'): Promise<XyoApiResponseBody<T>>;
     get(responseType?: 'tuple'): Promise<XyoApiResponseTuple<T>>;

package/dist/esm/Simple.js.map

@@ -1 +1 @@
-{"version":3,"file":"Simple.js","sourceRoot":"","sources":["../../src/Simple.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAA;AAEnC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAIzC,MAAM,OAAO,YAAgI,SAAQ,UAAa;IAIzJ,KAAK,CAAC,GAAG,CAAC,YAAiC;QAChD,QAAQ,YAAY,EAAE;YACpB,KAAK,OAAO;gBACV,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;YACnD;gBACE,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAA;SAC3C;IACH,CAAC;IAKM,KAAK,CAAC,IAAI,CAAC,KAAK,GAAG,EAAE,EAAE,YAAiC;QAC7D,QAAQ,YAAY,EAAE;YACpB,KAAK,OAAO;gBACV,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,CAAA;YAC3D;gBACE,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAA;SACnD;IACH,CAAC;IAKM,KAAK,CAAC,IAAI,CAAC,IAAQ,EAAE,YAAiC;QAC3D,QAAQ,YAAY,EAAE;YACpB,KAAK,OAAO;gBACV,OAAO,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;YAC1D;gBACE,OAAO,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,IAAI,CAAC,CAAA;SAClD;IACH,CAAC;IAKM,KAAK,CAAC,GAAG,CAAC,IAAQ,EAAE,YAAiC;QAC1D,QAAQ,YAAY,EAAE;YACpB,KAAK,OAAO;gBACV,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;YACzD;gBACE,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,IAAI,CAAC,CAAA;SACjD;IACH,CAAC;IAKM,KAAK,CAAC,MAAM,CAAC,YAAiC;QACnD,QAAQ,YAAY,EAAE;YACpB,KAAK,OAAO;gBACV,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;YACtD;gBACE,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,CAAA;SAC9C;IACH,CAAC;CACF"}
+{"version":3,"file":"Simple.js","sourceRoot":"","sources":["../../src/Simple.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAA;AAEnC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAIzC,MAAM,OAAO,YAA4H,SAAQ,UAAa;IAIrJ,KAAK,CAAC,GAAG,CAAC,YAAiC;QAChD,QAAQ,YAAY,EAAE;YACpB,KAAK,OAAO;gBACV,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;YACnD;gBACE,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAA;SAC3C;IACH,CAAC;IAKM,KAAK,CAAC,IAAI,CAAC,KAAK,GAAG,EAAE,EAAE,YAAiC;QAC7D,QAAQ,YAAY,EAAE;YACpB,KAAK,OAAO;gBACV,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,CAAA;YAC3D;gBACE,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAA;SACnD;IACH,CAAC;IAKM,KAAK,CAAC,IAAI,CAAC,IAAQ,EAAE,YAAiC;QAC3D,QAAQ,YAAY,EAAE;YACpB,KAAK,OAAO;gBACV,OAAO,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;YAC1D;gBACE,OAAO,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,IAAI,CAAC,CAAA;SAClD;IACH,CAAC;IAKM,KAAK,CAAC,GAAG,CAAC,IAAQ,EAAE,YAAiC;QAC1D,QAAQ,YAAY,EAAE;YACpB,KAAK,OAAO;gBACV,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;YACzD;gBACE,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,IAAI,CAAC,CAAA;SACjD;IACH,CAAC;IAKM,KAAK,CAAC,MAAM,CAAC,YAAiC;QACnD,QAAQ,YAAY,EAAE;YACpB,KAAK,OAAO;gBACV,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;YACtD;gBACE,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,CAAA;SAC9C;IACH,CAAC;CACF"}

package/dist/esm/User/Api.d.ts

@@ -11,8 +11,8 @@ export interface XyoUserLogin {
 export declare class XyoUserApi extends XyoApiBase {
     get authenticated(): boolean;
     get headers(): Record<string, string>;
-    get login(): XyoApiSimple<XyoUserLogin, XyoUserLogin, Record<string, never>, import("../models/Api/Config").XyoApiConfig>;
-    get profile(): XyoApiSimple<import("@xyo-network/payload").XyoPayloadBase, import("@xyo-network/payload").XyoPayloadBase, Record<string, never>, {
+    get login(): XyoApiSimple<XyoUserLogin, XyoUserLogin, import("@xyo-network/payload").XyoPayloadBase, import("../models/Api/Config").XyoApiConfig>;
+    get profile(): XyoApiSimple<import("@xyo-network/payload").XyoPayloadBase, import("@xyo-network/payload").XyoPayloadBase, import("@xyo-network/payload").XyoPayloadBase, {
         root: string;
         apiDomain: string; /** @field Password of the user [in] */
         userid?: string | undefined;

package/package.json

@@ -10,12 +10,12 @@
   },
   "dependencies": {
     "@xylabs/sdk-js": "^2.6.2",
-    "@xyo-network/account": "^2.22.4",
-    "@xyo-network/archivist": "^2.22.4",
-    "@xyo-network/boundwitness": "^2.22.4",
-    "@xyo-network/core": "^2.22.4",
-    "@xyo-network/payload": "^2.22.4",
-    "@xyo-network/typeof": "^2.22.4",
+    "@xyo-network/account": "^2.22.5",
+    "@xyo-network/archivist": "^2.22.5",
+    "@xyo-network/boundwitness": "^2.22.5",
+    "@xyo-network/core": "^2.22.5",
+    "@xyo-network/payload": "^2.22.5",
+    "@xyo-network/typeof": "^2.22.5",
     "axios": "^0.27.2",
     "lru-cache": "^7.13.1",
     "pako": "^2.0.4",
@@ -62,6 +62,6 @@
   },
   "sideEffects": true,
   "types": "dist/esm/index.d.ts",
-  "version": "2.22.4",
+  "version": "2.22.5",
   "packageManager": "yarn@3.1.1"
 }

package/src/Archivist/Api.spec.ts

@@ -198,7 +198,7 @@ describe.skip('XyoArchivistApi', () => {
         const boundWitness = new XyoBoundWitnessBuilder().witness(XyoAccount.random()).build()
         await api.archives.archive(archive).block.post([boundWitness])
         const timestamp = Date.now() - 10000
-        const response = await api.archives.archive(archive).block.find({ order: 'asc', timestamp })
+        const response = await api.archives.archive(archive).block.find({ order: 'asc', schema: 'netowrk.xyo.query', timestamp })
         expect(response?.length).toBe(1)
         const actual = response?.[0]
         expect(actual?._timestamp).toBeTruthy()

package/src/Archivist/ApiUtil.spec.ts

@@ -18,8 +18,7 @@ export const getTokenForNewUser = async (api: XyoArchivistApi): Promise<string>
   const account = XyoAccount.random()
   const address = new Wallet(account.private.bytes)
   const challenge = await api.account(account.public).challenge.post()
-  expect(challenge?.state).toBeTruthy()
-  const message = challenge?.state || ''
+  const message = assertEx(challenge?.state, 'Missing state from login challenge')
   const signature = await address.signMessage(message)
   const verify = await api.account(account.public).verify.post({ message, signature })
   const jwtToken = assertEx(verify?.token, 'Missing JWT token in response')

package/src/Archivist/Payload/Api.spec.ts

@@ -27,7 +27,7 @@ describe('XyoArchivistPayloadApi', () => {
           const boundWitness = new XyoBoundWitnessBuilder().witness(XyoAccount.random()).build()
           const blockResult = await api.archive(archive).block.post([boundWitness])
           expect(blockResult?.length).toBe(1)
-          const response = await api.archive(archive).block.find({ order: 'asc', timestamp })
+          const response = await api.archive(archive).block.find({ order: 'asc', schema: 'netowrk.xyo.query', timestamp })
           expect(response?.length).toBe(1)
           const actual = response?.[0]
           expect(actual?._timestamp).toBeTruthy()
@@ -46,7 +46,7 @@ describe('XyoArchivistPayloadApi', () => {
           const blockResult = await api.archive(archive).block.post([boundWitness])
           expect(blockResult?.length).toBe(1)
           const timestamp = getTimestampMinutesFromNow(1)
-          const response = await api.archive(archive).block.find({ order: 'desc', timestamp })
+          const response = await api.archive(archive).block.find({ order: 'desc', schema: 'netowrk.xyo.query', timestamp })
           expect(response?.length).toBe(1)
           const actual = response?.[0]
           expect(actual?._timestamp).toBeTruthy()

package/src/Archivist/Payload/Api.ts

@@ -61,33 +61,33 @@ export class XyoArchivistPayloadApi<
 
   /** @deprecated use find */
   public async findBefore(timestamp: number, limit = 20) {
-    return await this.find({ limit, order: 'desc', timestamp })
+    return await this.find({ limit, order: 'desc', schema: 'network.xyo.query', timestamp })
   }
 
   /** @deprecated use findBefore */
   public async getBefore(timestamp: number, limit = 20) {
-    return await this.find({ limit, order: 'desc', timestamp })
+    return await this.find({ limit, order: 'desc', schema: 'network.xyo.query', timestamp })
   }
 
   /** @deprecated use find */
   public async findAfter(timestamp: number, limit = 20) {
-    return await this.find({ limit, order: 'asc', timestamp })
+    return await this.find({ limit, order: 'asc', schema: 'network.xyo.query', timestamp })
   }
 
   /** @deprecated use find */
   public async getAfter(timestamp: number, limit = 20) {
-    return await this.find({ limit, order: 'asc', timestamp })
+    return await this.find({ limit, order: 'asc', schema: 'network.xyo.query', timestamp })
   }
 
   /** @deprecated use find */
   public async findMostRecent(limit = 20) {
     assertEx(limit > 0, 'min limit = 1')
     assertEx(limit <= 100, 'max limit = 100')
-    return await this.find({ limit, order: 'desc', timestamp: 999999999999 })
+    return await this.find({ limit, order: 'desc', schema: 'network.xyo.query', timestamp: 999999999999 })
   }
 
   /** @deprecated use find */
   public async getMostRecent(limit = 20) {
-    return await this.find({ limit, order: 'desc', timestamp: 999999999999 })
+    return await this.find({ limit, order: 'desc', schema: 'network.xyo.query', timestamp: 999999999999 })
   }
 }

package/src/Archivist/XyoRemoteArchivist.ts

@@ -0,0 +1,51 @@
+import { assertEx } from '@xylabs/sdk-js'
+import { XyoAccount } from '@xyo-network/account'
+import { XyoArchivist, XyoArchivistBase, XyoPayloadFindFilter } from '@xyo-network/archivist'
+import { XyoBoundWitnessWithPartialMeta } from '@xyo-network/boundwitness'
+import { XyoPayload, XyoPayloadWrapper } from '@xyo-network/payload'
+
+import { XyoArchivistApi } from './Api'
+
+export class XyoRemoteArchivist extends XyoArchivistBase {
+  protected api: XyoArchivistApi
+  protected archive: string
+  constructor(api: XyoArchivistApi, archive: string, parent?: XyoArchivist, account?: XyoAccount) {
+    super(parent, account)
+    this.api = api
+    this.archive = archive
+  }
+
+  public async get(hash: string) {
+    const [payloads] = await this.api.archive(this.archive).payload.hash(hash).get('tuple')
+    return payloads?.pop()
+  }
+
+  public async insert(payloads: XyoPayload[]) {
+    const boundwitnesses = payloads.filter((payload) => payload.schema === 'network.xyo.payload') as XyoBoundWitnessWithPartialMeta[]
+    boundwitnesses.forEach((boundwitness) => {
+      boundwitness._payloads ===
+        payloads.filter((payload) => {
+          const hash = new XyoPayloadWrapper(payload).hash
+          return boundwitness.payload_hashes.includes(hash)
+        })
+    })
+    payloads.forEach((payload) => {
+      let found = false
+      const hash = new XyoPayloadWrapper(payload).hash
+      boundwitnesses.forEach((boundwitnesses) => {
+        if (boundwitnesses.payload_hashes.includes(hash)) {
+          found = true
+        }
+      })
+      assertEx(found, 'Payload not in Boundwitness received')
+    })
+    await this.api.archive(this.archive).block.post(boundwitnesses)
+    return payloads
+  }
+
+  public async find(filter: XyoPayloadFindFilter) {
+    const [payloads = []] = (await this.api.archive(this.archive).payload.find(filter, 'tuple')) ?? []
+    const [blocks = []] = (await this.api.archive(this.archive).block.find(filter, 'tuple')) ?? []
+    return payloads.concat(blocks)
+  }
+}

package/src/Archivist/index.ts

@@ -4,4 +4,4 @@ export * from './Archive'
 export * from './Archives'
 export * from './Block'
 export * from './Payload'
-export * from './XyoApiArchivist'
+export * from './XyoRemoteArchivist'

package/src/Simple.ts

@@ -1,12 +1,13 @@
+import { EmptyObject } from '@xyo-network/core'
 import { XyoPayload } from '@xyo-network/payload'
 
 import { XyoApiBase } from './Base'
 import { XyoApiConfig, XyoApiResponseBody, XyoApiResponseTuple, XyoApiResponseTupleOrBody, XyoApiResponseType } from './models'
 import { objToQuery } from './objToQuery'
 
-export type XyoApiSimpleQuery = Record<string, unknown>
+export type XyoApiSimpleQuery<T extends EmptyObject = EmptyObject> = XyoPayload<T>
 
-export class XyoApiSimple<T = XyoPayload, D = T, Q extends XyoApiSimpleQuery = Record<string, never>, C extends XyoApiConfig = XyoApiConfig> extends XyoApiBase<C> {
+export class XyoApiSimple<T = XyoPayload, D = T, Q extends XyoApiSimpleQuery = XyoApiSimpleQuery, C extends XyoApiConfig = XyoApiConfig> extends XyoApiBase<C> {
   public async get(): Promise<XyoApiResponseBody<T>>
   public async get(responseType?: 'body'): Promise<XyoApiResponseBody<T>>
   public async get(responseType?: 'tuple'): Promise<XyoApiResponseTuple<T>>

package/src/Archivist/XyoApiArchivist.ts

@@ -1,31 +0,0 @@
-import { assertEx } from '@xylabs/sdk-js'
-import { XyoAccount } from '@xyo-network/account'
-import { XyoArchivist, XyoBoundWitnessArchivist, XyoPayloadFindFilter } from '@xyo-network/archivist'
-import { XyoBoundWitnessWithPartialMeta } from '@xyo-network/boundwitness'
-
-import { XyoArchivistApi } from './Api'
-
-export class XyoApiArchivist extends XyoBoundWitnessArchivist {
-  protected api: XyoArchivistApi
-  protected archive: string
-  constructor(api: XyoArchivistApi, archive: string, parent?: XyoArchivist, account?: XyoAccount) {
-    super(parent, account)
-    this.api = api
-    this.archive = archive
-  }
-
-  public async get(hash: string) {
-    const [payloads] = await this.api.archive(this.archive).payload.hash(hash).get('tuple')
-    return payloads
-  }
-
-  public async insert(payload: XyoBoundWitnessWithPartialMeta) {
-    return (await this.api.archive(this.archive).block.post([payload]))?.map((value) => assertEx(value._hash)) ?? []
-  }
-
-  public async find(filter: XyoPayloadFindFilter) {
-    const [payloads = []] = (await this.api.archive(this.archive).payload.find(filter, 'tuple')) ?? []
-    const [blocks = []] = (await this.api.archive(this.archive).block.find(filter, 'tuple')) ?? []
-    return payloads.concat(blocks)
-  }
-}