@xyo-network/node 2.33.15 → 2.34.0

package/dist/esm/MemoryNode.d.ts

@@ -12,6 +12,6 @@ export declare class MemoryNode<TConfig extends NodeConfig = NodeConfig, TModule
     resolve(address: string): TModule | null;
     register(module: TModule): void;
     attach(address: string): void;
-    detatch(address: string): void;
+    detach(address: string): void;
 }
 //# sourceMappingURL=MemoryNode.d.ts.map

package/dist/esm/MemoryNode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MemoryNode.d.ts","sourceRoot":"","sources":["../../src/MemoryNode.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAE/C,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AAErC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAEnC,qBAAa,UAAU,CAAC,OAAO,SAAS,UAAU,GAAG,UAAU,EAAE,OAAO,SAAS,SAAS,GAAG,SAAS,CAAE,SAAQ,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC;IACvI,OAAO,CAAC,mBAAmB,CAA6B;IACxD,OAAO,CAAC,iBAAiB,CAA6B;IAEtC,OAAO,IAAI,MAAM,EAAE;IAI1B,QAAQ;IAMR,UAAU;IAMV,eAAe;IAMf,iBAAiB;IAMjB,OAAO,CAAC,OAAO,EAAE,MAAM;IASvB,QAAQ,CAAC,MAAM,EAAE,OAAO;IAIxB,MAAM,CAAC,OAAO,EAAE,MAAM;IAKtB,OAAO,CAAC,OAAO,EAAE,MAAM;CAGjC"}
+{"version":3,"file":"MemoryNode.d.ts","sourceRoot":"","sources":["../../src/MemoryNode.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAE/C,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AAErC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAEnC,qBAAa,UAAU,CAAC,OAAO,SAAS,UAAU,GAAG,UAAU,EAAE,OAAO,SAAS,SAAS,GAAG,SAAS,CAAE,SAAQ,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC;IACvI,OAAO,CAAC,mBAAmB,CAA6B;IACxD,OAAO,CAAC,iBAAiB,CAA6B;IAEtC,OAAO,IAAI,MAAM,EAAE;IAI1B,QAAQ;IAMR,UAAU;IAMV,eAAe;IAMf,iBAAiB;IAMjB,OAAO,CAAC,OAAO,EAAE,MAAM;IASvB,QAAQ,CAAC,MAAM,EAAE,OAAO;IAIxB,MAAM,CAAC,OAAO,EAAE,MAAM;IAKtB,MAAM,CAAC,OAAO,EAAE,MAAM;CAGhC"}

package/dist/esm/MemoryNode.js

@@ -1,12 +1,12 @@
 import { assertEx } from '@xylabs/assert';
 import { XyoArchivistGetQuerySchema } from '@xyo-network/archivist';
-import { XyoNodeAttachQuerySchema, XyoNodeDetatchQuerySchema } from './Queries';
+import { XyoNodeAttachQuerySchema, XyoNodeDetachQuerySchema } from './Queries';
 import { XyoNode } from './XyoNode';
 export class MemoryNode extends XyoNode {
     registeredModuleMap = new Map();
     attachedModuleMap = new Map();
     queries() {
-        return [XyoNodeAttachQuerySchema, XyoNodeDetatchQuerySchema, ...super.queries()];
+        return [XyoNodeAttachQuerySchema, XyoNodeDetachQuerySchema, ...super.queries()];
     }
     attached() {
         return Array.from(this.attachedModuleMap.keys()).map((key) => {
@@ -43,7 +43,7 @@ export class MemoryNode extends XyoNode {
         const module = assertEx(this.registeredModuleMap.get(address), 'No module found at that address');
         this.attachedModuleMap.set(address, module);
     }
-    detatch(address) {
+    detach(address) {
         this.attachedModuleMap.delete(address);
     }
 }

package/dist/esm/MemoryNode.js.map

@@ -1 +1 @@
-{"version":3,"file":"MemoryNode.js","sourceRoot":"","sources":["../../src/MemoryNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAA;AAInE,OAAO,EAAE,wBAAwB,EAAE,yBAAyB,EAAE,MAAM,WAAW,CAAA;AAC/E,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAEnC,MAAM,OAAO,UAA2F,SAAQ,OAAyB;IAC/H,mBAAmB,GAAG,IAAI,GAAG,EAAmB,CAAA;IAChD,iBAAiB,GAAG,IAAI,GAAG,EAAmB,CAAA;IAEtC,OAAO;QACrB,OAAO,CAAC,wBAAwB,EAAE,yBAAyB,EAAE,GAAG,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;IAClF,CAAC;IAEQ,QAAQ;QACf,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YAC3D,OAAO,GAAG,CAAA;QACZ,CAAC,CAAC,CAAA;IACJ,CAAC;IAEQ,UAAU;QACjB,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YAC7D,OAAO,GAAG,CAAA;QACZ,CAAC,CAAC,CAAA;IACJ,CAAC;IAEQ,eAAe;QACtB,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YAC/D,OAAO,KAAK,CAAA;QACd,CAAC,CAAC,CAAA;IACJ,CAAC;IAEQ,iBAAiB;QACxB,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YACjE,OAAO,KAAK,CAAA;QACd,CAAC,CAAC,CAAA;IACJ,CAAC;IAEQ,OAAO,CAAC,OAAe;QAC9B,OAAO,CAAC,GAAG,CAAC,4BAA4B,OAAO,EAAE,CAAC,CAAA;QAClD,IAAI,OAAO,KAAK,WAAW,EAAE;YAC3B,OAAO,CAAC,GAAG,CAAC,oBAAoB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,eAAe,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAA;YAClF,OAAO,IAAI,CAAC,eAAe,EAAE,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,0BAA0B,CAAC,CAAC,IAAI,IAAI,CAAA;SACrG;QACD,OAAO,IAAI,CAAC,iBAAiB,EAAE,GAAG,CAAC,OAAO,CAAC,IAAI,IAAI,CAAA;IACrD,CAAC;IAEQ,QAAQ,CAAC,MAAe;QAC/B,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;IACtD,CAAC;IAEQ,MAAM,CAAC,OAAe;QAC7B,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,iCAAiC,CAAC,CAAA;QACjG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;IAC7C,CAAC;IAEQ,OAAO,CAAC,OAAe;QAC9B,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;IACxC,CAAC;CACF"}
+{"version":3,"file":"MemoryNode.js","sourceRoot":"","sources":["../../src/MemoryNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAA;AAInE,OAAO,EAAE,wBAAwB,EAAE,wBAAwB,EAAE,MAAM,WAAW,CAAA;AAC9E,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAEnC,MAAM,OAAO,UAA2F,SAAQ,OAAyB;IAC/H,mBAAmB,GAAG,IAAI,GAAG,EAAmB,CAAA;IAChD,iBAAiB,GAAG,IAAI,GAAG,EAAmB,CAAA;IAEtC,OAAO;QACrB,OAAO,CAAC,wBAAwB,EAAE,wBAAwB,EAAE,GAAG,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;IACjF,CAAC;IAEQ,QAAQ;QACf,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YAC3D,OAAO,GAAG,CAAA;QACZ,CAAC,CAAC,CAAA;IACJ,CAAC;IAEQ,UAAU;QACjB,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YAC7D,OAAO,GAAG,CAAA;QACZ,CAAC,CAAC,CAAA;IACJ,CAAC;IAEQ,eAAe;QACtB,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YAC/D,OAAO,KAAK,CAAA;QACd,CAAC,CAAC,CAAA;IACJ,CAAC;IAEQ,iBAAiB;QACxB,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YACjE,OAAO,KAAK,CAAA;QACd,CAAC,CAAC,CAAA;IACJ,CAAC;IAEQ,OAAO,CAAC,OAAe;QAC9B,OAAO,CAAC,GAAG,CAAC,4BAA4B,OAAO,EAAE,CAAC,CAAA;QAClD,IAAI,OAAO,KAAK,WAAW,EAAE;YAC3B,OAAO,CAAC,GAAG,CAAC,oBAAoB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,eAAe,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAA;YAClF,OAAO,IAAI,CAAC,eAAe,EAAE,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,0BAA0B,CAAC,CAAC,IAAI,IAAI,CAAA;SACrG;QACD,OAAO,IAAI,CAAC,iBAAiB,EAAE,GAAG,CAAC,OAAO,CAAC,IAAI,IAAI,CAAA;IACrD,CAAC;IAEQ,QAAQ,CAAC,MAAe;QAC/B,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;IACtD,CAAC;IAEQ,MAAM,CAAC,OAAe;QAC7B,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,iCAAiC,CAAC,CAAA;QACjG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;IAC7C,CAAC;IAEQ,MAAM,CAAC,OAAe;QAC7B,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;IACxC,CAAC;CACF"}

package/dist/esm/Node.d.ts

@@ -1,7 +1,7 @@
 import { Promisable } from '@xyo-network/promise';
 export interface Node {
     attach(address: string): void;
-    detatch(address: string): void;
+    detach(address: string): void;
     registered(): Promisable<string[]>;
     attached(): Promisable<string[]>;
 }

package/dist/esm/Node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Node.d.ts","sourceRoot":"","sources":["../../src/Node.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,MAAM,WAAW,IAAI;IACnB,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;IAC7B,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;IAC9B,UAAU,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC,CAAA;IAClC,QAAQ,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC,CAAA;CACjC"}
+{"version":3,"file":"Node.d.ts","sourceRoot":"","sources":["../../src/Node.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,MAAM,WAAW,IAAI;IACnB,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;IAC7B,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;IAC7B,UAAU,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC,CAAA;IAClC,QAAQ,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC,CAAA;CACjC"}

package/dist/esm/Queries/Detach.d.ts

@@ -0,0 +1,8 @@
+import { XyoQuery } from '@xyo-network/module';
+export declare type XyoNodeDetachQuerySchema = 'network.xyo.query.node.detach';
+export declare const XyoNodeDetachQuerySchema: XyoNodeDetachQuerySchema;
+export declare type XyoNodeDetachQuery = XyoQuery<{
+    schema: XyoNodeDetachQuerySchema;
+    address: string;
+}>;
+//# sourceMappingURL=Detach.d.ts.map

package/dist/esm/Queries/Detach.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Detach.d.ts","sourceRoot":"","sources":["../../../src/Queries/Detach.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AAE9C,oBAAY,wBAAwB,GAAG,+BAA+B,CAAA;AACtE,eAAO,MAAM,wBAAwB,EAAE,wBAA0D,CAAA;AAEjG,oBAAY,kBAAkB,GAAG,QAAQ,CAAC;IACxC,MAAM,EAAE,wBAAwB,CAAA;IAChC,OAAO,EAAE,MAAM,CAAA;CAChB,CAAC,CAAA"}

package/dist/esm/Queries/Detach.js

@@ -0,0 +1,2 @@
+export const XyoNodeDetachQuerySchema = 'network.xyo.query.node.detach';
+//# sourceMappingURL=Detach.js.map

package/dist/esm/Queries/Detach.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Detach.js","sourceRoot":"","sources":["../../../src/Queries/Detach.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,wBAAwB,GAA6B,+BAA+B,CAAA"}

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

@@ -1,12 +1,12 @@
 import { XyoModuleQuery, XyoQuery } from '@xyo-network/module';
 import { XyoNodeAttachQuery } from './Attach';
 import { XyoNodeAttachedQuery } from './Attached';
-import { XyoNodeDetatchQuery } from './Detatch';
+import { XyoNodeDetachQuery } from './Detach';
 import { XyoNodeRegisteredQuery } from './Registered';
 export * from './Attach';
 export * from './Attached';
-export * from './Detatch';
+export * from './Detach';
 export * from './Registered';
-export declare type XyoNodeQueryBase = XyoNodeAttachQuery | XyoNodeDetatchQuery | XyoNodeAttachedQuery | XyoNodeRegisteredQuery;
+export declare type XyoNodeQueryBase = XyoNodeAttachQuery | XyoNodeDetachQuery | XyoNodeAttachedQuery | XyoNodeRegisteredQuery;
 export declare type XyoNodeQuery<T extends XyoQuery | void = void> = XyoModuleQuery<T extends XyoQuery ? XyoNodeQueryBase | T : XyoNodeQueryBase>;
 //# sourceMappingURL=index.d.ts.map

package/dist/esm/Queries/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/Queries/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AAE9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAA;AAC7C,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAA;AACjD,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAA;AAC/C,OAAO,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAA;AAErD,cAAc,UAAU,CAAA;AACxB,cAAc,YAAY,CAAA;AAC1B,cAAc,WAAW,CAAA;AACzB,cAAc,cAAc,CAAA;AAE5B,oBAAY,gBAAgB,GAAG,kBAAkB,GAAG,mBAAmB,GAAG,oBAAoB,GAAG,sBAAsB,CAAA;AAEvH,oBAAY,YAAY,CAAC,CAAC,SAAS,QAAQ,GAAG,IAAI,GAAG,IAAI,IAAI,cAAc,CAAC,CAAC,SAAS,QAAQ,GAAG,gBAAgB,GAAG,CAAC,GAAG,gBAAgB,CAAC,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/Queries/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AAE9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAA;AAC7C,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAA;AACjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAA;AAC7C,OAAO,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAA;AAErD,cAAc,UAAU,CAAA;AACxB,cAAc,YAAY,CAAA;AAC1B,cAAc,UAAU,CAAA;AACxB,cAAc,cAAc,CAAA;AAE5B,oBAAY,gBAAgB,GAAG,kBAAkB,GAAG,kBAAkB,GAAG,oBAAoB,GAAG,sBAAsB,CAAA;AAEtH,oBAAY,YAAY,CAAC,CAAC,SAAS,QAAQ,GAAG,IAAI,GAAG,IAAI,IAAI,cAAc,CAAC,CAAC,SAAS,QAAQ,GAAG,gBAAgB,GAAG,CAAC,GAAG,gBAAgB,CAAC,CAAA"}

package/dist/esm/Queries/index.js

@@ -1,5 +1,5 @@
 export * from './Attach';
 export * from './Attached';
-export * from './Detatch';
+export * from './Detach';
 export * from './Registered';
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/Queries/index.ts"],"names":[],"mappings":"AAOA,cAAc,UAAU,CAAA;AACxB,cAAc,YAAY,CAAA;AAC1B,cAAc,WAAW,CAAA;AACzB,cAAc,cAAc,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/Queries/index.ts"],"names":[],"mappings":"AAOA,cAAc,UAAU,CAAA;AACxB,cAAc,YAAY,CAAA;AAC1B,cAAc,UAAU,CAAA;AACxB,cAAc,cAAc,CAAA"}

package/dist/esm/XyoNode.d.ts

@@ -1,4 +1,5 @@
 import { XyoAccount } from '@xyo-network/account';
+import { XyoBoundWitness } from '@xyo-network/boundwitness';
 import { XyoModule, XyoModuleQueryResult, XyoModuleResolverFunc, XyoQuery } from '@xyo-network/module';
 import { NodeConfig } from './Config';
 import { NodeModule } from './NodeModule';
@@ -6,14 +7,14 @@ export declare abstract class XyoNode<TConfig extends NodeConfig = NodeConfig, T
     constructor(config?: TConfig, account?: XyoAccount, resolver?: XyoModuleResolverFunc);
     /** Query Functions - Start */
     abstract attach(_address: string): void;
-    abstract detatch(_address: string): void;
+    abstract detach(_address: string): void;
     abstract resolve(_address: string): TModule | null;
     registered(): string[];
     attached(): string[];
     registeredModules(): TModule[];
     attachedModules(): TModule[];
     /** Query Functions - End */
-    query<T extends XyoQuery = XyoQuery>(query: T): Promise<XyoModuleQueryResult>;
+    query<T extends XyoQuery = XyoQuery>(bw: XyoBoundWitness, query: T): Promise<XyoModuleQueryResult>;
     register(_module: TModule): void;
 }
 //# sourceMappingURL=XyoNode.d.ts.map

package/dist/esm/XyoNode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"XyoNode.d.ts","sourceRoot":"","sources":["../../src/XyoNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAE,SAAS,EAAE,oBAAoB,EAAE,qBAAqB,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AAGtG,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AACrC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAQzC,8BAAsB,OAAO,CAAC,OAAO,SAAS,UAAU,GAAG,UAAU,EAAE,OAAO,SAAS,SAAS,GAAG,SAAS,CAC1G,SAAQ,SAAS,CAAC,OAAO,CACzB,YAAW,UAAU,CAAC,OAAO,CAAC;gBAElB,MAAM,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,UAAU,EAAE,QAAQ,CAAC,EAAE,qBAAqB;IAIpF,8BAA8B;IAC9B,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IACvC,QAAQ,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IACxC,QAAQ,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,GAAG,IAAI;IAElD,UAAU,IAAI,MAAM,EAAE;IAGtB,QAAQ,IAAI,MAAM,EAAE;IAIpB,iBAAiB,IAAI,OAAO,EAAE;IAG9B,eAAe,IAAI,OAAO,EAAE;IAG5B,4BAA4B;IAEnB,KAAK,CAAC,CAAC,SAAS,QAAQ,GAAG,QAAQ,EAAE,KAAK,EAAE,CAAC,GAAG,OAAO,CAAC,oBAAoB,CAAC;IA2BtF,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;CAGjC"}
+{"version":3,"file":"XyoNode.d.ts","sourceRoot":"","sources":["../../src/XyoNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAC3D,OAAO,EAAE,SAAS,EAAE,oBAAoB,EAAE,qBAAqB,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AAGtG,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AACrC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAEzC,8BAAsB,OAAO,CAAC,OAAO,SAAS,UAAU,GAAG,UAAU,EAAE,OAAO,SAAS,SAAS,GAAG,SAAS,CAC1G,SAAQ,SAAS,CAAC,OAAO,CACzB,YAAW,UAAU,CAAC,OAAO,CAAC;gBAElB,MAAM,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,UAAU,EAAE,QAAQ,CAAC,EAAE,qBAAqB;IAIpF,8BAA8B;IAC9B,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IACvC,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IACvC,QAAQ,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,GAAG,IAAI;IAElD,UAAU,IAAI,MAAM,EAAE;IAGtB,QAAQ,IAAI,MAAM,EAAE;IAIpB,iBAAiB,IAAI,OAAO,EAAE;IAG9B,eAAe,IAAI,OAAO,EAAE;IAG5B,4BAA4B;IAEnB,KAAK,CAAC,CAAC,SAAS,QAAQ,GAAG,QAAQ,EAAE,EAAE,EAAE,eAAe,EAAE,KAAK,EAAE,CAAC,GAAG,OAAO,CAAC,oBAAoB,CAAC;IA6B3G,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;CAGjC"}

package/dist/esm/XyoNode.js

@@ -1,6 +1,7 @@
+import { assertEx } from '@xylabs/assert';
 import { XyoAccount } from '@xyo-network/account';
 import { XyoModule } from '@xyo-network/module';
-import { XyoNodeAttachedQuerySchema, XyoNodeAttachQuerySchema, XyoNodeDetatchQuerySchema, XyoNodeRegisteredQuerySchema, } from './Queries';
+import { XyoNodeAttachedQuerySchema, XyoNodeAttachQuerySchema, XyoNodeDetachQuerySchema, XyoNodeRegisteredQuerySchema } from './Queries';
 export class XyoNode extends XyoModule {
     constructor(config, account, resolver) {
         super(config, account, resolver);
@@ -18,7 +19,8 @@ export class XyoNode extends XyoModule {
         throw new Error('Method not implemented.');
     }
     /** Query Functions - End */
-    query(query) {
+    query(bw, query) {
+        assertEx(this.queryable(query.schema, bw.addresses));
         const queryAccount = new XyoAccount();
         const typedQuery = query;
         const payloads = [];
@@ -27,8 +29,8 @@ export class XyoNode extends XyoModule {
                 this.attach(typedQuery.address);
                 break;
             }
-            case XyoNodeDetatchQuerySchema: {
-                this.detatch(typedQuery.address);
+            case XyoNodeDetachQuerySchema: {
+                this.detach(typedQuery.address);
                 break;
             }
             case XyoNodeAttachedQuerySchema: {
@@ -40,7 +42,7 @@ export class XyoNode extends XyoModule {
                 break;
             }
             default:
-                return super.query(typedQuery);
+                return super.query(bw, typedQuery);
         }
         return this.bindPayloads(payloads, queryAccount);
     }

package/dist/esm/XyoNode.js.map

@@ -1 +1 @@
-{"version":3,"file":"XyoNode.js","sourceRoot":"","sources":["../../src/XyoNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAE,SAAS,EAAyD,MAAM,qBAAqB,CAAA;AAKtG,OAAO,EACL,0BAA0B,EAC1B,wBAAwB,EACxB,yBAAyB,EAEzB,4BAA4B,GAC7B,MAAM,WAAW,CAAA;AAClB,MAAM,OAAgB,OACpB,SAAQ,SAAkB;IAG1B,YAAY,MAAgB,EAAE,OAAoB,EAAE,QAAgC;QAClF,KAAK,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAA;IAClC,CAAC;IAOD,UAAU;QACR,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;IAC5C,CAAC;IACD,QAAQ;QACN,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;IAC5C,CAAC;IAED,iBAAiB;QACf,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;IAC5C,CAAC;IACD,eAAe;QACb,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;IAC5C,CAAC;IACD,4BAA4B;IAEnB,KAAK,CAAgC,KAAQ;QACpD,MAAM,YAAY,GAAG,IAAI,UAAU,EAAE,CAAA;QACrC,MAAM,UAAU,GAAG,KAAqB,CAAA;QACxC,MAAM,QAAQ,GAAgB,EAAE,CAAA;QAChC,QAAQ,UAAU,CAAC,MAAM,EAAE;YACzB,KAAK,wBAAwB,CAAC,CAAC;gBAC7B,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,CAAA;gBAC/B,MAAK;aACN;YACD,KAAK,yBAAyB,CAAC,CAAC;gBAC9B,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,CAAA;gBAChC,MAAK;aACN;YACD,KAAK,0BAA0B,CAAC,CAAC;gBAC/B,IAAI,CAAC,QAAQ,EAAE,CAAA;gBACf,MAAK;aACN;YACD,KAAK,4BAA4B,CAAC,CAAC;gBACjC,IAAI,CAAC,UAAU,EAAE,CAAA;gBACjB,MAAK;aACN;YACD;gBACE,OAAO,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,CAAA;SACjC;QACD,OAAO,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAA;IAClD,CAAC;IAED,QAAQ,CAAC,OAAgB;QACvB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;IAC5C,CAAC;CACF"}
+{"version":3,"file":"XyoNode.js","sourceRoot":"","sources":["../../src/XyoNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAAE,SAAS,EAAyD,MAAM,qBAAqB,CAAA;AAKtG,OAAO,EAAE,0BAA0B,EAAE,wBAAwB,EAAE,wBAAwB,EAAgB,4BAA4B,EAAE,MAAM,WAAW,CAAA;AACtJ,MAAM,OAAgB,OACpB,SAAQ,SAAkB;IAG1B,YAAY,MAAgB,EAAE,OAAoB,EAAE,QAAgC;QAClF,KAAK,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAA;IAClC,CAAC;IAOD,UAAU;QACR,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;IAC5C,CAAC;IACD,QAAQ;QACN,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;IAC5C,CAAC;IAED,iBAAiB;QACf,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;IAC5C,CAAC;IACD,eAAe;QACb,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;IAC5C,CAAC;IACD,4BAA4B;IAEnB,KAAK,CAAgC,EAAmB,EAAE,KAAQ;QACzE,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC,SAAS,CAAC,CAAC,CAAA;QAEpD,MAAM,YAAY,GAAG,IAAI,UAAU,EAAE,CAAA;QACrC,MAAM,UAAU,GAAG,KAAqB,CAAA;QACxC,MAAM,QAAQ,GAAgB,EAAE,CAAA;QAChC,QAAQ,UAAU,CAAC,MAAM,EAAE;YACzB,KAAK,wBAAwB,CAAC,CAAC;gBAC7B,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,CAAA;gBAC/B,MAAK;aACN;YACD,KAAK,wBAAwB,CAAC,CAAC;gBAC7B,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,CAAA;gBAC/B,MAAK;aACN;YACD,KAAK,0BAA0B,CAAC,CAAC;gBAC/B,IAAI,CAAC,QAAQ,EAAE,CAAA;gBACf,MAAK;aACN;YACD,KAAK,4BAA4B,CAAC,CAAC;gBACjC,IAAI,CAAC,UAAU,EAAE,CAAA;gBACjB,MAAK;aACN;YACD;gBACE,OAAO,KAAK,CAAC,KAAK,CAAC,EAAE,EAAE,UAAU,CAAC,CAAA;SACrC;QACD,OAAO,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAA;IAClD,CAAC;IAED,QAAQ,CAAC,OAAgB;QACvB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;IAC5C,CAAC;CACF"}

package/dist/esm/XyoNodeWrapper.d.ts

@@ -5,7 +5,7 @@ export declare class XyoNodeWrapper extends XyoModuleWrapper implements NodeModu
     registered(): Promise<string[]>;
     attached(): Promise<string[]>;
     attach(address: string): Promise<void>;
-    detatch(address: string): Promise<void>;
+    detach(address: string): Promise<void>;
     registeredModules(): Promise<XyoModule[]>;
     attachedModules(): Promise<XyoModule[]>;
     resolve(_address: string): XyoModule | null;

package/dist/esm/XyoNodeWrapper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"XyoNodeWrapper.d.ts","sourceRoot":"","sources":["../../src/XyoNodeWrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAA;AAGzE,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAYzC,qBAAa,cAAe,SAAQ,gBAAiB,YAAW,UAAU;IACxE,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAGzB,UAAU,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAI/B,QAAQ,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAI7B,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAKtC,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAMvC,iBAAiB,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;IAIzC,eAAe,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;IAK7C,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI;CAG5C"}
+{"version":3,"file":"XyoNodeWrapper.d.ts","sourceRoot":"","sources":["../../src/XyoNodeWrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAA;AAGzE,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAYzC,qBAAa,cAAe,SAAQ,gBAAiB,YAAW,UAAU;IACxE,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAGzB,UAAU,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAK/B,QAAQ,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAK7B,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAMtC,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAOtC,iBAAiB,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;IAIzC,eAAe,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;IAK7C,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI;CAG5C"}

package/dist/esm/XyoNodeWrapper.js

@@ -1,26 +1,30 @@
 import { XyoModuleWrapper } from '@xyo-network/module';
 import compact from 'lodash/compact';
-import { XyoNodeAttachedQuerySchema, XyoNodeAttachQuerySchema, XyoNodeDetatchQuerySchema, XyoNodeRegisteredQuerySchema, } from './Queries';
+import { XyoNodeAttachedQuerySchema, XyoNodeAttachQuerySchema, XyoNodeDetachQuerySchema, XyoNodeRegisteredQuerySchema, } from './Queries';
 export class XyoNodeWrapper extends XyoModuleWrapper {
     register(_module) {
         throw Error('Not implemented');
     }
     async registered() {
         const query = { schema: XyoNodeRegisteredQuerySchema };
-        return compact((await this.module.query(query))[1].map((payload) => payload?.schema));
+        const bw = (await this.bindPayloads([query]))[0];
+        return compact((await this.module.query(bw, query))[1].map((payload) => payload?.schema));
     }
     async attached() {
         const query = { schema: XyoNodeAttachedQuerySchema };
-        return compact((await this.module.query(query))[1].map((payload) => payload?.schema));
+        const bw = (await this.bindPayloads([query]))[0];
+        return compact((await this.module.query(bw, query))[1].map((payload) => payload?.schema));
     }
     async attach(address) {
         const query = { address, schema: XyoNodeAttachQuerySchema };
-        await this.module.query(query);
+        const bw = (await this.bindPayloads([query]))[0];
+        await this.module.query(bw, query);
         return;
     }
-    async detatch(address) {
-        const query = { address, schema: XyoNodeDetatchQuerySchema };
-        await this.module.query(query);
+    async detach(address) {
+        const query = { address, schema: XyoNodeDetachQuerySchema };
+        const bw = (await this.bindPayloads([query]))[0];
+        await this.module.query(bw, query);
         return;
     }
     async registeredModules() {

package/dist/esm/XyoNodeWrapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"XyoNodeWrapper.js","sourceRoot":"","sources":["../../src/XyoNodeWrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,gBAAgB,EAAE,MAAM,qBAAqB,CAAA;AACzE,OAAO,OAAO,MAAM,gBAAgB,CAAA;AAGpC,OAAO,EAEL,0BAA0B,EAE1B,wBAAwB,EAExB,yBAAyB,EAEzB,4BAA4B,GAC7B,MAAM,WAAW,CAAA;AAElB,MAAM,OAAO,cAAe,SAAQ,gBAAgB;IAClD,QAAQ,CAAC,OAAe;QACtB,MAAM,KAAK,CAAC,iBAAiB,CAAC,CAAA;IAChC,CAAC;IACD,KAAK,CAAC,UAAU;QACd,MAAM,KAAK,GAA2B,EAAE,MAAM,EAAE,4BAA4B,EAAE,CAAA;QAC9E,OAAO,OAAO,CAAC,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAA;IACvF,CAAC;IACD,KAAK,CAAC,QAAQ;QACZ,MAAM,KAAK,GAAyB,EAAE,MAAM,EAAE,0BAA0B,EAAE,CAAA;QAC1E,OAAO,OAAO,CAAC,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAA;IACvF,CAAC;IACD,KAAK,CAAC,MAAM,CAAC,OAAe;QAC1B,MAAM,KAAK,GAAuB,EAAE,OAAO,EAAE,MAAM,EAAE,wBAAwB,EAAE,CAAA;QAC/E,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;QAC9B,OAAM;IACR,CAAC;IACD,KAAK,CAAC,OAAO,CAAC,OAAe;QAC3B,MAAM,KAAK,GAAwB,EAAE,OAAO,EAAE,MAAM,EAAE,yBAAyB,EAAE,CAAA;QACjF,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;QAC9B,OAAM;IACR,CAAC;IAED,KAAK,CAAC,iBAAiB;QACrB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,UAAU,EAAE,CAAA;QACzC,OAAO,OAAO,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAA;IACtF,CAAC;IACD,KAAK,CAAC,eAAe;QACnB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAA;QACvC,OAAO,OAAO,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAA;IACtF,CAAC;IAED,OAAO,CAAC,QAAgB;QACtB,MAAM,KAAK,CAAC,iBAAiB,CAAC,CAAA;IAChC,CAAC;CACF"}
+{"version":3,"file":"XyoNodeWrapper.js","sourceRoot":"","sources":["../../src/XyoNodeWrapper.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -11,24 +11,14 @@
   },
   "dependencies": {
     "@xylabs/assert": "^2.6.7",
-    "@xyo-network/account": "^2.33.15",
-    "@xyo-network/archivist": "^2.33.15",
-    "@xyo-network/module": "^2.33.15",
-    "@xyo-network/payload": "^2.33.15",
-    "@xyo-network/promise": "^2.33.15",
+    "@xyo-network/account": "^2.34.0",
+    "@xyo-network/archivist": "^2.34.0",
+    "@xyo-network/boundwitness": "^2.34.0",
+    "@xyo-network/module": "^2.34.0",
+    "@xyo-network/payload": "^2.34.0",
+    "@xyo-network/promise": "^2.34.0",
     "lodash": "^4.17.21",
-    "terminal-kit": "^2.11.6",
-    "tslib": "^2.4.0",
-    "yargs": "^17.5.1"
-  },
-  "bin": {
-    "xyo": "dist/cjs/cli/index.js"
-  },
-  "devDependencies": {
-    "@types/node": "^18.7.18",
-    "@types/terminal-kit": "^2.5.0",
-    "ts-node": "^10.9.1",
-    "typescript": "^4.8.3"
+    "tslib": "^2.4.0"
   },
   "description": "Primary SDK for using XYO Protocol 2.0",
   "browser": "dist/esm/index.js",
@@ -62,9 +52,6 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js.git"
   },
   "sideEffects": false,
-  "scripts": {
-    "xyo-ts": "ts-node src/cli/index.ts"
-  },
   "types": "dist/esm/index.d.ts",
-  "version": "2.33.15"
+  "version": "2.34.0"
 }

package/src/MemoryNode.spec.ts

@@ -10,7 +10,7 @@ import {
   XyoHuriSchema,
 } from '@xyo-network/diviner'
 import { XyoModule } from '@xyo-network/module'
-import { PayloadWrapper, XyoPayload, XyoPayloadBuilder, XyoPayloadSchema } from '@xyo-network/sdk'
+import { BoundWitnessBuilder, PayloadWrapper, XyoAccount, XyoPayload, XyoPayloadBuilder, XyoPayloadSchema } from '@xyo-network/sdk'
 
 import { MemoryNode } from './MemoryNode'
 import { NodeModule } from './NodeModule'
@@ -34,24 +34,27 @@ test('Create Node', async () => {
     .build()
 
   const insertQuery: XyoArchivistInsertQuery = { payloads: [testPayload], schema: XyoArchivistInsertQuerySchema }
-  await foundArchivist?.query(insertQuery)
+  const insertQueryBoundwitness = new BoundWitnessBuilder().payload(insertQuery).witness(new XyoAccount()).build()
+  await foundArchivist?.query(insertQueryBoundwitness, insertQuery)
 
   /*const subscribeQuery: XyoModuleSubscribeQuery = { payloads: [testPayload], schema: XyoModuleSubscribeQuerySchema }
   await foundArchivist?.query(subscribeQuery)*/
 
   const allQuery: XyoArchivistAllQuery = { schema: XyoArchivistAllQuerySchema }
-  const [, payloads] = (await foundArchivist?.query(allQuery)) ?? []
+  const allQueryBoundwitness = new BoundWitnessBuilder().payload(allQuery).witness(new XyoAccount()).build()
+  const [, payloads] = (await foundArchivist?.query(allQueryBoundwitness, allQuery)) ?? []
   expect(payloads?.length).toBe(1)
 
   if (payloads && payloads[0]) {
     const huri = new PayloadWrapper(payloads[0]).hash
     const huriPayload: XyoHuriPayload = { huri, schema: XyoHuriSchema }
     const divineQuery: XyoDivinerDivineQuery = { payloads: [huriPayload], schema: XyoDivinerDivineQuerySchema }
+    const divineQueryBoundwitness = new BoundWitnessBuilder().payload(divineQuery).witness(new XyoAccount()).build()
     const divinerModule = node.resolve(diviner.address) as DivinerModule
     const foundDiviner = divinerModule ? new XyoDivinerWrapper(divinerModule) : null
     expect(foundDiviner).toBeDefined()
     if (foundDiviner) {
-      const [, payloads] = await foundDiviner.query(divineQuery)
+      const [, payloads] = await foundDiviner.query(divineQueryBoundwitness, divineQuery)
       expect(payloads?.length).toBe(1)
       expect(payloads[0]).toBeDefined()
       if (payloads?.length === 1 && payloads[0]) {

package/src/MemoryNode.ts

@@ -3,7 +3,7 @@ import { XyoArchivistGetQuerySchema } from '@xyo-network/archivist'
 import { XyoModule } from '@xyo-network/module'
 
 import { NodeConfig } from './Config'
-import { XyoNodeAttachQuerySchema, XyoNodeDetatchQuerySchema } from './Queries'
+import { XyoNodeAttachQuerySchema, XyoNodeDetachQuerySchema } from './Queries'
 import { XyoNode } from './XyoNode'
 
 export class MemoryNode<TConfig extends NodeConfig = NodeConfig, TModule extends XyoModule = XyoModule> extends XyoNode<TConfig, TModule> {
@@ -11,7 +11,7 @@ export class MemoryNode<TConfig extends NodeConfig = NodeConfig, TModule extends
   private attachedModuleMap = new Map<string, TModule>()
 
   public override queries(): string[] {
-    return [XyoNodeAttachQuerySchema, XyoNodeDetatchQuerySchema, ...super.queries()]
+    return [XyoNodeAttachQuerySchema, XyoNodeDetachQuerySchema, ...super.queries()]
   }
 
   override attached() {
@@ -56,7 +56,7 @@ export class MemoryNode<TConfig extends NodeConfig = NodeConfig, TModule extends
     this.attachedModuleMap.set(address, module)
   }
 
-  override detatch(address: string) {
+  override detach(address: string) {
     this.attachedModuleMap.delete(address)
   }
 }

package/src/Node.ts

@@ -2,7 +2,7 @@ import { Promisable } from '@xyo-network/promise'
 
 export interface Node {
   attach(address: string): void
-  detatch(address: string): void
+  detach(address: string): void
   registered(): Promisable<string[]>
   attached(): Promisable<string[]>
 }

package/src/Queries/Detach.ts

@@ -0,0 +1,9 @@
+import { XyoQuery } from '@xyo-network/module'
+
+export type XyoNodeDetachQuerySchema = 'network.xyo.query.node.detach'
+export const XyoNodeDetachQuerySchema: XyoNodeDetachQuerySchema = 'network.xyo.query.node.detach'
+
+export type XyoNodeDetachQuery = XyoQuery<{
+  schema: XyoNodeDetachQuerySchema
+  address: string
+}>

package/src/Queries/index.ts

@@ -2,14 +2,14 @@ import { XyoModuleQuery, XyoQuery } from '@xyo-network/module'
 
 import { XyoNodeAttachQuery } from './Attach'
 import { XyoNodeAttachedQuery } from './Attached'
-import { XyoNodeDetatchQuery } from './Detatch'
+import { XyoNodeDetachQuery } from './Detach'
 import { XyoNodeRegisteredQuery } from './Registered'
 
 export * from './Attach'
 export * from './Attached'
-export * from './Detatch'
+export * from './Detach'
 export * from './Registered'
 
-export type XyoNodeQueryBase = XyoNodeAttachQuery | XyoNodeDetatchQuery | XyoNodeAttachedQuery | XyoNodeRegisteredQuery
+export type XyoNodeQueryBase = XyoNodeAttachQuery | XyoNodeDetachQuery | XyoNodeAttachedQuery | XyoNodeRegisteredQuery
 
 export type XyoNodeQuery<T extends XyoQuery | void = void> = XyoModuleQuery<T extends XyoQuery ? XyoNodeQueryBase | T : XyoNodeQueryBase>

package/src/XyoNode.ts

@@ -1,16 +1,12 @@
+import { assertEx } from '@xylabs/assert'
 import { XyoAccount } from '@xyo-network/account'
+import { XyoBoundWitness } from '@xyo-network/boundwitness'
 import { XyoModule, XyoModuleQueryResult, XyoModuleResolverFunc, XyoQuery } from '@xyo-network/module'
 import { XyoPayloads } from '@xyo-network/payload'
 
 import { NodeConfig } from './Config'
 import { NodeModule } from './NodeModule'
-import {
-  XyoNodeAttachedQuerySchema,
-  XyoNodeAttachQuerySchema,
-  XyoNodeDetatchQuerySchema,
-  XyoNodeQuery,
-  XyoNodeRegisteredQuerySchema,
-} from './Queries'
+import { XyoNodeAttachedQuerySchema, XyoNodeAttachQuerySchema, XyoNodeDetachQuerySchema, XyoNodeQuery, XyoNodeRegisteredQuerySchema } from './Queries'
 export abstract class XyoNode<TConfig extends NodeConfig = NodeConfig, TModule extends XyoModule = XyoModule>
   extends XyoModule<TConfig>
   implements NodeModule<TModule>
@@ -21,7 +17,7 @@ export abstract class XyoNode<TConfig extends NodeConfig = NodeConfig, TModule e
 
   /** Query Functions - Start */
   abstract attach(_address: string): void
-  abstract detatch(_address: string): void
+  abstract detach(_address: string): void
   abstract resolve(_address: string): TModule | null
 
   registered(): string[] {
@@ -39,7 +35,9 @@ export abstract class XyoNode<TConfig extends NodeConfig = NodeConfig, TModule e
   }
   /** Query Functions - End */
 
-  override query<T extends XyoQuery = XyoQuery>(query: T): Promise<XyoModuleQueryResult> {
+  override query<T extends XyoQuery = XyoQuery>(bw: XyoBoundWitness, query: T): Promise<XyoModuleQueryResult> {
+    assertEx(this.queryable(query.schema, bw.addresses))
+
     const queryAccount = new XyoAccount()
     const typedQuery = query as XyoNodeQuery
     const payloads: XyoPayloads = []
@@ -48,8 +46,8 @@ export abstract class XyoNode<TConfig extends NodeConfig = NodeConfig, TModule e
         this.attach(typedQuery.address)
         break
       }
-      case XyoNodeDetatchQuerySchema: {
-        this.detatch(typedQuery.address)
+      case XyoNodeDetachQuerySchema: {
+        this.detach(typedQuery.address)
         break
       }
       case XyoNodeAttachedQuerySchema: {
@@ -61,7 +59,7 @@ export abstract class XyoNode<TConfig extends NodeConfig = NodeConfig, TModule e
         break
       }
       default:
-        return super.query(typedQuery)
+        return super.query(bw, typedQuery)
     }
     return this.bindPayloads(payloads, queryAccount)
   }

package/src/XyoNodeWrapper.ts

@@ -7,8 +7,8 @@ import {
   XyoNodeAttachedQuerySchema,
   XyoNodeAttachQuery,
   XyoNodeAttachQuerySchema,
-  XyoNodeDetatchQuery,
-  XyoNodeDetatchQuerySchema,
+  XyoNodeDetachQuery,
+  XyoNodeDetachQuerySchema,
   XyoNodeRegisteredQuery,
   XyoNodeRegisteredQuerySchema,
 } from './Queries'
@@ -19,20 +19,24 @@ export class XyoNodeWrapper extends XyoModuleWrapper implements NodeModule {
   }
   async registered(): Promise<string[]> {
     const query: XyoNodeRegisteredQuery = { schema: XyoNodeRegisteredQuerySchema }
-    return compact((await this.module.query(query))[1].map((payload) => payload?.schema))
+    const bw = (await this.bindPayloads([query]))[0]
+    return compact((await this.module.query(bw, query))[1].map((payload) => payload?.schema))
   }
   async attached(): Promise<string[]> {
     const query: XyoNodeAttachedQuery = { schema: XyoNodeAttachedQuerySchema }
-    return compact((await this.module.query(query))[1].map((payload) => payload?.schema))
+    const bw = (await this.bindPayloads([query]))[0]
+    return compact((await this.module.query(bw, query))[1].map((payload) => payload?.schema))
   }
   async attach(address: string): Promise<void> {
     const query: XyoNodeAttachQuery = { address, schema: XyoNodeAttachQuerySchema }
-    await this.module.query(query)
+    const bw = (await this.bindPayloads([query]))[0]
+    await this.module.query(bw, query)
     return
   }
-  async detatch(address: string): Promise<void> {
-    const query: XyoNodeDetatchQuery = { address, schema: XyoNodeDetatchQuerySchema }
-    await this.module.query(query)
+  async detach(address: string): Promise<void> {
+    const query: XyoNodeDetachQuery = { address, schema: XyoNodeDetachQuerySchema }
+    const bw = (await this.bindPayloads([query]))[0]
+    await this.module.query(bw, query)
     return
   }
 

package/dist/cjs/Queries/Detatch.d.ts

@@ -1,8 +0,0 @@
-import { XyoQuery } from '@xyo-network/module';
-export declare type XyoNodeDetatchQuerySchema = 'network.xyo.query.node.detatch';
-export declare const XyoNodeDetatchQuerySchema: XyoNodeDetatchQuerySchema;
-export declare type XyoNodeDetatchQuery = XyoQuery<{
-    schema: XyoNodeDetatchQuerySchema;
-    address: string;
-}>;
-//# sourceMappingURL=Detatch.d.ts.map

package/dist/cjs/Queries/Detatch.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"Detatch.d.ts","sourceRoot":"","sources":["../../../src/Queries/Detatch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AAE9C,oBAAY,yBAAyB,GAAG,gCAAgC,CAAA;AACxE,eAAO,MAAM,yBAAyB,EAAE,yBAA4D,CAAA;AAEpG,oBAAY,mBAAmB,GAAG,QAAQ,CAAC;IACzC,MAAM,EAAE,yBAAyB,CAAA;IACjC,OAAO,EAAE,MAAM,CAAA;CAChB,CAAC,CAAA"}

package/dist/cjs/Queries/Detatch.js

@@ -1,5 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.XyoNodeDetatchQuerySchema = void 0;
-exports.XyoNodeDetatchQuerySchema = 'network.xyo.query.node.detatch';
-//# sourceMappingURL=Detatch.js.map

package/dist/cjs/Queries/Detatch.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Detatch.js","sourceRoot":"","sources":["../../../src/Queries/Detatch.ts"],"names":[],"mappings":";;;AAGa,QAAA,yBAAyB,GAA8B,gCAAgC,CAAA"}

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

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=index.d.ts.map

package/dist/cjs/cli/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cli/index.ts"],"names":[],"mappings":""}