@xyo-network/witness 2.49.4 → 2.50.0

package/dist/esm/AbstractWitness.js

@@ -48,7 +48,4 @@ export class AbstractWitness extends AbstractModule {
         }
     }
 }
-/** @deprecated use AbstractWitness instead */
-export class XyoWitness extends AbstractWitness {
-}
 //# sourceMappingURL=AbstractWitness.js.map

package/dist/esm/AbstractWitness.js.map

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

package/dist/esm/TimestampWitness.js.map

@@ -1 +1 @@
-{"version":3,"file":"TimestampWitness.js","sourceRoot":"","sources":["../../src/TimestampWitness.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AAGnD,MAAM,OAAgB,gBAAgE,SAAQ,eAAkB;IACrG,OAAO,CAAC,MAAiC;QAChD,OAAO,KAAK,CAAC,OAAO,CAClB,MAAM,EAAE,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE;YACxB,OAAO,EAAE,GAAG,SAAS,EAAE,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,CAAA;QAChD,CAAC,CAAC,CACH,CAAA;IACH,CAAC;CACF"}
+{"version":3,"file":"TimestampWitness.js","sourceRoot":"","sources":["../../src/TimestampWitness.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAiB,MAAM,mBAAmB,CAAA;AAElE,MAAM,OAAgB,gBAA0D,SAAQ,eAAkB;IAC/F,OAAO,CAAC,MAAiC;QAChD,OAAO,KAAK,CAAC,OAAO,CAClB,MAAM,EAAE,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE;YACxB,OAAO,EAAE,GAAG,SAAS,EAAE,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,CAAA;QAChD,CAAC,CAAC,CACH,CAAA;IACH,CAAC;CACF"}

package/dist/esm/WitnessWrapper.js

@@ -4,17 +4,19 @@ import { PayloadWrapper } from '@xyo-network/payload-wrapper';
 import { XyoWitnessObserveQuerySchema } from './Queries';
 export class WitnessWrapper extends ModuleWrapper {
     static requiredQueries = [XyoWitnessObserveQuerySchema, ...super.requiredQueries];
-    static tryWrap(module) {
-        const missingRequiredQueries = this.missingRequiredQueries(module);
-        if (missingRequiredQueries.length > 0) {
-            console.warn(`Missing queries: ${JSON.stringify(missingRequiredQueries, null, 2)}`);
-        }
-        else {
-            return new ModuleWrapper(module);
+    static tryWrap(module, account) {
+        if (module) {
+            const missingRequiredQueries = this.missingRequiredQueries(module);
+            if (missingRequiredQueries.length > 0) {
+                console.warn(`Missing queries: ${JSON.stringify(missingRequiredQueries, null, 2)}`);
+            }
+            else {
+                return new WitnessWrapper(module, account);
+            }
         }
     }
-    static wrap(module) {
-        return assertEx(this.tryWrap(module), 'Unable to wrap module as ModuleWrapper');
+    static wrap(module, account) {
+        return assertEx(this.tryWrap(module, account), 'Unable to wrap module as ModuleWrapper');
     }
     observe(payloads) {
         const queryPayload = PayloadWrapper.parse({ schema: XyoWitnessObserveQuerySchema });

package/dist/esm/WitnessWrapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"WitnessWrapper.js","sourceRoot":"","sources":["../../src/WitnessWrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAU,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAE3D,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAE7D,OAAO,EAA0B,4BAA4B,EAAE,MAAM,WAAW,CAAA;AAGhF,MAAM,OAAO,cAAe,SAAQ,aAAa;IAC/C,MAAM,CAAU,eAAe,GAAG,CAAC,4BAA4B,EAAE,GAAG,KAAK,CAAC,eAAe,CAAC,CAAA;IAE1F,MAAM,CAAU,OAAO,CAAC,MAAc;QACpC,MAAM,sBAAsB,GAAG,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAA;QAClE,IAAI,sBAAsB,CAAC,MAAM,GAAG,CAAC,EAAE;YACrC,OAAO,CAAC,IAAI,CAAC,oBAAoB,IAAI,CAAC,SAAS,CAAC,sBAAsB,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAA;SACpF;aAAM;YACL,OAAO,IAAI,aAAa,CAAC,MAAgB,CAAC,CAAA;SAC3C;IACH,CAAC;IAED,MAAM,CAAU,IAAI,CAAC,MAAc;QACjC,OAAO,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,wCAAwC,CAAC,CAAA;IACjF,CAAC;IAED,OAAO,CAAC,QAAuB;QAC7B,MAAM,YAAY,GAAG,cAAc,CAAC,KAAK,CAAyB,EAAE,MAAM,EAAE,4BAA4B,EAAE,CAAC,CAAA;QAC3G,OAAO,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,CAAC,YAAY,CAAC,OAAO,EAAE,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,CAAC,CAAA;IAClF,CAAC;;AAGH,6CAA6C;AAC7C,MAAM,OAAO,iBAAkB,SAAQ,cAAc;CAAG"}
+{"version":3,"file":"WitnessWrapper.js","sourceRoot":"","sources":["../../src/WitnessWrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAEzC,OAAO,EAAU,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAE3D,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAE7D,OAAO,EAA0B,4BAA4B,EAAE,MAAM,WAAW,CAAA;AAGhF,MAAM,OAAO,cAAe,SAAQ,aAAa;IAC/C,MAAM,CAAU,eAAe,GAAG,CAAC,4BAA4B,EAAE,GAAG,KAAK,CAAC,eAAe,CAAC,CAAA;IAE1F,MAAM,CAAU,OAAO,CAAC,MAAe,EAAE,OAAiB;QACxD,IAAI,MAAM,EAAE;YACV,MAAM,sBAAsB,GAAG,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAA;YAClE,IAAI,sBAAsB,CAAC,MAAM,GAAG,CAAC,EAAE;gBACrC,OAAO,CAAC,IAAI,CAAC,oBAAoB,IAAI,CAAC,SAAS,CAAC,sBAAsB,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAA;aACpF;iBAAM;gBACL,OAAO,IAAI,cAAc,CAAC,MAAgB,EAAE,OAAO,CAAC,CAAA;aACrD;SACF;IACH,CAAC;IAED,MAAM,CAAU,IAAI,CAAC,MAAe,EAAE,OAAiB;QACrD,OAAO,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,wCAAwC,CAAC,CAAA;IAC1F,CAAC;IAED,OAAO,CAAC,QAAuB;QAC7B,MAAM,YAAY,GAAG,cAAc,CAAC,KAAK,CAAyB,EAAE,MAAM,EAAE,4BAA4B,EAAE,CAAC,CAAA;QAC3G,OAAO,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,CAAC,YAAY,CAAC,OAAO,EAAE,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,CAAC,CAAA;IAClF,CAAC;;AAGH,6CAA6C;AAC7C,MAAM,OAAO,iBAAkB,SAAQ,cAAc;CAAG"}

package/dist/types/AbstractWitness.d.ts

@@ -1,9 +1,11 @@
+import { AnyObject } from '@xyo-network/core';
 import { AbstractModule, ModuleConfig, ModuleParams, ModuleQueryResult, XyoQueryBoundWitness } from '@xyo-network/module';
 import { XyoPayload } from '@xyo-network/payload-model';
 import { Promisable } from '@xyo-network/promise';
 import { XyoWitnessConfig } from './Config';
 import { WitnessModule } from './Witness';
-export declare abstract class AbstractWitness<TConfig extends XyoWitnessConfig = XyoWitnessConfig> extends AbstractModule<TConfig> implements WitnessModule {
+export type WitnessParams<TConfig extends XyoWitnessConfig = XyoWitnessConfig, TAdditionalParams extends AnyObject | undefined = undefined> = ModuleParams<TConfig, TAdditionalParams>;
+export declare abstract class AbstractWitness<TParams extends WitnessParams = WitnessParams> extends AbstractModule<TParams> implements WitnessModule<TParams['config']> {
     static configSchema: string;
     get queries(): string[];
     get targetSet(): (import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & import("@xyo-network/payload-model").PayloadSet & {
@@ -13,7 +15,4 @@ export declare abstract class AbstractWitness<TConfig extends XyoWitnessConfig =
     observe(payloads?: XyoPayload[]): Promisable<XyoPayload[]>;
     query<T extends XyoQueryBoundWitness = XyoQueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(query: T, payloads?: XyoPayload[], queryConfig?: TConfig): Promise<ModuleQueryResult>;
 }
-/** @deprecated use AbstractWitness instead */
-export declare abstract class XyoWitness<TTarget extends XyoPayload = XyoPayload, TConfig extends XyoWitnessConfig<TTarget> = XyoWitnessConfig<TTarget>> extends AbstractWitness<TConfig> {
-}
 //# sourceMappingURL=AbstractWitness.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"AbstractWitness.d.ts","sourceRoot":"","sources":["../../src/AbstractWitness.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,cAAc,EACd,YAAY,EACZ,YAAY,EACZ,iBAAiB,EAGjB,oBAAoB,EACrB,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AAEvD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAA;AAE3C,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAA;AAEzC,8BAAsB,eAAe,CAAC,OAAO,SAAS,gBAAgB,GAAG,gBAAgB,CAAE,SAAQ,cAAc,CAAC,OAAO,CAAE,YAAW,aAAa;IACjJ,OAAgB,YAAY,EAAE,MAAM,CAAA;IAEpC,IAAa,OAAO,IAAI,MAAM,EAAE,CAE/B;IAED,IAAI,SAAS;;mBAEZ;WAEqB,MAAM,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC,GAAG,OAAO,CAAC,eAAe,CAAC;IAMxG,OAAO,CAAC,QAAQ,CAAC,EAAE,UAAU,EAAE,GAAG,UAAU,CAAC,UAAU,EAAE,CAAC;IAS3C,KAAK,CAAC,CAAC,SAAS,oBAAoB,GAAG,oBAAoB,EAAE,OAAO,SAAS,YAAY,GAAG,YAAY,EACrH,KAAK,EAAE,CAAC,EACR,QAAQ,CAAC,EAAE,UAAU,EAAE,EACvB,WAAW,CAAC,EAAE,OAAO,GACpB,OAAO,CAAC,iBAAiB,CAAC;CAsB9B;AAED,8CAA8C;AAC9C,8BAAsB,UAAU,CAC9B,OAAO,SAAS,UAAU,GAAG,UAAU,EACvC,OAAO,SAAS,gBAAgB,CAAC,OAAO,CAAC,GAAG,gBAAgB,CAAC,OAAO,CAAC,CACrE,SAAQ,eAAe,CAAC,OAAO,CAAC;CAAG"}
+{"version":3,"file":"AbstractWitness.d.ts","sourceRoot":"","sources":["../../src/AbstractWitness.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EACL,cAAc,EACd,YAAY,EACZ,YAAY,EACZ,iBAAiB,EAGjB,oBAAoB,EACrB,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AAEvD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAA;AAE3C,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAA;AAEzC,MAAM,MAAM,aAAa,CACvB,OAAO,SAAS,gBAAgB,GAAG,gBAAgB,EACnD,iBAAiB,SAAS,SAAS,GAAG,SAAS,GAAG,SAAS,IACzD,YAAY,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAA;AAC5C,8BAAsB,eAAe,CAAC,OAAO,SAAS,aAAa,GAAG,aAAa,CACjF,SAAQ,cAAc,CAAC,OAAO,CAC9B,YAAW,aAAa,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAE3C,OAAgB,YAAY,EAAE,MAAM,CAAA;IAEpC,IAAa,OAAO,IAAI,MAAM,EAAE,CAE/B;IAED,IAAI,SAAS;;mBAEZ;WAEqB,MAAM,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC,GAAG,OAAO,CAAC,eAAe,CAAC;IAMxG,OAAO,CAAC,QAAQ,CAAC,EAAE,UAAU,EAAE,GAAG,UAAU,CAAC,UAAU,EAAE,CAAC;IAS3C,KAAK,CAAC,CAAC,SAAS,oBAAoB,GAAG,oBAAoB,EAAE,OAAO,SAAS,YAAY,GAAG,YAAY,EACrH,KAAK,EAAE,CAAC,EACR,QAAQ,CAAC,EAAE,UAAU,EAAE,EACvB,WAAW,CAAC,EAAE,OAAO,GACpB,OAAO,CAAC,iBAAiB,CAAC;CAsB9B"}

package/dist/types/TimestampWitness.d.ts

@@ -1,8 +1,7 @@
 import { XyoPayload } from '@xyo-network/payload-model';
 import { Promisable } from '@xyo-network/promise';
-import { AbstractWitness } from './AbstractWitness';
-import { XyoWitnessConfig } from './Config';
-export declare abstract class TimestampWitness<C extends XyoWitnessConfig = XyoWitnessConfig> extends AbstractWitness<C> {
+import { AbstractWitness, WitnessParams } from './AbstractWitness';
+export declare abstract class TimestampWitness<P extends WitnessParams = WitnessParams> extends AbstractWitness<P> {
     observe(fields?: XyoPayload[] | undefined): Promisable<XyoPayload[]>;
 }
 //# sourceMappingURL=TimestampWitness.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"TimestampWitness.d.ts","sourceRoot":"","sources":["../../src/TimestampWitness.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AACnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAA;AAE3C,8BAAsB,gBAAgB,CAAC,CAAC,SAAS,gBAAgB,GAAG,gBAAgB,CAAE,SAAQ,eAAe,CAAC,CAAC,CAAC;IACrG,OAAO,CAAC,MAAM,CAAC,EAAE,UAAU,EAAE,GAAG,SAAS,GAAG,UAAU,CAAC,UAAU,EAAE,CAAC;CAO9E"}
+{"version":3,"file":"TimestampWitness.d.ts","sourceRoot":"","sources":["../../src/TimestampWitness.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AAElE,8BAAsB,gBAAgB,CAAC,CAAC,SAAS,aAAa,GAAG,aAAa,CAAE,SAAQ,eAAe,CAAC,CAAC,CAAC;IAC/F,OAAO,CAAC,MAAM,CAAC,EAAE,UAAU,EAAE,GAAG,SAAS,GAAG,UAAU,CAAC,UAAU,EAAE,CAAC;CAO9E"}

package/dist/types/Witness.d.ts

@@ -1,8 +1,9 @@
 import { Module } from '@xyo-network/module-model';
 import { XyoPayload } from '@xyo-network/payload-model';
 import { Promisable } from '@xyo-network/promise';
+import { XyoWitnessConfig } from './Config';
 export interface Witness {
     observe: (payloads?: XyoPayload[]) => Promisable<XyoPayload[]>;
 }
-export type WitnessModule = Witness & Module;
+export type WitnessModule<TConfig extends XyoWitnessConfig = XyoWitnessConfig> = Witness & Module<TConfig>;
 //# sourceMappingURL=Witness.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAA;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,MAAM,WAAW,OAAO;IACtB,OAAO,EAAE,CAAC,QAAQ,CAAC,EAAE,UAAU,EAAE,KAAK,UAAU,CAAC,UAAU,EAAE,CAAC,CAAA;CAC/D;AAED,MAAM,MAAM,aAAa,GAAG,OAAO,GAAG,MAAM,CAAA"}
+{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAA;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAA;AAE3C,MAAM,WAAW,OAAO;IACtB,OAAO,EAAE,CAAC,QAAQ,CAAC,EAAE,UAAU,EAAE,KAAK,UAAU,CAAC,UAAU,EAAE,CAAC,CAAA;CAC/D;AAED,MAAM,MAAM,aAAa,CAAC,OAAO,SAAS,gBAAgB,GAAG,gBAAgB,IAAI,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,CAAA"}

package/dist/types/WitnessWrapper.d.ts

@@ -1,10 +1,11 @@
+import { Account } from '@xyo-network/account';
 import { Module, ModuleWrapper } from '@xyo-network/module';
 import { XyoPayload, XyoPayloads } from '@xyo-network/payload-model';
 import { Witness } from './Witness';
 export declare class WitnessWrapper extends ModuleWrapper implements Witness {
     static requiredQueries: string[];
-    static tryWrap(module: Module): ModuleWrapper | undefined;
-    static wrap(module: Module): ModuleWrapper;
+    static tryWrap(module?: Module, account?: Account): WitnessWrapper | undefined;
+    static wrap(module?: Module, account?: Account): WitnessWrapper;
     observe(payloads?: XyoPayload[]): Promise<XyoPayloads>;
 }
 /** @deprecated use WitnessWrapper instead */

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

@@ -1 +1 @@
-{"version":3,"file":"WitnessWrapper.d.ts","sourceRoot":"","sources":["../../src/WitnessWrapper.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAC3D,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AAIpE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAEnC,qBAAa,cAAe,SAAQ,aAAc,YAAW,OAAO;IAClE,OAAgB,eAAe,WAA2D;WAE1E,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS;WASlD,IAAI,CAAC,MAAM,EAAE,MAAM,GAAG,aAAa;IAInD,OAAO,CAAC,QAAQ,CAAC,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,WAAW,CAAC;CAIvD;AAED,6CAA6C;AAC7C,qBAAa,iBAAkB,SAAQ,cAAc;CAAG"}
+{"version":3,"file":"WitnessWrapper.d.ts","sourceRoot":"","sources":["../../src/WitnessWrapper.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAA;AAC9C,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAC3D,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AAIpE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAEnC,qBAAa,cAAe,SAAQ,aAAc,YAAW,OAAO;IAClE,OAAgB,eAAe,WAA2D;WAE1E,OAAO,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,cAAc,GAAG,SAAS;WAWvE,IAAI,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,cAAc;IAIxE,OAAO,CAAC,QAAQ,CAAC,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,WAAW,CAAC;CAIvD;AAED,6CAA6C;AAC7C,qBAAa,iBAAkB,SAAQ,cAAc;CAAG"}

package/package.json

@@ -11,12 +11,12 @@
   },
   "dependencies": {
     "@xylabs/assert": "^2.7.4",
-    "@xyo-network/account": "^2.49.4",
-    "@xyo-network/module": "^2.49.4",
-    "@xyo-network/module-model": "^2.49.4",
-    "@xyo-network/payload-model": "^2.49.4",
-    "@xyo-network/payload-wrapper": "^2.49.4",
-    "@xyo-network/promise": "^2.49.4"
+    "@xyo-network/account": "^2.50.0",
+    "@xyo-network/module": "^2.50.0",
+    "@xyo-network/module-model": "^2.50.0",
+    "@xyo-network/payload-model": "^2.50.0",
+    "@xyo-network/payload-wrapper": "^2.50.0",
+    "@xyo-network/promise": "^2.50.0"
   },
   "devDependencies": {
     "@xylabs/ts-scripts-yarn3": "^2.15.0",
@@ -56,5 +56,5 @@
   },
   "sideEffects": false,
   "types": "dist/types/index.d.ts",
-  "version": "2.49.4"
+  "version": "2.50.0"
 }

package/src/AbstractWitness.ts

@@ -1,5 +1,6 @@
 import { assertEx } from '@xylabs/assert'
 import { Account } from '@xyo-network/account'
+import { AnyObject } from '@xyo-network/core'
 import {
   AbstractModule,
   ModuleConfig,
@@ -17,7 +18,14 @@ import { XyoWitnessConfig } from './Config'
 import { XyoWitnessObserveQuerySchema, XyoWitnessQuery } from './Queries'
 import { WitnessModule } from './Witness'
 
-export abstract class AbstractWitness<TConfig extends XyoWitnessConfig = XyoWitnessConfig> extends AbstractModule<TConfig> implements WitnessModule {
+export type WitnessParams<
+  TConfig extends XyoWitnessConfig = XyoWitnessConfig,
+  TAdditionalParams extends AnyObject | undefined = undefined,
+> = ModuleParams<TConfig, TAdditionalParams>
+export abstract class AbstractWitness<TParams extends WitnessParams = WitnessParams>
+  extends AbstractModule<TParams>
+  implements WitnessModule<TParams['config']>
+{
   static override configSchema: string
 
   override get queries(): string[] {
@@ -70,9 +78,3 @@ export abstract class AbstractWitness<TConfig extends XyoWitnessConfig = XyoWitn
     }
   }
 }
-
-/** @deprecated use AbstractWitness instead */
-export abstract class XyoWitness<
-  TTarget extends XyoPayload = XyoPayload,
-  TConfig extends XyoWitnessConfig<TTarget> = XyoWitnessConfig<TTarget>,
-> extends AbstractWitness<TConfig> {}

package/src/TimestampWitness.ts

@@ -1,10 +1,9 @@
 import { XyoPayload } from '@xyo-network/payload-model'
 import { Promisable } from '@xyo-network/promise'
 
-import { AbstractWitness } from './AbstractWitness'
-import { XyoWitnessConfig } from './Config'
+import { AbstractWitness, WitnessParams } from './AbstractWitness'
 
-export abstract class TimestampWitness<C extends XyoWitnessConfig = XyoWitnessConfig> extends AbstractWitness<C> {
+export abstract class TimestampWitness<P extends WitnessParams = WitnessParams> extends AbstractWitness<P> {
   override observe(fields?: XyoPayload[] | undefined): Promisable<XyoPayload[]> {
     return super.observe(
       fields?.map((fieldItem) => {

package/src/Witness.ts

@@ -2,8 +2,10 @@ import { Module } from '@xyo-network/module-model'
 import { XyoPayload } from '@xyo-network/payload-model'
 import { Promisable } from '@xyo-network/promise'
 
+import { XyoWitnessConfig } from './Config'
+
 export interface Witness {
   observe: (payloads?: XyoPayload[]) => Promisable<XyoPayload[]>
 }
 
-export type WitnessModule = Witness & Module
+export type WitnessModule<TConfig extends XyoWitnessConfig = XyoWitnessConfig> = Witness & Module<TConfig>

package/src/WitnessWrapper.ts

@@ -1,4 +1,5 @@
 import { assertEx } from '@xylabs/assert'
+import { Account } from '@xyo-network/account'
 import { Module, ModuleWrapper } from '@xyo-network/module'
 import { XyoPayload, XyoPayloads } from '@xyo-network/payload-model'
 import { PayloadWrapper } from '@xyo-network/payload-wrapper'
@@ -9,17 +10,19 @@ import { Witness } from './Witness'
 export class WitnessWrapper extends ModuleWrapper implements Witness {
   static override requiredQueries = [XyoWitnessObserveQuerySchema, ...super.requiredQueries]
 
-  static override tryWrap(module: Module): ModuleWrapper | undefined {
-    const missingRequiredQueries = this.missingRequiredQueries(module)
-    if (missingRequiredQueries.length > 0) {
-      console.warn(`Missing queries: ${JSON.stringify(missingRequiredQueries, null, 2)}`)
-    } else {
-      return new ModuleWrapper(module as Module)
+  static override tryWrap(module?: Module, account?: Account): WitnessWrapper | undefined {
+    if (module) {
+      const missingRequiredQueries = this.missingRequiredQueries(module)
+      if (missingRequiredQueries.length > 0) {
+        console.warn(`Missing queries: ${JSON.stringify(missingRequiredQueries, null, 2)}`)
+      } else {
+        return new WitnessWrapper(module as Module, account)
+      }
     }
   }
 
-  static override wrap(module: Module): ModuleWrapper {
-    return assertEx(this.tryWrap(module), 'Unable to wrap module as ModuleWrapper')
+  static override wrap(module?: Module, account?: Account): WitnessWrapper {
+    return assertEx(this.tryWrap(module, account), 'Unable to wrap module as ModuleWrapper')
   }
 
   observe(payloads?: XyoPayload[]): Promise<XyoPayloads> {