@xyo-network/manifest 2.64.3 → 2.64.5

package/dist/esm/ManifestWrapper.js

@@ -1,5 +1,5 @@
 import { assertEx } from '@xylabs/assert';
-import { MemoryNode, NodeWrapper } from '@xyo-network/node';
+import { MemoryNode } from '@xyo-network/node';
 import { PayloadWrapper } from '@xyo-network/payload-wrapper';
 import { standardCreatableModules } from './ModuleFactory';
 export class ManifestWrapper extends PayloadWrapper {
@@ -21,26 +21,26 @@ export class ManifestWrapper extends PayloadWrapper {
             }
         }
     }
-    async loadNodeFromIndex(node, index, additionalCreatableModules) {
-        return await this.loadNodeFromManifest(node, assertEx(this.nodeManifest(index), 'Failed to find Node Manifest'), additionalCreatableModules);
+    async loadNodeFromIndex(index, additionalCreatableModules) {
+        const manifest = assertEx(this.nodeManifest(index), 'Failed to find Node Manifest');
+        return await this.loadNodeFromManifest(manifest, manifest.config.accountPath ?? `${index}'`, additionalCreatableModules);
     }
-    async loadNodeFromManifest(node, manifest, additionalCreatableModules) {
-        const nodeWrapper = NodeWrapper.wrap(node);
+    async loadNodeFromManifest(manifest, path, additionalCreatableModules) {
+        const node = await MemoryNode.create({ config: manifest.config, wallet: await this.wallet.derivePath(path) });
         // Load Private Modules
         await Promise.all(manifest.modules?.private?.map(async (moduleManifest) => {
-            await this.loadModule(nodeWrapper, moduleManifest, false, additionalCreatableModules);
+            await this.loadModule(node, moduleManifest, false, additionalCreatableModules);
         }) ?? [() => null]);
         // Load Public Modules
         await Promise.all(manifest.modules?.public?.map(async (moduleManifest) => {
-            await this.loadModule(nodeWrapper, moduleManifest, true, additionalCreatableModules);
+            await this.loadModule(node, moduleManifest, true, additionalCreatableModules);
         }) ?? [() => null]);
         return node;
     }
     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}'`) });
+            const subNode = await this.loadNodeFromManifest(nodeManifest, nodeManifest.config.accountPath ?? `${index}'`, additionalCreatableModules);
             await node?.register(subNode);
-            await this.loadNodeFromManifest(subNode, nodeManifest, additionalCreatableModules);
             return subNode;
         }));
     }
@@ -53,7 +53,7 @@ export class ManifestWrapper extends PayloadWrapper {
             account: manifest.config.accountPath ? await this.wallet.derivePath(manifest.config.accountPath) : this.wallet,
             config: assertEx(manifest.config, 'Missing config'),
         });
-        await node.module.register(module);
+        await node.register(module);
         return module;
     }
 }

package/dist/esm/ManifestWrapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"ManifestWrapper.js","sourceRoot":"","sources":["../../src/ManifestWrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAEzC,OAAO,EAAE,UAAU,EAAc,WAAW,EAAE,MAAM,mBAAmB,CAAA;AACvE,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAG7D,OAAO,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAA;AAG1D,MAAM,OAAO,eAAgB,SAAQ,cAA+B;IAClB;IAAhD,YAAY,OAAwB,EAAY,MAAsB;QACpE,KAAK,CAAC,OAAO,CAAC,CAAA;QADgC,WAAM,GAAN,MAAM,CAAgB;IAEtE,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,IAA6B,EAAE,QAAwB,EAAE,QAAQ,GAAG,IAAI,EAAE,0BAAsD;QAC/I,MAAM,SAAS,GAAG,KAAK,EAAE,IAAgB,EAAE,IAAY,EAAE,QAAiB,EAAE,EAAE;YAC5E,MAAM,gBAAgB,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAA;YAC3I,OAAO,gBAAgB,IAAI,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,CAAA;QAC7F,CAAC,CAAA;QAED,MAAM,gBAAgB,GAAG,EAAE,GAAG,wBAAwB,EAAE,GAAG,0BAA0B,EAAE,CAAA;QACvF,IAAI,CAAC,CAAC,MAAM,SAAS,CAAC,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,EAAE;YAC5D,IAAI,QAAQ,CAAC,MAAM,CAAC,QAAQ,IAAI,QAAQ,CAAC,MAAM,CAAC,QAAQ,KAAK,YAAY,EAAE;gBACzE,QAAQ,CACN,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;oBAC3E,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,QAAQ,EAAE,gBAAgB,CAAC,CAAC,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,EACtG,iCAAiC,QAAQ,CAAC,MAAM,CAAC,IAAI,cAAc,CACpE,CAAA;aACF;SACF;IACH,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,IAAgB,EAAE,KAAa,EAAE,0BAAsD;QAC7G,OAAO,MAAM,IAAI,CAAC,oBAAoB,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,8BAA8B,CAAC,EAAE,0BAA0B,CAAC,CAAA;IAC9I,CAAC;IAED,KAAK,CAAC,oBAAoB,CAAC,IAAgB,EAAE,QAAsB,EAAE,0BAAsD;QACzH,MAAM,WAAW,GAAG,WAAW,CAAC,IAAI,CAA0B,IAAI,CAAC,CAAA;QACnE,uBAAuB;QACvB,MAAM,OAAO,CAAC,GAAG,CACf,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,CAAC,KAAK,EAAE,cAAc,EAAE,EAAE;YACtD,MAAM,IAAI,CAAC,UAAU,CAAC,WAAW,EAAE,cAAc,EAAE,KAAK,EAAE,0BAA0B,CAAC,CAAA;QACvF,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CACnB,CAAA;QAED,sBAAsB;QACtB,MAAM,OAAO,CAAC,GAAG,CACf,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,KAAK,EAAE,cAAc,EAAE,EAAE;YACrD,MAAM,IAAI,CAAC,UAAU,CAAC,WAAW,EAAE,cAAc,EAAE,IAAI,EAAE,0BAA0B,CAAC,CAAA;QACtF,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CACnB,CAAA;QAED,OAAO,IAAI,CAAA;IACb,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,IAAiB,EAAE,0BAAsD;QACvF,OAAO,MAAM,OAAO,CAAC,GAAG,CACtB,IAAI,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,YAAY,EAAE,KAAK,EAAE,EAAE;YACtD,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,yBAAyB,EAAE,EAAE,MAAM,EAAE,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,KAAK,GAAG,CAAC,EAAE,CAAC,CAAA;YAC7I,MAAM,IAAI,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAA;YAC7B,MAAM,IAAI,CAAC,oBAAoB,CAAC,OAAO,EAAE,YAAY,EAAE,0BAA0B,CAAC,CAAA;YAClF,OAAO,OAAO,CAAA;QAChB,CAAC,CAAC,CACH,CAAA;IACH,CAAC;IAED,YAAY,CAAC,KAAa;QACxB,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,CAAA;IACtC,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,IAA6B,EAAE,QAAwB,EAAE,gBAA4C;QACxH,MAAM,eAAe,GAAG,QAAQ,CAC9B,gBAAgB,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,EAC1C,mBAAmB,QAAQ,CAAC,MAAM,CAAC,MAAM,4CAA4C,CACtF,CAAA;QAED,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,MAAM,CAAC;YAC1C,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM;YAC9G,MAAM,EAAE,QAAQ,CAAC,QAAQ,CAAC,MAAM,EAAE,gBAAgB,CAAC;SACpD,CAAC,CAAA;QACF,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;QAClC,OAAO,MAAM,CAAA;IACf,CAAC;CACF"}
+{"version":3,"file":"ManifestWrapper.js","sourceRoot":"","sources":["../../src/ManifestWrapper.ts"],"names":[],"mappings":"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"}

package/dist/esm/index.js

@@ -1,4 +1,4 @@
 export * from './ManifestWrapper';
 export * from './ModuleFactory';
-export * from './Payload';
+export * from '@xyo-network/manifest-model';
 //# 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,cAAc,mBAAmB,CAAA;AACjC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,WAAW,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAA;AACjC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,6BAA6B,CAAA"}

package/dist/types/ManifestWrapper.d.ts

@@ -1,16 +1,16 @@
+import { ManifestPayload, ModuleManifest, NodeManifest } from '@xyo-network/manifest-model';
 import { CreatableModuleDictionary } from '@xyo-network/module';
-import { MemoryNode, NodeWrapper } from '@xyo-network/node';
+import { MemoryNode } from '@xyo-network/node';
 import { PayloadWrapper } from '@xyo-network/payload-wrapper';
 import { WalletInstance } from '@xyo-network/wallet-model';
-import { ManifestPayload, ModuleManifest, NodeManifest } from './Payload';
 export declare class ManifestWrapper extends PayloadWrapper<ManifestPayload> {
     protected wallet: WalletInstance;
     constructor(payload: ManifestPayload, wallet: WalletInstance);
-    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>>;
+    loadModule(node: MemoryNode, manifest: ModuleManifest, external?: boolean, additionalCreatableModules?: CreatableModuleDictionary): Promise<void>;
+    loadNodeFromIndex(index: number, additionalCreatableModules?: CreatableModuleDictionary): Promise<MemoryNode<import("@xyo-network/node").MemoryNodeParams, import("@xyo-network/node").NodeModuleEventData>>;
+    loadNodeFromManifest(manifest: NodeManifest, path: string, 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>;
+    registerModule(node: MemoryNode, manifest: ModuleManifest, creatableModules?: CreatableModuleDictionary): Promise<import("@xyo-network/module").Module>;
 }
 //# 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,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"}
+{"version":3,"file":"ManifestWrapper.d.ts","sourceRoot":"","sources":["../../src/ManifestWrapper.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAA;AAC3F,OAAO,EAAE,yBAAyB,EAAE,MAAM,qBAAqB,CAAA;AAC/D,OAAO,EAAE,UAAU,EAAc,MAAM,mBAAmB,CAAA;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAC7D,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAI1D,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,UAAU,EAAE,QAAQ,EAAE,cAAc,EAAE,QAAQ,UAAO,EAAE,0BAA0B,CAAC,EAAE,yBAAyB;IAkB9H,iBAAiB,CAAC,KAAK,EAAE,MAAM,EAAE,0BAA0B,CAAC,EAAE,yBAAyB;IAKvF,oBAAoB,CAAC,QAAQ,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,EAAE,0BAA0B,CAAC,EAAE,yBAAyB;IAmBjH,SAAS,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,0BAA0B,CAAC,EAAE,yBAAyB;IAUzF,YAAY,CAAC,KAAK,EAAE,MAAM;IAIpB,cAAc,CAAC,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,cAAc,EAAE,gBAAgB,CAAC,EAAE,yBAAyB;CAa9G"}

package/dist/types/index.d.ts

@@ -1,4 +1,4 @@
 export * from './ManifestWrapper';
 export * from './ModuleFactory';
-export * from './Payload';
+export * from '@xyo-network/manifest-model';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAA;AACjC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,WAAW,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAA;AACjC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,6BAA6B,CAAA"}

package/package.json

@@ -13,15 +13,14 @@
   "docs": "dist/docs.json",
   "dependencies": {
     "@xylabs/assert": "^2.9.3",
-    "@xyo-network/http-bridge": "^2.64.3",
-    "@xyo-network/memory-archivist": "^2.64.3",
-    "@xyo-network/module": "^2.64.3",
-    "@xyo-network/module-model": "^2.64.3",
-    "@xyo-network/node": "^2.64.3",
-    "@xyo-network/payload-model": "^2.64.3",
-    "@xyo-network/payload-wrapper": "^2.64.3",
-    "@xyo-network/sentinel": "^2.64.3",
-    "@xyo-network/wallet-model": "^2.64.3"
+    "@xyo-network/http-bridge": "^2.64.5",
+    "@xyo-network/manifest-model": "^2.64.5",
+    "@xyo-network/memory-archivist": "^2.64.5",
+    "@xyo-network/module": "^2.64.5",
+    "@xyo-network/node": "^2.64.5",
+    "@xyo-network/payload-wrapper": "^2.64.5",
+    "@xyo-network/sentinel": "^2.64.5",
+    "@xyo-network/wallet-model": "^2.64.5"
   },
   "devDependencies": {
     "@xylabs/ts-scripts-yarn3": "^2.18.5",
@@ -61,5 +60,5 @@
   },
   "sideEffects": false,
   "types": "dist/types/index.d.ts",
-  "version": "2.64.3"
+  "version": "2.64.5"
 }

package/src/ManifestWrapper.ts

@@ -1,18 +1,18 @@
 import { assertEx } from '@xylabs/assert'
+import { ManifestPayload, ModuleManifest, NodeManifest } from '@xyo-network/manifest-model'
 import { CreatableModuleDictionary } from '@xyo-network/module'
-import { MemoryNode, NodeModule, NodeWrapper } from '@xyo-network/node'
+import { MemoryNode, NodeModule } from '@xyo-network/node'
 import { PayloadWrapper } from '@xyo-network/payload-wrapper'
 import { WalletInstance } from '@xyo-network/wallet-model'
 
 import { standardCreatableModules } from './ModuleFactory'
-import { ManifestPayload, ModuleManifest, NodeManifest } from './Payload'
 
 export class ManifestWrapper extends PayloadWrapper<ManifestPayload> {
   constructor(payload: ManifestPayload, protected wallet: WalletInstance) {
     super(payload)
   }
 
-  async loadModule(node: NodeWrapper<MemoryNode>, manifest: ModuleManifest, external = true, additionalCreatableModules?: CreatableModuleDictionary) {
+  async loadModule(node: 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
@@ -30,23 +30,24 @@ export class ManifestWrapper extends PayloadWrapper<ManifestPayload> {
     }
   }
 
-  async loadNodeFromIndex(node: MemoryNode, index: number, additionalCreatableModules?: CreatableModuleDictionary) {
-    return await this.loadNodeFromManifest(node, assertEx(this.nodeManifest(index), 'Failed to find Node Manifest'), additionalCreatableModules)
+  async loadNodeFromIndex(index: number, additionalCreatableModules?: CreatableModuleDictionary) {
+    const manifest = assertEx(this.nodeManifest(index), 'Failed to find Node Manifest')
+    return await this.loadNodeFromManifest(manifest, manifest.config.accountPath ?? `${index}'`, additionalCreatableModules)
   }
 
-  async loadNodeFromManifest(node: MemoryNode, manifest: NodeManifest, additionalCreatableModules?: CreatableModuleDictionary) {
-    const nodeWrapper = NodeWrapper.wrap<NodeWrapper<MemoryNode>>(node)
+  async loadNodeFromManifest(manifest: NodeManifest, path: string, additionalCreatableModules?: CreatableModuleDictionary) {
+    const node = await MemoryNode.create({ config: manifest.config, wallet: await this.wallet.derivePath(path) })
     // Load Private Modules
     await Promise.all(
       manifest.modules?.private?.map(async (moduleManifest) => {
-        await this.loadModule(nodeWrapper, moduleManifest, false, additionalCreatableModules)
+        await this.loadModule(node, moduleManifest, false, additionalCreatableModules)
       }) ?? [() => null],
     )
 
     // Load Public Modules
     await Promise.all(
       manifest.modules?.public?.map(async (moduleManifest) => {
-        await this.loadModule(nodeWrapper, moduleManifest, true, additionalCreatableModules)
+        await this.loadModule(node, moduleManifest, true, additionalCreatableModules)
       }) ?? [() => null],
     )
 
@@ -56,9 +57,8 @@ export class ManifestWrapper extends PayloadWrapper<ManifestPayload> {
   async loadNodes(node?: MemoryNode, additionalCreatableModules?: CreatableModuleDictionary) {
     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}'`) })
+        const subNode = await this.loadNodeFromManifest(nodeManifest, nodeManifest.config.accountPath ?? `${index}'`, additionalCreatableModules)
         await node?.register(subNode)
-        await this.loadNodeFromManifest(subNode, nodeManifest, additionalCreatableModules)
         return subNode
       }),
     )
@@ -68,7 +68,7 @@ export class ManifestWrapper extends PayloadWrapper<ManifestPayload> {
     return this.payload().nodes?.[index]
   }
 
-  async registerModule(node: NodeWrapper<MemoryNode>, manifest: ModuleManifest, creatableModules?: CreatableModuleDictionary) {
+  async registerModule(node: MemoryNode, manifest: ModuleManifest, creatableModules?: CreatableModuleDictionary) {
     const creatableModule = assertEx(
       creatableModules?.[manifest.config.schema],
       `No module with [${manifest.config.schema}] config schema available for registration`,
@@ -78,7 +78,7 @@ export class ManifestWrapper extends PayloadWrapper<ManifestPayload> {
       account: manifest.config.accountPath ? await this.wallet.derivePath(manifest.config.accountPath) : this.wallet,
       config: assertEx(manifest.config, 'Missing config'),
     })
-    await node.module.register(module)
+    await node.register(module)
     return module
   }
 }

package/src/index.ts

@@ -1,3 +1,3 @@
 export * from './ManifestWrapper'
 export * from './ModuleFactory'
-export * from './Payload'
+export * from '@xyo-network/manifest-model'

package/dist/cjs/Payload.js

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

package/dist/cjs/Payload.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Payload.js","sourceRoot":"","sources":["../../src/Payload.ts"],"names":[],"mappings":";;;AAIa,QAAA,qBAAqB,GAA0B,sBAAsB,CAAA"}

package/dist/esm/Payload.js

@@ -1,2 +0,0 @@
-export const ManifestPayloadSchema = 'network.xyo.manifest';
-//# sourceMappingURL=Payload.js.map

package/dist/esm/Payload.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Payload.js","sourceRoot":"","sources":["../../src/Payload.ts"],"names":[],"mappings":"AAIA,MAAM,CAAC,MAAM,qBAAqB,GAA0B,sBAAsB,CAAA"}

package/dist/types/Payload.d.ts

@@ -1,30 +0,0 @@
-import { ModuleConfig } from '@xyo-network/module-model';
-import { Payload } from '@xyo-network/payload-model';
-export type ManifestPayloadSchema = 'network.xyo.manifest';
-export declare const ManifestPayloadSchema: ManifestPayloadSchema;
-export interface Manifest {
-    description?: string;
-}
-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 {
-    config: ConfigManifest;
-}
-export type ManifestPayload = Payload<{
-    modules?: Record<string, ModuleManifest>;
-    nodes: NodeManifest[];
-}, ManifestPayloadSchema>;
-//# sourceMappingURL=Payload.d.ts.map

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

@@ -1 +0,0 @@
-{"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/src/Payload.ts

@@ -1,36 +0,0 @@
-import { ModuleConfig } from '@xyo-network/module-model'
-import { Payload } from '@xyo-network/payload-model'
-
-export type ManifestPayloadSchema = 'network.xyo.manifest'
-export const ManifestPayloadSchema: ManifestPayloadSchema = 'network.xyo.manifest'
-
-export interface Manifest {
-  description?: string
-}
-
-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 {
-  config: ConfigManifest
-}
-
-export type ManifestPayload = Payload<
-  {
-    modules?: Record<string, ModuleManifest>
-    nodes: NodeManifest[]
-  },
-  ManifestPayloadSchema
->