@xyo-network/node-system-info-payload-plugin 2.41.10 → 2.41.12

package/dist/esm/Config.d.ts

@@ -1,8 +1,7 @@
 import { XyoWitnessConfig } from '@xyo-network/witness';
-import { XyoNodeSystemInfoPayload } from './Payload';
 export type XyoNodeSystemInfoWitnessConfigSchema = 'network.xyo.system.info.witness.node.config';
 export declare const XyoNodeSystemInfoWitnessConfigSchema: XyoNodeSystemInfoWitnessConfigSchema;
-export type XyoNodeSystemInfoWitnessConfig = XyoWitnessConfig<XyoNodeSystemInfoPayload, {
+export type XyoNodeSystemInfoWitnessConfig = XyoWitnessConfig<{
     nodeValues?: Record<string, string>;
     schema: XyoNodeSystemInfoWitnessConfigSchema;
 }>;

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

@@ -1 +1 @@
-{"version":3,"file":"Config.d.ts","sourceRoot":"","sources":["../../src/Config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAEvD,OAAO,EAAE,wBAAwB,EAAE,MAAM,WAAW,CAAA;AAEpD,MAAM,MAAM,oCAAoC,GAAG,6CAA6C,CAAA;AAChG,eAAO,MAAM,oCAAoC,EAAE,oCAAoF,CAAA;AAEvI,MAAM,MAAM,8BAA8B,GAAG,gBAAgB,CAC3D,wBAAwB,EACxB;IACE,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACnC,MAAM,EAAE,oCAAoC,CAAA;CAC7C,CACF,CAAA"}
+{"version":3,"file":"Config.d.ts","sourceRoot":"","sources":["../../src/Config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAEvD,MAAM,MAAM,oCAAoC,GAAG,6CAA6C,CAAA;AAChG,eAAO,MAAM,oCAAoC,EAAE,oCAAoF,CAAA;AAEvI,MAAM,MAAM,8BAA8B,GAAG,gBAAgB,CAAC;IAC5D,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACnC,MAAM,EAAE,oCAAoC,CAAA;CAC7C,CAAC,CAAA"}

package/dist/esm/Config.js.map

@@ -1 +1 @@
-{"version":3,"file":"Config.js","sourceRoot":"","sources":["../../src/Config.ts"],"names":[],"mappings":"AAKA,MAAM,CAAC,MAAM,oCAAoC,GAAyC,6CAA6C,CAAA"}
+{"version":3,"file":"Config.js","sourceRoot":"","sources":["../../src/Config.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,oCAAoC,GAAyC,6CAA6C,CAAA"}

package/dist/esm/Plugin.d.ts

@@ -1,8 +1,6 @@
 import { XyoModuleParams } from '@xyo-network/module';
-export declare const XyoNodeSystemInfoPayloadPlugin: () => import("@xyo-network/payload-plugin").XyoPayloadPlugin<import("@xyo-network/payload").SchemaFields & import("@xyo-network/payload").PayloadFields & {
-    schema: "network.xyo.system.info.node";
-    systeminfo?: Record<string, unknown> | undefined;
-}, XyoModuleParams<import("@xyo-network/payload").SchemaFields & import("@xyo-network/payload").PayloadFields & {
+import { PayloadSetWitnessPlugin } from '@xyo-network/payloadset-plugin';
+export declare const XyoNodeSystemInfoPlugin: () => PayloadSetWitnessPlugin<XyoModuleParams<import("@xyo-network/payload").SchemaFields & import("@xyo-network/payload").PayloadFields & {
     security?: {
         allowed?: Record<string, string[][]> | undefined;
         disallowed?: Record<string, string[]> | undefined;
@@ -11,15 +9,8 @@ export declare const XyoNodeSystemInfoPayloadPlugin: () => import("@xyo-network/
     nodeValues?: Record<string, string> | undefined;
     schema: "network.xyo.system.info.witness.node.config";
 } & {
-    targetSchema: "network.xyo.system.info.node";
-}>, XyoModuleParams<import("@xyo-network/payload").SchemaFields & import("@xyo-network/payload").PayloadFields & {
-    security?: {
-        allowed?: Record<string, string[][]> | undefined;
-        disallowed?: Record<string, string[]> | undefined;
-    } | undefined;
-} & {
-    targetSchema?: string | undefined;
-} & {
-    schema: string;
+    targetSet?: (import("@xyo-network/payload").SchemaFields & import("@xyo-network/payload").PayloadFields & import("@xyo-network/payload").PayloadSet & {
+        schema: "network.xyo.payload.set";
+    }) | undefined;
 }>>;
 //# sourceMappingURL=Plugin.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Plugin.d.ts","sourceRoot":"","sources":["../../src/Plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAQrD,eAAO,MAAM,8BAA8B;;;;;;;;;;;;;;;;;;;;;;GAOvC,CAAA"}
+{"version":3,"file":"Plugin.d.ts","sourceRoot":"","sources":["../../src/Plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAErD,OAAO,EAA0B,uBAAuB,EAAE,MAAM,gCAAgC,CAAA;AAMhG,eAAO,MAAM,uBAAuB;;;;;;;;;;;;GASjC,CAAA"}

package/dist/esm/Plugin.js

@@ -1,11 +1,11 @@
-import { createXyoPayloadPlugin } from '@xyo-network/payload-plugin';
+import { PayloadSetSchema } from '@xyo-network/payload';
+import { createPayloadSetPlugin } from '@xyo-network/payloadset-plugin';
 import { XyoNodeSystemInfoSchema } from './Schema';
 import { XyoNodeSystemInfoWitness } from './Witness';
-export const XyoNodeSystemInfoPayloadPlugin = () => createXyoPayloadPlugin({
-    auto: true,
-    schema: XyoNodeSystemInfoSchema,
+export const XyoNodeSystemInfoPlugin = () => createPayloadSetPlugin({ required: { [XyoNodeSystemInfoSchema]: 1 }, schema: PayloadSetSchema }, {
     witness: async (params) => {
-        return await XyoNodeSystemInfoWitness.create(params);
+        const result = await XyoNodeSystemInfoWitness.create(params);
+        return result;
     },
 });
 //# sourceMappingURL=Plugin.js.map

package/dist/esm/Plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"Plugin.js","sourceRoot":"","sources":["../../src/Plugin.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAA;AAIpE,OAAO,EAAE,uBAAuB,EAAE,MAAM,UAAU,CAAA;AAClD,OAAO,EAAE,wBAAwB,EAAE,MAAM,WAAW,CAAA;AAEpD,MAAM,CAAC,MAAM,8BAA8B,GAAG,GAAG,EAAE,CACjD,sBAAsB,CAA4E;IAChG,IAAI,EAAE,IAAI;IACV,MAAM,EAAE,uBAAuB;IAC/B,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;QACxB,OAAO,MAAM,wBAAwB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;IACtD,CAAC;CACF,CAAC,CAAA"}
+{"version":3,"file":"Plugin.js","sourceRoot":"","sources":["../../src/Plugin.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AACvD,OAAO,EAAE,sBAAsB,EAA2B,MAAM,gCAAgC,CAAA;AAGhG,OAAO,EAAE,uBAAuB,EAAE,MAAM,UAAU,CAAA;AAClD,OAAO,EAAE,wBAAwB,EAAE,MAAM,WAAW,CAAA;AAEpD,MAAM,CAAC,MAAM,uBAAuB,GAAG,GAAG,EAAE,CAC1C,sBAAsB,CACpB,EAAE,QAAQ,EAAE,EAAE,CAAC,uBAAuB,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,gBAAgB,EAAE,EACxE;IACE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;QACxB,MAAM,MAAM,GAAG,MAAM,wBAAwB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;QAC5D,OAAO,MAAM,CAAA;IACf,CAAC;CACF,CACF,CAAA"}

package/dist/esm/Witness.d.ts

@@ -2,10 +2,11 @@ import { XyoModuleParams } from '@xyo-network/module';
 import { AbstractWitness } from '@xyo-network/witness';
 import { XyoNodeSystemInfoWitnessConfig } from './Config';
 import { XyoNodeSystemInfoPayload } from './Payload';
-export declare class XyoNodeSystemInfoWitness<TPayload extends XyoNodeSystemInfoPayload = XyoNodeSystemInfoPayload> extends AbstractWitness<TPayload, XyoNodeSystemInfoWitnessConfig> {
+export declare class XyoNodeSystemInfoWitness<TPayload extends XyoNodeSystemInfoPayload = XyoNodeSystemInfoPayload> extends AbstractWitness<XyoNodeSystemInfoWitnessConfig> {
     static configSchema: "network.xyo.system.info.witness.node.config";
-    static targetSchema: "network.xyo.system.info.node";
     static create(params?: XyoModuleParams<XyoNodeSystemInfoWitnessConfig>): Promise<XyoNodeSystemInfoWitness>;
-    observe(fields?: Partial<TPayload>[]): Promise<TPayload[]>;
+    observe(payloads?: TPayload[]): Promise<(import("@xyo-network/payload").SchemaFields & import("@xyo-network/payload").PayloadFields & {
+        schema: string;
+    })[]>;
 }
 //# sourceMappingURL=Witness.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAGtD,OAAO,EAAE,8BAA8B,EAAwC,MAAM,UAAU,CAAA;AAC/F,OAAO,EAAE,wBAAwB,EAAE,MAAM,WAAW,CAAA;AAIpD,qBAAa,wBAAwB,CAAC,QAAQ,SAAS,wBAAwB,GAAG,wBAAwB,CAAE,SAAQ,eAAe,CACjI,QAAQ,EACR,8BAA8B,CAC/B;IACC,OAAgB,YAAY,gDAAuC;IACnE,OAAgB,YAAY,iCAA0B;WAEhC,MAAM,CAAC,MAAM,CAAC,EAAE,eAAe,CAAC,8BAA8B,CAAC,GAAG,OAAO,CAAC,wBAAwB,CAAC;IAI1G,OAAO,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,EAAE;CAIpD"}
+{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAGtD,OAAO,EAAE,8BAA8B,EAAwC,MAAM,UAAU,CAAA;AAC/F,OAAO,EAAE,wBAAwB,EAAE,MAAM,WAAW,CAAA;AAIpD,qBAAa,wBAAwB,CACnC,QAAQ,SAAS,wBAAwB,GAAG,wBAAwB,CACpE,SAAQ,eAAe,CAAC,8BAA8B,CAAC;IACvD,OAAgB,YAAY,gDAAuC;WAE7C,MAAM,CAAC,MAAM,CAAC,EAAE,eAAe,CAAC,8BAA8B,CAAC,GAAG,OAAO,CAAC,wBAAwB,CAAC;IAI1G,OAAO,CAAC,QAAQ,CAAC,EAAE,QAAQ,EAAE;;;CAI7C"}

package/dist/esm/Witness.js

@@ -5,13 +5,12 @@ import { XyoNodeSystemInfoSchema } from './Schema';
 import { defaultSystemInfoConfig } from './Template';
 export class XyoNodeSystemInfoWitness extends AbstractWitness {
     static configSchema = XyoNodeSystemInfoWitnessConfigSchema;
-    static targetSchema = XyoNodeSystemInfoSchema;
     static async create(params) {
         return (await super.create(params));
     }
-    async observe(fields) {
+    async observe(payloads) {
         const node = await get(this.config?.nodeValues ?? defaultSystemInfoConfig());
-        return await super.observe([{ ...node, ...fields?.[0] }]);
+        return await super.observe([{ ...node, ...payloads?.[0], schema: XyoNodeSystemInfoSchema }]);
     }
 }
 //# sourceMappingURL=Witness.js.map

package/dist/esm/Witness.js.map

@@ -1 +1 @@
-{"version":3,"file":"Witness.js","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAA;AAEvC,OAAO,EAAkC,oCAAoC,EAAE,MAAM,UAAU,CAAA;AAE/F,OAAO,EAAE,uBAAuB,EAAE,MAAM,UAAU,CAAA;AAClD,OAAO,EAAE,uBAAuB,EAAE,MAAM,YAAY,CAAA;AAEpD,MAAM,OAAO,wBAA+F,SAAQ,eAGnH;IACC,MAAM,CAAU,YAAY,GAAG,oCAAoC,CAAA;IACnE,MAAM,CAAU,YAAY,GAAG,uBAAuB,CAAA;IAEtD,MAAM,CAAU,KAAK,CAAC,MAAM,CAAC,MAAwD;QACnF,OAAO,CAAC,MAAM,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAA6B,CAAA;IACjE,CAAC;IAEQ,KAAK,CAAC,OAAO,CAAC,MAA4B;QACjD,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,IAAI,uBAAuB,EAAE,CAAC,CAAA;QAC5E,OAAO,MAAM,KAAK,CAAC,OAAO,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,GAAG,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;IAC3D,CAAC"}
+{"version":3,"file":"Witness.js","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAA;AAEvC,OAAO,EAAkC,oCAAoC,EAAE,MAAM,UAAU,CAAA;AAE/F,OAAO,EAAE,uBAAuB,EAAE,MAAM,UAAU,CAAA;AAClD,OAAO,EAAE,uBAAuB,EAAE,MAAM,YAAY,CAAA;AAEpD,MAAM,OAAO,wBAEX,SAAQ,eAA+C;IACvD,MAAM,CAAU,YAAY,GAAG,oCAAoC,CAAA;IAEnE,MAAM,CAAU,KAAK,CAAC,MAAM,CAAC,MAAwD;QACnF,OAAO,CAAC,MAAM,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAA6B,CAAA;IACjE,CAAC;IAEQ,KAAK,CAAC,OAAO,CAAC,QAAqB;QAC1C,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,IAAI,uBAAuB,EAAE,CAAC,CAAA;QAC5E,OAAO,MAAM,KAAK,CAAC,OAAO,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,GAAG,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,uBAAuB,EAAE,CAAC,CAAC,CAAA;IAC9F,CAAC"}

package/dist/esm/index.d.ts

@@ -1,9 +1,9 @@
-import { XyoNodeSystemInfoPayloadPlugin } from './Plugin';
+import { XyoNodeSystemInfoPlugin } from './Plugin';
 export * from './Config';
 export * from './Payload';
 export * from './Schema';
 export * from './Template';
 export * from './Witness';
-export { XyoNodeSystemInfoPayloadPlugin };
-export default XyoNodeSystemInfoPayloadPlugin;
+export { XyoNodeSystemInfoPlugin };
+export default XyoNodeSystemInfoPlugin;
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,8BAA8B,EAAE,MAAM,UAAU,CAAA;AAEzD,cAAc,UAAU,CAAA;AACxB,cAAc,WAAW,CAAA;AACzB,cAAc,UAAU,CAAA;AACxB,cAAc,YAAY,CAAA;AAC1B,cAAc,WAAW,CAAA;AAEzB,OAAO,EAAE,8BAA8B,EAAE,CAAA;AAGzC,eAAe,8BAA8B,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,UAAU,CAAA;AAElD,cAAc,UAAU,CAAA;AACxB,cAAc,WAAW,CAAA;AACzB,cAAc,UAAU,CAAA;AACxB,cAAc,YAAY,CAAA;AAC1B,cAAc,WAAW,CAAA;AAEzB,OAAO,EAAE,uBAAuB,EAAE,CAAA;AAGlC,eAAe,uBAAuB,CAAA"}

package/dist/esm/index.js

@@ -1,10 +1,10 @@
-import { XyoNodeSystemInfoPayloadPlugin } from './Plugin';
+import { XyoNodeSystemInfoPlugin } from './Plugin';
 export * from './Config';
 export * from './Payload';
 export * from './Schema';
 export * from './Template';
 export * from './Witness';
-export { XyoNodeSystemInfoPayloadPlugin };
+export { XyoNodeSystemInfoPlugin };
 // eslint-disable-next-line import/no-default-export
-export default XyoNodeSystemInfoPayloadPlugin;
+export default XyoNodeSystemInfoPlugin;
 //# sourceMappingURL=index.js.map

package/dist/esm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,8BAA8B,EAAE,MAAM,UAAU,CAAA;AAEzD,cAAc,UAAU,CAAA;AACxB,cAAc,WAAW,CAAA;AACzB,cAAc,UAAU,CAAA;AACxB,cAAc,YAAY,CAAA;AAC1B,cAAc,WAAW,CAAA;AAEzB,OAAO,EAAE,8BAA8B,EAAE,CAAA;AAEzC,oDAAoD;AACpD,eAAe,8BAA8B,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,UAAU,CAAA;AAElD,cAAc,UAAU,CAAA;AACxB,cAAc,WAAW,CAAA;AACzB,cAAc,UAAU,CAAA;AACxB,cAAc,YAAY,CAAA;AAC1B,cAAc,WAAW,CAAA;AAEzB,OAAO,EAAE,uBAAuB,EAAE,CAAA;AAElC,oDAAoD;AACpD,eAAe,uBAAuB,CAAA"}

package/package.json

@@ -10,11 +10,11 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/issues"
   },
   "dependencies": {
-    "@xyo-network/module": "^2.41.10",
-    "@xyo-network/payload": "^2.41.10",
-    "@xyo-network/payload-plugin": "^2.41.10",
-    "@xyo-network/witness": "^2.41.10",
-    "systeminformation": "^5.14.4",
+    "@xyo-network/module": "^2.41.12",
+    "@xyo-network/payload": "^2.41.12",
+    "@xyo-network/payloadset-plugin": "^2.41.12",
+    "@xyo-network/witness": "^2.41.12",
+    "systeminformation": "^5.16.1",
     "tslib": "^2.4.1"
   },
   "description": "Primary SDK for using XYO Protocol 2.0",
@@ -50,5 +50,5 @@
   },
   "sideEffects": false,
   "types": "dist/esm/index.d.ts",
-  "version": "2.41.10"
+  "version": "2.41.12"
 }

package/src/Config.ts

@@ -1,14 +1,9 @@
 import { XyoWitnessConfig } from '@xyo-network/witness'
 
-import { XyoNodeSystemInfoPayload } from './Payload'
-
 export type XyoNodeSystemInfoWitnessConfigSchema = 'network.xyo.system.info.witness.node.config'
 export const XyoNodeSystemInfoWitnessConfigSchema: XyoNodeSystemInfoWitnessConfigSchema = 'network.xyo.system.info.witness.node.config'
 
-export type XyoNodeSystemInfoWitnessConfig = XyoWitnessConfig<
-  XyoNodeSystemInfoPayload,
-  {
-    nodeValues?: Record<string, string>
-    schema: XyoNodeSystemInfoWitnessConfigSchema
-  }
->
+export type XyoNodeSystemInfoWitnessConfig = XyoWitnessConfig<{
+  nodeValues?: Record<string, string>
+  schema: XyoNodeSystemInfoWitnessConfigSchema
+}>

package/src/Plugin.spec.ts

@@ -1,12 +1,13 @@
-import { XyoPayloadPluginResolver } from '@xyo-network/payload-plugin'
+import { PayloadSetPluginResolver } from '@xyo-network/payloadset-plugin'
 
-import { XyoNodeSystemInfoPayloadPlugin } from './Plugin'
+import { XyoNodeSystemInfoPlugin } from './Plugin'
 import { XyoNodeSystemInfoSchema } from './Schema'
 
-describe('XyoBowserSystemInfoPayloadPlugin', () => {
+describe('XyoBowserSystemInfoPlugin', () => {
   test('Add to Resolver', () => {
-    const resolver = new XyoPayloadPluginResolver().register(XyoNodeSystemInfoPayloadPlugin())
-    expect(resolver.resolve({ schema: XyoNodeSystemInfoSchema })).toBeObject()
+    const plugin = XyoNodeSystemInfoPlugin()
+    const resolver = new PayloadSetPluginResolver().register(plugin)
+    expect(resolver.resolve(plugin.set)).toBeObject()
     expect(resolver.witness(XyoNodeSystemInfoSchema)).toBeObject()
   })
 })

package/src/Plugin.ts

@@ -1,16 +1,18 @@
 import { XyoModuleParams } from '@xyo-network/module'
-import { createXyoPayloadPlugin } from '@xyo-network/payload-plugin'
+import { PayloadSetSchema } from '@xyo-network/payload'
+import { createPayloadSetPlugin, PayloadSetWitnessPlugin } from '@xyo-network/payloadset-plugin'
 
 import { XyoNodeSystemInfoWitnessConfig } from './Config'
-import { XyoNodeSystemInfoPayload } from './Payload'
 import { XyoNodeSystemInfoSchema } from './Schema'
 import { XyoNodeSystemInfoWitness } from './Witness'
 
-export const XyoNodeSystemInfoPayloadPlugin = () =>
-  createXyoPayloadPlugin<XyoNodeSystemInfoPayload, XyoModuleParams<XyoNodeSystemInfoWitnessConfig>>({
-    auto: true,
-    schema: XyoNodeSystemInfoSchema,
-    witness: async (params) => {
-      return await XyoNodeSystemInfoWitness.create(params)
+export const XyoNodeSystemInfoPlugin = () =>
+  createPayloadSetPlugin<PayloadSetWitnessPlugin<XyoModuleParams<XyoNodeSystemInfoWitnessConfig>>>(
+    { required: { [XyoNodeSystemInfoSchema]: 1 }, schema: PayloadSetSchema },
+    {
+      witness: async (params) => {
+        const result = await XyoNodeSystemInfoWitness.create(params)
+        return result
+      },
     },
-  })
+  )

package/src/Witness.spec.ts

@@ -1,13 +1,12 @@
 import { PayloadWrapper } from '@xyo-network/payload'
 
 import { XyoNodeSystemInfoWitnessConfigSchema } from './Config'
-import { XyoNodeSystemInfoSchema } from './Schema'
 import { XyoNodeSystemInfoWitness } from './Witness'
 
 describe('XyoSystemInfoWitness', () => {
   test('observe', async () => {
     const witness = await XyoNodeSystemInfoWitness.create({
-      config: { schema: XyoNodeSystemInfoWitnessConfigSchema, targetSchema: XyoNodeSystemInfoSchema },
+      config: { schema: XyoNodeSystemInfoWitnessConfigSchema },
     })
 
     const [observation] = await witness.observe()

package/src/Witness.ts

@@ -7,19 +7,17 @@ import { XyoNodeSystemInfoPayload } from './Payload'
 import { XyoNodeSystemInfoSchema } from './Schema'
 import { defaultSystemInfoConfig } from './Template'
 
-export class XyoNodeSystemInfoWitness<TPayload extends XyoNodeSystemInfoPayload = XyoNodeSystemInfoPayload> extends AbstractWitness<
-  TPayload,
-  XyoNodeSystemInfoWitnessConfig
-> {
+export class XyoNodeSystemInfoWitness<
+  TPayload extends XyoNodeSystemInfoPayload = XyoNodeSystemInfoPayload,
+> extends AbstractWitness<XyoNodeSystemInfoWitnessConfig> {
   static override configSchema = XyoNodeSystemInfoWitnessConfigSchema
-  static override targetSchema = XyoNodeSystemInfoSchema
 
   static override async create(params?: XyoModuleParams<XyoNodeSystemInfoWitnessConfig>): Promise<XyoNodeSystemInfoWitness> {
     return (await super.create(params)) as XyoNodeSystemInfoWitness
   }
 
-  override async observe(fields?: Partial<TPayload>[]) {
+  override async observe(payloads?: TPayload[]) {
     const node = await get(this.config?.nodeValues ?? defaultSystemInfoConfig())
-    return await super.observe([{ ...node, ...fields?.[0] }])
+    return await super.observe([{ ...node, ...payloads?.[0], schema: XyoNodeSystemInfoSchema }])
   }
 }

package/src/index.ts

@@ -1,4 +1,4 @@
-import { XyoNodeSystemInfoPayloadPlugin } from './Plugin'
+import { XyoNodeSystemInfoPlugin } from './Plugin'
 
 export * from './Config'
 export * from './Payload'
@@ -6,7 +6,7 @@ export * from './Schema'
 export * from './Template'
 export * from './Witness'
 
-export { XyoNodeSystemInfoPayloadPlugin }
+export { XyoNodeSystemInfoPlugin }
 
 // eslint-disable-next-line import/no-default-export
-export default XyoNodeSystemInfoPayloadPlugin
+export default XyoNodeSystemInfoPlugin