@xyo-network/manifest 2.63.13 → 2.64.0

package/dist/esm/ManifestWrapper.js

@@ -8,54 +8,53 @@ export class ManifestWrapper extends PayloadWrapper {
         super(payload);
         this.wallet = wallet;
     }
-    dAppManifest(id) {
-        return this.payload().dapps?.find((dapp) => dapp.id === id);
+    async loadModule(node, manifest, external = true, additionalCreatableModules) {
+        const collision = async (node, name, external) => {
+            const externalConflict = external ? (await (external ? node.upResolver : node.downResolver).resolve({ name: [name] })).length !== 0 : false;
+            return externalConflict || (await node.downResolver.resolve({ name: [name] })).length !== 0;
+        };
+        const creatableModules = { ...standardCreatableModules, ...additionalCreatableModules };
+        if (!(await collision(node, manifest.config.name, external))) {
+            if (manifest.config.language && manifest.config.language === 'javascript') {
+                assertEx((manifest.config.name && (await node.attach(manifest.config.name, external))) ??
+                    (await node.attach((await this.registerModule(node, manifest, creatableModules)).address, external)), `No module with config schema [${manifest.config.name}] registered`);
+            }
+        }
     }
-    async loadDappFromId(node, id, additionalCreatableModules) {
-        return await this.loadDappFromManifest(node, assertEx(this.dAppManifest(id), 'Failed to find dApp Manifest'), additionalCreatableModules);
+    async loadNodeFromIndex(node, index, additionalCreatableModules) {
+        return await this.loadNodeFromManifest(node, assertEx(this.nodeManifest(index), 'Failed to find Node Manifest'), additionalCreatableModules);
     }
-    async loadDappFromManifest(node, manifest, additionalCreatableModules) {
+    async loadNodeFromManifest(node, manifest, additionalCreatableModules) {
         const nodeWrapper = NodeWrapper.wrap(node);
         // Load Private Modules
         await Promise.all(manifest.modules?.private?.map(async (moduleManifest) => {
-            await this.loadModule(nodeWrapper, assertEx(this.resolveModuleManifest(moduleManifest), 'Unable to resolve module manifest'), false, additionalCreatableModules);
+            await this.loadModule(nodeWrapper, moduleManifest, false, additionalCreatableModules);
         }) ?? [() => null]);
         // Load Public Modules
         await Promise.all(manifest.modules?.public?.map(async (moduleManifest) => {
-            await this.loadModule(nodeWrapper, assertEx(this.resolveModuleManifest(moduleManifest), 'Unable to resolve module manifest'), true, additionalCreatableModules);
+            await this.loadModule(nodeWrapper, moduleManifest, true, additionalCreatableModules);
         }) ?? [() => null]);
         return node;
     }
-    async loadDapps(node, additionalCreatableModules) {
-        return await Promise.all(this.payload().dapps?.map(async (dappManifest) => {
-            const subNode = await MemoryNode.create();
+    async loadNodes(node, additionalCreatableModules) {
+        return await Promise.all(this.payload().nodes?.map(async (nodeManifest, index) => {
+            const subNode = await MemoryNode.create({ config: { schema: 'network.xyo.node.config' }, wallet: await this.wallet.derivePath(`${index}'`) });
             await node?.register(subNode);
-            await this.loadDappFromManifest(subNode, dappManifest, additionalCreatableModules);
+            await this.loadNodeFromManifest(subNode, nodeManifest, additionalCreatableModules);
             return subNode;
         }));
     }
-    async loadModule(node, manifest, external = true, additionalCreatableModules) {
-        const creatableModules = { ...standardCreatableModules, ...additionalCreatableModules };
-        const nodeWrapper = NodeWrapper.wrap(node);
-        if (!manifest.name || (await (external ? nodeWrapper.downResolver : nodeWrapper.upResolver).resolve({ name: [manifest.name] })).length === 0) {
-            if (manifest.language && manifest.language === 'javascript') {
-                const id = manifest.id;
-                assertEx((manifest.name && (await node.attach(manifest.name, external))) ??
-                    (id ? await node.attach((await this.registerModule(node, manifest, creatableModules)).address, external) : undefined), `No module named [${manifest.name}] registered`);
-            }
-        }
+    nodeManifest(index) {
+        return this.payload().nodes?.[index];
     }
     async registerModule(node, manifest, creatableModules) {
-        const creatableModule = assertEx(creatableModules?.[assertEx(manifest.id, 'Attempting to create a module without an id')], `No module with [${manifest.id}] id available for registration`);
-        const module = await creatableModule.create(manifest.config ? { account: this.wallet, config: manifest.config } : undefined);
+        const creatableModule = assertEx(creatableModules?.[manifest.config.schema], `No module with [${manifest.config.schema}] config schema available for registration`);
+        const module = await creatableModule.create({
+            account: manifest.config.accountPath ? await this.wallet.derivePath(manifest.config.accountPath) : this.wallet,
+            config: assertEx(manifest.config, 'Missing config'),
+        });
         await node.module.register(module);
         return module;
     }
-    resolveModuleManifest(manifest) {
-        if (manifest?.name && !manifest.id) {
-            return this.payload().modules?.[manifest.name];
-        }
-        return manifest;
-    }
 }
 //# sourceMappingURL=ManifestWrapper.js.map

package/dist/esm/ManifestWrapper.js.map

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

package/dist/esm/ModuleFactory.js

@@ -4,9 +4,9 @@ import { ModuleFactory } from '@xyo-network/module';
 import { MemoryNode } from '@xyo-network/node';
 import { MemorySentinel } from '@xyo-network/sentinel';
 export const standardCreatableModules = {
-    'network.xyo.archivist': MemoryArchivist,
-    'network.xyo.bridge.http': ModuleFactory.withParams(HttpBridge, { config: { schema: HttpBridge.configSchema } }),
-    'network.xyo.node': MemoryNode,
-    'network.xyo.sentinel': MemorySentinel,
+    'network.xyo.archivist.config': MemoryArchivist,
+    'network.xyo.bridge.http.config': ModuleFactory.withParams(HttpBridge, { config: { schema: HttpBridge.configSchema } }),
+    'network.xyo.node.config': MemoryNode,
+    'network.xyo.sentinel.config': MemorySentinel,
 };
 //# sourceMappingURL=ModuleFactory.js.map

package/dist/esm/ModuleFactory.js.map

@@ -1 +1 @@
-{"version":3,"file":"ModuleFactory.js","sourceRoot":"","sources":["../../src/ModuleFactory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAA;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAA;AAC/D,OAAO,EAA6B,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAC9E,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AAEtD,MAAM,CAAC,MAAM,wBAAwB,GAA8B;IACjE,uBAAuB,EAAE,eAAe;IACxC,yBAAyB,EAAE,aAAa,CAAC,UAAU,CAAC,UAAU,EAAE,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,UAAU,CAAC,YAAY,EAAE,EAAE,CAAC;IAChH,kBAAkB,EAAE,UAAU;IAC9B,sBAAsB,EAAE,cAAc;CACvC,CAAA"}
+{"version":3,"file":"ModuleFactory.js","sourceRoot":"","sources":["../../src/ModuleFactory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAA;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAA;AAC/D,OAAO,EAA6B,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAC9E,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AAEtD,MAAM,CAAC,MAAM,wBAAwB,GAA8B;IACjE,8BAA8B,EAAE,eAAe;IAC/C,gCAAgC,EAAE,aAAa,CAAC,UAAU,CAAC,UAAU,EAAE,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,UAAU,CAAC,YAAY,EAAE,EAAE,CAAC;IACvH,yBAAyB,EAAE,UAAU;IACrC,6BAA6B,EAAE,cAAc;CAC9C,CAAA"}

package/dist/types/ManifestWrapper.d.ts

@@ -2,16 +2,15 @@ import { CreatableModuleDictionary } from '@xyo-network/module';
 import { MemoryNode, NodeWrapper } from '@xyo-network/node';
 import { PayloadWrapper } from '@xyo-network/payload-wrapper';
 import { WalletInstance } from '@xyo-network/wallet-model';
-import { DappManifest, ManifestPayload, ModuleManifest } from './Payload';
+import { ManifestPayload, ModuleManifest, NodeManifest } from './Payload';
 export declare class ManifestWrapper extends PayloadWrapper<ManifestPayload> {
     protected wallet: WalletInstance;
     constructor(payload: ManifestPayload, wallet: WalletInstance);
-    dAppManifest(id: string): DappManifest | undefined;
-    loadDappFromId(node: MemoryNode, id: string, additionalCreatableModules?: CreatableModuleDictionary): Promise<MemoryNode<import("@xyo-network/node").MemoryNodeParams, import("@xyo-network/node").NodeModuleEventData>>;
-    loadDappFromManifest(node: MemoryNode, manifest: DappManifest, additionalCreatableModules?: CreatableModuleDictionary): Promise<MemoryNode<import("@xyo-network/node").MemoryNodeParams, import("@xyo-network/node").NodeModuleEventData>>;
-    loadDapps(node?: MemoryNode, additionalCreatableModules?: CreatableModuleDictionary): Promise<MemoryNode<import("@xyo-network/node").MemoryNodeParams, import("@xyo-network/node").NodeModuleEventData>[]>;
     loadModule(node: NodeWrapper<MemoryNode>, manifest: ModuleManifest, external?: boolean, additionalCreatableModules?: CreatableModuleDictionary): Promise<void>;
+    loadNodeFromIndex(node: MemoryNode, index: number, additionalCreatableModules?: CreatableModuleDictionary): Promise<MemoryNode<import("@xyo-network/node").MemoryNodeParams, import("@xyo-network/node").NodeModuleEventData>>;
+    loadNodeFromManifest(node: MemoryNode, manifest: NodeManifest, additionalCreatableModules?: CreatableModuleDictionary): Promise<MemoryNode<import("@xyo-network/node").MemoryNodeParams, import("@xyo-network/node").NodeModuleEventData>>;
+    loadNodes(node?: MemoryNode, additionalCreatableModules?: CreatableModuleDictionary): Promise<MemoryNode<import("@xyo-network/node").MemoryNodeParams, import("@xyo-network/node").NodeModuleEventData>[]>;
+    nodeManifest(index: number): NodeManifest;
     registerModule(node: NodeWrapper<MemoryNode>, manifest: ModuleManifest, creatableModules?: CreatableModuleDictionary): Promise<import("@xyo-network/module").Module>;
-    resolveModuleManifest(manifest?: ModuleManifest): ModuleManifest | undefined;
 }
 //# sourceMappingURL=ManifestWrapper.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"ManifestWrapper.d.ts","sourceRoot":"","sources":["../../src/ManifestWrapper.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,yBAAyB,EAAE,MAAM,qBAAqB,CAAA;AAC/D,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAC7D,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAG1D,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,WAAW,CAAA;AAEzE,qBAAa,eAAgB,SAAQ,cAAc,CAAC,eAAe,CAAC;IAC5B,SAAS,CAAC,MAAM,EAAE,cAAc;gBAA1D,OAAO,EAAE,eAAe,EAAY,MAAM,EAAE,cAAc;IAItE,YAAY,CAAC,EAAE,EAAE,MAAM;IAIjB,cAAc,CAAC,IAAI,EAAE,UAAU,EAAE,EAAE,EAAE,MAAM,EAAE,0BAA0B,CAAC,EAAE,yBAAyB;IAInG,oBAAoB,CAAC,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,YAAY,EAAE,0BAA0B,CAAC,EAAE,yBAAyB;IA6BrH,SAAS,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,0BAA0B,CAAC,EAAE,yBAAyB;IAWnF,UAAU,CAAC,IAAI,EAAE,WAAW,CAAC,UAAU,CAAC,EAAE,QAAQ,EAAE,cAAc,EAAE,QAAQ,UAAO,EAAE,0BAA0B,CAAC,EAAE,yBAAyB;IAe3I,cAAc,CAAC,IAAI,EAAE,WAAW,CAAC,UAAU,CAAC,EAAE,QAAQ,EAAE,cAAc,EAAE,gBAAgB,CAAC,EAAE,yBAAyB;IAW1H,qBAAqB,CAAC,QAAQ,CAAC,EAAE,cAAc;CAMhD"}
+{"version":3,"file":"ManifestWrapper.d.ts","sourceRoot":"","sources":["../../src/ManifestWrapper.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,yBAAyB,EAAE,MAAM,qBAAqB,CAAA;AAC/D,OAAO,EAAE,UAAU,EAAc,WAAW,EAAE,MAAM,mBAAmB,CAAA;AACvE,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAC7D,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAG1D,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAEzE,qBAAa,eAAgB,SAAQ,cAAc,CAAC,eAAe,CAAC;IAC5B,SAAS,CAAC,MAAM,EAAE,cAAc;gBAA1D,OAAO,EAAE,eAAe,EAAY,MAAM,EAAE,cAAc;IAIhE,UAAU,CAAC,IAAI,EAAE,WAAW,CAAC,UAAU,CAAC,EAAE,QAAQ,EAAE,cAAc,EAAE,QAAQ,UAAO,EAAE,0BAA0B,CAAC,EAAE,yBAAyB;IAkB3I,iBAAiB,CAAC,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,0BAA0B,CAAC,EAAE,yBAAyB;IAIzG,oBAAoB,CAAC,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,YAAY,EAAE,0BAA0B,CAAC,EAAE,yBAAyB;IAmBrH,SAAS,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,0BAA0B,CAAC,EAAE,yBAAyB;IAWzF,YAAY,CAAC,KAAK,EAAE,MAAM;IAIpB,cAAc,CAAC,IAAI,EAAE,WAAW,CAAC,UAAU,CAAC,EAAE,QAAQ,EAAE,cAAc,EAAE,gBAAgB,CAAC,EAAE,yBAAyB;CAa3H"}

package/dist/types/Payload.d.ts

@@ -4,24 +4,27 @@ export type ManifestPayloadSchema = 'network.xyo.manifest';
 export declare const ManifestPayloadSchema: ManifestPayloadSchema;
 export interface Manifest {
     description?: string;
-    id?: string;
-    name?: string;
 }
-export interface DappManifest extends Manifest {
+export type ConfigManifest = ModuleConfig<{
+    schema: string;
+}> & {
+    accountPath?: string;
+    features?: string[];
+    language?: string;
+    name: string;
+    os?: string;
+};
+export interface NodeManifest extends ModuleManifest {
     modules?: {
         private?: ModuleManifest[];
         public?: ModuleManifest[];
     };
 }
 export interface ModuleManifest extends Manifest {
-    accountPath?: string;
-    config?: ModuleConfig;
-    features?: string[];
-    language?: string;
-    os?: string;
+    config: ConfigManifest;
 }
 export type ManifestPayload = Payload<{
-    dapps: DappManifest[];
     modules?: Record<string, ModuleManifest>;
+    nodes: NodeManifest[];
 }, ManifestPayloadSchema>;
 //# sourceMappingURL=Payload.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Payload.d.ts","sourceRoot":"","sources":["../../src/Payload.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AACxD,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAEpD,MAAM,MAAM,qBAAqB,GAAG,sBAAsB,CAAA;AAC1D,eAAO,MAAM,qBAAqB,EAAE,qBAA8C,CAAA;AAElF,MAAM,WAAW,QAAQ;IACvB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,EAAE,CAAC,EAAE,MAAM,CAAA;IACX,IAAI,CAAC,EAAE,MAAM,CAAA;CACd;AAED,MAAM,WAAW,YAAa,SAAQ,QAAQ;IAC5C,OAAO,CAAC,EAAE;QACR,OAAO,CAAC,EAAE,cAAc,EAAE,CAAA;QAC1B,MAAM,CAAC,EAAE,cAAc,EAAE,CAAA;KAC1B,CAAA;CACF;AAED,MAAM,WAAW,cAAe,SAAQ,QAAQ;IAC9C,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,MAAM,CAAC,EAAE,YAAY,CAAA;IACrB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,EAAE,CAAC,EAAE,MAAM,CAAA;CACZ;AAED,MAAM,MAAM,eAAe,GAAG,OAAO,CACnC;IACE,KAAK,EAAE,YAAY,EAAE,CAAA;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAA;CACzC,EACD,qBAAqB,CACtB,CAAA"}
+{"version":3,"file":"Payload.d.ts","sourceRoot":"","sources":["../../src/Payload.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AACxD,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAEpD,MAAM,MAAM,qBAAqB,GAAG,sBAAsB,CAAA;AAC1D,eAAO,MAAM,qBAAqB,EAAE,qBAA8C,CAAA;AAElF,MAAM,WAAW,QAAQ;IACvB,WAAW,CAAC,EAAE,MAAM,CAAA;CACrB;AAED,MAAM,MAAM,cAAc,GAAG,YAAY,CAAC;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,GAAG;IAC9D,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,IAAI,EAAE,MAAM,CAAA;IACZ,EAAE,CAAC,EAAE,MAAM,CAAA;CACZ,CAAA;AAED,MAAM,WAAW,YAAa,SAAQ,cAAc;IAClD,OAAO,CAAC,EAAE;QACR,OAAO,CAAC,EAAE,cAAc,EAAE,CAAA;QAC1B,MAAM,CAAC,EAAE,cAAc,EAAE,CAAA;KAC1B,CAAA;CACF;AAED,MAAM,WAAW,cAAe,SAAQ,QAAQ;IAC9C,MAAM,EAAE,cAAc,CAAA;CACvB;AAED,MAAM,MAAM,eAAe,GAAG,OAAO,CACnC;IACE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAA;IACxC,KAAK,EAAE,YAAY,EAAE,CAAA;CACtB,EACD,qBAAqB,CACtB,CAAA"}

package/package.json

@@ -13,15 +13,15 @@
   "docs": "dist/docs.json",
   "dependencies": {
     "@xylabs/assert": "^2.9.3",
-    "@xyo-network/http-bridge": "^2.63.13",
-    "@xyo-network/memory-archivist": "^2.63.13",
-    "@xyo-network/module": "^2.63.13",
-    "@xyo-network/module-model": "^2.63.13",
-    "@xyo-network/node": "^2.63.13",
-    "@xyo-network/payload-model": "^2.63.13",
-    "@xyo-network/payload-wrapper": "^2.63.13",
-    "@xyo-network/sentinel": "^2.63.13",
-    "@xyo-network/wallet-model": "^2.63.13"
+    "@xyo-network/http-bridge": "^2.64.0",
+    "@xyo-network/memory-archivist": "^2.64.0",
+    "@xyo-network/module": "^2.64.0",
+    "@xyo-network/module-model": "^2.64.0",
+    "@xyo-network/node": "^2.64.0",
+    "@xyo-network/payload-model": "^2.64.0",
+    "@xyo-network/payload-wrapper": "^2.64.0",
+    "@xyo-network/sentinel": "^2.64.0",
+    "@xyo-network/wallet-model": "^2.64.0"
   },
   "devDependencies": {
     "@xylabs/ts-scripts-yarn3": "^2.17.17",
@@ -43,7 +43,9 @@
     "./dist/docs.json": {
       "default": "./dist/docs.json"
     },
-    "./package.json": "./package.json"
+    "./package.json": "./package.json",
+    "./schema.json": "./src/schema.json",
+    "./schema": "./src/schema.json"
   },
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
@@ -59,5 +61,5 @@
   },
   "sideEffects": false,
   "types": "dist/types/index.d.ts",
-  "version": "2.63.13"
+  "version": "2.64.0"
 }

package/src/ManifestWrapper.ts

@@ -1,95 +1,84 @@
 import { assertEx } from '@xylabs/assert'
 import { CreatableModuleDictionary } from '@xyo-network/module'
-import { MemoryNode, NodeWrapper } from '@xyo-network/node'
+import { MemoryNode, NodeModule, NodeWrapper } from '@xyo-network/node'
 import { PayloadWrapper } from '@xyo-network/payload-wrapper'
 import { WalletInstance } from '@xyo-network/wallet-model'
 
 import { standardCreatableModules } from './ModuleFactory'
-import { DappManifest, ManifestPayload, ModuleManifest } from './Payload'
+import { ManifestPayload, ModuleManifest, NodeManifest } from './Payload'
 
 export class ManifestWrapper extends PayloadWrapper<ManifestPayload> {
   constructor(payload: ManifestPayload, protected wallet: WalletInstance) {
     super(payload)
   }
 
-  dAppManifest(id: string) {
-    return this.payload().dapps?.find((dapp) => dapp.id === id)
+  async loadModule(node: NodeWrapper<MemoryNode>, manifest: ModuleManifest, external = true, additionalCreatableModules?: CreatableModuleDictionary) {
+    const collision = async (node: NodeModule, name: string, external: boolean) => {
+      const externalConflict = external ? (await (external ? node.upResolver : node.downResolver).resolve({ name: [name] })).length !== 0 : false
+      return externalConflict || (await node.downResolver.resolve({ name: [name] })).length !== 0
+    }
+
+    const creatableModules = { ...standardCreatableModules, ...additionalCreatableModules }
+    if (!(await collision(node, manifest.config.name, external))) {
+      if (manifest.config.language && manifest.config.language === 'javascript') {
+        assertEx(
+          (manifest.config.name && (await node.attach(manifest.config.name, external))) ??
+            (await node.attach((await this.registerModule(node, manifest, creatableModules)).address, external)),
+          `No module with config schema [${manifest.config.name}] registered`,
+        )
+      }
+    }
   }
 
-  async loadDappFromId(node: MemoryNode, id: string, additionalCreatableModules?: CreatableModuleDictionary) {
-    return await this.loadDappFromManifest(node, assertEx(this.dAppManifest(id), 'Failed to find dApp Manifest'), additionalCreatableModules)
+  async loadNodeFromIndex(node: MemoryNode, index: number, additionalCreatableModules?: CreatableModuleDictionary) {
+    return await this.loadNodeFromManifest(node, assertEx(this.nodeManifest(index), 'Failed to find Node Manifest'), additionalCreatableModules)
   }
 
-  async loadDappFromManifest(node: MemoryNode, manifest: DappManifest, additionalCreatableModules?: CreatableModuleDictionary) {
+  async loadNodeFromManifest(node: MemoryNode, manifest: NodeManifest, additionalCreatableModules?: CreatableModuleDictionary) {
     const nodeWrapper = NodeWrapper.wrap<NodeWrapper<MemoryNode>>(node)
     // Load Private Modules
     await Promise.all(
       manifest.modules?.private?.map(async (moduleManifest) => {
-        await this.loadModule(
-          nodeWrapper,
-          assertEx(this.resolveModuleManifest(moduleManifest), 'Unable to resolve module manifest'),
-          false,
-          additionalCreatableModules,
-        )
+        await this.loadModule(nodeWrapper, moduleManifest, false, additionalCreatableModules)
       }) ?? [() => null],
     )
 
     // Load Public Modules
     await Promise.all(
       manifest.modules?.public?.map(async (moduleManifest) => {
-        await this.loadModule(
-          nodeWrapper,
-          assertEx(this.resolveModuleManifest(moduleManifest), 'Unable to resolve module manifest'),
-          true,
-          additionalCreatableModules,
-        )
+        await this.loadModule(nodeWrapper, moduleManifest, true, additionalCreatableModules)
       }) ?? [() => null],
     )
 
     return node
   }
 
-  async loadDapps(node?: MemoryNode, additionalCreatableModules?: CreatableModuleDictionary) {
+  async loadNodes(node?: MemoryNode, additionalCreatableModules?: CreatableModuleDictionary) {
     return await Promise.all(
-      this.payload().dapps?.map(async (dappManifest) => {
-        const subNode = await MemoryNode.create()
+      this.payload().nodes?.map(async (nodeManifest, index) => {
+        const subNode = await MemoryNode.create({ config: { schema: 'network.xyo.node.config' }, wallet: await this.wallet.derivePath(`${index}'`) })
         await node?.register(subNode)
-        await this.loadDappFromManifest(subNode, dappManifest, additionalCreatableModules)
+        await this.loadNodeFromManifest(subNode, nodeManifest, additionalCreatableModules)
         return subNode
       }),
     )
   }
 
-  async loadModule(node: NodeWrapper<MemoryNode>, manifest: ModuleManifest, external = true, additionalCreatableModules?: CreatableModuleDictionary) {
-    const creatableModules = { ...standardCreatableModules, ...additionalCreatableModules }
-    const nodeWrapper = NodeWrapper.wrap(node)
-    if (!manifest.name || (await (external ? nodeWrapper.downResolver : nodeWrapper.upResolver).resolve({ name: [manifest.name] })).length === 0) {
-      if (manifest.language && manifest.language === 'javascript') {
-        const id = manifest.id
-        assertEx(
-          (manifest.name && (await node.attach(manifest.name, external))) ??
-            (id ? await node.attach((await this.registerModule(node, manifest, creatableModules)).address, external) : undefined),
-          `No module named [${manifest.name}] registered`,
-        )
-      }
-    }
+  nodeManifest(index: number) {
+    return this.payload().nodes?.[index]
   }
 
   async registerModule(node: NodeWrapper<MemoryNode>, manifest: ModuleManifest, creatableModules?: CreatableModuleDictionary) {
     const creatableModule = assertEx(
-      creatableModules?.[assertEx(manifest.id, 'Attempting to create a module without an id')],
-      `No module with [${manifest.id}] id available for registration`,
+      creatableModules?.[manifest.config.schema],
+      `No module with [${manifest.config.schema}] config schema available for registration`,
     )
 
-    const module = await creatableModule.create(manifest.config ? { account: this.wallet, config: manifest.config } : undefined)
+    const module = await creatableModule.create({
+      account: manifest.config.accountPath ? await this.wallet.derivePath(manifest.config.accountPath) : this.wallet,
+      config: assertEx(manifest.config, 'Missing config'),
+    })
     await node.module.register(module)
     return module
   }
-
-  resolveModuleManifest(manifest?: ModuleManifest) {
-    if (manifest?.name && !manifest.id) {
-      return this.payload().modules?.[manifest.name]
-    }
-    return manifest
-  }
 }

package/src/ModuleFactory.ts

@@ -5,8 +5,8 @@ import { MemoryNode } from '@xyo-network/node'
 import { MemorySentinel } from '@xyo-network/sentinel'
 
 export const standardCreatableModules: CreatableModuleDictionary = {
-  'network.xyo.archivist': MemoryArchivist,
-  'network.xyo.bridge.http': ModuleFactory.withParams(HttpBridge, { config: { schema: HttpBridge.configSchema } }),
-  'network.xyo.node': MemoryNode,
-  'network.xyo.sentinel': MemorySentinel,
+  'network.xyo.archivist.config': MemoryArchivist,
+  'network.xyo.bridge.http.config': ModuleFactory.withParams(HttpBridge, { config: { schema: HttpBridge.configSchema } }),
+  'network.xyo.node.config': MemoryNode,
+  'network.xyo.sentinel.config': MemorySentinel,
 }

package/src/Payload.ts

@@ -6,11 +6,17 @@ export const ManifestPayloadSchema: ManifestPayloadSchema = 'network.xyo.manifes
 
 export interface Manifest {
   description?: string
-  id?: string
-  name?: string
 }
 
-export interface DappManifest extends Manifest {
+export type ConfigManifest = ModuleConfig<{ schema: string }> & {
+  accountPath?: string
+  features?: string[]
+  language?: string
+  name: string
+  os?: string
+}
+
+export interface NodeManifest extends ModuleManifest {
   modules?: {
     private?: ModuleManifest[]
     public?: ModuleManifest[]
@@ -18,17 +24,13 @@ export interface DappManifest extends Manifest {
 }
 
 export interface ModuleManifest extends Manifest {
-  accountPath?: string
-  config?: ModuleConfig
-  features?: string[]
-  language?: string
-  os?: string
+  config: ConfigManifest
 }
 
 export type ManifestPayload = Payload<
   {
-    dapps: DappManifest[]
     modules?: Record<string, ModuleManifest>
+    nodes: NodeManifest[]
   },
   ManifestPayloadSchema
 >