@xyo-network/archivist 2.67.0-rc.1 → 2.67.0-rc.3

package/dist/cjs/{ArchivingModule.js → AbstractArchivingModule.js}

@@ -1,13 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ArchivingModule = void 0;
+exports.AbstractArchivingModule = void 0;
 const tslib_1 = require("tslib");
 const archivist_model_1 = require("@xyo-network/archivist-model");
-const archivist_wrapper_1 = require("@xyo-network/archivist-wrapper");
 const module_1 = require("@xyo-network/module");
 const compact_1 = tslib_1.__importDefault(require("lodash/compact"));
 // @creatableModule()
-class ArchivingModule extends module_1.AbstractModule {
+class AbstractArchivingModule extends module_1.AbstractModuleInstance {
     bindQueryResult(query, payloads, additionalWitnesses = [], errorPayloads = []) {
         const _super = Object.create(null, {
             bindQueryResult: { get: () => super.bindQueryResult }
@@ -21,17 +20,18 @@ class ArchivingModule extends module_1.AbstractModule {
     resolveArchivists() {
         var _a, _b;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            return (0, compact_1.default)((yield Promise.all((_b = (yield this.resolve({ address: (_a = this.config.archivists) !== null && _a !== void 0 ? _a : [] }))) !== null && _b !== void 0 ? _b : [])).map((module) => (0, archivist_model_1.asArchivistModule)(module)));
+            return (0, compact_1.default)((yield Promise.all((_b = (yield this.resolve({ address: (_a = this.config.archivists) !== null && _a !== void 0 ? _a : [] }))) !== null && _b !== void 0 ? _b : [])).map((module) => (0, archivist_model_1.asArchivistInstance)(module, () => `Module failed to cast to Archivist [${module.config.name}]`)));
         });
     }
     storeToArchivists(payloads) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const archivists = yield this.resolveArchivists();
             return (yield Promise.all(archivists.map((archivist) => {
-                return (0, archivist_model_1.isArchivistInstance)(archivist) ? archivist.insert(payloads) : archivist_wrapper_1.ArchivistWrapper.wrap(archivist, this.account).insert(payloads);
+                var _a;
+                return (_a = archivist.insert) === null || _a === void 0 ? void 0 : _a.call(archivist, payloads);
             }))).map(([bw]) => bw);
         });
     }
 }
-exports.ArchivingModule = ArchivingModule;
-//# sourceMappingURL=ArchivingModule.js.map
+exports.AbstractArchivingModule = AbstractArchivingModule;
+//# sourceMappingURL=AbstractArchivingModule.js.map

package/dist/cjs/AbstractArchivingModule.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"AbstractArchivingModule.js","sourceRoot":"","sources":["../../src/AbstractArchivingModule.ts"],"names":[],"mappings":";;;;AACA,kEAAqF;AAErF,gDAAoI;AAEpI,qEAAoC;AAQpC,qBAAqB;AACrB,MAAsB,uBAIpB,SAAQ,+BAA2C;IAG1B,eAAe,CACtC,KAAQ,EACR,QAAmB,EACnB,sBAAyC,EAAE,EAC3C,gBAA+B,EAAE;;;;;YAEjC,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,MAAM,OAAM,eAAe,YAAC,KAAK,EAAE,QAAQ,EAAE,mBAAmB,EAAE,aAAa,CAAC,CAAA;YAC5G,MAAM,IAAI,CAAC,iBAAiB,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;YACvD,OAAO,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;QAC5B,CAAC;KAAA;IAEe,iBAAiB;;;YAC/B,OAAO,IAAA,iBAAO,EACZ,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,MAAA,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,MAAA,IAAI,CAAC,MAAM,CAAC,UAAU,mCAAI,EAAE,EAAE,CAAC,CAAC,mCAAI,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CACxG,IAAA,qCAAmB,EAAC,MAAM,EAAE,GAAG,EAAE,CAAC,uCAAuC,MAAM,CAAC,MAAM,CAAC,IAAI,GAAG,CAAC,CAChG,CACF,CAAA;;KACF;IAEe,iBAAiB,CAAC,QAAmB;;YACnD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAA;YACjD,OAAO,CACL,MAAM,OAAO,CAAC,GAAG,CACf,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE;;gBAC3B,OAAO,MAAA,SAAS,CAAC,MAAM,0DAAG,QAAQ,CAAC,CAAA;YACrC,CAAC,CAAC,CACH,CACF,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,CAAA;QACrB,CAAC;KAAA;CACF;AApCD,0DAoCC"}

package/dist/cjs/CookieArchivist.js

@@ -11,7 +11,7 @@ const payload_wrapper_1 = require("@xyo-network/payload-wrapper");
 const js_cookie_1 = tslib_1.__importDefault(require("js-cookie"));
 const compact_1 = tslib_1.__importDefault(require("lodash/compact"));
 exports.CookieArchivistConfigSchema = 'network.xyo.archivist.cookie.config';
-class CookieArchivist extends abstract_archivist_1.AbstractDirectArchivist {
+class CookieArchivist extends abstract_archivist_1.AbstractArchivist {
     get domain() {
         var _a;
         return (_a = this.config) === null || _a === void 0 ? void 0 : _a.domain;
@@ -72,10 +72,10 @@ class CookieArchivist extends abstract_archivist_1.AbstractDirectArchivist {
                 (0, assert_1.assertEx)(payloads.length > 0, 'Nothing to commit');
                 const settled = yield Promise.allSettled((0, compact_1.default)((_b = Object.values((_a = (yield this.parents()).commit) !== null && _a !== void 0 ? _a : [])) === null || _b === void 0 ? void 0 : _b.map((parent) => tslib_1.__awaiter(this, void 0, void 0, function* () {
                     var _c;
-                    const queryPayload = payload_wrapper_1.PayloadWrapper.wrap({
+                    const queryPayload = {
                         payloads: yield core_1.PayloadHasher.hashes(payloads),
                         schema: archivist_model_1.ArchivistInsertQuerySchema,
-                    });
+                    };
                     const query = yield this.bindQuery(queryPayload, payloads);
                     return (_c = (yield (parent === null || parent === void 0 ? void 0 : parent.query(query[0], query[1])))) === null || _c === void 0 ? void 0 : _c[0];
                 }))));
@@ -132,15 +132,13 @@ class CookieArchivist extends abstract_archivist_1.AbstractDirectArchivist {
                     return wrapper.payload();
                 })));
                 const [result] = yield this.bindQueryResult({ payloads, schema: archivist_model_1.ArchivistInsertQuerySchema }, resultPayloads);
-                const parentBoundWitnesses = [];
                 const parents = yield this.parents();
                 if (Object.entries((_a = parents.write) !== null && _a !== void 0 ? _a : {}).length) {
                     //we store the child bw also
-                    parentBoundWitnesses.push(...(yield this.writeToParents([result[0], ...resultPayloads])));
+                    yield this.writeToParents([result[0], ...resultPayloads]);
                 }
-                const boundWitnesses = [result[0], ...parentBoundWitnesses];
-                yield this.emit('inserted', { boundWitnesses, module: this });
-                return boundWitnesses;
+                yield this.emit('inserted', { module: this, payloads });
+                return payloads;
             }
             catch (ex) {
                 console.error(`Error: ${JSON.stringify(ex, null, 2)}`);

package/dist/cjs/CookieArchivist.js.map

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

package/dist/cjs/StorageArchivist.js

@@ -5,14 +5,13 @@ const tslib_1 = require("tslib");
 const assert_1 = require("@xylabs/assert");
 const promise_1 = require("@xylabs/promise");
 const abstract_archivist_1 = require("@xyo-network/abstract-archivist");
-const account_1 = require("@xyo-network/account");
 const archivist_model_1 = require("@xyo-network/archivist-model");
 const core_1 = require("@xyo-network/core");
 const payload_wrapper_1 = require("@xyo-network/payload-wrapper");
 const compact_1 = tslib_1.__importDefault(require("lodash/compact"));
 const store2_1 = tslib_1.__importDefault(require("store2"));
 exports.StorageArchivistConfigSchema = 'network.xyo.archivist.storage.config';
-class StorageArchivist extends abstract_archivist_1.AbstractDirectArchivist {
+class StorageArchivist extends abstract_archivist_1.AbstractArchivist {
     get maxEntries() {
         var _a, _b;
         return (_b = (_a = this.config) === null || _a === void 0 ? void 0 : _a.maxEntries) !== null && _b !== void 0 ? _b : 1000;
@@ -55,29 +54,23 @@ class StorageArchivist extends abstract_archivist_1.AbstractDirectArchivist {
         this._storage = (_a = this._storage) !== null && _a !== void 0 ? _a : store2_1.default[this.type].namespace(this.namespace);
         return this._storage;
     }
-    loadAccount(account, persistAccount, privateStorage, _logger) {
-        const _super = Object.create(null, {
-            loadAccount: { get: () => super.loadAccount }
-        });
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            if (!this._account) {
-                if (persistAccount) {
-                    const privateKey = privateStorage === null || privateStorage === void 0 ? void 0 : privateStorage.get('privateKey');
-                    if (privateKey) {
-                        try {
-                            this._account = yield account_1.Account.create({ privateKey });
-                            return this._account;
-                        }
-                        catch (ex) {
-                            console.error(`Error reading Account from storage [${ex}] - Recreating Account`);
-                            privateStorage === null || privateStorage === void 0 ? void 0 : privateStorage.remove('privateKey');
-                        }
-                    }
-                }
+    /*override async loadAccount(account?: AccountInstance, persistAccount?: boolean, privateStorage?: StoreBase, _logger?: Logger) {
+      if (!this._account) {
+        if (persistAccount) {
+          const privateKey = privateStorage?.get('privateKey')
+          if (privateKey) {
+            try {
+              this._account = await Account.create({ privateKey })
+              return this._account
+            } catch (ex) {
+              console.error(`Error reading Account from storage [${ex}] - Recreating Account`)
+              privateStorage?.remove('privateKey')
             }
-            return yield _super.loadAccount.call(this);
-        });
-    }
+          }
+        }
+      }
+      return await super.loadAccount()
+    }*/
     allHandler() {
         var _a;
         (_a = this.logger) === null || _a === void 0 ? void 0 : _a.log(`this.storage.length: ${this.storage.length}`);
@@ -97,10 +90,10 @@ class StorageArchivist extends abstract_archivist_1.AbstractDirectArchivist {
             (0, assert_1.assertEx)(payloads.length > 0, 'Nothing to commit');
             const settled = yield Promise.allSettled((0, compact_1.default)((_c = Object.values((_b = (yield this.parents()).commit) !== null && _b !== void 0 ? _b : [])) === null || _c === void 0 ? void 0 : _c.map((parent) => tslib_1.__awaiter(this, void 0, void 0, function* () {
                 var _d;
-                const queryPayload = payload_wrapper_1.PayloadWrapper.wrap({
+                const queryPayload = {
                     payloads: yield core_1.PayloadHasher.hashes(payloads),
                     schema: archivist_model_1.ArchivistInsertQuerySchema,
-                });
+                };
                 const query = yield this.bindQuery(queryPayload, payloads);
                 return (_d = (yield (parent === null || parent === void 0 ? void 0 : parent.query(query[0], query[1])))) === null || _d === void 0 ? void 0 : _d[0];
             }))));
@@ -150,16 +143,13 @@ class StorageArchivist extends abstract_archivist_1.AbstractDirectArchivist {
                 return wrapper.payload();
             })));
             const [[storageBoundWitness]] = yield this.bindQueryResult({ payloads, schema: archivist_model_1.ArchivistInsertQuerySchema }, resultPayloads);
-            const parentBoundWitnesses = [];
             const parents = yield this.parents();
             if (Object.entries((_a = parents.write) !== null && _a !== void 0 ? _a : {}).length) {
                 //we store the child bw also
-                const [parentBoundWitness] = yield this.writeToParents([storageBoundWitness, ...resultPayloads]);
-                parentBoundWitnesses.push(parentBoundWitness);
+                yield this.writeToParents([storageBoundWitness, ...resultPayloads]);
             }
-            const boundWitnesses = [storageBoundWitness, ...parentBoundWitnesses];
-            yield this.emit('inserted', { boundWitnesses, module: this });
-            return boundWitnesses;
+            yield this.emit('inserted', { module: this, payloads });
+            return payloads;
         });
     }
     saveAccount() {

package/dist/cjs/StorageArchivist.js.map

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

package/dist/cjs/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-tslib_1.__exportStar(require("./ArchivingModule"), exports);
+tslib_1.__exportStar(require("./AbstractArchivingModule"), exports);
 tslib_1.__exportStar(require("./CookieArchivist"), exports);
 tslib_1.__exportStar(require("./StorageArchivist"), exports);
 tslib_1.__exportStar(require("@xyo-network/abstract-archivist"), exports);

package/dist/cjs/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;AAAA,4DAAiC;AACjC,4DAAiC;AACjC,6DAAkC;AAClC,0EAA+C;AAC/C,uEAA4C;AAC5C,yEAA8C;AAC9C,wEAA6C"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;AAAA,oEAAyC;AACzC,4DAAiC;AACjC,6DAAkC;AAClC,0EAA+C;AAC/C,uEAA4C;AAC5C,yEAA8C;AAC9C,wEAA6C"}

package/dist/esm/{ArchivingModule.js → AbstractArchivingModule.js}

@@ -1,22 +1,21 @@
-import { asArchivistModule, isArchivistInstance } from '@xyo-network/archivist-model';
-import { ArchivistWrapper } from '@xyo-network/archivist-wrapper';
-import { AbstractModule } from '@xyo-network/module';
+import { asArchivistInstance } from '@xyo-network/archivist-model';
+import { AbstractModuleInstance } from '@xyo-network/module';
 import compact from 'lodash/compact';
 // @creatableModule()
-export class ArchivingModule extends AbstractModule {
+export class AbstractArchivingModule extends AbstractModuleInstance {
     async bindQueryResult(query, payloads, additionalWitnesses = [], errorPayloads = []) {
         const [result, witnesses] = await super.bindQueryResult(query, payloads, additionalWitnesses, errorPayloads);
         await this.storeToArchivists([result[0], ...result[1]]);
         return [result, witnesses];
     }
     async resolveArchivists() {
-        return compact((await Promise.all((await this.resolve({ address: this.config.archivists ?? [] })) ?? [])).map((module) => asArchivistModule(module)));
+        return compact((await Promise.all((await this.resolve({ address: this.config.archivists ?? [] })) ?? [])).map((module) => asArchivistInstance(module, () => `Module failed to cast to Archivist [${module.config.name}]`)));
     }
     async storeToArchivists(payloads) {
         const archivists = await this.resolveArchivists();
         return (await Promise.all(archivists.map((archivist) => {
-            return isArchivistInstance(archivist) ? archivist.insert(payloads) : ArchivistWrapper.wrap(archivist, this.account).insert(payloads);
+            return archivist.insert?.(payloads);
         }))).map(([bw]) => bw);
     }
 }
-//# sourceMappingURL=ArchivingModule.js.map
+//# sourceMappingURL=AbstractArchivingModule.js.map

package/dist/esm/AbstractArchivingModule.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"AbstractArchivingModule.js","sourceRoot":"","sources":["../../src/AbstractArchivingModule.ts"],"names":[],"mappings":"AACA,OAAO,EAAqB,mBAAmB,EAAE,MAAM,8BAA8B,CAAA;AAErF,OAAO,EAAE,sBAAsB,EAA0E,MAAM,qBAAqB,CAAA;AAEpI,OAAO,OAAO,MAAM,gBAAgB,CAAA;AAQpC,qBAAqB;AACrB,MAAM,OAAgB,uBAIpB,SAAQ,sBAA2C;IAGhC,KAAK,CAAC,eAAe,CACtC,KAAQ,EACR,QAAmB,EACnB,sBAAyC,EAAE,EAC3C,gBAA+B,EAAE;QAEjC,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,MAAM,KAAK,CAAC,eAAe,CAAC,KAAK,EAAE,QAAQ,EAAE,mBAAmB,EAAE,aAAa,CAAC,CAAA;QAC5G,MAAM,IAAI,CAAC,iBAAiB,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QACvD,OAAO,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;IAC5B,CAAC;IAES,KAAK,CAAC,iBAAiB;QAC/B,OAAO,OAAO,CACZ,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CACxG,mBAAmB,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,uCAAuC,MAAM,CAAC,MAAM,CAAC,IAAI,GAAG,CAAC,CAChG,CACF,CAAA;IACH,CAAC;IAES,KAAK,CAAC,iBAAiB,CAAC,QAAmB;QACnD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAA;QACjD,OAAO,CACL,MAAM,OAAO,CAAC,GAAG,CACf,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE;YAC3B,OAAO,SAAS,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,CAAA;QACrC,CAAC,CAAC,CACH,CACF,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,CAAA;IACrB,CAAC;CACF"}

package/dist/esm/CookieArchivist.js

@@ -1,13 +1,13 @@
 import { assertEx } from '@xylabs/assert';
 import { fulfilled } from '@xylabs/promise';
-import { AbstractDirectArchivist } from '@xyo-network/abstract-archivist';
+import { AbstractArchivist } from '@xyo-network/abstract-archivist';
 import { ArchivistAllQuerySchema, ArchivistClearQuerySchema, ArchivistCommitQuerySchema, ArchivistDeleteQuerySchema, ArchivistInsertQuerySchema, } from '@xyo-network/archivist-model';
 import { PayloadHasher } from '@xyo-network/core';
 import { PayloadWrapper } from '@xyo-network/payload-wrapper';
 import Cookies from 'js-cookie';
 import compact from 'lodash/compact';
 export const CookieArchivistConfigSchema = 'network.xyo.archivist.cookie.config';
-export class CookieArchivist extends AbstractDirectArchivist {
+export class CookieArchivist extends AbstractArchivist {
     static configSchemas = [CookieArchivistConfigSchema];
     get domain() {
         return this.config?.domain;
@@ -62,10 +62,10 @@ export class CookieArchivist extends AbstractDirectArchivist {
             const payloads = await this.all();
             assertEx(payloads.length > 0, 'Nothing to commit');
             const settled = await Promise.allSettled(compact(Object.values((await this.parents()).commit ?? [])?.map(async (parent) => {
-                const queryPayload = PayloadWrapper.wrap({
+                const queryPayload = {
                     payloads: await PayloadHasher.hashes(payloads),
                     schema: ArchivistInsertQuerySchema,
-                });
+                };
                 const query = await this.bindQuery(queryPayload, payloads);
                 return (await parent?.query(query[0], query[1]))?.[0];
             })));
@@ -114,15 +114,13 @@ export class CookieArchivist extends AbstractDirectArchivist {
                 return wrapper.payload();
             }));
             const [result] = await this.bindQueryResult({ payloads, schema: ArchivistInsertQuerySchema }, resultPayloads);
-            const parentBoundWitnesses = [];
             const parents = await this.parents();
             if (Object.entries(parents.write ?? {}).length) {
                 //we store the child bw also
-                parentBoundWitnesses.push(...(await this.writeToParents([result[0], ...resultPayloads])));
+                await this.writeToParents([result[0], ...resultPayloads]);
             }
-            const boundWitnesses = [result[0], ...parentBoundWitnesses];
-            await this.emit('inserted', { boundWitnesses, module: this });
-            return boundWitnesses;
+            await this.emit('inserted', { module: this, payloads });
+            return payloads;
         }
         catch (ex) {
             console.error(`Error: ${JSON.stringify(ex, null, 2)}`);

package/dist/esm/CookieArchivist.js.map

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

package/dist/esm/StorageArchivist.js

@@ -1,14 +1,13 @@
 import { assertEx } from '@xylabs/assert';
 import { fulfilled } from '@xylabs/promise';
-import { AbstractDirectArchivist } from '@xyo-network/abstract-archivist';
-import { Account } from '@xyo-network/account';
+import { AbstractArchivist } from '@xyo-network/abstract-archivist';
 import { ArchivistAllQuerySchema, ArchivistClearQuerySchema, ArchivistCommitQuerySchema, ArchivistDeleteQuerySchema, ArchivistInsertQuerySchema, } from '@xyo-network/archivist-model';
 import { PayloadHasher } from '@xyo-network/core';
 import { PayloadWrapper } from '@xyo-network/payload-wrapper';
 import compact from 'lodash/compact';
 import store from 'store2';
 export const StorageArchivistConfigSchema = 'network.xyo.archivist.storage.config';
-export class StorageArchivist extends AbstractDirectArchivist {
+export class StorageArchivist extends AbstractArchivist {
     static configSchemas = [StorageArchivistConfigSchema];
     _privateStorage;
     _storage;
@@ -47,24 +46,23 @@ export class StorageArchivist extends AbstractDirectArchivist {
         this._storage = this._storage ?? store[this.type].namespace(this.namespace);
         return this._storage;
     }
-    async loadAccount(account, persistAccount, privateStorage, _logger) {
-        if (!this._account) {
-            if (persistAccount) {
-                const privateKey = privateStorage?.get('privateKey');
-                if (privateKey) {
-                    try {
-                        this._account = await Account.create({ privateKey });
-                        return this._account;
-                    }
-                    catch (ex) {
-                        console.error(`Error reading Account from storage [${ex}] - Recreating Account`);
-                        privateStorage?.remove('privateKey');
-                    }
-                }
+    /*override async loadAccount(account?: AccountInstance, persistAccount?: boolean, privateStorage?: StoreBase, _logger?: Logger) {
+      if (!this._account) {
+        if (persistAccount) {
+          const privateKey = privateStorage?.get('privateKey')
+          if (privateKey) {
+            try {
+              this._account = await Account.create({ privateKey })
+              return this._account
+            } catch (ex) {
+              console.error(`Error reading Account from storage [${ex}] - Recreating Account`)
+              privateStorage?.remove('privateKey')
             }
+          }
         }
-        return await super.loadAccount();
-    }
+      }
+      return await super.loadAccount()
+    }*/
     allHandler() {
         this.logger?.log(`this.storage.length: ${this.storage.length}`);
         return Object.entries(this.storage.getAll()).map(([, value]) => value);
@@ -79,10 +77,10 @@ export class StorageArchivist extends AbstractDirectArchivist {
         const payloads = await this.all();
         assertEx(payloads.length > 0, 'Nothing to commit');
         const settled = await Promise.allSettled(compact(Object.values((await this.parents()).commit ?? [])?.map(async (parent) => {
-            const queryPayload = PayloadWrapper.wrap({
+            const queryPayload = {
                 payloads: await PayloadHasher.hashes(payloads),
                 schema: ArchivistInsertQuerySchema,
-            });
+            };
             const query = await this.bindQuery(queryPayload, payloads);
             return (await parent?.query(query[0], query[1]))?.[0];
         })));
@@ -119,16 +117,13 @@ export class StorageArchivist extends AbstractDirectArchivist {
             return wrapper.payload();
         }));
         const [[storageBoundWitness]] = await this.bindQueryResult({ payloads, schema: ArchivistInsertQuerySchema }, resultPayloads);
-        const parentBoundWitnesses = [];
         const parents = await this.parents();
         if (Object.entries(parents.write ?? {}).length) {
             //we store the child bw also
-            const [parentBoundWitness] = await this.writeToParents([storageBoundWitness, ...resultPayloads]);
-            parentBoundWitnesses.push(parentBoundWitness);
+            await this.writeToParents([storageBoundWitness, ...resultPayloads]);
         }
-        const boundWitnesses = [storageBoundWitness, ...parentBoundWitnesses];
-        await this.emit('inserted', { boundWitnesses, module: this });
-        return boundWitnesses;
+        await this.emit('inserted', { module: this, payloads });
+        return payloads;
     }
     saveAccount() {
         if (this.persistAccount) {

package/dist/esm/StorageArchivist.js.map

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

package/dist/esm/index.js

@@ -1,4 +1,4 @@
-export * from './ArchivingModule';
+export * from './AbstractArchivingModule';
 export * from './CookieArchivist';
 export * from './StorageArchivist';
 export * from '@xyo-network/abstract-archivist';

package/dist/esm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAA;AACjC,cAAc,mBAAmB,CAAA;AACjC,cAAc,oBAAoB,CAAA;AAClC,cAAc,iCAAiC,CAAA;AAC/C,cAAc,8BAA8B,CAAA;AAC5C,cAAc,gCAAgC,CAAA;AAC9C,cAAc,+BAA+B,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,2BAA2B,CAAA;AACzC,cAAc,mBAAmB,CAAA;AACjC,cAAc,oBAAoB,CAAA;AAClC,cAAc,iCAAiC,CAAA;AAC/C,cAAc,8BAA8B,CAAA;AAC5C,cAAc,gCAAgC,CAAA;AAC9C,cAAc,+BAA+B,CAAA"}

package/dist/types/AbstractArchivingModule.d.ts

@@ -0,0 +1,15 @@
+import { AccountInstance } from '@xyo-network/account-model';
+import { ArchivistInstance } from '@xyo-network/archivist-model';
+import { AnyObject } from '@xyo-network/core';
+import { AbstractModuleInstance, Module, ModuleConfig, ModuleEventData, ModuleParams, ModuleQueryResult } from '@xyo-network/module';
+import { ModuleError, Payload, Query } from '@xyo-network/payload-model';
+export type ArchivingModuleConfig<T extends AnyObject = AnyObject> = ModuleConfig<{
+    archivists?: string[];
+    schema: string;
+} & T>;
+export declare abstract class AbstractArchivingModule<TParams extends ModuleParams<ArchivingModuleConfig> = ModuleParams<ArchivingModuleConfig>, TEventData extends ModuleEventData = ModuleEventData> extends AbstractModuleInstance<TParams, TEventData> implements Module<TParams, TEventData> {
+    protected bindQueryResult<T extends Query>(query: T, payloads: Payload[], additionalWitnesses?: AccountInstance[], errorPayloads?: ModuleError[]): Promise<[ModuleQueryResult, AccountInstance[]]>;
+    protected resolveArchivists(): Promise<ArchivistInstance[]>;
+    protected storeToArchivists(payloads: Payload[]): Promise<Payload[]>;
+}
+//# sourceMappingURL=AbstractArchivingModule.d.ts.map

package/dist/types/AbstractArchivingModule.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"AbstractArchivingModule.d.ts","sourceRoot":"","sources":["../../src/AbstractArchivingModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAC5D,OAAO,EAAE,iBAAiB,EAAuB,MAAM,8BAA8B,CAAA;AACrF,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAE,sBAAsB,EAAE,MAAM,EAAE,YAAY,EAAE,eAAe,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AACpI,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,4BAA4B,CAAA;AAGxE,MAAM,MAAM,qBAAqB,CAAC,CAAC,SAAS,SAAS,GAAG,SAAS,IAAI,YAAY,CAC/E;IACE,UAAU,CAAC,EAAE,MAAM,EAAE,CAAA;IACrB,MAAM,EAAE,MAAM,CAAA;CACf,GAAG,CAAC,CACN,CAAA;AAED,8BAAsB,uBAAuB,CACzC,OAAO,SAAS,YAAY,CAAC,qBAAqB,CAAC,GAAG,YAAY,CAAC,qBAAqB,CAAC,EACzF,UAAU,SAAS,eAAe,GAAG,eAAe,CAEtD,SAAQ,sBAAsB,CAAC,OAAO,EAAE,UAAU,CAClD,YAAW,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC;cAEb,eAAe,CAAC,CAAC,SAAS,KAAK,EACtD,KAAK,EAAE,CAAC,EACR,QAAQ,EAAE,OAAO,EAAE,EACnB,mBAAmB,GAAE,eAAe,EAAO,EAC3C,aAAa,GAAE,WAAW,EAAO,GAChC,OAAO,CAAC,CAAC,iBAAiB,EAAE,eAAe,EAAE,CAAC,CAAC;cAMlC,iBAAiB,IAAI,OAAO,CAAC,iBAAiB,EAAE,CAAC;cAQjD,iBAAiB,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;CAU3E"}

package/dist/types/CookieArchivist.d.ts

@@ -1,4 +1,4 @@
-import { AbstractDirectArchivist } from '@xyo-network/abstract-archivist';
+import { AbstractArchivist } from '@xyo-network/abstract-archivist';
 import { ArchivistConfig, ArchivistModuleEventData, ArchivistParams } from '@xyo-network/archivist-model';
 import { BoundWitness } from '@xyo-network/boundwitness-model';
 import { AnyConfigSchema } from '@xyo-network/module';
@@ -14,7 +14,7 @@ export type CookieArchivistConfig = ArchivistConfig<{
     schema: CookieArchivistConfigSchema;
 }>;
 export type CookieArchivistParams = ArchivistParams<AnyConfigSchema<CookieArchivistConfig>>;
-export declare class CookieArchivist<TParams extends CookieArchivistParams, TEventData extends ArchivistModuleEventData = ArchivistModuleEventData> extends AbstractDirectArchivist<TParams, TEventData> {
+export declare class CookieArchivist<TParams extends CookieArchivistParams, TEventData extends ArchivistModuleEventData = ArchivistModuleEventData> extends AbstractArchivist<TParams, TEventData> {
     static configSchemas: "network.xyo.archivist.cookie.config"[];
     get domain(): string | undefined;
     get maxEntries(): number;
@@ -26,7 +26,7 @@ export declare class CookieArchivist<TParams extends CookieArchivistParams, TEve
     protected commitHandler(): Promise<BoundWitness[]>;
     protected deleteHandler(hashes: string[]): Promise<boolean[]>;
     protected getHandler(hashes: string[]): Promise<Payload[]>;
-    protected insertHandler(payloads: Payload[]): Promise<BoundWitness[]>;
+    protected insertHandler(payloads: Payload[]): Promise<Payload[]>;
     private keyFromHash;
 }
 //# sourceMappingURL=CookieArchivist.d.ts.map

package/dist/types/CookieArchivist.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CookieArchivist.d.ts","sourceRoot":"","sources":["../../src/CookieArchivist.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAA;AACzE,OAAO,EAIL,eAAe,EAIf,wBAAwB,EACxB,eAAe,EAChB,MAAM,8BAA8B,CAAA;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAA;AAE9D,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAEpD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAItD,MAAM,MAAM,2BAA2B,GAAG,qCAAqC,CAAA;AAC/E,eAAO,MAAM,2BAA2B,EAAE,2BAAmE,CAAA;AAE7G,MAAM,MAAM,qBAAqB,GAAG,eAAe,CAAC;IAClD,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE,2BAA2B,CAAA;CACpC,CAAC,CAAA;AAEF,MAAM,MAAM,qBAAqB,GAAG,eAAe,CAAC,eAAe,CAAC,qBAAqB,CAAC,CAAC,CAAA;AAE3F,qBAAa,eAAe,CAC1B,OAAO,SAAS,qBAAqB,EACrC,UAAU,SAAS,wBAAwB,GAAG,wBAAwB,CACtE,SAAQ,uBAAuB,CAAC,OAAO,EAAE,UAAU,CAAC;IACpD,OAAgB,aAAa,0CAAgC;IAE7D,IAAI,MAAM,uBAET;IAED,IAAI,UAAU,WAGb;IAED,IAAI,YAAY,WAGf;IAED,IAAI,SAAS,WAEZ;IAED,IAAa,OAAO,IAAI,MAAM,EAAE,CAS/B;cAEkB,UAAU,IAAI,eAAe,CAAC,OAAO,CAAC;cAWtC,YAAY,IAAI,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;cAa9B,aAAa,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;cAwBxC,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;cAcnD,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;cAczD,aAAa,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;IA4B3E,OAAO,CAAC,WAAW;CAGpB"}
+{"version":3,"file":"CookieArchivist.d.ts","sourceRoot":"","sources":["../../src/CookieArchivist.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AACnE,OAAO,EAIL,eAAe,EAIf,wBAAwB,EACxB,eAAe,EAChB,MAAM,8BAA8B,CAAA;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAA;AAE9D,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAEpD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAItD,MAAM,MAAM,2BAA2B,GAAG,qCAAqC,CAAA;AAC/E,eAAO,MAAM,2BAA2B,EAAE,2BAAmE,CAAA;AAE7G,MAAM,MAAM,qBAAqB,GAAG,eAAe,CAAC;IAClD,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE,2BAA2B,CAAA;CACpC,CAAC,CAAA;AAEF,MAAM,MAAM,qBAAqB,GAAG,eAAe,CAAC,eAAe,CAAC,qBAAqB,CAAC,CAAC,CAAA;AAE3F,qBAAa,eAAe,CAC1B,OAAO,SAAS,qBAAqB,EACrC,UAAU,SAAS,wBAAwB,GAAG,wBAAwB,CACtE,SAAQ,iBAAiB,CAAC,OAAO,EAAE,UAAU,CAAC;IAC9C,OAAgB,aAAa,0CAAgC;IAE7D,IAAI,MAAM,uBAET;IAED,IAAI,UAAU,WAGb;IAED,IAAI,YAAY,WAGf;IAED,IAAI,SAAS,WAEZ;IAED,IAAa,OAAO,IAAI,MAAM,EAAE,CAS/B;cAEkB,UAAU,IAAI,eAAe,CAAC,OAAO,CAAC;cAWtC,YAAY,IAAI,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;cAa9B,aAAa,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;cAwBxC,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;cAcnD,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;cAczD,aAAa,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IA0BtE,OAAO,CAAC,WAAW;CAGpB"}

package/dist/types/StorageArchivist.d.ts

@@ -1,12 +1,9 @@
-import { AbstractDirectArchivist } from '@xyo-network/abstract-archivist';
-import { AccountInstance } from '@xyo-network/account-model';
+import { AbstractArchivist } from '@xyo-network/abstract-archivist';
 import { ArchivistConfig, ArchivistInstance, ArchivistModuleEventData, ArchivistParams } from '@xyo-network/archivist-model';
 import { BoundWitness } from '@xyo-network/boundwitness-model';
-import { Logger } from '@xyo-network/core';
 import { AnyConfigSchema } from '@xyo-network/module';
 import { Payload } from '@xyo-network/payload-model';
 import { PromisableArray } from '@xyo-network/promise';
-import { StoreBase } from 'store2';
 export type StorageArchivistConfigSchema = 'network.xyo.archivist.storage.config';
 export declare const StorageArchivistConfigSchema: StorageArchivistConfigSchema;
 export type StorageArchivistConfig = ArchivistConfig<{
@@ -18,7 +15,7 @@ export type StorageArchivistConfig = ArchivistConfig<{
     type?: 'local' | 'session' | 'page';
 }>;
 export type StorageArchivistParams = ArchivistParams<AnyConfigSchema<StorageArchivistConfig>>;
-export declare class StorageArchivist<TParams extends StorageArchivistParams = StorageArchivistParams, TEventData extends ArchivistModuleEventData = ArchivistModuleEventData> extends AbstractDirectArchivist<TParams, TEventData> implements ArchivistInstance {
+export declare class StorageArchivist<TParams extends StorageArchivistParams = StorageArchivistParams, TEventData extends ArchivistModuleEventData = ArchivistModuleEventData> extends AbstractArchivist<TParams, TEventData> implements ArchivistInstance {
     static configSchemas: "network.xyo.archivist.storage.config"[];
     private _privateStorage;
     private _storage;
@@ -30,13 +27,12 @@ export declare class StorageArchivist<TParams extends StorageArchivistParams = S
     get type(): "local" | "session" | "page";
     private get privateStorage();
     private get storage();
-    loadAccount(account?: AccountInstance, persistAccount?: boolean, privateStorage?: StoreBase, _logger?: Logger): Promise<AccountInstance>;
     protected allHandler(): PromisableArray<Payload>;
     protected clearHandler(): void | Promise<void>;
     protected commitHandler(): Promise<BoundWitness[]>;
     protected deleteHandler(hashes: string[]): Promise<boolean[]>;
     protected getHandler(hashes: string[]): Promise<Payload[]>;
-    protected insertHandler(payloads: Payload[]): Promise<BoundWitness[]>;
+    protected insertHandler(payloads: Payload[]): Promise<Payload[]>;
     protected saveAccount(): void;
     protected startHandler(): Promise<boolean>;
 }

package/dist/types/StorageArchivist.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"StorageArchivist.d.ts","sourceRoot":"","sources":["../../src/StorageArchivist.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAA;AAEzE,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAC5D,OAAO,EAIL,eAAe,EAIf,iBAAiB,EACjB,wBAAwB,EACxB,eAAe,EAChB,MAAM,8BAA8B,CAAA;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAA;AAC9D,OAAO,EAAE,MAAM,EAAiB,MAAM,mBAAmB,CAAA;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAEpD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAEtD,OAAc,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAA;AAEzC,MAAM,MAAM,4BAA4B,GAAG,sCAAsC,CAAA;AACjF,eAAO,MAAM,4BAA4B,EAAE,4BAAqE,CAAA;AAEhH,MAAM,MAAM,sBAAsB,GAAG,eAAe,CAAC;IACnD,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,MAAM,EAAE,4BAA4B,CAAA;IACpC,IAAI,CAAC,EAAE,OAAO,GAAG,SAAS,GAAG,MAAM,CAAA;CACpC,CAAC,CAAA;AAEF,MAAM,MAAM,sBAAsB,GAAG,eAAe,CAAC,eAAe,CAAC,sBAAsB,CAAC,CAAC,CAAA;AAC7F,qBAAa,gBAAgB,CACzB,OAAO,SAAS,sBAAsB,GAAG,sBAAsB,EAC/D,UAAU,SAAS,wBAAwB,GAAG,wBAAwB,CAExE,SAAQ,uBAAuB,CAAC,OAAO,EAAE,UAAU,CACnD,YAAW,iBAAiB;IAE5B,OAAgB,aAAa,2CAAiC;IAE9D,OAAO,CAAC,eAAe,CAAuB;IAC9C,OAAO,CAAC,QAAQ,CAAuB;IAEvC,IAAI,UAAU,WAEb;IAED,IAAI,YAAY,WAEf;IAED,IAAI,SAAS,WAEZ;IAED,IAAI,cAAc,YAEjB;IAED,IAAa,OAAO,IAAI,MAAM,EAAE,CAS/B;IAED,IAAI,IAAI,iCAEP;IAGD,OAAO,KAAK,cAAc,GAGzB;IAGD,OAAO,KAAK,OAAO,GAGlB;IAEc,WAAW,CAAC,OAAO,CAAC,EAAE,eAAe,EAAE,cAAc,CAAC,EAAE,OAAO,EAAE,cAAc,CAAC,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,MAAM;cAkBzG,UAAU,IAAI,eAAe,CAAC,OAAO,CAAC;cAKtC,YAAY,IAAI,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;cAM9B,aAAa,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;cAqBxC,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;cAUnD,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;cAczD,aAAa,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;IAwB3E,SAAS,CAAC,WAAW;cAQI,YAAY;CAKtC"}
+{"version":3,"file":"StorageArchivist.d.ts","sourceRoot":"","sources":["../../src/StorageArchivist.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AACnE,OAAO,EAIL,eAAe,EAIf,iBAAiB,EACjB,wBAAwB,EACxB,eAAe,EAChB,MAAM,8BAA8B,CAAA;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAA;AAE9D,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAEpD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAItD,MAAM,MAAM,4BAA4B,GAAG,sCAAsC,CAAA;AACjF,eAAO,MAAM,4BAA4B,EAAE,4BAAqE,CAAA;AAEhH,MAAM,MAAM,sBAAsB,GAAG,eAAe,CAAC;IACnD,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,MAAM,EAAE,4BAA4B,CAAA;IACpC,IAAI,CAAC,EAAE,OAAO,GAAG,SAAS,GAAG,MAAM,CAAA;CACpC,CAAC,CAAA;AAEF,MAAM,MAAM,sBAAsB,GAAG,eAAe,CAAC,eAAe,CAAC,sBAAsB,CAAC,CAAC,CAAA;AAC7F,qBAAa,gBAAgB,CACzB,OAAO,SAAS,sBAAsB,GAAG,sBAAsB,EAC/D,UAAU,SAAS,wBAAwB,GAAG,wBAAwB,CAExE,SAAQ,iBAAiB,CAAC,OAAO,EAAE,UAAU,CAC7C,YAAW,iBAAiB;IAE5B,OAAgB,aAAa,2CAAiC;IAE9D,OAAO,CAAC,eAAe,CAAuB;IAC9C,OAAO,CAAC,QAAQ,CAAuB;IAEvC,IAAI,UAAU,WAEb;IAED,IAAI,YAAY,WAEf;IAED,IAAI,SAAS,WAEZ;IAED,IAAI,cAAc,YAEjB;IAED,IAAa,OAAO,IAAI,MAAM,EAAE,CAS/B;IAED,IAAI,IAAI,iCAEP;IAGD,OAAO,KAAK,cAAc,GAGzB;IAGD,OAAO,KAAK,OAAO,GAGlB;cAoBkB,UAAU,IAAI,eAAe,CAAC,OAAO,CAAC;cAKtC,YAAY,IAAI,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;cAM9B,aAAa,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;cAqBxC,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;cAUnD,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;cAczD,aAAa,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAqBtE,SAAS,CAAC,WAAW;cAQI,YAAY;CAKtC"}

package/dist/types/index.d.ts

@@ -1,4 +1,4 @@
-export * from './ArchivingModule';
+export * from './AbstractArchivingModule';
 export * from './CookieArchivist';
 export * from './StorageArchivist';
 export * from '@xyo-network/abstract-archivist';

package/dist/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAA;AACjC,cAAc,mBAAmB,CAAA;AACjC,cAAc,oBAAoB,CAAA;AAClC,cAAc,iCAAiC,CAAA;AAC/C,cAAc,8BAA8B,CAAA;AAC5C,cAAc,gCAAgC,CAAA;AAC9C,cAAc,+BAA+B,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,2BAA2B,CAAA;AACzC,cAAc,mBAAmB,CAAA;AACjC,cAAc,oBAAoB,CAAA;AAClC,cAAc,iCAAiC,CAAA;AAC/C,cAAc,8BAA8B,CAAA;AAC5C,cAAc,gCAAgC,CAAA;AAC9C,cAAc,+BAA+B,CAAA"}

package/package.json

@@ -11,18 +11,17 @@
   "dependencies": {
     "@xylabs/assert": "^2.9.3",
     "@xylabs/promise": "^2.9.3",
-    "@xyo-network/abstract-archivist": "~2.67.0-rc.1",
-    "@xyo-network/account": "~2.67.0-rc.1",
-    "@xyo-network/account-model": "~2.67.0-rc.1",
-    "@xyo-network/archivist-model": "~2.67.0-rc.1",
-    "@xyo-network/archivist-wrapper": "~2.67.0-rc.1",
-    "@xyo-network/boundwitness-model": "~2.67.0-rc.1",
-    "@xyo-network/core": "~2.67.0-rc.1",
-    "@xyo-network/memory-archivist": "~2.67.0-rc.1",
-    "@xyo-network/module": "~2.67.0-rc.1",
-    "@xyo-network/payload-model": "~2.67.0-rc.1",
-    "@xyo-network/payload-wrapper": "~2.67.0-rc.1",
-    "@xyo-network/promise": "~2.67.0-rc.1",
+    "@xyo-network/abstract-archivist": "~2.67.0-rc.3",
+    "@xyo-network/account-model": "~2.67.0-rc.3",
+    "@xyo-network/archivist-model": "~2.67.0-rc.3",
+    "@xyo-network/archivist-wrapper": "~2.67.0-rc.3",
+    "@xyo-network/boundwitness-model": "~2.67.0-rc.3",
+    "@xyo-network/core": "~2.67.0-rc.3",
+    "@xyo-network/memory-archivist": "~2.67.0-rc.3",
+    "@xyo-network/module": "~2.67.0-rc.3",
+    "@xyo-network/payload-model": "~2.67.0-rc.3",
+    "@xyo-network/payload-wrapper": "~2.67.0-rc.3",
+    "@xyo-network/promise": "~2.67.0-rc.3",
     "js-cookie": "^3.0.5",
     "lodash": "^4.17.21",
     "store2": "^2.14.2"
@@ -33,8 +32,7 @@
     "@xylabs/delay": "^2.9.3",
     "@xylabs/ts-scripts-yarn3": "^2.19.0",
     "@xylabs/tsconfig": "^2.19.0",
-    "@xyo-network/boundwitness-wrapper": "~2.67.0-rc.1",
-    "@xyo-network/id-payload-plugin": "~2.67.0-rc.1",
+    "@xyo-network/id-payload-plugin": "~2.67.0-rc.3",
     "typescript": "^5.1.6"
   },
   "description": "Primary SDK for using XYO Protocol 2.0",
@@ -71,6 +69,6 @@
   },
   "sideEffects": false,
   "types": "dist/types/index.d.ts",
-  "version": "2.67.0-rc.1",
+  "version": "2.67.0-rc.3",
   "stableVersion": "2.66.9"
 }

package/src/{ArchivingModule.ts → AbstractArchivingModule.ts}

@@ -1,11 +1,8 @@
 import { AccountInstance } from '@xyo-network/account-model'
-import { ArchivistModule, asArchivistModule, isArchivistInstance } from '@xyo-network/archivist-model'
-import { ArchivistWrapper } from '@xyo-network/archivist-wrapper'
-import { BoundWitness } from '@xyo-network/boundwitness-model'
+import { ArchivistInstance, asArchivistInstance } from '@xyo-network/archivist-model'
 import { AnyObject } from '@xyo-network/core'
-import { AbstractModule, Module, ModuleConfig, ModuleEventData, ModuleParams, ModuleQueryResult } from '@xyo-network/module'
+import { AbstractModuleInstance, Module, ModuleConfig, ModuleEventData, ModuleParams, ModuleQueryResult } from '@xyo-network/module'
 import { ModuleError, Payload, Query } from '@xyo-network/payload-model'
-import { PayloadWrapper } from '@xyo-network/payload-wrapper'
 import compact from 'lodash/compact'
 
 export type ArchivingModuleConfig<T extends AnyObject = AnyObject> = ModuleConfig<
@@ -15,14 +12,14 @@ export type ArchivingModuleConfig<T extends AnyObject = AnyObject> = ModuleConfi
   } & T
 >
 // @creatableModule()
-export abstract class ArchivingModule<
+export abstract class AbstractArchivingModule<
     TParams extends ModuleParams<ArchivingModuleConfig> = ModuleParams<ArchivingModuleConfig>,
     TEventData extends ModuleEventData = ModuleEventData,
   >
-  extends AbstractModule<TParams, TEventData>
+  extends AbstractModuleInstance<TParams, TEventData>
   implements Module<TParams, TEventData>
 {
-  protected override async bindQueryResult<T extends Query | PayloadWrapper<Query>>(
+  protected override async bindQueryResult<T extends Query>(
     query: T,
     payloads: Payload[],
     additionalWitnesses: AccountInstance[] = [],
@@ -33,18 +30,20 @@ export abstract class ArchivingModule<
     return [result, witnesses]
   }
 
-  protected async resolveArchivists(): Promise<ArchivistModule[]> {
+  protected async resolveArchivists(): Promise<ArchivistInstance[]> {
     return compact(
-      (await Promise.all((await this.resolve({ address: this.config.archivists ?? [] })) ?? [])).map((module) => asArchivistModule(module)),
+      (await Promise.all((await this.resolve({ address: this.config.archivists ?? [] })) ?? [])).map((module) =>
+        asArchivistInstance(module, () => `Module failed to cast to Archivist [${module.config.name}]`),
+      ),
     )
   }
 
-  protected async storeToArchivists(payloads: Payload[]): Promise<BoundWitness[]> {
+  protected async storeToArchivists(payloads: Payload[]): Promise<Payload[]> {
     const archivists = await this.resolveArchivists()
     return (
       await Promise.all(
         archivists.map((archivist) => {
-          return isArchivistInstance(archivist) ? archivist.insert(payloads) : ArchivistWrapper.wrap(archivist, this.account).insert(payloads)
+          return archivist.insert?.(payloads)
         }),
       )
     ).map(([bw]) => bw)

package/src/CookieArchivist.ts

@@ -1,6 +1,6 @@
 import { assertEx } from '@xylabs/assert'
 import { fulfilled } from '@xylabs/promise'
-import { AbstractDirectArchivist } from '@xyo-network/abstract-archivist'
+import { AbstractArchivist } from '@xyo-network/abstract-archivist'
 import {
   ArchivistAllQuerySchema,
   ArchivistClearQuerySchema,
@@ -37,7 +37,7 @@ export type CookieArchivistParams = ArchivistParams<AnyConfigSchema<CookieArchiv
 export class CookieArchivist<
   TParams extends CookieArchivistParams,
   TEventData extends ArchivistModuleEventData = ArchivistModuleEventData,
-> extends AbstractDirectArchivist<TParams, TEventData> {
+> extends AbstractArchivist<TParams, TEventData> {
   static override configSchemas = [CookieArchivistConfigSchema]
 
   get domain() {
@@ -100,10 +100,10 @@ export class CookieArchivist<
       const settled = await Promise.allSettled(
         compact(
           Object.values((await this.parents()).commit ?? [])?.map(async (parent) => {
-            const queryPayload = PayloadWrapper.wrap<ArchivistInsertQuery>({
+            const queryPayload: ArchivistInsertQuery = {
               payloads: await PayloadHasher.hashes(payloads),
               schema: ArchivistInsertQuerySchema,
-            })
+            }
             const query = await this.bindQuery(queryPayload, payloads)
             return (await parent?.query(query[0], query[1]))?.[0]
           }),
@@ -145,7 +145,7 @@ export class CookieArchivist<
     }
   }
 
-  protected async insertHandler(payloads: Payload[]): Promise<BoundWitness[]> {
+  protected async insertHandler(payloads: Payload[]): Promise<Payload[]> {
     try {
       const resultPayloads: Payload[] = await Promise.all(
         payloads.map(async (payload) => {
@@ -158,15 +158,13 @@ export class CookieArchivist<
         }),
       )
       const [result] = await this.bindQueryResult({ payloads, schema: ArchivistInsertQuerySchema }, resultPayloads)
-      const parentBoundWitnesses: BoundWitness[] = []
       const parents = await this.parents()
       if (Object.entries(parents.write ?? {}).length) {
         //we store the child bw also
-        parentBoundWitnesses.push(...(await this.writeToParents([result[0], ...resultPayloads])))
+        await this.writeToParents([result[0], ...resultPayloads])
       }
-      const boundWitnesses = [result[0], ...parentBoundWitnesses]
-      await this.emit('inserted', { boundWitnesses, module: this })
-      return boundWitnesses
+      await this.emit('inserted', { module: this, payloads })
+      return payloads
     } catch (ex) {
       console.error(`Error: ${JSON.stringify(ex, null, 2)}`)
       throw ex

package/src/StorageArchivist.ts

@@ -1,8 +1,6 @@
 import { assertEx } from '@xylabs/assert'
 import { fulfilled } from '@xylabs/promise'
-import { AbstractDirectArchivist } from '@xyo-network/abstract-archivist'
-import { Account } from '@xyo-network/account'
-import { AccountInstance } from '@xyo-network/account-model'
+import { AbstractArchivist } from '@xyo-network/abstract-archivist'
 import {
   ArchivistAllQuerySchema,
   ArchivistClearQuerySchema,
@@ -16,7 +14,7 @@ import {
   ArchivistParams,
 } from '@xyo-network/archivist-model'
 import { BoundWitness } from '@xyo-network/boundwitness-model'
-import { Logger, PayloadHasher } from '@xyo-network/core'
+import { PayloadHasher } from '@xyo-network/core'
 import { AnyConfigSchema } from '@xyo-network/module'
 import { Payload } from '@xyo-network/payload-model'
 import { PayloadWrapper } from '@xyo-network/payload-wrapper'
@@ -41,7 +39,7 @@ export class StorageArchivist<
     TParams extends StorageArchivistParams = StorageArchivistParams,
     TEventData extends ArchivistModuleEventData = ArchivistModuleEventData,
   >
-  extends AbstractDirectArchivist<TParams, TEventData>
+  extends AbstractArchivist<TParams, TEventData>
   implements ArchivistInstance
 {
   static override configSchemas = [StorageArchivistConfigSchema]
@@ -92,7 +90,7 @@ export class StorageArchivist<
     return this._storage
   }
 
-  override async loadAccount(account?: AccountInstance, persistAccount?: boolean, privateStorage?: StoreBase, _logger?: Logger) {
+  /*override async loadAccount(account?: AccountInstance, persistAccount?: boolean, privateStorage?: StoreBase, _logger?: Logger) {
     if (!this._account) {
       if (persistAccount) {
         const privateKey = privateStorage?.get('privateKey')
@@ -108,7 +106,7 @@ export class StorageArchivist<
       }
     }
     return await super.loadAccount()
-  }
+  }*/
 
   protected override allHandler(): PromisableArray<Payload> {
     this.logger?.log(`this.storage.length: ${this.storage.length}`)
@@ -128,10 +126,10 @@ export class StorageArchivist<
     const settled = await Promise.allSettled(
       compact(
         Object.values((await this.parents()).commit ?? [])?.map(async (parent) => {
-          const queryPayload = PayloadWrapper.wrap<ArchivistInsertQuery>({
+          const queryPayload: ArchivistInsertQuery = {
             payloads: await PayloadHasher.hashes(payloads),
             schema: ArchivistInsertQuerySchema,
-          })
+          }
           const query = await this.bindQuery(queryPayload, payloads)
           return (await parent?.query(query[0], query[1]))?.[0]
         }),
@@ -166,7 +164,7 @@ export class StorageArchivist<
     )
   }
 
-  protected async insertHandler(payloads: Payload[]): Promise<BoundWitness[]> {
+  protected async insertHandler(payloads: Payload[]): Promise<Payload[]> {
     const resultPayloads = await Promise.all(
       payloads.map(async (payload) => {
         const wrapper = PayloadWrapper.wrap(payload)
@@ -178,16 +176,13 @@ export class StorageArchivist<
       }),
     )
     const [[storageBoundWitness]] = await this.bindQueryResult({ payloads, schema: ArchivistInsertQuerySchema }, resultPayloads)
-    const parentBoundWitnesses: BoundWitness[] = []
     const parents = await this.parents()
     if (Object.entries(parents.write ?? {}).length) {
       //we store the child bw also
-      const [parentBoundWitness] = await this.writeToParents([storageBoundWitness, ...resultPayloads])
-      parentBoundWitnesses.push(parentBoundWitness)
+      await this.writeToParents([storageBoundWitness, ...resultPayloads])
     }
-    const boundWitnesses = [storageBoundWitness, ...parentBoundWitnesses]
-    await this.emit('inserted', { boundWitnesses, module: this })
-    return boundWitnesses
+    await this.emit('inserted', { module: this, payloads })
+    return payloads
   }
 
   protected saveAccount() {

package/src/index.ts

@@ -1,4 +1,4 @@
-export * from './ArchivingModule'
+export * from './AbstractArchivingModule'
 export * from './CookieArchivist'
 export * from './StorageArchivist'
 export * from '@xyo-network/abstract-archivist'

package/src/spec/testArchivist.ts

@@ -4,8 +4,6 @@
 
 import { delay } from '@xylabs/delay'
 import { ArchivistInstance } from '@xyo-network/archivist-model'
-import { BoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper'
-import { PayloadHasher } from '@xyo-network/core'
 import { IdSchema } from '@xyo-network/id-payload-plugin'
 import { Payload } from '@xyo-network/payload-model'
 import { PayloadWrapper } from '@xyo-network/payload-wrapper'
@@ -21,11 +19,8 @@ export const testArchivistRoundTrip = (archivistPromise: Promisable<ArchivistIns
 
     const archivist = await archivistPromise
     const insertResult = await archivist.insert([idPayload])
-    const insertResultWrappers = insertResult.map((bw) => BoundWitnessWrapper.wrap(bw))
-    const insertResultPayload = insertResultWrappers.pop() as BoundWitnessWrapper
-    expect(insertResultPayload).toBeDefined()
+    expect(insertResult).toBeDefined()
 
-    expect(PayloadHasher.find(insertResultPayload.payloadHashes, await payloadWrapper.hashAsync())).toBeDefined()
     const getResult = await archivist.get([await payloadWrapper.hashAsync()])
     expect(getResult).toBeDefined()
     expect(getResult.length).toBe(1)

package/dist/cjs/ArchivingModule.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ArchivingModule.js","sourceRoot":"","sources":["../../src/ArchivingModule.ts"],"names":[],"mappings":";;;;AACA,kEAAsG;AACtG,sEAAiE;AAGjE,gDAA4H;AAG5H,qEAAoC;AAQpC,qBAAqB;AACrB,MAAsB,eAIpB,SAAQ,uBAAmC;IAGlB,eAAe,CACtC,KAAQ,EACR,QAAmB,EACnB,sBAAyC,EAAE,EAC3C,gBAA+B,EAAE;;;;;YAEjC,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,MAAM,OAAM,eAAe,YAAC,KAAK,EAAE,QAAQ,EAAE,mBAAmB,EAAE,aAAa,CAAC,CAAA;YAC5G,MAAM,IAAI,CAAC,iBAAiB,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;YACvD,OAAO,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;QAC5B,CAAC;KAAA;IAEe,iBAAiB;;;YAC/B,OAAO,IAAA,iBAAO,EACZ,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,MAAA,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,MAAA,IAAI,CAAC,MAAM,CAAC,UAAU,mCAAI,EAAE,EAAE,CAAC,CAAC,mCAAI,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAA,mCAAiB,EAAC,MAAM,CAAC,CAAC,CACtI,CAAA;;KACF;IAEe,iBAAiB,CAAC,QAAmB;;YACnD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAA;YACjD,OAAO,CACL,MAAM,OAAO,CAAC,GAAG,CACf,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE;gBAC3B,OAAO,IAAA,qCAAmB,EAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,oCAAgB,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;YACtI,CAAC,CAAC,CACH,CACF,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,CAAA;QACrB,CAAC;KAAA;CACF;AAlCD,0CAkCC"}

package/dist/esm/ArchivingModule.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ArchivingModule.js","sourceRoot":"","sources":["../../src/ArchivingModule.ts"],"names":[],"mappings":"AACA,OAAO,EAAmB,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAA;AACtG,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AAGjE,OAAO,EAAE,cAAc,EAA0E,MAAM,qBAAqB,CAAA;AAG5H,OAAO,OAAO,MAAM,gBAAgB,CAAA;AAQpC,qBAAqB;AACrB,MAAM,OAAgB,eAIpB,SAAQ,cAAmC;IAGxB,KAAK,CAAC,eAAe,CACtC,KAAQ,EACR,QAAmB,EACnB,sBAAyC,EAAE,EAC3C,gBAA+B,EAAE;QAEjC,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,MAAM,KAAK,CAAC,eAAe,CAAC,KAAK,EAAE,QAAQ,EAAE,mBAAmB,EAAE,aAAa,CAAC,CAAA;QAC5G,MAAM,IAAI,CAAC,iBAAiB,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QACvD,OAAO,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;IAC5B,CAAC;IAES,KAAK,CAAC,iBAAiB;QAC/B,OAAO,OAAO,CACZ,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,CACtI,CAAA;IACH,CAAC;IAES,KAAK,CAAC,iBAAiB,CAAC,QAAmB;QACnD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAA;QACjD,OAAO,CACL,MAAM,OAAO,CAAC,GAAG,CACf,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE;YAC3B,OAAO,mBAAmB,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;QACtI,CAAC,CAAC,CACH,CACF,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,CAAA;IACrB,CAAC;CACF"}

package/dist/types/ArchivingModule.d.ts

@@ -1,17 +0,0 @@
-import { AccountInstance } from '@xyo-network/account-model';
-import { ArchivistModule } from '@xyo-network/archivist-model';
-import { BoundWitness } from '@xyo-network/boundwitness-model';
-import { AnyObject } from '@xyo-network/core';
-import { AbstractModule, Module, ModuleConfig, ModuleEventData, ModuleParams, ModuleQueryResult } from '@xyo-network/module';
-import { ModuleError, Payload, Query } from '@xyo-network/payload-model';
-import { PayloadWrapper } from '@xyo-network/payload-wrapper';
-export type ArchivingModuleConfig<T extends AnyObject = AnyObject> = ModuleConfig<{
-    archivists?: string[];
-    schema: string;
-} & T>;
-export declare abstract class ArchivingModule<TParams extends ModuleParams<ArchivingModuleConfig> = ModuleParams<ArchivingModuleConfig>, TEventData extends ModuleEventData = ModuleEventData> extends AbstractModule<TParams, TEventData> implements Module<TParams, TEventData> {
-    protected bindQueryResult<T extends Query | PayloadWrapper<Query>>(query: T, payloads: Payload[], additionalWitnesses?: AccountInstance[], errorPayloads?: ModuleError[]): Promise<[ModuleQueryResult, AccountInstance[]]>;
-    protected resolveArchivists(): Promise<ArchivistModule[]>;
-    protected storeToArchivists(payloads: Payload[]): Promise<BoundWitness[]>;
-}
-//# sourceMappingURL=ArchivingModule.d.ts.map

package/dist/types/ArchivingModule.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ArchivingModule.d.ts","sourceRoot":"","sources":["../../src/ArchivingModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAC5D,OAAO,EAAE,eAAe,EAA0C,MAAM,8BAA8B,CAAA;AAEtG,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAA;AAC9D,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,YAAY,EAAE,eAAe,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAC5H,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,4BAA4B,CAAA;AACxE,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAG7D,MAAM,MAAM,qBAAqB,CAAC,CAAC,SAAS,SAAS,GAAG,SAAS,IAAI,YAAY,CAC/E;IACE,UAAU,CAAC,EAAE,MAAM,EAAE,CAAA;IACrB,MAAM,EAAE,MAAM,CAAA;CACf,GAAG,CAAC,CACN,CAAA;AAED,8BAAsB,eAAe,CACjC,OAAO,SAAS,YAAY,CAAC,qBAAqB,CAAC,GAAG,YAAY,CAAC,qBAAqB,CAAC,EACzF,UAAU,SAAS,eAAe,GAAG,eAAe,CAEtD,SAAQ,cAAc,CAAC,OAAO,EAAE,UAAU,CAC1C,YAAW,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC;cAEb,eAAe,CAAC,CAAC,SAAS,KAAK,GAAG,cAAc,CAAC,KAAK,CAAC,EAC9E,KAAK,EAAE,CAAC,EACR,QAAQ,EAAE,OAAO,EAAE,EACnB,mBAAmB,GAAE,eAAe,EAAO,EAC3C,aAAa,GAAE,WAAW,EAAO,GAChC,OAAO,CAAC,CAAC,iBAAiB,EAAE,eAAe,EAAE,CAAC,CAAC;cAMlC,iBAAiB,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;cAM/C,iBAAiB,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;CAUhF"}