@xyo-network/xl1-cli 1.18.5 → 1.19.0

package/dist/cli-min.mjs

@@ -17687,7 +17687,7 @@ function requireFollowRedirects () {
 var followRedirectsExports = requireFollowRedirects();
 var followRedirects = /*@__PURE__*/getDefaultExportFromCjs(followRedirectsExports);
 
-const VERSION$1 = "1.13.3";
+const VERSION$1 = "1.13.4";
 
 function parseProtocol(url) {
   const match = /^([-+\w]{1,25})(:?\/\/|:)/.exec(url);
@@ -20361,13 +20361,8 @@ let Axios$1 = class Axios {
 
       promise = Promise.resolve(config);
 
-      let prevResult = config;
       while (i < len) {
-        promise = promise
-            .then(chain[i++])
-            .then(result => { prevResult = result !== undefined ? result : prevResult; })
-            .catch(chain[i++])
-            .then(() => prevResult);
+        promise = promise.then(chain[i++], chain[i++]);
       }
 
       return promise;
@@ -20398,7 +20393,7 @@ let Axios$1 = class Axios {
     len = responseInterceptorChain.length;
 
     while (i < len) {
-      promise = promise.then(responseInterceptorChain[i++]).catch(responseInterceptorChain[i++]);
+      promise = promise.then(responseInterceptorChain[i++], responseInterceptorChain[i++]);
     }
 
     return promise;
@@ -71238,9 +71233,9 @@ var Elliptic = class {
   }
 };
 
-var __defProp$u = Object.defineProperty;
+var __defProp$v = Object.defineProperty;
 var __getOwnPropDesc$f = Object.getOwnPropertyDescriptor;
-var __defNormalProp$e = (obj, key, value) => key in obj ? __defProp$u(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __defNormalProp$e = (obj, key, value) => key in obj ? __defProp$v(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __decorateClass$f = (decorators, target, key, kind) => {
   var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$f(target, key) : target;
   for (var i = decorators.length - 1, decorator; i >= 0; i--)
@@ -71479,9 +71474,15 @@ var asAnyPayload = AsObjectFactory.create(isAnyPayload);
 function isPayloadOfSchemaType(schema) {
   return (x) => isAnyPayload(x) && x?.schema === schema;
 }
+var SchemaRegEx = /^(?:[a-z0-9]+\.)*[a-z0-9]+$/;
+var SchemaZod = z.string().regex(SchemaRegEx).transform((v) => v);
+var isSchema = zodIsFactory(SchemaZod);
+var asSchema = zodAsFactory(SchemaZod, "asSchema");
+var PayloadSchema = asSchema("network.xyo.payload", true);
+z.literal(PayloadSchema);
 
 // src/Error.ts
-var ModuleErrorSchema = "network.xyo.error.module";
+var ModuleErrorSchema = asSchema("network.xyo.error.module", true);
 function isPayloadOfZodType(zodSchema, schema) {
   return (x) => {
     if (!isAnyPayload(x)) return false;
@@ -71490,12 +71491,6 @@ function isPayloadOfZodType(zodSchema, schema) {
     return zodSchema.safeParse(data).success;
   };
 }
-var SchemaRegEx = /^(?:[a-z0-9]+\.)*[a-z0-9]+$/;
-var SchemaZod = z.string().regex(SchemaRegEx);
-var PayloadSchema = "network.xyo.payload";
-z.literal(PayloadSchema);
-var isSchema = zodIsFactory(SchemaZod);
-var asSchema = zodAsFactory(SchemaZod, "asSchema");
 var isLocalSequence = (value) => {
   return isHex(value) && value.length === SequenceConstants.localSequenceBytes * 2;
 };
@@ -71680,7 +71675,7 @@ var PayloadZodStrictOfSchema = (schema) => PayloadZodStrict.extend({ schema: z.l
 var PayloadZodLooseOfSchema = (schema) => PayloadZodLoose.extend({ schema: z.literal(schema) });
 
 // src/PayloadBundle.ts
-var PayloadBundleSchema = "network.xyo.payload.bundle";
+var PayloadBundleSchema = asSchema("network.xyo.payload.bundle", true);
 var PayloadBundleFieldsZod = z.object({
   payloads: PayloadZodLoose.array(),
   root: HashZod
@@ -71688,8 +71683,11 @@ var PayloadBundleFieldsZod = z.object({
 var PayloadBundleZod = PayloadZodOfSchema(PayloadBundleSchema).extend(PayloadBundleFieldsZod.shape);
 var isPayloadBundle = zodIsFactory(PayloadBundleZod);
 
+// src/PayloadSet/PayloadSetSchema.ts
+asSchema("network.xyo.payload.set", true);
+
 // src/Config/Config.ts
-var ModuleConfigSchema = "network.xyo.module.config";
+var ModuleConfigSchema = asSchema("network.xyo.module.config", true);
 
 // src/CreatableModule/CreatableModule.ts
 function creatableModule() {
@@ -71787,18 +71785,10 @@ var ModuleFactory = class _ModuleFactory {
     return new _ModuleFactory(this.creatableModule, params, labels);
   }
 };
-
-// src/Queries/Manifest.ts
-var ModuleManifestQuerySchema = "network.xyo.query.module.manifest";
-
-// src/Queries/ModuleAddress/Query.ts
-var ModuleAddressQuerySchema = "network.xyo.query.module.address";
-
-// src/Queries/State.ts
-var ModuleStateQuerySchema = "network.xyo.query.module.state";
-
-// src/Queries/Subscribe.ts
-var ModuleSubscribeQuerySchema = "network.xyo.query.module.subscribe";
+var ModuleManifestQuerySchema = asSchema("network.xyo.query.module.manifest", true);
+var ModuleAddressQuerySchema = asSchema("network.xyo.query.module.address", true);
+var ModuleStateQuerySchema = asSchema("network.xyo.query.module.state", true);
+var ModuleSubscribeQuerySchema = asSchema("network.xyo.query.module.subscribe", true);
 var requiredModuleShape = {
   address: "string",
   queries: "array",
@@ -71945,13 +71935,11 @@ var isModuleName = (value) => {
 var includesReservedModuleIdentifierCharacter = (value) => {
   return typeof value === "string" && [...value].some((char) => ReservedModuleIdentifierCharacters.has(char));
 };
-var AddressSchema = "network.xyo.address";
-
-// src/Payload/AddressPreviousHash.ts
-var AddressPreviousHashSchema = "network.xyo.address.hash.previous";
-
-// src/Payload/Description.ts
-var ModuleDescriptionSchema = "network.xyo.module.description";
+var AddressSchema = asSchema("network.xyo.address", true);
+asSchema("network.xyo.address.child", true);
+var AddressPreviousHashSchema = asSchema("network.xyo.address.hash.previous", true);
+var ModuleDescriptionSchema = asSchema("network.xyo.module.description", true);
+asSchema("network.xyo.module.state", true);
 
 // src/ResolveHelper/resolveAddressToInstance.ts
 var resolveAddressToInstanceDown = async (root, address, includePrivate = void 0, ignore = []) => {
@@ -72235,9 +72223,7 @@ var ResolveHelper = class _ResolveHelper extends ResolveHelperStatic {
 };
 
 // src/BoundWitness/BoundWitness.ts
-
-// src/BoundWitness/BoundWitnessSchema.ts
-var BoundWitnessSchema = "network.xyo.boundwitness";
+var BoundWitnessSchema = asSchema("network.xyo.boundwitness", true);
 var SignaturesMetaZod = z.object({ $signatures: z.array(z.union([HexZod, z.null()])) });
 var UnsignedSignaturesMetaZod = z.object({ $signatures: z.array(z.null()) });
 var SignedSignaturesMetaZod = z.object({ $signatures: z.array(HexZod).min(1) });
@@ -75318,8 +75304,10 @@ var boundWitnessJsonSchema = {
 };
 
 // src/Manifest.ts
-var ModuleManifestPayloadSchema = "network.xyo.module.manifest";
-var NodeManifestPayloadSchema = "network.xyo.node.manifest";
+asSchema("network.xyo.manifest.package.dapp", true);
+asSchema("network.xyo.manifest.package", true);
+var ModuleManifestPayloadSchema = asSchema("network.xyo.module.manifest", true);
+var NodeManifestPayloadSchema = asSchema("network.xyo.node.manifest", true);
 
 // src/Account.ts
 var isPhraseInitializationConfig = (value) => {
@@ -75345,33 +75333,16 @@ var isAccountInstance = (account) => {
 };
 
 // src/ArchivistSnapshot.ts
-
-// src/ArchivistStats.ts
-var ArchivistStatsPayloadSchema = "network.xyo.archivist.stats";
-
-// src/Queries/All.ts
-var ArchivistAllQuerySchema = "network.xyo.query.archivist.all";
-
-// src/Queries/Clear.ts
-var ArchivistClearQuerySchema = "network.xyo.query.archivist.clear";
-
-// src/Queries/Commit.ts
-var ArchivistCommitQuerySchema = "network.xyo.query.archivist.commit";
-
-// src/Queries/Delete.ts
-var ArchivistDeleteQuerySchema = "network.xyo.query.archivist.delete";
-
-// src/Queries/Get.ts
-var ArchivistGetQuerySchema = "network.xyo.query.archivist.get";
-
-// src/Queries/Insert.ts
-var ArchivistInsertQuerySchema = "network.xyo.query.archivist.insert";
-
-// src/Queries/Next.ts
-var ArchivistNextQuerySchema = "network.xyo.query.archivist.next";
-
-// src/Queries/Snapshot.ts
-var ArchivistSnapshotQuerySchema = "network.xyo.query.archivist.snapshot";
+asSchema("network.xyo.archivist.snapshot", true);
+var ArchivistStatsPayloadSchema = asSchema("network.xyo.archivist.stats", true);
+var ArchivistAllQuerySchema = asSchema("network.xyo.query.archivist.all", true);
+var ArchivistClearQuerySchema = asSchema("network.xyo.query.archivist.clear", true);
+var ArchivistCommitQuerySchema = asSchema("network.xyo.query.archivist.commit", true);
+var ArchivistDeleteQuerySchema = asSchema("network.xyo.query.archivist.delete", true);
+var ArchivistGetQuerySchema = asSchema("network.xyo.query.archivist.get", true);
+var ArchivistInsertQuerySchema = asSchema("network.xyo.query.archivist.insert", true);
+var ArchivistNextQuerySchema = asSchema("network.xyo.query.archivist.next", true);
+var ArchivistSnapshotQuerySchema = asSchema("network.xyo.query.archivist.snapshot", true);
 
 // src/typeChecks.ts
 var isArchivistInstance = new IsInstanceFactory().create({ get: "function" }, [isModuleInstance]);
@@ -75388,9 +75359,7 @@ var isAttachableArchivistInstance = factory$5.create(requiredAttachableArchivist
 
 // src/attachable/asAttachableInstance.ts
 var asAttachableArchivistInstance = AsObjectFactory.create(isAttachableArchivistInstance);
-
-// src/Config.ts
-var ArchivistConfigSchema = "network.xyo.archivist.config";
+var ArchivistConfigSchema = asSchema("network.xyo.archivist.config", true);
 var tryGetTypedBoundWitnessWithStorageMeta = async (archivist, hash, identity) => {
   const payload = (await archivist.get([hash])).at(0);
   return identity(payload) ? payload : void 0;
@@ -75626,14 +75595,10 @@ var QueryBoundWitnessBuilder = class extends BoundWitnessBuilder {
 };
 
 // src/Plugin.ts
-
-// src/Schema.ts
-var ConfigSchema = "network.xyo.config";
+var ConfigSchema = asSchema("network.xyo.config", true);
 
 // src/Plugin.ts
-
-// src/Schema.ts
-var QuerySchema = "network.xyo.query";
+var QuerySchema = asSchema("network.xyo.query", true);
 
 /**
  * @module LRUCache
@@ -77219,12 +77184,12 @@ class LRUCache {
     }
 }
 
-// src/Schema.ts
-var PayloadDivinerSchema = "network.xyo.diviner.payload";
+// src/Config.ts
+var PayloadDivinerSchema = asSchema("network.xyo.diviner.payload", true);
 
 // src/Config.ts
-var PayloadDivinerConfigSchema = `${PayloadDivinerSchema}.config`;
-var PayloadDivinerQuerySchema = `${PayloadDivinerSchema}.query`;
+var PayloadDivinerConfigSchema = asSchema(`${PayloadDivinerSchema}.config`, true);
+var PayloadDivinerQuerySchema = asSchema(`${PayloadDivinerSchema}.query`, true);
 var isPayloadDivinerQueryPayload = isPayloadOfSchemaType(PayloadDivinerQuerySchema);
 var asPayloadDivinerQueryPayload = AsObjectFactory.create(isPayloadDivinerQueryPayload);
 
@@ -77545,21 +77510,11 @@ var CompositeModuleResolver = class _CompositeModuleResolver extends AbstractMod
 };
 
 // src/attachable/asAttachableInstance.ts
-
-// src/Queries/Attach.ts
-var NodeAttachQuerySchema = "network.xyo.query.node.attach";
-
-// src/Queries/Attached.ts
-var NodeAttachedQuerySchema = "network.xyo.query.node.attached";
-
-// src/Queries/Certify.ts
-var NodeCertifyQuerySchema = "network.xyo.query.node.certify";
-
-// src/Queries/Detach.ts
-var NodeDetachQuerySchema = "network.xyo.query.node.detach";
-
-// src/Queries/Registered.ts
-var NodeRegisteredQuerySchema = "network.xyo.query.node.registered";
+var NodeAttachQuerySchema = asSchema("network.xyo.query.node.attach", true);
+var NodeAttachedQuerySchema = asSchema("network.xyo.query.node.attached", true);
+var NodeCertifyQuerySchema = asSchema("network.xyo.query.node.certify", true);
+var NodeDetachQuerySchema = asSchema("network.xyo.query.node.detach", true);
+var NodeRegisteredQuerySchema = asSchema("network.xyo.query.node.registered", true);
 
 // src/typeChecks.ts
 var instanceFactory = new IsInstanceFactory();
@@ -77586,12 +77541,8 @@ var isAttachableNodeInstance = factory$4.create(requiredAttachableNodeInstanceFu
 
 // src/attachable/asAttachableInstance.ts
 var asAttachableNodeInstance = AsObjectFactory.create(isAttachableNodeInstance);
-
-// src/ChildCertification.ts
-var ChildCertificationSchema = "network.xyo.child.certification";
-
-// src/Config.ts
-var NodeConfigSchema = "network.xyo.node.config";
+var ChildCertificationSchema = asSchema("network.xyo.child.certification", true);
+var NodeConfigSchema = asSchema("network.xyo.node.config", true);
 
 // src/AbstractModule.ts
 var isDetermineAccountFromAccountParams = (params) => {
@@ -77662,12 +77613,14 @@ var ModuleConfigQueryValidator = class {
   constructor(config) {
     if (config?.security?.allowed) {
       for (const [schema, addresses] of Object.entries(config.security?.allowed)) {
-        this.allowed[schema] = addresses.map(toAddressesString);
+        const typedSchema = asSchema(schema, true);
+        this.allowed[typedSchema] = addresses.map(toAddressesString);
       }
     }
     if (config?.security?.disallowed) {
       for (const [schema, addresses] of Object.entries(config.security?.disallowed)) {
-        this.disallowed[schema] = addresses.map(toAddressesString);
+        const typedSchema = asSchema(schema, true);
+        this.disallowed[typedSchema] = addresses.map(toAddressesString);
       }
     }
     this.hasAllowedRules = Object.keys(this.allowed).length > 0;
@@ -77939,7 +77892,7 @@ var AbstractModule = class _AbstractModule extends AbstractCreatable {
           });
         }
         if (this.timestamp) {
-          const timestamp = { schema: "network.xyo.timestamp", timestamp: Date.now() };
+          const timestamp = { schema: asSchema("network.xyo.timestamp", true), timestamp: Date.now() };
           resultPayloads.push(timestamp);
         }
         const result = await this.bindQueryResult(sourceQuery, resultPayloads, queryAccount ? [queryAccount] : [], errorPayloads);
@@ -78093,7 +78046,8 @@ var AbstractModule = class _AbstractModule extends AbstractCreatable {
     const resultPayloads = [];
     switch (queryPayload.schema) {
       case ModuleManifestQuerySchema: {
-        resultPayloads.push(await this.manifestHandler(queryPayload.maxDepth));
+        const typedQueryPayload = queryPayload;
+        resultPayloads.push(await this.manifestHandler(typedQueryPayload.maxDepth));
         break;
       }
       case ModuleAddressQuerySchema: {
@@ -78199,6 +78153,9 @@ var AbstractModuleInstance = class _AbstractModuleInstance extends AbstractModul
   get root() {
     return this;
   }
+  get timeBudget() {
+    return this.config.timeBudget;
+  }
   get upResolver() {
     this._upResolver = this._upResolver ?? new CompositeModuleResolver({
       allowNameResolution: this.allowNameResolution,
@@ -78510,6 +78467,7 @@ var AbstractNode = class _AbstractNode extends AbstractModuleInstance {
     this._cachedManifests.set(maxDepth, manifest);
     return manifest;
   }
+  // eslint-disable-next-line max-statements
   async queryHandler(query, payloads, queryConfig) {
     const wrapper = QueryBoundWitnessWrapper.parseQuery(query, payloads);
     const queryPayload = await wrapper.getQuery();
@@ -78517,7 +78475,8 @@ var AbstractNode = class _AbstractNode extends AbstractModuleInstance {
     const resultPayloads = [];
     switch (queryPayload.schema) {
       case NodeAttachQuerySchema: {
-        const address = await this.attachHandler(queryPayload.id, queryPayload.external);
+        const typedQueryPayload = queryPayload;
+        const address = await this.attachHandler(typedQueryPayload.id, typedQueryPayload.external);
         if (address) {
           const payload = new PayloadBuilder({ schema: AddressSchema }).fields({ address }).build();
           resultPayloads.push(payload);
@@ -78525,7 +78484,8 @@ var AbstractNode = class _AbstractNode extends AbstractModuleInstance {
         break;
       }
       case NodeCertifyQuerySchema: {
-        const fields = await this.certifyHandler(queryPayload.id);
+        const typedQueryPayload = queryPayload;
+        const fields = await this.certifyHandler(typedQueryPayload.id);
         if (fields) {
           const payload = new PayloadBuilder({ schema: ChildCertificationSchema }).fields(fields).build();
           resultPayloads.push(payload);
@@ -78533,7 +78493,8 @@ var AbstractNode = class _AbstractNode extends AbstractModuleInstance {
         break;
       }
       case NodeDetachQuerySchema: {
-        const address = await this.detachHandler(queryPayload.id);
+        const typedQueryPayload = queryPayload;
+        const address = await this.detachHandler(typedQueryPayload.id);
         if (address) {
           const payload = new PayloadBuilder({ schema: AddressSchema }).fields({ address }).build();
           resultPayloads.push(payload);
@@ -81599,9 +81560,9 @@ zero
 zone
 zoo`.split('\n');
 
-var __defProp$t = Object.defineProperty;
+var __defProp$u = Object.defineProperty;
 var __getOwnPropDesc$d = Object.getOwnPropertyDescriptor;
-var __defNormalProp$d = (obj, key, value) => key in obj ? __defProp$t(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __defNormalProp$d = (obj, key, value) => key in obj ? __defProp$u(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __decorateClass$d = (decorators, target, key, kind) => {
   var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$d(target, key) : target;
   for (var i = decorators.length - 1, decorator; i >= 0; i--)
@@ -81906,7 +81867,7 @@ var AbstractArchivist = class _AbstractArchivist extends AbstractModuleInstance
       } finally {
         this.globalReentrancyMutex?.release();
       }
-    }, { timeBudgetLimit: 100 });
+    }, { timeBudgetLimit: this.timeBudget });
   }
   /** deprecated use nextQuery or snapshotQuery instead */
   async allQuery(account) {
@@ -81932,7 +81893,7 @@ var AbstractArchivist = class _AbstractArchivist extends AbstractModuleInstance
       } finally {
         this.globalReentrancyMutex?.release();
       }
-    }, { timeBudgetLimit: 100 });
+    }, { timeBudgetLimit: this.timeBudget });
   }
   async clearQuery(account) {
     this._noOverride("clearQuery");
@@ -81955,7 +81916,7 @@ var AbstractArchivist = class _AbstractArchivist extends AbstractModuleInstance
       } finally {
         this.globalReentrancyMutex?.release();
       }
-    }, { timeBudgetLimit: 200 });
+    }, { timeBudgetLimit: this.timeBudget });
   }
   async commitQuery(account) {
     this._noOverride("commitQuery");
@@ -81978,7 +81939,7 @@ var AbstractArchivist = class _AbstractArchivist extends AbstractModuleInstance
       } finally {
         this.globalReentrancyMutex?.release();
       }
-    }, { timeBudgetLimit: 200 });
+    }, { timeBudgetLimit: this.timeBudget });
   }
   async deleteQuery(hashes, account) {
     this._noOverride("deleteQuery");
@@ -82001,7 +81962,7 @@ var AbstractArchivist = class _AbstractArchivist extends AbstractModuleInstance
       } finally {
         this.globalReentrancyMutex?.release();
       }
-    }, { timeBudgetLimit: 200 });
+    }, { timeBudgetLimit: this.timeBudget });
   }
   async getQuery(hashes, account) {
     this._noOverride("getQuery");
@@ -82024,7 +81985,7 @@ var AbstractArchivist = class _AbstractArchivist extends AbstractModuleInstance
       } finally {
         this.globalReentrancyMutex?.release();
       }
-    }, { timeBudgetLimit: 200 });
+    }, { timeBudgetLimit: this.timeBudget });
   }
   async insertQuery(payloads, account) {
     this._noOverride("insertQuery");
@@ -82048,7 +82009,7 @@ var AbstractArchivist = class _AbstractArchivist extends AbstractModuleInstance
       } finally {
         this.globalReentrancyMutex?.release();
       }
-    }, { timeBudgetLimit: 200 });
+    }, { timeBudgetLimit: this.timeBudget });
   }
   async nextQuery(options, account) {
     this._noOverride("nextQuery");
@@ -82071,7 +82032,7 @@ var AbstractArchivist = class _AbstractArchivist extends AbstractModuleInstance
       } finally {
         this.globalReentrancyMutex?.release();
       }
-    }, { timeBudgetLimit: 200 });
+    }, { timeBudgetLimit: this.timeBudget });
   }
   async snapshotQuery(account) {
     this._noOverride("snapshotQuery");
@@ -82253,6 +82214,7 @@ var AbstractArchivist = class _AbstractArchivist extends AbstractModuleInstance
   payloadCountHandler() {
     return -1;
   }
+  // eslint-disable-next-line max-statements
   async queryHandler(query, payloads, queryConfig) {
     const sanitizedQuery = PayloadBuilder.omitStorageMeta(query);
     const sanitizedPayloads = PayloadBuilder.omitStorageMeta(payloads);
@@ -82274,11 +82236,13 @@ var AbstractArchivist = class _AbstractArchivist extends AbstractModuleInstance
         break;
       }
       case ArchivistDeleteQuerySchema: {
-        resultPayloads.push(...await this.deleteWithConfig(queryPayload.hashes));
+        const typedQueryPayload = queryPayload;
+        resultPayloads.push(...await this.deleteWithConfig(typedQueryPayload.hashes));
         break;
       }
       case ArchivistGetQuerySchema: {
-        resultPayloads.push(...await this.getWithConfig(queryPayload.hashes ?? []));
+        const typedQueryPayload = queryPayload;
+        resultPayloads.push(...await this.getWithConfig(typedQueryPayload.hashes ?? []));
         break;
       }
       case ArchivistInsertQuerySchema: {
@@ -82286,7 +82250,8 @@ var AbstractArchivist = class _AbstractArchivist extends AbstractModuleInstance
         break;
       }
       case ArchivistNextQuerySchema: {
-        resultPayloads.push(...await this.nextHandler(queryPayload));
+        const typedQueryPayload = queryPayload;
+        resultPayloads.push(...await this.nextHandler(typedQueryPayload));
         break;
       }
       case ArchivistSnapshotQuerySchema: {
@@ -82374,11 +82339,11 @@ var AbstractArchivist = class _AbstractArchivist extends AbstractModuleInstance
   }
 };
 
-var __defProp$s = Object.defineProperty;
+var __defProp$t = Object.defineProperty;
 var __getOwnPropDesc$c = Object.getOwnPropertyDescriptor;
 var __getProtoOf$6 = Object.getPrototypeOf;
 var __reflectGet$6 = Reflect.get;
-var __defNormalProp$c = (obj, key, value) => key in obj ? __defProp$s(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __defNormalProp$c = (obj, key, value) => key in obj ? __defProp$t(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __decorateClass$c = (decorators, target, key, kind) => {
   var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$c(target, key) : target;
   for (var i = decorators.length - 1, decorator; i >= 0; i--)
@@ -82388,9 +82353,7 @@ var __decorateClass$c = (decorators, target, key, kind) => {
 };
 var __publicField$c = (obj, key, value) => __defNormalProp$c(obj, typeof key !== "symbol" ? key + "" : key, value);
 var __superGet$6 = (cls, obj, key) => __reflectGet$6(__getProtoOf$6(cls), key, obj);
-
-// src/Config.ts
-var GenericArchivistConfigSchema = "network.xyo.archivist.generic.config";
+var GenericArchivistConfigSchema = asSchema("network.xyo.archivist.generic.config", true);
 
 // src/Archivist.ts
 var GenericArchivist = class extends AbstractArchivist {
@@ -82457,11 +82420,11 @@ GenericArchivist = __decorateClass$c([
   creatableModule()
 ], GenericArchivist);
 
-var __defProp$r = Object.defineProperty;
+var __defProp$s = Object.defineProperty;
 var __getOwnPropDesc$b = Object.getOwnPropertyDescriptor;
 var __getProtoOf$5 = Object.getPrototypeOf;
 var __reflectGet$5 = Reflect.get;
-var __defNormalProp$b = (obj, key, value) => key in obj ? __defProp$r(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __defNormalProp$b = (obj, key, value) => key in obj ? __defProp$s(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __decorateClass$b = (decorators, target, key, kind) => {
   var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$b(target, key) : target;
   for (var i = decorators.length - 1, decorator; i >= 0; i--)
@@ -82471,9 +82434,7 @@ var __decorateClass$b = (decorators, target, key, kind) => {
 };
 var __publicField$b = (obj, key, value) => __defNormalProp$b(obj, typeof key !== "symbol" ? key + "" : key, value);
 var __superGet$5 = (cls, obj, key) => __reflectGet$5(__getProtoOf$5(cls), key, obj);
-
-// src/Config.ts
-var MemoryArchivistConfigSchema = "network.xyo.archivist.memory.config";
+var MemoryArchivistConfigSchema = asSchema("network.xyo.archivist.memory.config", true);
 var MemoryDriver = class extends AbstractCreatable {
   _cache;
   _config;
@@ -82595,11 +82556,11 @@ MemoryArchivist = __decorateClass$b([
   creatableModule()
 ], MemoryArchivist);
 
-var __defProp$q = Object.defineProperty;
+var __defProp$r = Object.defineProperty;
 var __getOwnPropDesc$a = Object.getOwnPropertyDescriptor;
 var __getProtoOf$4 = Object.getPrototypeOf;
 var __reflectGet$4 = Reflect.get;
-var __defNormalProp$a = (obj, key, value) => key in obj ? __defProp$q(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __defNormalProp$a = (obj, key, value) => key in obj ? __defProp$r(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __decorateClass$a = (decorators, target, key, kind) => {
   var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$a(target, key) : target;
   for (var i = decorators.length - 1, decorator; i >= 0; i--)
@@ -82609,7 +82570,7 @@ var __decorateClass$a = (decorators, target, key, kind) => {
 };
 var __publicField$a = (obj, key, value) => __defNormalProp$a(obj, typeof key !== "symbol" ? key + "" : key, value);
 var __superGet$4 = (cls, obj, key) => __reflectGet$4(__getProtoOf$4(cls), key, obj);
-var ViewArchivistConfigSchema = "network.xyo.archivist.view.config";
+var ViewArchivistConfigSchema = asSchema("network.xyo.archivist.view.config", true);
 var ViewArchivist = class extends AbstractArchivist {
   _originArchivistInstance;
   get originArchivist() {
@@ -82641,19 +82602,11 @@ ViewArchivist = __decorateClass$a([
 ], ViewArchivist);
 
 // src/attachable/asAttachableInstance.ts
-
-// src/Queries/Connect.ts
-var BridgeConnectQuerySchema = "network.xyo.query.bridge.connect";
-
-// src/Queries/Disconnect.ts
-var BridgeDisconnectQuerySchema = "network.xyo.query.bridge.disconnect";
-
-// src/Queries/Expose.ts
-var BridgeExposeQuerySchema = "network.xyo.query.bridge.expose";
-var ModuleFilterPayloadSchema = "network.xyo.module.filter";
-
-// src/Queries/Unexpose.ts
-var BridgeUnexposeQuerySchema = "network.xyo.query.bridge.unexpose";
+var BridgeConnectQuerySchema = asSchema("network.xyo.query.bridge.connect", true);
+var BridgeDisconnectQuerySchema = asSchema("network.xyo.query.bridge.disconnect", true);
+var BridgeExposeQuerySchema = asSchema("network.xyo.query.bridge.expose", true);
+var ModuleFilterPayloadSchema = asSchema("network.xyo.module.filter", true);
+var BridgeUnexposeQuerySchema = asSchema("network.xyo.query.bridge.unexpose", true);
 
 // src/typeChecks.ts
 var isBridgeInstance = new IsInstanceFactory().create(
@@ -82669,13 +82622,11 @@ factory$3.create(requiredAttachableBridgeInstanceFunctions, [
   isBridgeInstance,
   isAttachableModuleInstance
 ]);
+var BridgeConfigSchema = asSchema("network.xyo.bridge.config", true);
 
-// src/Config.ts
-var BridgeConfigSchema = "network.xyo.bridge.config";
-
-var __defProp$p = Object.defineProperty;
+var __defProp$q = Object.defineProperty;
 var __getOwnPropDesc$9 = Object.getOwnPropertyDescriptor;
-var __defNormalProp$9 = (obj, key, value) => key in obj ? __defProp$p(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __defNormalProp$9 = (obj, key, value) => key in obj ? __defProp$q(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __decorateClass$9 = (decorators, target, key, kind) => {
   var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$9(target, key) : target;
   for (var i = decorators.length - 1, decorator; i >= 0; i--)
@@ -83025,9 +82976,7 @@ var ArchivistWrapper = class extends ModuleWrapper {
 };
 
 // src/attachable/asAttachableInstance.ts
-
-// src/Queries/Divine.ts
-var DivinerDivineQuerySchema = "network.xyo.query.diviner.divine";
+var DivinerDivineQuerySchema = asSchema("network.xyo.query.diviner.divine", true);
 
 // src/typeChecks.ts
 var isDivinerInstance = new IsInstanceFactory().create({ divine: "function" }, [isModuleInstance]);
@@ -83041,9 +82990,7 @@ factory$2.create(requiredAttachableDivinerInstanceFunctions, [
   isDivinerInstance,
   isAttachableModuleInstance
 ]);
-
-// src/Config.ts
-var DivinerConfigSchema = "network.xyo.diviner.config";
+var DivinerConfigSchema = asSchema("network.xyo.diviner.config", true);
 
 // src/DivinerWrapper.ts
 var DivinerWrapper = class extends ModuleWrapper {
@@ -83133,9 +83080,7 @@ var NodeWrapper = class extends ModuleWrapper {
 };
 
 // src/attachable/asAttachableInstance.ts
-
-// src/Queries/Report.ts
-var SentinelReportQuerySchema = "network.xyo.query.sentinel.report";
+var SentinelReportQuerySchema = asSchema("network.xyo.query.sentinel.report", true);
 
 // src/typeChecks.ts
 var isSentinelInstance = new IsInstanceFactory().create({ report: "function" }, [isModuleInstance]);
@@ -83149,11 +83094,11 @@ factory$1.create(requiredAttachableSentinelInstanceFunctions, [
   isSentinelInstance,
   isAttachableModuleInstance
 ]);
-var SentinelIntervalAutomationSchema = "network.xyo.automation.interval";
+asSchema("network.xyo.automation", true);
+var SentinelIntervalAutomationSchema = asSchema("network.xyo.automation.interval", true);
+asSchema("network.xyo.automation.event.module", true);
 var isSentinelIntervalAutomation = isPayloadOfSchemaType(SentinelIntervalAutomationSchema);
-
-// src/Config.ts
-var SentinelConfigSchema = "network.xyo.sentinel.config";
+var SentinelConfigSchema = asSchema("network.xyo.sentinel.config", true);
 
 // src/Wrapper.ts
 var SentinelWrapper = class extends ModuleWrapper {
@@ -83177,9 +83122,7 @@ var SentinelWrapper = class extends ModuleWrapper {
 };
 
 // src/attachable/asAttachableInstance.ts
-
-// src/Queries/Observe.ts
-var WitnessObserveQuerySchema = "network.xyo.query.witness.observe";
+var WitnessObserveQuerySchema = asSchema("network.xyo.query.witness.observe", true);
 
 // src/typeChecks.ts
 var isWitnessInstance = new IsInstanceFactory().create({ observe: "function" }, [isModuleInstance]);
@@ -83193,9 +83136,7 @@ factory.create(requiredAttachableWitnessInstanceFunctions, [
   isWitnessInstance,
   isAttachableModuleInstance
 ]);
-
-// src/Config.ts
-var WitnessConfigSchema = "network.xyo.witness.config";
+var WitnessConfigSchema = asSchema("network.xyo.witness.config", true);
 
 // src/WitnessWrapper.ts
 var WitnessWrapper = class extends ModuleWrapper {
@@ -83662,11 +83603,11 @@ var AbstractModuleProxy = class extends AbstractModuleInstance {
   }
 };
 
-var __defProp$o = Object.defineProperty;
+var __defProp$p = Object.defineProperty;
 var __getOwnPropDesc$8 = Object.getOwnPropertyDescriptor;
 var __getProtoOf$3 = Object.getPrototypeOf;
 var __reflectGet$3 = Reflect.get;
-var __defNormalProp$8 = (obj, key, value) => key in obj ? __defProp$o(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __defNormalProp$8 = (obj, key, value) => key in obj ? __defProp$p(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __decorateClass$8 = (decorators, target, key, kind) => {
   var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$8(target, key) : target;
   for (var i = decorators.length - 1, decorator; i >= 0; i--)
@@ -83676,9 +83617,7 @@ var __decorateClass$8 = (decorators, target, key, kind) => {
 };
 var __publicField$8 = (obj, key, value) => __defNormalProp$8(obj, typeof key !== "symbol" ? key + "" : key, value);
 var __superGet$3 = (cls, obj, key) => __reflectGet$3(__getProtoOf$3(cls), key, obj);
-
-// src/HttpBridgeConfig.ts
-var HttpBridgeConfigSchema = "network.xyo.bridge.http.config";
+var HttpBridgeConfigSchema = asSchema("network.xyo.bridge.http.config", true);
 var HttpModuleProxy = class extends AbstractModuleProxy {
   async proxyQueryHandler(query, payloads = []) {
     if (this.archiving && this.isAllowedArchivingQuery(query.schema)) {
@@ -84113,11 +84052,11 @@ var AbstractDiviner = class _AbstractDiviner extends AbstractModuleInstance {
   }
 };
 
-// src/Schema.ts
-var BoundWitnessDivinerSchema = "network.xyo.diviner.boundwitness";
+// src/Config.ts
+var BoundWitnessDivinerSchema = asSchema("network.xyo.diviner.boundwitness", true);
 
 // src/Config.ts
-var BoundWitnessDivinerConfigSchema = `${BoundWitnessDivinerSchema}.config`;
+var BoundWitnessDivinerConfigSchema = asSchema(`${BoundWitnessDivinerSchema}.config`, true);
 var BoundWitnessDivinerQuerySchema = asSchema(`${BoundWitnessDivinerSchema}.query`, true);
 var isBoundWitnessDivinerQueryPayload = isPayloadOfSchemaType(BoundWitnessDivinerQuerySchema);
 
@@ -84171,9 +84110,9 @@ var MemoryBoundWitnessDiviner = class extends BoundWitnessDiviner {
   }
 };
 
-var __defProp$n = Object.defineProperty;
+var __defProp$o = Object.defineProperty;
 var __getOwnPropDesc$7 = Object.getOwnPropertyDescriptor;
-var __defNormalProp$7 = (obj, key, value) => key in obj ? __defProp$n(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __defNormalProp$7 = (obj, key, value) => key in obj ? __defProp$o(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __decorateClass$7 = (decorators, target, key, kind) => {
   var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$7(target, key) : target;
   for (var i = decorators.length - 1, decorator; i >= 0; i--)
@@ -84187,7 +84126,7 @@ var IdentityDiviner = class extends AbstractDiviner {
     return assertEx(payloads, () => "IdentityDiviner requires passed payload");
   }
 };
-__publicField$7(IdentityDiviner, "targetSchema", "network.xyo.test");
+__publicField$7(IdentityDiviner, "targetSchema", asSchema("network.xyo.test", true));
 IdentityDiviner = __decorateClass$7([
   creatableModule()
 ], IdentityDiviner);
@@ -84198,11 +84137,11 @@ var PayloadDiviner = class extends AbstractDiviner {
   static defaultConfigSchema = PayloadDivinerConfigSchema;
 };
 
-var __defProp$m = Object.defineProperty;
+var __defProp$n = Object.defineProperty;
 var __getOwnPropDesc$6 = Object.getOwnPropertyDescriptor;
 var __getProtoOf$2 = Object.getPrototypeOf;
 var __reflectGet$2 = Reflect.get;
-var __defNormalProp$6 = (obj, key, value) => key in obj ? __defProp$m(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __defNormalProp$6 = (obj, key, value) => key in obj ? __defProp$n(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __decorateClass$6 = (decorators, target, key, kind) => {
   var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$6(target, key) : target;
   for (var i = decorators.length - 1, decorator; i >= 0; i--)
@@ -84214,7 +84153,7 @@ var __publicField$6 = (obj, key, value) => __defNormalProp$6(obj, typeof key !==
 var __superGet$2 = (cls, obj, key) => __reflectGet$2(__getProtoOf$2(cls), key, obj);
 var DEFAULT_INDEX_BATCH_SIZE = 100;
 var DEFAULT_MAX_INDEX_SIZE = 8e3;
-var GenericPayloadDivinerConfigSchema = "network.xyo.diviner.payload.generic.config";
+var GenericPayloadDivinerConfigSchema = asSchema("network.xyo.diviner.payload.generic.config", true);
 var GenericPayloadDiviner = class extends PayloadDiviner {
   indexMaps = {};
   payloadsWithMeta = [];
@@ -84344,11 +84283,11 @@ GenericPayloadDiviner = __decorateClass$6([
   creatableModule()
 ], GenericPayloadDiviner);
 
-var __defProp$l = Object.defineProperty;
+var __defProp$m = Object.defineProperty;
 var __getOwnPropDesc$5 = Object.getOwnPropertyDescriptor;
 var __getProtoOf$1 = Object.getPrototypeOf;
 var __reflectGet$1 = Reflect.get;
-var __defNormalProp$5 = (obj, key, value) => key in obj ? __defProp$l(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __defNormalProp$5 = (obj, key, value) => key in obj ? __defProp$m(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __decorateClass$5 = (decorators, target, key, kind) => {
   var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$5(target, key) : target;
   for (var i = decorators.length - 1, decorator; i >= 0; i--)
@@ -84358,7 +84297,7 @@ var __decorateClass$5 = (decorators, target, key, kind) => {
 };
 var __publicField$5 = (obj, key, value) => __defNormalProp$5(obj, typeof key !== "symbol" ? key + "" : key, value);
 var __superGet$1 = (cls, obj, key) => __reflectGet$1(__getProtoOf$1(cls), key, obj);
-var ViewNodeConfigSchema = "network.xyo.node.view.config";
+var ViewNodeConfigSchema = asSchema("network.xyo.node.view.config", true);
 var ViewNode = class extends MemoryNode {
   _buildMutex = new Mutex$1();
   _built = false;
@@ -84943,7 +84882,7 @@ var AbstractWitness = class _AbstractWitness extends AbstractModuleInstance {
 };
 
 // src/Witness.ts
-var AdhocWitnessConfigSchema = "network.xyo.witness.adhoc.config";
+var AdhocWitnessConfigSchema = asSchema("network.xyo.witness.adhoc.config", true);
 var AdhocWitness = class extends AbstractWitness {
   static configSchemas = [...super.configSchemas, AdhocWitnessConfigSchema];
   static defaultConfigSchema = AdhocWitnessConfigSchema;
@@ -85012,10 +84951,11 @@ var ModuleFactoryLocator = class _ModuleFactoryLocator {
   merge(locator) {
     const registry = { ...this.registry };
     for (const schema in locator.registry) {
-      if (registry[schema]) {
-        registry[schema].push(...locator.registry[schema] ?? []);
+      const typedSchema = asSchema(schema, true);
+      if (registry[typedSchema]) {
+        registry[typedSchema].push(...locator.registry[typedSchema] ?? []);
       } else {
-        registry[schema] = locator.registry[schema];
+        registry[typedSchema] = locator.registry[typedSchema];
       }
     }
     return new _ModuleFactoryLocator(registry);
@@ -85052,9 +84992,7 @@ var ModuleFactoryLocator = class _ModuleFactoryLocator {
 };
 
 // src/Payload.ts
-
-// src/Schema.ts
-var SchemaSchema = "network.xyo.schema";
+var SchemaSchema = asSchema("network.xyo.schema", true);
 
 // src/Payload.ts
 var isSchemaPayload = isPayloadOfSchemaType(SchemaSchema);
@@ -85179,7 +85117,7 @@ var BridgeDetailsFieldsZod = BridgeDetailsSourceFieldsZod.extend(
 );
 
 // src/payload/elevatable/Bridge/BridgeDestinationObservation.ts
-var BridgeDestinationObservationSchema = "network.xyo.chain.bridge.observation.destination";
+var BridgeDestinationObservationSchema = asSchema("network.xyo.chain.bridge.observation.destination", true);
 var BridgeDestinationObservationFieldsZod = BridgeDetailsFieldsZod.extend({
   /**
    * Destination chain confirmation
@@ -85190,7 +85128,7 @@ var isBridgeDestinationObservation = isPayloadOfZodType(
   BridgeDestinationObservationFieldsZod,
   BridgeDestinationObservationSchema
 );
-var BridgeIntentSchema = "network.xyo.chain.bridge.intent";
+var BridgeIntentSchema = asSchema("network.xyo.chain.bridge.intent", true);
 var BridgeIntentFieldsZod = BridgeDetailsFieldsZod.extend({
   /**
    * Unique identifier for replay protection
@@ -85201,7 +85139,7 @@ var isBridgeIntent = isPayloadOfZodType(
   BridgeIntentFieldsZod,
   BridgeIntentSchema
 );
-var BridgeSourceObservationSchema = "network.xyo.chain.bridge.observation.source";
+var BridgeSourceObservationSchema = asSchema("network.xyo.chain.bridge.observation.source", true);
 var BridgeSourceObservationFieldsZod = BridgeDetailsFieldsZod.extend({
   /**
    * Source chain confirmation
@@ -85212,7 +85150,7 @@ var isBridgeSourceObservation = isPayloadOfZodType(
   BridgeSourceObservationFieldsZod,
   BridgeSourceObservationSchema
 );
-var ChainStakeIntentSchema = "network.xyo.chain.stake.intent";
+var ChainStakeIntentSchema = asSchema("network.xyo.chain.stake.intent", true);
 var isChainStakeIntent = (x) => {
   return isPayloadOfSchemaType(ChainStakeIntentSchema)(x) && asNonNegativeInteger(x.nbf) !== void 0 && asNonNegativeInteger(x.exp) !== void 0;
 };
@@ -85226,10 +85164,10 @@ var asNonNegativeInteger = (num) => {
 var isExecutable = (value) => {
   return isAnyPayload(value) && Array.isArray(value.script);
 };
-var HashSchema = "network.xyo.hash";
+var HashSchema = asSchema("network.xyo.hash", true);
 var isHashPayload = isPayloadOfSchemaType(HashSchema);
-var StepCompleteSchema = "network.xyo.chain.step.complete";
-var TimeSchema = "network.xyo.time";
+var StepCompleteSchema = asSchema("network.xyo.chain.step.complete", true);
+var TimeSchema = asSchema("network.xyo.time", true);
 var XL1TimeFieldsZod = object$4({
   // block number
   xl1: number$3().optional(),
@@ -85255,7 +85193,7 @@ var isTimePayload = (value) => {
   return isPayloadOfSchemaType(TimeSchema)(value) && isSafeEpoch(value.epoch);
 };
 var asTimePayload = AsObjectFactory.create(isTimePayload);
-var TransferSchema = "network.xyo.transfer";
+var TransferSchema = asSchema("network.xyo.transfer", true);
 var TransferFieldsZod = object$4({
   // Removed as only transaction have opCodes
   // $opCodes: z.array(z.string()).optional(),
@@ -85297,7 +85235,7 @@ var StepIdentityZod = object$4({
 });
 
 // src/payload/StepIdentityPayload.ts
-var StepIdentitySchema = "network.xyo.chain.step.identity";
+var StepIdentitySchema = asSchema("network.xyo.chain.step.identity", true);
 var isStepIdentityPayload = isPayloadOfZodType(StepIdentityZod, StepIdentitySchema);
 function base64Encode(u8) {
   if (typeof Buffer !== "undefined" && typeof Buffer.from === "function") {
@@ -85740,9 +85678,10 @@ var isAllowedBlockPayload = (value) => {
 var isAllowedBlockPayloadWithHashMeta = (value) => {
   return isAllowedBlockPayload(value) && isHashMeta(value);
 };
-var BlockNumberSchema = "network.xyo.chain.block.number";
+var BlockNumberSchema = asSchema("network.xyo.chain.block.number", true);
 var isBlockNumberPayload = isPayloadOfSchemaType(BlockNumberSchema);
 var asBlockNumberPayload = AsObjectFactory.create(isBlockNumberPayload);
+asSchema("network.xyo.chain.status", true);
 var ValidationError = class extends Error {
   hash;
   value;
@@ -85774,9 +85713,9 @@ var InBlockPayloadValidationError = class extends ValidationError {
 var HydratedTransactionValidationError = class extends ValidationError {
 };
 
-var __defProp$k = Object.defineProperty;
+var __defProp$l = Object.defineProperty;
 var __getOwnPropDesc$4 = Object.getOwnPropertyDescriptor;
-var __defNormalProp$4 = (obj, key, value) => key in obj ? __defProp$k(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __defNormalProp$4 = (obj, key, value) => key in obj ? __defProp$l(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __decorateClass$4 = (decorators, target, key, kind) => {
   var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$4(target, key) : target;
   for (var i = decorators.length - 1, decorator; i >= 0; i--)
@@ -87004,7 +86943,7 @@ var findEndBlockRecursive = async (viewer, startBlock, targetTimeMs, estimatedBl
     adjustedBlocksBack,
     toleranceMs);
 };
-async function getWindowedChain(blockViewer, maxWindowSize, previousChain = []) {
+async function getWindowedChain(context, blockViewer, maxWindowSize, previousChain = []) {
   return await spanRootAsync("getWindowedChain", async () => {
     const newChain = [];
     const previousChainByHash = new Map(previousChain.map((block) => [block[0]._hash, block]));
@@ -87031,7 +86970,7 @@ async function getWindowedChain(blockViewer, maxWindowSize, previousChain = [])
       currentBlock = previousChainByHash.get(previousBlockHash) ?? await blockViewer.blockByHash(previousBlockHash);
     }
     return newChain;
-  }, { timeBudgetLimit: 100 });
+  }, context);
 }
 function completedStepRewardAddress({ block, step }) {
   const resolvedStepSize = step < StepSizes.length ? StepSizes[step] : step;
@@ -87105,6 +87044,7 @@ async function stepRewardBlock(context, { block, step }) {
   assertEx(block % StepSizes[step] === 0, () => `Block must be the first block of the step [${StepSizes[step]}], got ${block}`);
   return assertEx(await hydratedBlockByNumber(context, block), () => `Could not find block for block number ${block}`);
 }
+asSchema("network.xyo.address.pair", true);
 var netBalancesForPayloads = (payloads) => {
   return span("netBalancesForPayloads", () => {
     const balances = {};
@@ -87170,7 +87110,7 @@ async function stepRewardTotal(context, { block, step }, multipliers) {
   });
 }
 var functionName = "externalBlockNumberFromXL1BlockNumber";
-async function externalBlockNumberFromXL1BlockNumber(context, blockViewer, xl1BlockNumber, externalTimeName, externalGenesisTime, timeBudgetMs = 2e3) {
+async function externalBlockNumberFromXL1BlockNumber(context, blockViewer, xl1BlockNumber, externalTimeName, externalGenesisTime) {
   const cacheKey = `${xl1BlockNumber}-${externalTimeName}-${"default"}`;
   return await withContextCacheResponse(context, functionName, cacheKey, async () => {
     const [, payloads = []] = await blockViewer.blockByNumber(xl1BlockNumber) ?? [];
@@ -87180,7 +87120,7 @@ async function externalBlockNumberFromXL1BlockNumber(context, blockViewer, xl1Bl
       timePayload?.[externalTimeName] ?? externalGenesisTime ?? 23372716,
       { name: functionName }
     );
-  }, { timeBudgetMs });
+  });
 }
 
 // src/primitives/chain/time/externalBlockRangeFromXL1BlockRange.ts
@@ -87196,7 +87136,7 @@ async function externalBlockRangeFromStep(context, blockViewer, stepIdentity) {
   return await withContextCacheResponse(context, "externalBlockRangeFromStep", cacheKey, async () => {
     const xl1BlockRange = stepBlockRange(stepIdentity);
     return await externalBlockRangeFromXL1BlockRange(context, blockViewer, xl1BlockRange);
-  }, { timeBudgetMs: 1e3 });
+  });
 }
 function mapToMapType(map) {
   return {
@@ -87348,7 +87288,7 @@ async function weightedStakeForRangeByPosition(context, blockViewer, externalRan
       )).toSorted((a, b) => a.time - b.time);
       let currentTime = externalRange[0];
       let currentStake = 0n;
-      if (isDefined(staked) && mergedEvents[0].args.staked !== staked) {
+      if (isDefined(staked) && mergedEvents.at(0)?.args.staked !== staked) {
         return 0n;
       }
       for (const event of mergedEvents) {
@@ -87484,17 +87424,18 @@ function contextCache(context, name, create) {
   }
   return context.caches[name];
 }
-async function withContextCacheResponse(context, name, key, func, { max = 1e4, timeBudgetMs = 0 } = {}) {
+async function withContextCacheResponse(context, name, key, func, { max = 1e4 } = {}) {
   const cache = contextCache(
     context,
     name,
     () => new LruCacheMap({ max })
   );
+  const { timeBudgetLimit = 0 } = context;
   const cacheResult = await cache.get(key);
   if (isDefined(cacheResult)) {
     return cacheResult;
   }
-  const result = timeBudgetMs > 0 ? await timeBudget(name, context.logger, func, timeBudgetMs) : await func();
+  const result = timeBudgetLimit > 0 ? await timeBudget(name, context.logger, func, timeBudgetLimit) : await func();
   await cache.set(key, result);
   return result;
 }
@@ -87980,7 +87921,7 @@ var EIP712DataPayloadFieldsZod = object$4({
   types: TypedDataTypesZod,
   values: TypedDataValueZod
 });
-var EIP712DataPayloadSchema = "network.xyo.chains.ethereum.eip712.data";
+var EIP712DataPayloadSchema = asSchema("network.xyo.chains.ethereum.eip712.data", true);
 var isEIP712DataPayload = isPayloadOfZodType(
   EIP712DataPayloadFieldsZod,
   EIP712DataPayloadSchema
@@ -87990,7 +87931,7 @@ var EIP712SignaturePayloadFieldsZod = object$4({
   hash: HashZod,
   signature: string$2()
 });
-var EIP712SignaturePayloadSchema = "network.xyo.chains.ethereum.eip712.signature";
+var EIP712SignaturePayloadSchema = asSchema("network.xyo.chains.ethereum.eip712.signature", true);
 var isEIP712SignaturePayload = isPayloadOfZodType(
   EIP712SignaturePayloadFieldsZod,
   EIP712SignaturePayloadSchema
@@ -88009,7 +87950,7 @@ var verifyEIP712Message = async (data, sig) => {
 };
 asAttoXL1(1343884111859145740576652n);
 asAttoXL1(100000000000000000000000000n);
-var ChainIndexingServiceStateSchema = "network.xyo.chain.indexing.service.state";
+var ChainIndexingServiceStateSchema = asSchema("network.xyo.chain.indexing.service.state", true);
 var isChainIndexingServiceState = (payload) => {
   return isPayloadOfSchemaType(ChainIndexingServiceStateSchema)(payload);
 };
@@ -88033,9 +87974,10 @@ var parseSignedBigInt = (value) => {
 var toSignedBigInt = (value) => {
   return value < 0n ? { negative: toHex(-value) } : { positive: toHex(value) };
 };
-var BalancesStepSummarySchema = "network.xyo.step.summary.balances";
-var SchemasStepSummarySchema = "network.xyo.step.summary.schemas";
-var TransfersStepSummarySchema = "network.xyo.step.summary.transfer";
+var BalancesStepSummarySchema = asSchema("network.xyo.step.summary.balances", true);
+var SchemasStepSummarySchema = asSchema("network.xyo.step.summary.schemas", true);
+asSchema("network.xyo.step.summary", true);
+var TransfersStepSummarySchema = asSchema("network.xyo.step.summary.transfer", true);
 async function balancesStepSummaryFromRange(context, range) {
   const cacheKey = `${range[0]}|${range[1]}`;
   return await withContextCacheResponse(context, "balancesStepSummaryFromRange", cacheKey, async () => {
@@ -88057,7 +87999,7 @@ async function balancesStepSummaryFromRange(context, range) {
           stepSize: -1,
           balances
         });
-      }, { timeBudgetLimit: 100 }) : await spanRootAsync(`balancesStepSummaryFromRange.frameSize>1[${key}]`, async () => {
+      }, context) : await spanRootAsync(`balancesStepSummaryFromRange.frameSize>1[${key}]`, async () => {
         const step = StepSizes.indexOf(asXL1BlockNumber(frameSize, true));
         assertEx(step !== -1, () => `Invalid step size: ${frameSize}. Must be one of ${StepSizes.join(", ")}`);
         const summaryResult = await context.summaryMap.get(key);
@@ -88094,9 +88036,9 @@ async function balancesStepSummaryFromRange(context, range) {
             context.stepSemaphores[step].release();
           }
         }
-      }, { timeBudgetLimit: 100 });
-    }, { timeBudgetLimit: 200 });
-  }, { max: 1e5, timeBudgetMs: 200 });
+      }, context);
+    }, context);
+  }, { max: 1e5 });
 }
 async function balancesSummary(context, config) {
   return await spanRootAsync("balancesSummary", async () => {
@@ -88117,7 +88059,7 @@ async function balancesSummary(context, config) {
       }
     }
     return [balances, { range, head: headHash }];
-  }, { timeBudgetLimit: 500 });
+  }, context);
 }
 async function schemasStepSummaryFromRange(context, range) {
   const frameHeadHash = await hashFromBlockNumber(context, range[1]);
@@ -88159,7 +88101,8 @@ async function schemasStepSummaryFromRange(context, range) {
         const schemas = {};
         for (const subResult of subResults) {
           for (const [schema, count] of Object.entries(subResult.schemas)) {
-            schemas[schema] = (schemas[schema] ?? 0) + count;
+            const typedSchema = schema;
+            schemas[typedSchema] = (schemas[typedSchema] ?? 0) + count;
           }
         }
         result = await PayloadBuilder.addHashMeta({
@@ -88190,11 +88133,12 @@ async function schemasSummary(context, config) {
     const results = {};
     for (let summary of summaries) {
       for (const [schema, count] of Object.entries(summary.schemas)) {
-        results[schema] = (results[schema] ?? 0) + count;
+        const typedSchema = schema;
+        results[typedSchema] = (results[typedSchema] ?? 0) + count;
       }
     }
     return [results, { range, head: headHash }];
-  }, { timeBudgetLimit: 500 });
+  }, context);
 }
 function transfersSummaryKey(frameHeadHash, frameSize) {
   return `${frameHeadHash}|${frameSize}`;
@@ -88323,7 +88267,7 @@ var SimpleAccountBalanceViewer = class extends AbstractCreatableProvider {
         ]));
       }
       return result;
-    }, { timeBudgetLimit: 200 });
+    }, this.context);
   }
   async accountBalances(address, config) {
     const [result] = await this.qualifiedAccountBalances(address, config ?? {});
@@ -88363,7 +88307,7 @@ var SimpleAccountBalanceViewer = class extends AbstractCreatableProvider {
         );
       }
       return [Object.fromEntries(entries), { range: qualifiedRange, head: qualifiedHeadHash }];
-    }, { timeBudgetLimit: 200 });
+    }, this.context);
   }
   async qualifiedAccountBalances(address, config) {
     return await this.spanAsync("qualifiedAccountsBalances", async () => {
@@ -88377,7 +88321,7 @@ var SimpleAccountBalanceViewer = class extends AbstractCreatableProvider {
         result[addr] = AttoXL1(summaryBalance < 0n ? 0n : summaryBalance);
       }
       return [result, qualifiedSummary[1]];
-    }, { timeBudgetLimit: 200 });
+    }, this.context);
   }
   async startHandler() {
     await super.startHandler();
@@ -88419,7 +88363,7 @@ var SimpleAccountBalanceViewer = class extends AbstractCreatableProvider {
         }
       }
       return [...resultBlockNumbers].toSorted((a, b) => b - a).slice(0, max);
-    }, { timeBudgetLimit: 200 });
+    }, this.context);
   }
   async qualifiedAccountBalanceHistory(address, headOrRange) {
     return await this.spanAsync("qualifiedAccountBalanceHistory", async () => {
@@ -88452,7 +88396,7 @@ var SimpleAccountBalanceViewer = class extends AbstractCreatableProvider {
         ]));
       }
       return [result, { range: startingRange, head: head._hash }];
-    }, { timeBudgetLimit: 200 });
+    }, this.context);
   }
 };
 __publicField$4(SimpleAccountBalanceViewer, "defaultMoniker", AccountBalanceViewerMoniker);
@@ -88486,6 +88430,7 @@ var HydratedCache = class {
 var SimpleBlockViewer = class extends AbstractCreatableProvider {
   moniker = SimpleBlockViewer.defaultMoniker;
   _store;
+  chainContractViewer;
   finalizationViewer;
   _payloadCache;
   _signedHydratedBlockCache;
@@ -88510,14 +88455,16 @@ var SimpleBlockViewer = class extends AbstractCreatableProvider {
     return this._store;
   }
   static async paramsHandler(params) {
-    assertEx(params.finalizedArchivist, () => "finalizedArchivist is required");
-    return { ...await super.paramsHandler(params) };
+    return {
+      ...await super.paramsHandler(params),
+      finalizedArchivist: assertEx(params.finalizedArchivist, () => "finalizedArchivist is required")
+    };
   }
   async blockByHash(hash) {
     return await this.spanAsync("blockByHash", async () => {
       const cache = this.hydratedBlockCache;
       return await cache.get(hash);
-    }, { timeBudgetLimit: 200 });
+    }, this.context);
   }
   async blockByNumber(blockNumber) {
     return await this.spanAsync("blockByNumber", async () => {
@@ -88533,7 +88480,7 @@ var SimpleBlockViewer = class extends AbstractCreatableProvider {
         },
         store: this.store
       }, blockNumber)) ?? null;
-    }, { timeBudgetLimit: 200 });
+    }, this.context);
   }
   async blocksByHash(hash, limit = 50) {
     return await this.spanAsync("blocksByHash", async () => {
@@ -88548,7 +88495,7 @@ var SimpleBlockViewer = class extends AbstractCreatableProvider {
         current = await this.blockByHash(previousHash);
       }
       return blocks.map((b) => asSignedHydratedBlockWithHashMeta(b, true));
-    }, { timeBudgetLimit: 200 });
+    }, this.context);
   }
   async blocksByNumber(blockNumber, limit = 50) {
     return await this.spanAsync("blocksByNumber", async () => {
@@ -88563,19 +88510,19 @@ var SimpleBlockViewer = class extends AbstractCreatableProvider {
         current = await this.blockByNumber(previousNumber);
       }
       return blocks.map((b) => asSignedHydratedBlockWithHashMeta(b, true));
-    }, { timeBudgetLimit: 200 });
+    }, this.context);
   }
   async chainId(blockNumber = "latest") {
     return await this.spanAsync("chainId", async () => {
-      const block = assertEx(
-        blockNumber === "latest" ? await this.currentBlock() : await this.blockByNumber(blockNumber),
-        () => `Could not find block for block number ${blockNumber}`
-      );
-      return block[0].chain;
-    }, { timeBudgetLimit: 200 });
+      return blockNumber === "latest" ? await this.chainContractViewer.chainId() : await this.chainContractViewer.chainIdAtBlockNumber(blockNumber);
+    }, this.context);
   }
   async createHandler() {
     await super.createHandler();
+    this.chainContractViewer = this.params.chainContractViewer ?? assertEx(
+      await this.locateAndCreate(ChainContractViewerMoniker),
+      () => "chainContractViewer is required"
+    );
     this.finalizationViewer = await this.locator.getInstance(FinalizationViewerMoniker);
     this._store = { chainMap: readPayloadMapFromStore(this.params.finalizedArchivist) };
   }
@@ -88619,7 +88566,7 @@ var SimpleBlockViewer = class extends AbstractCreatableProvider {
   }
 };
 __publicField$4(SimpleBlockViewer, "defaultMoniker", BlockViewerMoniker);
-__publicField$4(SimpleBlockViewer, "dependencies", [FinalizationViewerMoniker]);
+__publicField$4(SimpleBlockViewer, "dependencies", [FinalizationViewerMoniker, ChainContractViewerMoniker]);
 __publicField$4(SimpleBlockViewer, "monikers", [BlockViewerMoniker]);
 SimpleBlockViewer = __decorateClass$4([
   creatableProvider()
@@ -88704,6 +88651,7 @@ var SimpleBlockValidationViewer = class extends AbstractCreatableProvider {
   async doValidateProtocol(blocks, chainIdAtBlockNumber) {
     return (await Promise.all(blocks.map(async (block) => {
       return await this.params.protocol(
+        this.context,
         block,
         chainIdAtBlockNumber
       );
@@ -88719,6 +88667,7 @@ var SimpleBlockValidationViewer = class extends AbstractCreatableProvider {
     }
     return (await Promise.all(uncles[0].map(async (block) => {
       return await this.params.state(
+        this.context,
         block,
         chainIdAtBlockNumber,
         { accountBalance: this._accountBalanceViewer }
@@ -88726,7 +88675,7 @@ var SimpleBlockValidationViewer = class extends AbstractCreatableProvider {
     }))).flat();
   }
   async updateWindowedChainCache() {
-    this._uncleWindowedChainCache = await getWindowedChain(this.blockViewer, this.maxUncleWindowSize, this._uncleWindowedChainCache ?? []);
+    this._uncleWindowedChainCache = await getWindowedChain(this.context, this.blockViewer, this.maxUncleWindowSize, this._uncleWindowedChainCache ?? []);
     return [...this._uncleWindowedChainCache];
   }
 };
@@ -88736,6 +88685,52 @@ __publicField$4(SimpleBlockValidationViewer, "monikers", [BlockValidationViewerM
 SimpleBlockValidationViewer = __decorateClass$4([
   creatableProvider()
 ], SimpleBlockValidationViewer);
+var SimpleChainContractViewer = class extends AbstractCreatableProvider {
+  moniker = SimpleChainContractViewer.defaultMoniker;
+  chainId() {
+    return this.params.chainId;
+  }
+  async chainIdAtBlockNumber(blockNumber) {
+    return await withContextCacheResponse(this.context, "chainIdAtBlockNumber", `${blockNumber}`, async () => {
+      let chainId = this.chainId();
+      let contractViewer = this;
+      let forkedAtBlockNumber = await contractViewer.forkedAtBlockNumber();
+      while (forkedAtBlockNumber !== null && blockNumber <= forkedAtBlockNumber) {
+        contractViewer = assertEx(await contractViewer.forkedChainContractViewer());
+        forkedAtBlockNumber = await contractViewer.forkedAtBlockNumber();
+        chainId = await contractViewer.chainId();
+      }
+      return chainId;
+    });
+  }
+  forkedAtBlockNumber() {
+    return this.params.forkedAtBlockNumber ?? null;
+  }
+  forkedAtHash() {
+    return this.params.forkedAtHash ?? null;
+  }
+  forkedChainContractViewer() {
+    return this.params.forkedChainContractViewer ?? null;
+  }
+  forkedChainId() {
+    return this.params.forkedChainId ?? null;
+  }
+  minWithdrawalBlocks() {
+    return this.params.minWithdrawalBlocks;
+  }
+  rewardsContract() {
+    return this.params.rewardsContract;
+  }
+  stakingTokenAddress() {
+    return this.params.stakingTokenAddress;
+  }
+};
+__publicField$4(SimpleChainContractViewer, "defaultMoniker", ChainContractViewerMoniker);
+__publicField$4(SimpleChainContractViewer, "dependencies", []);
+__publicField$4(SimpleChainContractViewer, "monikers", [ChainContractViewerMoniker]);
+SimpleChainContractViewer = __decorateClass$4([
+  creatableProvider()
+], SimpleChainContractViewer);
 var SimpleStakeViewer = class extends AbstractCreatableProvider {
   moniker = SimpleStakeViewer.defaultMoniker;
   _chainStakeEventsViewer;
@@ -88956,8 +88951,16 @@ SimpleFinalizationRunner = __decorateClass$4([
 ], SimpleFinalizationRunner);
 var SimpleFinalizationViewer = class extends AbstractCreatableProvider {
   moniker = SimpleFinalizationViewer.defaultMoniker;
+  _chainContractViewer;
+  _chainId;
   _store;
   _signedHydratedBlockCache;
+  get chainContractViewer() {
+    return this._chainContractViewer;
+  }
+  get chainId() {
+    return this._chainId;
+  }
   get finalizedArchivist() {
     return this.params.finalizedArchivist;
   }
@@ -88974,11 +88977,15 @@ var SimpleFinalizationViewer = class extends AbstractCreatableProvider {
     return this._store;
   }
   static async paramsHandler(params) {
-    assertEx(params.finalizedArchivist, () => "finalizedArchivist is required");
-    return { ...await super.paramsHandler(params) };
+    return {
+      ...await super.paramsHandler(params),
+      finalizedArchivist: assertEx(params.finalizedArchivist, () => "finalizedArchivist is required")
+    };
   }
   async createHandler() {
     await super.createHandler();
+    this._chainContractViewer = await this.locateAndCreate(ChainContractViewerMoniker);
+    this._chainId = await this.chainContractViewer.chainId();
     this._store = { chainMap: readPayloadMapFromStore(this.params.finalizedArchivist) };
   }
   async head() {
@@ -88990,7 +88997,7 @@ var SimpleFinalizationViewer = class extends AbstractCreatableProvider {
         console.log(`Could not find current block with hash ${currentHead._hash}`);
       }
       return assertEx(block, () => "Could not find current block");
-    }, { timeBudgetLimit: 200 });
+    }, this.context);
   }
   async headBlock() {
     return (await this.head())[0];
@@ -89003,11 +89010,13 @@ var SimpleFinalizationViewer = class extends AbstractCreatableProvider {
   }
   async getCurrentHead() {
     const chainArchivist = this.finalizedArchivist;
-    return await findMostRecentBlock(chainArchivist);
+    const result = assertEx(await findMostRecentBlock(chainArchivist), () => "Could not find most recent block [getCurrentHead]");
+    assertEx(result?.chain === this.chainId, () => "Chain ID does not match head block chain ID");
+    return result;
   }
 };
 __publicField$4(SimpleFinalizationViewer, "defaultMoniker", FinalizationViewerMoniker);
-__publicField$4(SimpleFinalizationViewer, "dependencies", []);
+__publicField$4(SimpleFinalizationViewer, "dependencies", [ChainContractViewerMoniker]);
 __publicField$4(SimpleFinalizationViewer, "monikers", [FinalizationViewerMoniker]);
 SimpleFinalizationViewer = __decorateClass$4([
   creatableProvider()
@@ -89062,6 +89071,7 @@ var SimpleXyoGatewayRunner = class _SimpleXyoGatewayRunner extends AbstractCreat
   }
   async createHandler() {
     await super.createHandler();
+    this._connection = await this.locator.getInstance(XyoConnectionMoniker);
     this._signer = await this.locator.getInstance(XyoSignerMoniker);
   }
   async send(to, amount, options) {
@@ -94582,9 +94592,9 @@ function v4$1(options, buf, offset) {
     return _v4(options);
 }
 
-var __defProp$j = Object.defineProperty;
+var __defProp$k = Object.defineProperty;
 var __getOwnPropDesc$3 = Object.getOwnPropertyDescriptor;
-var __defNormalProp$3 = (obj, key, value) => key in obj ? __defProp$j(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __defNormalProp$3 = (obj, key, value) => key in obj ? __defProp$k(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __decorateClass$3 = (decorators, target, key, kind) => {
   var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$3(target, key) : target;
   for (var i = decorators.length - 1, decorator; i >= 0; i--)
@@ -96734,9 +96744,9 @@ NodeXyoRunner = __decorateClass$3([
   creatableProvider()
 ], NodeXyoRunner);
 
-var __defProp$i = Object.defineProperty;
+var __defProp$j = Object.defineProperty;
 var __getOwnPropDesc$2 = Object.getOwnPropertyDescriptor;
-var __defNormalProp$2 = (obj, key, value) => key in obj ? __defProp$i(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __defNormalProp$2 = (obj, key, value) => key in obj ? __defProp$j(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __decorateClass$2 = (decorators, target, key, kind) => {
   var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$2(target, key) : target;
   for (var i = decorators.length - 1, decorator; i >= 0; i--)
@@ -96797,7 +96807,8 @@ var SimpleXyoViewer = class extends AbstractCreatableProvider {
   static async paramsHandler(params) {
     return {
       ...await super.paramsHandler(params),
-      finalizedArchivist: assertEx(params.finalizedArchivist, () => "SimpleXyoViewer requires a finalizedArchivist")
+      finalizedArchivist: assertEx(params.finalizedArchivist, () => "SimpleXyoViewer requires a finalizedArchivist"),
+      chainId: assertEx(params.chainId, () => "SimpleXyoViewer requires a chainId")
     };
   }
   async accountBalance(address, config = {}) {
@@ -96825,7 +96836,7 @@ var SimpleXyoViewer = class extends AbstractCreatableProvider {
         () => `Could not find block for chainId at block ${blockNumber}`
       );
       return block[0].chain;
-    }, { timeBudgetLimit: 200 });
+    }, this.context);
   }
   async createHandler() {
     await super.createHandler();
@@ -96875,7 +96886,7 @@ var SimpleXyoViewer = class extends AbstractCreatableProvider {
       const positionReward = asAttoXL1(rewards.reduce((a, b) => a + b[0], 0n));
       const totalReward = asAttoXL1(rewards.reduce((a, b) => a + b[1], 0n));
       return [positionReward, totalReward];
-    }, { timeBudgetLimit: 100 });
+    }, this.context);
   }
   async networkStakeStepRewardForStep(stepContext) {
     return await stepRewardTotal(await this.getStakedChainContext(), stepContext, this.rewardMultipliers);
@@ -96956,7 +96967,7 @@ var SimpleXyoViewer = class extends AbstractCreatableProvider {
         return await this.networkStakeStepRewardForStep(step);
       }));
       return asAttoXL1(rewards.reduce((a, b) => a + b, 0n));
-    }, { timeBudgetLimit: 100 });
+    }, this.context);
   }
   async networkStakeStepRewardsForStepLevel(stepLevel, range) {
     const steps = blockRangeSteps(range, [stepLevel]);
@@ -97022,7 +97033,7 @@ var SimpleXyoViewer = class extends AbstractCreatableProvider {
       } catch {
         return null;
       }
-    }, { timeBudgetLimit: 200 });
+    }, this.context);
   }
   async transactionByBlockNumberAndIndex(blockNumber, transactionIndex = 0) {
     return await this.spanAsync("transactionByBlockNumberAndIndex", async () => {
@@ -97033,22 +97044,24 @@ var SimpleXyoViewer = class extends AbstractCreatableProvider {
       } catch {
         return null;
       }
-    }, { timeBudgetLimit: 200 });
+    }, this.context);
   }
   async transactionByHash(transactionHash) {
     return await this.spanAsync("transactionByHash", async () => {
       try {
-        const cache = await this.getHydratedTransactionCache();
+        const cache = this.getHydratedTransactionCache();
         const hydratedTransaction = await cache.get(transactionHash);
         return hydratedTransaction ?? null;
       } catch {
         return null;
       }
-    }, { timeBudgetLimit: 200 });
+    }, this.context);
   }
   async getCurrentHead() {
     const chainArchivist = this.finalizedArchivist;
-    return await findMostRecentBlock(chainArchivist);
+    const result = assertEx(await findMostRecentBlock(chainArchivist), () => "No blocks found in finalizedArchivist");
+    assertEx(result.chain === this.params.chainId, () => `Chain ID mismatch in finalizedArchivist [${result.chain} should be ${this.params.chainId}]`);
+    return result;
   }
   getHydratedBlockCache() {
     if (this._signedHydratedBlockCache) return this._signedHydratedBlockCache;
@@ -97695,6 +97708,7 @@ async function buildJsonRpcProviderLocator(params) {
   ]);
 }
 function buildLocalProviderLocator({
+  chainId,
   balanceSummaryContext,
   finalizedArchivist,
   pendingBlocksArchivist,
@@ -97712,7 +97726,7 @@ function buildLocalProviderLocator({
     SimpleBlockViewer.factory(SimpleBlockViewer.dependencies, { finalizedArchivist }),
     SimpleXyoRunner.factory(SimpleXyoRunner.dependencies),
     SimpleWindowedBlockViewer.factory(SimpleWindowedBlockViewer.dependencies, { maxWindowSize: 1e4, syncInterval: 1e4 }),
-    NodeXyoViewer.factory(NodeXyoViewer.dependencies, { node })
+    NodeXyoViewer.factory(NodeXyoViewer.dependencies, { node, chainId })
   ]);
 }
 
@@ -179007,9 +179021,9 @@ function requireExpress () {
 var expressExports = requireExpress();
 var express2 = /*@__PURE__*/getDefaultExportFromCjs(expressExports);
 
-var __defProp$h = Object.defineProperty;
-var __name$e = (target, value) => __defProp$h(target, "name", { value, configurable: true });
-var isBaseBuildBlockOptions = /* @__PURE__ */ __name$e((value) => {
+var __defProp$i = Object.defineProperty;
+var __name$f = (target, value) => __defProp$i(target, "name", { value, configurable: true });
+var isBaseBuildBlockOptions = /* @__PURE__ */ __name$f((value) => {
   if (!isObject$5(value)) {
     return false;
   }
@@ -179019,7 +179033,7 @@ var isBaseBuildBlockOptions = /* @__PURE__ */ __name$e((value) => {
   }
   return true;
 }, "isBaseBuildBlockOptions");
-var isBuildGenesisBlockOptions = /* @__PURE__ */ __name$e((value) => {
+var isBuildGenesisBlockOptions = /* @__PURE__ */ __name$f((value) => {
   if (!isBaseBuildBlockOptions(value)) {
     return false;
   }
@@ -179032,7 +179046,7 @@ var isBuildGenesisBlockOptions = /* @__PURE__ */ __name$e((value) => {
   }
   return true;
 }, "isBuildGenesisBlockOptions");
-var isBuildNextBlockOptions = /* @__PURE__ */ __name$e((value) => {
+var isBuildNextBlockOptions = /* @__PURE__ */ __name$f((value) => {
   if (!isBaseBuildBlockOptions(value)) {
     return false;
   }
@@ -179053,7 +179067,7 @@ var isBuildNextBlockOptions = /* @__PURE__ */ __name$e((value) => {
 function calculateCompletedStepReward(step, balance) {
   return AttoXL1(StepRewardFractions[step][0] * balance / StepRewardFractions[step][1]);
 }
-__name$e(calculateCompletedStepReward, "calculateCompletedStepReward");
+__name$f(calculateCompletedStepReward, "calculateCompletedStepReward");
 async function buildBlock(options) {
   const previousBlockNumber = isBuildGenesisBlockOptions(options) ? -1 : options.previousBlockNumber;
   const blockNumber = asXL1BlockNumber(previousBlockNumber + 1, true);
@@ -179143,7 +179157,7 @@ async function buildBlock(options) {
     txPayloads
   ];
 }
-__name$e(buildBlock, "buildBlock");
+__name$f(buildBlock, "buildBlock");
 async function buildGenesisBlock(chainId, txs, blockPayloads, signers, chainStepRewardAddress = XYO_ZERO_ADDRESS, protocol) {
   return await buildBlock({
     previousBlockHash: null,
@@ -179155,7 +179169,7 @@ async function buildGenesisBlock(chainId, txs, blockPayloads, signers, chainStep
     protocol
   });
 }
-__name$e(buildGenesisBlock, "buildGenesisBlock");
+__name$f(buildGenesisBlock, "buildGenesisBlock");
 async function buildNextBlock(previousBlock, txs, blockPayloads, signers, chainStepRewardAddress = XYO_STEP_REWARD_ADDRESS, stepRewardPoolBalance = AttoXL1(0n), protocol, chainId) {
   return await buildBlock({
     chainId: chainId ?? previousBlock.chain,
@@ -179170,7 +179184,7 @@ async function buildNextBlock(previousBlock, txs, blockPayloads, signers, chainS
     stepRewardPoolBalance
   });
 }
-__name$e(buildNextBlock, "buildNextBlock");
+__name$f(buildNextBlock, "buildNextBlock");
 assertEx(asAddress("c5fe2e6F6841Cbab12d8C0618Be2DF8C6156cC44"));
 async function createProducerChainStakeIntent(from, exp, nbf = 0) {
   return await PayloadBuilder.addHashMeta(new PayloadBuilder({
@@ -179182,7 +179196,7 @@ async function createProducerChainStakeIntent(from, exp, nbf = 0) {
     intent: "producer"
   }).build());
 }
-__name$e(createProducerChainStakeIntent, "createProducerChainStakeIntent");
+__name$f(createProducerChainStakeIntent, "createProducerChainStakeIntent");
 async function createProducerChainStakeIntentTransaction(chain, signers = [], producer, exp, nbf = asXL1BlockNumber(0, true), fees = defaultTransactionFees) {
   const intent = await createProducerChainStakeIntent(producer, exp, nbf);
   const tx = await buildTransaction(chain, [
@@ -179190,10 +179204,10 @@ async function createProducerChainStakeIntentTransaction(chain, signers = [], pr
   ], [], signers, nbf, exp, signers[0].address, fees);
   return tx;
 }
-__name$e(createProducerChainStakeIntentTransaction, "createProducerChainStakeIntentTransaction");
+__name$f(createProducerChainStakeIntentTransaction, "createProducerChainStakeIntentTransaction");
 
 // src/block/createGenesisBlock.ts
-var createGenesisBlock = /* @__PURE__ */ __name$e(async (initialBlockProducer, nextContractAddress, genesisBlockRewardAmount, genesisBlockRewardAddress) => {
+var createGenesisBlock = /* @__PURE__ */ __name$f(async (initialBlockProducer, nextContractAddress, genesisBlockRewardAmount, genesisBlockRewardAddress) => {
   const blockPayloads = await PayloadBuilder.addHashMeta([
     TransferPayloadJsonSchemaPayload,
     BlockBoundWitnessSchemaPayload,
@@ -179223,10 +179237,10 @@ function _ts_decorate$6(decorators, target, key, desc) {
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-__name$e(_ts_decorate$6, "_ts_decorate");
+__name$f(_ts_decorate$6, "_ts_decorate");
 var SynchronousLmdbMap = class extends AbstractCreatable {
   static {
-    __name$e(this, "SynchronousLmdbMap");
+    __name$f(this, "SynchronousLmdbMap");
   }
   db;
   rootDatabase;
@@ -179297,14 +179311,14 @@ function _ts_decorate2$4(decorators, target, key, desc) {
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-__name$e(_ts_decorate2$4, "_ts_decorate");
-var stripMongoId = /* @__PURE__ */ __name$e((doc) => {
+__name$f(_ts_decorate2$4, "_ts_decorate");
+var stripMongoId = /* @__PURE__ */ __name$f((doc) => {
   const { _id, ...rest } = doc;
   return rest;
 }, "stripMongoId");
 var MongoMap = class extends AbstractCreatable {
   static {
-    __name$e(this, "MongoMap");
+    __name$f(this, "MongoMap");
   }
   _getCache;
   get sdk() {
@@ -179317,11 +179331,11 @@ var MongoMap = class extends AbstractCreatable {
   [Symbol.asyncIterator]() {
     const cursorPromise = this.sdk.find({});
     let cursor;
-    const loadCursor = /* @__PURE__ */ __name$e(async () => {
+    const loadCursor = /* @__PURE__ */ __name$f(async () => {
       if (!cursor) cursor = await cursorPromise;
     }, "loadCursor");
     return {
-      next: /* @__PURE__ */ __name$e(async () => {
+      next: /* @__PURE__ */ __name$f(async () => {
         await loadCursor();
         if (!cursor) return {
           value: void 0,
@@ -179475,18 +179489,18 @@ async function frameList(block, archivist) {
   }
   return result;
 }
-__name$e(frameList, "frameList");
-var getStoreDirectory = /* @__PURE__ */ __name$e((name, storageRoot, kind) => {
+__name$f(frameList, "frameList");
+var getStoreDirectory = /* @__PURE__ */ __name$f((name, storageRoot, kind) => {
   return kind === void 0 ? path.join(storageRoot, name) : path.join(storageRoot, kind, name);
 }, "getStoreDirectory");
 
 // src/nodejs/map/localPersistentMap.ts
 path.join(process.cwd(), ".store");
 
-var __defProp$g = Object.defineProperty;
+var __defProp$h = Object.defineProperty;
 var __export = (target, all) => {
   for (var name in all)
-    __defProp$g(target, name, { get: all[name], enumerable: true });
+    __defProp$h(target, name, { get: all[name], enumerable: true });
 };
 
 // src/factories/index.ts
@@ -201618,13 +201632,13 @@ var StakedXyoChainV2__factory = class extends ContractFactory {
   }
 };
 
-var __defProp$f = Object.defineProperty;
-var __name$d = (target, value) => __defProp$f(target, "name", { value, configurable: true });
+var __defProp$g = Object.defineProperty;
+var __name$e = (target, value) => __defProp$g(target, "name", { value, configurable: true });
 
 // src/BaseEthProvider.ts
 (class {
   static {
-    __name$d(this, "BaseEthProvider");
+    __name$e(this, "BaseEthProvider");
   }
   eth_accounts() {
     throw new Error("Method not implemented.");
@@ -201774,7 +201788,7 @@ var __name$d = (target, value) => __defProp$f(target, "name", { value, configura
     throw new Error("Method not implemented.");
   }
 });
-var createChainContract = /* @__PURE__ */ __name$d(async (signer, stakingTokenAddress, genesisBlockHash, rewardsContractAddress, minWithdrawalBlocks, maxStakersPerAddress = 10, unlimitedStakingAddress = XYO_NETWORK_STAKING_ADDRESS, minStake = 10000n, gas = {}) => {
+var createChainContract = /* @__PURE__ */ __name$e(async (signer, stakingTokenAddress, genesisBlockHash, rewardsContractAddress, minWithdrawalBlocks, maxStakersPerAddress = 10, unlimitedStakingAddress = XYO_NETWORK_STAKING_ADDRESS, minStake = 10000n, gas = {}) => {
   try {
     const xyoChainFactory = new StakedXyoChainV2__factory(signer);
     const contractTransactionResponse = await (await xyoChainFactory.deploy(ETH_ZERO_ADDRESS, 0n, hexToBigInt(genesisBlockHash), toEthAddress(rewardsContractAddress), minWithdrawalBlocks, toEthAddress(stakingTokenAddress), maxStakersPerAddress, unlimitedStakingAddress, minStake, gas)).waitForDeployment();
@@ -201785,13 +201799,13 @@ var createChainContract = /* @__PURE__ */ __name$d(async (signer, stakingTokenAd
     throw ex;
   }
 }, "createChainContract");
-var gasConfig = /* @__PURE__ */ __name$d(() => {
+var gasConfig = /* @__PURE__ */ __name$e(() => {
   return {
     gasLimit: 2e6,
     gasPrice: parseUnits$1("100", "gwei")
   };
 }, "gasConfig");
-var createChainRewardsContract = /* @__PURE__ */ __name$d(async (signer, genesisReward = 0n, gas = gasConfig()) => {
+var createChainRewardsContract = /* @__PURE__ */ __name$e(async (signer, genesisReward = 0n, gas = gasConfig()) => {
   try {
     const xyoChainRewardsFactory = new XyoChainRewards__factory(signer);
     const xyoChainRewardsFactoryResponse = await (await xyoChainRewardsFactory.deploy(toFixedPoint(1000n), 1000000n, 95n, 100n, toFixedPoint(30n), genesisReward, 18n, gas)).waitForDeployment();
@@ -201802,7 +201816,7 @@ var createChainRewardsContract = /* @__PURE__ */ __name$d(async (signer, genesis
     throw ex;
   }
 }, "createChainRewardsContract");
-var nextContractAddressForAddress = /* @__PURE__ */ __name$d(async (address, provider) => {
+var nextContractAddressForAddress = /* @__PURE__ */ __name$e(async (address, provider) => {
   const deployerAddress = toEthAddress(address);
   const nonce = await provider.getTransactionCount(deployerAddress);
   const contractAddress = getCreateAddress({
@@ -201811,7 +201825,7 @@ var nextContractAddressForAddress = /* @__PURE__ */ __name$d(async (address, pro
   });
   return assertEx(asAddress(contractAddress), () => "Unable to convert contract address to address");
 }, "nextContractAddressForAddress");
-var nextContractAddress = /* @__PURE__ */ __name$d(async (signer) => {
+var nextContractAddress = /* @__PURE__ */ __name$e(async (signer) => {
   const provider = assertEx(signer.provider, () => "Unable to obtain provider from signer");
   const address = assertEx(asAddress(await signer.getAddress()), () => "Unable to obtain address from signer");
   return await nextContractAddressForAddress(address, provider);
@@ -201830,15 +201844,15 @@ async function createChain(signer, stakingTokenAddress, initialBlockProducer, re
     rewardContractAddressResolved
   ];
 }
-__name$d(createChain, "createChain");
+__name$e(createChain, "createChain");
 function _ts_decorate$5(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-__name$d(_ts_decorate$5, "_ts_decorate");
-var ethStakeToStake = /* @__PURE__ */ __name$d((ethStake) => {
+__name$e(_ts_decorate$5, "_ts_decorate");
+var ethStakeToStake = /* @__PURE__ */ __name$e((ethStake) => {
   const stake = {
     id: Number(ethStake.id),
     staked: toAddress(ethStake.staked),
@@ -201852,7 +201866,7 @@ var ethStakeToStake = /* @__PURE__ */ __name$d((ethStake) => {
 }, "ethStakeToStake");
 var EthereumChainStakeViewer = class _EthereumChainStakeViewer extends AbstractCreatableProvider {
   static {
-    __name$d(this, "EthereumChainStakeViewer");
+    __name$e(this, "EthereumChainStakeViewer");
   }
   static defaultMoniker = StakeViewerMoniker;
   static dependencies = [];
@@ -202069,8 +202083,8 @@ function _ts_decorate2$3(decorators, target, key, desc) {
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-__name$d(_ts_decorate2$3, "_ts_decorate");
-var isStakeLogEventName = /* @__PURE__ */ __name$d((name) => {
+__name$e(_ts_decorate2$3, "_ts_decorate");
+var isStakeLogEventName = /* @__PURE__ */ __name$e((name) => {
   return isString$1(name) && [
     "StakeAdded",
     "StakeRemoved",
@@ -202079,7 +202093,7 @@ var isStakeLogEventName = /* @__PURE__ */ __name$d((name) => {
 }, "isStakeLogEventName");
 var EthereumChainStakeEventsViewer = class _EthereumChainStakeEventsViewer extends AbstractCreatableProvider {
   static {
-    __name$d(this, "EthereumChainStakeEventsViewer");
+    __name$e(this, "EthereumChainStakeEventsViewer");
   }
   static defaultMoniker = StakeEventsViewerMoniker;
   static dependencies = [];
@@ -202230,7 +202244,7 @@ EthereumChainStakeEventsViewer = _ts_decorate2$3([
 ], EthereumChainStakeEventsViewer);
 var AbstractEvmProvider = class extends AbstractCreatableProvider {
   static {
-    __name$d(this, "AbstractEvmProvider");
+    __name$e(this, "AbstractEvmProvider");
   }
   _contract;
   get contract() {
@@ -202247,10 +202261,10 @@ function _ts_decorate3$2(decorators, target, key, desc) {
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-__name$d(_ts_decorate3$2, "_ts_decorate");
+__name$e(_ts_decorate3$2, "_ts_decorate");
 var EvmChainContractViewer = class _EvmChainContractViewer extends AbstractEvmProvider {
   static {
-    __name$d(this, "EvmChainContractViewer");
+    __name$e(this, "EvmChainContractViewer");
   }
   static defaultMoniker = ChainContractViewerMoniker;
   static dependencies = [];
@@ -202275,9 +202289,9 @@ var EvmChainContractViewer = class _EvmChainContractViewer extends AbstractEvmPr
     return await withContextCacheResponse(this.context, "chainIdAtBlockNumber", `${blockNumber}`, async () => {
       let chainId = this.chainId();
       let contractViewer = this;
-      let forkedAtBlockNumber = await this.forkedAtBlockNumber();
-      while (blockNumber <= forkedAtBlockNumber) {
-        contractViewer = await contractViewer.forkedChainContractViewer();
+      let forkedAtBlockNumber = await contractViewer.forkedAtBlockNumber();
+      while (forkedAtBlockNumber !== null && blockNumber <= forkedAtBlockNumber) {
+        contractViewer = assertEx(await contractViewer.forkedChainContractViewer(), () => "Forked chain contract viewer is undefined");
         forkedAtBlockNumber = await contractViewer.forkedAtBlockNumber();
         chainId = await contractViewer.chainId();
       }
@@ -202285,7 +202299,7 @@ var EvmChainContractViewer = class _EvmChainContractViewer extends AbstractEvmPr
     });
   }
   async forkedAtBlockNumber() {
-    this._forkedAtBlockNumber = this._forkedAtBlockNumber ?? (async () => Number(await this.contract.forkedAtBlockNumber()))();
+    this._forkedAtBlockNumber = this._forkedAtBlockNumber ?? (async () => toXL1BlockNumber(await this.contract.forkedAtBlockNumber(), true))();
     return await this._forkedAtBlockNumber;
   }
   async forkedAtHash() {
@@ -202337,10 +202351,10 @@ function _ts_decorate4$1(decorators, target, key, desc) {
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-__name$d(_ts_decorate4$1, "_ts_decorate");
+__name$e(_ts_decorate4$1, "_ts_decorate");
 var EvmStakeRunner = class _EvmStakeRunner extends AbstractEvmProvider {
   static {
-    __name$d(this, "EvmStakeRunner");
+    __name$e(this, "EvmStakeRunner");
   }
   static defaultMoniker = StakeRunnerMoniker;
   static dependencies = [];
@@ -202376,10 +202390,10 @@ function _ts_decorate5$1(decorators, target, key, desc) {
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-__name$d(_ts_decorate5$1, "_ts_decorate");
+__name$e(_ts_decorate5$1, "_ts_decorate");
 var EvmStakeTotalsViewer = class _EvmStakeTotalsViewer extends AbstractEvmProvider {
   static {
-    __name$d(this, "EvmStakeTotalsViewer");
+    __name$e(this, "EvmStakeTotalsViewer");
   }
   static defaultMoniker = StakeTotalsViewerMoniker;
   static dependencies = [];
@@ -202416,15 +202430,16 @@ EvmStakeTotalsViewer = _ts_decorate5$1([
   creatableProvider()
 ], EvmStakeTotalsViewer);
 
-var __defProp$e = Object.defineProperty;
-var __name$c = (target, value) => __defProp$e(target, "name", { value, configurable: true });
-var analyzeBlock = /* @__PURE__ */ __name$c(async (block, handlers) => {
+var __defProp$f = Object.defineProperty;
+var __name$d = (target, value) => __defProp$f(target, "name", { value, configurable: true });
+var analyzeBlock = /* @__PURE__ */ __name$d(async (block, handlers) => {
   await Promise.all(handlers.map(async (handler) => {
     await handler.onBlock(block);
   }));
   return block;
 }, "analyzeBlock");
-var analyzeChain = /* @__PURE__ */ __name$c(async (store, handlers, head, previousHead = null, maxDepth = -1n, tracer, logger) => {
+var analyzeChain = /* @__PURE__ */ __name$d(async (context, store, handlers, head, previousHead = null, maxDepth = -1n) => {
+  const { logger } = context;
   logger?.log("analyzeChain.start", previousHead);
   return assertEx(await spanRootAsync("analyzeChain", async () => {
     let lastBlockNumber = -1;
@@ -202453,16 +202468,12 @@ var analyzeChain = /* @__PURE__ */ __name$c(async (store, handlers, head, previo
     return handlers.map((handler) => {
       return handler.result();
     });
-  }, {
-    tracer,
-    timeBudgetLimit: 1e3,
-    logger
-  }), () => "analyzeChain failed");
+  }, context), () => "analyzeChain failed");
 }, "analyzeChain");
-var ChainSummaryBalancesSchema = "network.xyo.chain.summary.balances";
+var ChainSummaryBalancesSchema = asSchema("network.xyo.chain.summary.balances", true);
 
 // src/BalanceAnalyzer/BalanceAnalyzer.ts
-var bigintBalances = /* @__PURE__ */ __name$c((balances) => {
+var bigintBalances = /* @__PURE__ */ __name$d((balances) => {
   const result = {};
   for (const [address, balance] of Object.entries(balances)) {
     if (isDefined(balance)) {
@@ -202473,7 +202484,7 @@ var bigintBalances = /* @__PURE__ */ __name$c((balances) => {
 }, "bigintBalances");
 (class {
   static {
-    __name$c(this, "BalanceAnalyzer");
+    __name$d(this, "BalanceAnalyzer");
   }
   _tracer;
   _addresses;
@@ -202526,7 +202537,7 @@ var bigintBalances = /* @__PURE__ */ __name$c((balances) => {
 });
 var ChainFinalizer = class extends Base {
   static {
-    __name$c(this, "ChainFinalizer");
+    __name$d(this, "ChainFinalizer");
   }
   _tracer;
   // the chainArchivist is assumed to be an archivist with already validated blocks in it along with all the transactions and payloads
@@ -202562,7 +202573,7 @@ var ChainFinalizer = class extends Base {
 };
 var ChainHeadSelector = class extends ChainFinalizer {
   static {
-    __name$c(this, "ChainHeadSelector");
+    __name$d(this, "ChainHeadSelector");
   }
   allowedProducers;
   _timeSinceLastUncle = Date.now();
@@ -202583,22 +202594,19 @@ var ChainHeadSelector = class extends ChainFinalizer {
       if (isDefined(allowedProducers) && allowedProducers.length > 0) {
         return proposedBlocks.filter((pb) => allowedProducers.includes(pb[0].addresses[0]));
       }
-      this.windowedFinalizedChain = await getWindowedChain(this.blockViewer, this.maxWindowSize, this.windowedFinalizedChain);
+      this.windowedFinalizedChain = await getWindowedChain(this.context, this.blockViewer, this.maxWindowSize, this.windowedFinalizedChain);
       const uncles = findUncles(this.context, this.windowedFinalizedChain, proposedBlocks);
       const bestUncle = uncles.length > 0 ? findBestUncle(this.windowedFinalizedChain, uncles) : this.windowedFinalizedChain;
       return bestUncle;
-    }, {
-      tracer: this.tracer,
-      timeBudgetLimit: 1e3
-    });
+    }, this.context);
   }
 };
-var ChainSummaryProducersSchema = "network.xyo.chain.summary.producers";
+var ChainSummaryProducersSchema = asSchema("network.xyo.chain.summary.producers", true);
 
 // src/producer/ChainProducersAnalyzer.ts
 (class {
   static {
-    __name$c(this, "ChainProducersAnalyzer");
+    __name$d(this, "ChainProducersAnalyzer");
   }
   endingBlock = 0;
   producers = {};
@@ -202636,13 +202644,13 @@ var ChainSummaryProducersSchema = "network.xyo.chain.summary.producers";
     return true;
   }
 });
-var ChainSummaryStakeIntentSchema = "network.xyo.chain.summary.staked.intent";
+var ChainSummaryStakeIntentSchema = asSchema("network.xyo.chain.summary.staked.intent", true);
 var isChainSummaryStakeIntent = isPayloadOfSchemaType(ChainSummaryStakeIntentSchema);
 
 // src/producer/ChainStakeIntentAnalyzer.ts
 var ChainStakeIntentAnalyzer = class {
   static {
-    __name$c(this, "ChainStakeIntentAnalyzer");
+    __name$d(this, "ChainStakeIntentAnalyzer");
   }
   _endingBlock = void 0;
   _intent;
@@ -202673,8 +202681,8 @@ var ChainStakeIntentAnalyzer = class {
     return true;
   }
 };
-var ChainSummaryTransfersSchema = "network.xyo.chain.summary.transfers";
-var bigintTransfers = /* @__PURE__ */ __name$c((transfers) => {
+var ChainSummaryTransfersSchema = asSchema("network.xyo.chain.summary.transfers", true);
+var bigintTransfers = /* @__PURE__ */ __name$d((transfers) => {
   const result = {};
   for (const [from, toMap] of Object.entries(transfers)) {
     const validFrom = toAddress(from);
@@ -202689,7 +202697,7 @@ var bigintTransfers = /* @__PURE__ */ __name$c((transfers) => {
 }, "bigintTransfers");
 (class {
   static {
-    __name$c(this, "TransferAnalyzer");
+    __name$d(this, "TransferAnalyzer");
   }
   _tracer;
   _firstBlock;
@@ -202740,9 +202748,9 @@ var bigintTransfers = /* @__PURE__ */ __name$c((transfers) => {
   }
 });
 
-var __defProp$d = Object.defineProperty;
-var __name$b = (target, value) => __defProp$d(target, "name", { value, configurable: true });
-var BlockAllowedPayloadSchemasValidator = /* @__PURE__ */ __name$b((block) => {
+var __defProp$e = Object.defineProperty;
+var __name$c = (target, value) => __defProp$e(target, "name", { value, configurable: true });
+var BlockAllowedPayloadSchemasValidator = /* @__PURE__ */ __name$c((context, block) => {
   const errors = [];
   try {
     for (const schema of block.payload_schemas) {
@@ -202755,7 +202763,7 @@ var BlockAllowedPayloadSchemasValidator = /* @__PURE__ */ __name$b((block) => {
   }
   return errors;
 }, "BlockAllowedPayloadSchemasValidator");
-var BlockFieldsValidator = /* @__PURE__ */ __name$b((block, chainId) => {
+var BlockFieldsValidator = /* @__PURE__ */ __name$c((context, block, chainId) => {
   const errors = [];
   try {
     if (isDefined(chainId) && block.chain !== chainId.toLowerCase()) {
@@ -202775,13 +202783,13 @@ var BlockFieldsValidator = /* @__PURE__ */ __name$b((block, chainId) => {
   }
   return errors;
 }, "BlockFieldsValidator");
-var BlockJsonSchemaValidator = /* @__PURE__ */ __name$b((jsonSchema = BlockBoundWitnessWithStorageMetaJsonSchema) => {
+var BlockJsonSchemaValidator = /* @__PURE__ */ __name$c((jsonSchema = BlockBoundWitnessWithStorageMetaJsonSchema) => {
   const ajv = new ajvExports.Ajv({
     allErrors: true,
     strict: true
   });
   const validate = ajv.compile(jsonSchema);
-  return async (block) => {
+  return async (context, block) => {
     const errors = [];
     try {
       await validate(block);
@@ -202800,7 +202808,7 @@ var BlockJsonSchemaValidator = /* @__PURE__ */ __name$b((jsonSchema = BlockBound
     return errors;
   };
 }, "BlockJsonSchemaValidator");
-var BlockPreviousHashValidator = /* @__PURE__ */ __name$b((block) => {
+var BlockPreviousHashValidator = /* @__PURE__ */ __name$c((context, block) => {
   const errors = [];
   try {
     const blockNumber = block.block;
@@ -202824,7 +202832,7 @@ var BlockPreviousHashValidator = /* @__PURE__ */ __name$b((block) => {
 }, "BlockPreviousHashValidator");
 
 // src/block/validateBlock.ts
-var validateBlock = /* @__PURE__ */ __name$b(async (block, chainId, additionalValidators = []) => {
+var validateBlock = /* @__PURE__ */ __name$c(async (context, block, chainId, additionalValidators = []) => {
   const errors = [];
   try {
     const bwErrors = await BoundWitnessSignaturesValidator(block);
@@ -202837,13 +202845,13 @@ var validateBlock = /* @__PURE__ */ __name$b(async (block, chainId, additionalVa
       BlockAllowedPayloadSchemasValidator,
       ...additionalValidators
     ];
-    errors.push(...(await Promise.all(validators.map((validator) => validator(block, chainId)))).flat());
+    errors.push(...(await Promise.all(validators.map((validator) => validator(context, block, chainId)))).flat());
   } catch (ex) {
     errors.push(new BlockValidationError(block?._hash ?? ZERO_HASH, block, "validation excepted", ex));
   }
   return errors;
 }, "validateBlock");
-var isElevatedFromBlock = /* @__PURE__ */ __name$b((payload, [, payloads]) => {
+var isElevatedFromBlock = /* @__PURE__ */ __name$c((payload, [, payloads]) => {
   const txs = payloads.filter((p) => isTransactionBoundWitness(p));
   for (const tx of txs) {
     if (tx.payload_hashes.includes(payload._hash)) {
@@ -202852,7 +202860,7 @@ var isElevatedFromBlock = /* @__PURE__ */ __name$b((payload, [, payloads]) => {
   }
   return true;
 }, "isElevatedFromBlock");
-var validateElevatedFromBlock = /* @__PURE__ */ __name$b((payload, block) => {
+var validateElevatedFromBlock = /* @__PURE__ */ __name$c((payload, block) => {
   const errors = [];
   try {
     const txs = transactionsFromHydratedBlock(block);
@@ -202865,7 +202873,7 @@ var validateElevatedFromBlock = /* @__PURE__ */ __name$b((payload, block) => {
   }
   return errors;
 }, "validateElevatedFromBlock");
-var validateElevatedFromTransaction = /* @__PURE__ */ __name$b((payload, block) => {
+var validateElevatedFromTransaction = /* @__PURE__ */ __name$c((payload, block) => {
   const errors = [];
   try {
     const txs = transactionsFromHydratedBlock(block);
@@ -202882,7 +202890,7 @@ var validateElevatedFromTransaction = /* @__PURE__ */ __name$b((payload, block)
   }
   return errors;
 }, "validateElevatedFromTransaction");
-var validateTransactionInBlock = /* @__PURE__ */ __name$b(async (payload, block) => {
+var validateTransactionInBlock = /* @__PURE__ */ __name$c(async (payload, block) => {
   const errors = [];
   try {
     if (isTransactionBoundWitness(payload) && isStorageMeta(payload)) {
@@ -202905,7 +202913,7 @@ var validateTransactionInBlock = /* @__PURE__ */ __name$b(async (payload, block)
   }
   return errors;
 }, "validateTransactionInBlock");
-var validateTypedPayloadInBlock = /* @__PURE__ */ __name$b(async (payload, block, identityFunction) => {
+var validateTypedPayloadInBlock = /* @__PURE__ */ __name$c(async (payload, block, identityFunction) => {
   const errors = [];
   try {
     if (identityFunction(payload) && isStorageMeta(payload)) {
@@ -202922,7 +202930,7 @@ var validateTypedPayloadInBlock = /* @__PURE__ */ __name$b(async (payload, block
   }
   return errors;
 }, "validateTypedPayloadInBlock");
-var validateBridgeDestinationObservationInBlock = /* @__PURE__ */ __name$b(async (payload, block) => {
+var validateBridgeDestinationObservationInBlock = /* @__PURE__ */ __name$c(async (payload, block) => {
   const errors = [];
   try {
     const typedErrors = await validateTypedPayloadInBlock(payload, block, isBridgeDestinationObservation);
@@ -202934,7 +202942,7 @@ var validateBridgeDestinationObservationInBlock = /* @__PURE__ */ __name$b(async
   }
   return errors;
 }, "validateBridgeDestinationObservationInBlock");
-var validateBridgeIntentInBlock = /* @__PURE__ */ __name$b(async (payload, block) => {
+var validateBridgeIntentInBlock = /* @__PURE__ */ __name$c(async (payload, block) => {
   const errors = [];
   try {
     const typedErrors = await validateTypedPayloadInBlock(payload, block, isBridgeIntent);
@@ -202946,7 +202954,7 @@ var validateBridgeIntentInBlock = /* @__PURE__ */ __name$b(async (payload, block
   }
   return errors;
 }, "validateBridgeIntentInBlock");
-var validateBridgeSourceObservationInBlock = /* @__PURE__ */ __name$b(async (payload, block) => {
+var validateBridgeSourceObservationInBlock = /* @__PURE__ */ __name$c(async (payload, block) => {
   const errors = [];
   try {
     const typedErrors = await validateTypedPayloadInBlock(payload, block, isBridgeSourceObservation);
@@ -202958,7 +202966,7 @@ var validateBridgeSourceObservationInBlock = /* @__PURE__ */ __name$b(async (pay
   }
   return errors;
 }, "validateBridgeSourceObservationInBlock");
-var validateChainStakeIntentInBlock = /* @__PURE__ */ __name$b(async (payload, block) => {
+var validateChainStakeIntentInBlock = /* @__PURE__ */ __name$c(async (payload, block) => {
   const errors = [];
   try {
     const typedErrors = await validateTypedPayloadInBlock(payload, block, isChainStakeIntent);
@@ -202970,7 +202978,7 @@ var validateChainStakeIntentInBlock = /* @__PURE__ */ __name$b(async (payload, b
   }
   return errors;
 }, "validateChainStakeIntentInBlock");
-var validateHashInBlock = /* @__PURE__ */ __name$b(async (payload, block) => {
+var validateHashInBlock = /* @__PURE__ */ __name$c(async (payload, block) => {
   const errors = [];
   try {
     const typedErrors = await validateTypedPayloadInBlock(payload, block, isHashPayload);
@@ -202982,7 +202990,7 @@ var validateHashInBlock = /* @__PURE__ */ __name$b(async (payload, block) => {
   }
   return errors;
 }, "validateHashInBlock");
-var validateSchemaInBlock = /* @__PURE__ */ __name$b(async (payload, block) => {
+var validateSchemaInBlock = /* @__PURE__ */ __name$c(async (payload, block) => {
   const errors = [];
   try {
     const typedErrors = await validateTypedPayloadInBlock(payload, block, isSchemaPayload);
@@ -202994,7 +203002,7 @@ var validateSchemaInBlock = /* @__PURE__ */ __name$b(async (payload, block) => {
   }
   return errors;
 }, "validateSchemaInBlock");
-var validateTimeInBlock = /* @__PURE__ */ __name$b(async (payload, block) => {
+var validateTimeInBlock = /* @__PURE__ */ __name$c(async (payload, block) => {
   const errors = [];
   try {
     const typedErrors = await validateTypedPayloadInBlock(payload, block, isTimePayload);
@@ -203006,7 +203014,7 @@ var validateTimeInBlock = /* @__PURE__ */ __name$b(async (payload, block) => {
   }
   return errors;
 }, "validateTimeInBlock");
-var validateTransferInBlock = /* @__PURE__ */ __name$b(async (payload, block) => {
+var validateTransferInBlock = /* @__PURE__ */ __name$c(async (payload, block) => {
   const errors = [];
   try {
     const typedErrors = await validateTypedPayloadInBlock(payload, block, isTransfer);
@@ -203031,7 +203039,7 @@ var payloadValidators = {
   [TimeSchema]: validateTimeInBlock,
   [TransferSchema]: validateTransferInBlock
 };
-var validatePayloadInBlock = /* @__PURE__ */ __name$b(async (payload, block) => {
+var validatePayloadInBlock = /* @__PURE__ */ __name$c(async (payload, block) => {
   const errors = [];
   try {
     const validator = payloadValidators[payload.schema];
@@ -203049,7 +203057,7 @@ var validatePayloadInBlock = /* @__PURE__ */ __name$b(async (payload, block) =>
 }, "validatePayloadInBlock");
 
 // src/hydratedBlock/validators/Payloads.ts
-var PayloadsInBlockValidator = /* @__PURE__ */ __name$b(async ([block, payloads]) => {
+var PayloadsInBlockValidator = /* @__PURE__ */ __name$c(async (context, [block, payloads]) => {
   const errors = [];
   try {
     const payloadMap = {};
@@ -203098,10 +203106,10 @@ var PayloadsInBlockValidator = /* @__PURE__ */ __name$b(async ([block, payloads]
 }, "PayloadsInBlockValidator");
 
 // src/hydratedBlock/validateHydratedBlock.ts
-var validateHydratedBlock = /* @__PURE__ */ __name$b(async (hydratedBlock, chainIdAtBlockNumber, additionalValidators = [], additionalBlockValidators = []) => {
+var validateHydratedBlock = /* @__PURE__ */ __name$c(async (context, hydratedBlock, chainIdAtBlockNumber, additionalValidators = [], additionalBlockValidators = []) => {
   const errors = [];
   try {
-    const validateBlockErrors = await validateBlock(hydratedBlock[0], chainIdAtBlockNumber ? await chainIdAtBlockNumber(hydratedBlock[0].block) : void 0, additionalBlockValidators);
+    const validateBlockErrors = await validateBlock(context, hydratedBlock[0], chainIdAtBlockNumber ? await chainIdAtBlockNumber(hydratedBlock[0].block) : void 0, additionalBlockValidators);
     for (const validateBlockError of validateBlockErrors) {
       errors.push(new HydratedBlockValidationError(hydratedBlock[0]._hash, hydratedBlock, `validateBlock error: ${validateBlockError}`, validateBlockError));
     }
@@ -203113,13 +203121,13 @@ var validateHydratedBlock = /* @__PURE__ */ __name$b(async (hydratedBlock, chain
       PayloadsInBlockValidator,
       ...additionalValidators
     ];
-    errors.push(...(await Promise.all(validators.map((v) => v(hydratedBlock, chainIdAtBlockNumber)))).flat());
+    errors.push(...(await Promise.all(validators.map((v) => v(context, hydratedBlock, chainIdAtBlockNumber)))).flat());
   } catch (ex) {
     errors.push(new HydratedBlockValidationError(hydratedBlock?.[0]?._hash ?? ZERO_HASH, hydratedBlock, `Failed validateHydratedBlock: ${ex}`, ex));
   }
   return errors;
 }, "validateHydratedBlock");
-var RequiredBalanceBlockStateValidator = /* @__PURE__ */ __name$b(async (block, chainIdAtBlockNumber, services) => {
+var RequiredBalanceBlockStateValidator = /* @__PURE__ */ __name$c(async (context, block, chainIdAtBlockNumber, services) => {
   return await spanRootAsync("RequiredBalanceBlockStateValidator", async () => {
     const errors = [];
     let chainId = "00";
@@ -203149,28 +203157,22 @@ var RequiredBalanceBlockStateValidator = /* @__PURE__ */ __name$b(async (block,
             errors.push(new HydratedBlockStateValidationError(block?.[0]?._hash ?? ZERO_HASH, chainId, block, `insufficient balance for ${address} ${balance} < ${requiredBalances[address]}`));
           }
         }
-      }, {
-        timeBudgetLimit: 100,
-        logger: console
-      });
+      }, context);
     } catch (ex) {
       errors.push(new HydratedBlockStateValidationError(block?.[0]?._hash ?? ZERO_HASH, chainId, block, `Failed RequiredBalanceBlockStateValidator: ${ex}`, ex));
     }
     return await Promise.resolve(errors);
-  }, {
-    timeBudgetLimit: 200,
-    logger: console
-  });
+  }, context);
 }, "RequiredBalanceBlockStateValidator");
 
 // src/hydratedBlockState/validateHydratedBlockState.ts
-var validateHydratedBlockState = /* @__PURE__ */ __name$b(async (hydratedBlock, chainIdAtBlockNumber, services, additionalValidators = []) => {
+var validateHydratedBlockState = /* @__PURE__ */ __name$c(async (context, hydratedBlock, chainIdAtBlockNumber, services, additionalValidators = []) => {
   return await spanRootAsync("validateHydratedBlockState", async () => {
     const errors = [];
     let chainId;
     try {
       chainId = await chainIdAtBlockNumber(hydratedBlock[0].block);
-      const validateHydratedBlockErrors = await validateHydratedBlock(hydratedBlock, chainIdAtBlockNumber);
+      const validateHydratedBlockErrors = await validateHydratedBlock(context, hydratedBlock, chainIdAtBlockNumber);
       for (const validateHydratedBlockError of validateHydratedBlockErrors) {
         errors.push(new HydratedBlockStateValidationError(hydratedBlock[0]._hash, chainId, hydratedBlock, `validateBlock error: ${validateHydratedBlockError}`, validateHydratedBlockError));
       }
@@ -203178,43 +203180,37 @@ var validateHydratedBlockState = /* @__PURE__ */ __name$b(async (hydratedBlock,
         RequiredBalanceBlockStateValidator,
         ...additionalValidators
       ];
-      errors.push(...(await Promise.all(validators.map((v) => v(hydratedBlock, chainIdAtBlockNumber, services)))).flat());
+      errors.push(...(await Promise.all(validators.map((v) => v(context, hydratedBlock, chainIdAtBlockNumber, services)))).flat());
     } catch (ex) {
       errors.push(new HydratedBlockStateValidationError(hydratedBlock?.[0]?._hash ?? ZERO_HASH, chainId ?? "00", hydratedBlock, `Failed validateHydratedBlockState: ${ex}`, ex));
     }
     return errors;
-  }, {
-    timeBudgetLimit: 100,
-    logger: console
-  });
+  }, context);
 }, "validateHydratedBlockState");
 
-var __defProp$c = Object.defineProperty;
-var __name$a = (target, value) => __defProp$c(target, "name", { value, configurable: true });
-
-// src/diviners/BlockReward/Abstract/Config.ts
-var BlockRewardDivinerConfigSchema = "network.xyo.diviner.chain.block.reward.config";
+var __defProp$d = Object.defineProperty;
+var __name$b = (target, value) => __defProp$d(target, "name", { value, configurable: true });
+var BlockRewardDivinerConfigSchema = asSchema("network.xyo.diviner.chain.block.reward.config", true);
 var BlockRewardDiviner = class extends AbstractDiviner {
   static {
-    __name$a(this, "BlockRewardDiviner");
+    __name$b(this, "BlockRewardDiviner");
   }
   static configSchemas = [
     BlockRewardDivinerConfigSchema
   ];
 };
-
-// src/diviners/BlockReward/FixedPercentage/Config.ts
-var FixedPercentageBlockRewardDivinerConfigSchema = "network.xyo.diviner.chain.block.reward.fixed.percent.config";
+asSchema("network.xyo.block.reward", true);
+var FixedPercentageBlockRewardDivinerConfigSchema = asSchema("network.xyo.diviner.chain.block.reward.fixed.percent.config", true);
 function _ts_decorate$4(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-__name$a(_ts_decorate$4, "_ts_decorate");
+__name$b(_ts_decorate$4, "_ts_decorate");
 var FixedPercentageBlockRewardDiviner = class extends BlockRewardDiviner {
   static {
-    __name$a(this, "FixedPercentageBlockRewardDiviner");
+    __name$b(this, "FixedPercentageBlockRewardDiviner");
   }
   static configSchemas = [
     BlockRewardDivinerConfigSchema,
@@ -203283,7 +203279,7 @@ var FixedPercentageBlockRewardDiviner = class extends BlockRewardDiviner {
 FixedPercentageBlockRewardDiviner = _ts_decorate$4([
   creatableModule()
 ], FixedPercentageBlockRewardDiviner);
-var countDecimalPlaces = /* @__PURE__ */ __name$a((num) => {
+var countDecimalPlaces = /* @__PURE__ */ __name$b((num) => {
   if (!Number.isFinite(num)) {
     throw new TypeError("Input must be a finite number");
   }
@@ -203297,11 +203293,11 @@ function _ts_decorate2$2(decorators, target, key, desc) {
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-__name$a(_ts_decorate2$2, "_ts_decorate");
-var BlockValidationDivinerConfigSchema = "network.xyo.diviner.chain.block.validation.config";
+__name$b(_ts_decorate2$2, "_ts_decorate");
+var BlockValidationDivinerConfigSchema = asSchema("network.xyo.diviner.chain.block.validation.config", true);
 var BlockValidationDiviner = class extends AbstractDiviner {
   static {
-    __name$a(this, "BlockValidationDiviner");
+    __name$b(this, "BlockValidationDiviner");
   }
   static configSchemas = [
     ...super.configSchemas,
@@ -203313,6 +203309,9 @@ var BlockValidationDiviner = class extends AbstractDiviner {
   get chainId() {
     return assertEx(this.config.chainId, () => "Missing chainId");
   }
+  get context() {
+    return assertEx(this.params.context, () => "Missing context");
+  }
   async resolveInArchivist() {
     const resolvedModule = assertEx(await this.resolve(assertEx(this.config.inArchivist, () => "Missing inArchivist")), () => `Unable to resolve inArchivist [${this.config.inArchivist}]`);
     const resolvedArchivist = assertEx(asArchivistInstance(resolvedModule), () => "Invalid inArchivist resolved");
@@ -203334,7 +203333,7 @@ var BlockValidationDiviner = class extends AbstractDiviner {
       const hydratedBlock = await hydrateBlock({
         chainMap: inMap
       }, blockHash);
-      return (await validateHydratedBlock(hydratedBlock, () => this.chainId, [], [
+      return (await validateHydratedBlock(this.context, hydratedBlock, () => this.chainId, [], [
         BlockJsonSchemaValidator()
       ])).length === 0 ? block : void 0;
     }))).filter(exists$2);
@@ -203356,11 +203355,11 @@ function _ts_decorate3$1(decorators, target, key, desc) {
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-__name$a(_ts_decorate3$1, "_ts_decorate");
-var HeadValidationDivinerConfigSchema = "network.xyo.diviner.chain.head.validation.config";
+__name$b(_ts_decorate3$1, "_ts_decorate");
+var HeadValidationDivinerConfigSchema = asSchema("network.xyo.diviner.chain.head.validation.config", true);
 var HeadValidationDiviner = class extends AbstractDiviner {
   static {
-    __name$a(this, "HeadValidationDiviner");
+    __name$b(this, "HeadValidationDiviner");
   }
   static configSchemas = [
     ...super.configSchemas,
@@ -203452,9 +203451,7 @@ var HeadValidationDiviner = class extends AbstractDiviner {
                   this._headValidationDivinerHeadUpdateTotal?.add(1, finalizedBlockAttributes);
                 }
               }
-            }, {
-              timeBudgetLimit: 1e3
-            });
+            }, this.context);
             await this.headSelector.finalizeChainFragment(blocksToFinalize);
             this._startingHead = newHydratedHeadBlock;
             return payloadsToFinalize;
@@ -203464,9 +203461,7 @@ var HeadValidationDiviner = class extends AbstractDiviner {
         } catch (ex) {
           this.logger?.error("Error in divineHandler", ex);
         }
-      }, {
-        timeBudgetLimit: 1e3
-      }) ?? [];
+      }, this.context) ?? [];
     });
   }
 };
@@ -203512,11 +203507,11 @@ async function processPendingBlocks({ blockViewer, context, finalizedArchivist,
     logger?.info("No head found to validate", currentBlock?.[0]._hash);
   }
 }
-__name$a(processPendingBlocks, "processPendingBlocks");
-var ArchivistNextWitnessConfigSchema = "network.xyo.witness.archivist.next.config";
+__name$b(processPendingBlocks, "processPendingBlocks");
+var ArchivistNextWitnessConfigSchema = asSchema("network.xyo.witness.archivist.next.config", true);
 (class extends AbstractWitness {
   static {
-    __name$a(this, "ArchivistNextWitness");
+    __name$b(this, "ArchivistNextWitness");
   }
   static configSchemas = [
     ...super.configSchemas,
@@ -203540,6 +203535,8 @@ var ArchivistNextWitnessConfigSchema = "network.xyo.witness.archivist.next.confi
     return payloads;
   }
 });
+asSchema("network.xyo.witness.chain.stake.network.weighted", true);
+asSchema("network.xyo.witness.chain.stake.network.observe", true);
 
 var shallowequal;
 var hasRequiredShallowequal;
@@ -203599,14 +203596,14 @@ function requireShallowequal () {
 var shallowequalExports = requireShallowequal();
 var isSame = /*@__PURE__*/getDefaultExportFromCjs(shallowequalExports);
 
-var __defProp$b = Object.defineProperty;
-var __name$9 = (target, value) => __defProp$b(target, "name", { value, configurable: true });
+var __defProp$c = Object.defineProperty;
+var __name$a = (target, value) => __defProp$c(target, "name", { value, configurable: true });
 var DEFAULT_FIND_FIRST_MATCHING_NEXT_OPTIONS = {
   limit: 100,
   open: false,
   order: "desc"
 };
-var findFirstMatching = /* @__PURE__ */ __name$9(async (archivist, predicate = () => true, nextOptions = DEFAULT_FIND_FIRST_MATCHING_NEXT_OPTIONS) => {
+var findFirstMatching = /* @__PURE__ */ __name$a(async (archivist, predicate = () => true, nextOptions = DEFAULT_FIND_FIRST_MATCHING_NEXT_OPTIONS) => {
   let cursor = void 0;
   if (isDefined(nextOptions.cursor)) cursor = nextOptions.cursor;
   let batch = [];
@@ -203625,7 +203622,7 @@ var findFirstMatching = /* @__PURE__ */ __name$9(async (archivist, predicate = (
 }, "findFirstMatching");
 
 // src/formatters/string/removeTrailingZeros.ts
-var removeTrailingZeros = /* @__PURE__ */ __name$9((value) => {
+var removeTrailingZeros = /* @__PURE__ */ __name$a((value) => {
   let i = value.length - 1;
   while (i >= 0 && value[i] === "0") {
     i--;
@@ -203634,9 +203631,9 @@ var removeTrailingZeros = /* @__PURE__ */ __name$9((value) => {
 }, "removeTrailingZeros");
 
 // src/formatters/string/bigIntToFixedPointString.ts
-var bigIntToFixedPointString = /* @__PURE__ */ __name$9((value, decimalPlaces = 18) => {
+var bigIntToFixedPointString = /* @__PURE__ */ __name$a((value, decimalPlaces = 18) => {
   const stringValue = value.toString(10);
-  const splitAtIndex = /* @__PURE__ */ __name$9((value2, index) => {
+  const splitAtIndex = /* @__PURE__ */ __name$a((value2, index) => {
     const part1 = value2.slice(0, index);
     const part2 = value2.slice(index);
     return [
@@ -203657,7 +203654,7 @@ var bigIntToFixedPointString = /* @__PURE__ */ __name$9((value, decimalPlaces =
 }, "bigIntToFixedPointString");
 
 // src/formatters/string/formatNumber.ts
-var isUnsafeInteger = /* @__PURE__ */ __name$9((value) => {
+var isUnsafeInteger = /* @__PURE__ */ __name$a((value) => {
   try {
     const parsedNumber = BigInt(value);
     return parsedNumber > BigInt(Number.MAX_SAFE_INTEGER);
@@ -203666,7 +203663,7 @@ var isUnsafeInteger = /* @__PURE__ */ __name$9((value) => {
     return true;
   }
 }, "isUnsafeInteger");
-var safeReturnInteger = /* @__PURE__ */ __name$9((value) => {
+var safeReturnInteger = /* @__PURE__ */ __name$a((value) => {
   return isUnsafeInteger(value) ? {
     unsafeInteger: true,
     value
@@ -203710,18 +203707,18 @@ function formatNumberForDisplay(value, significantFigures = 5, bigIntShift = 18)
     return safeReturnInteger(whole);
   }
 }
-__name$9(formatNumberForDisplay, "formatNumberForDisplay");
+__name$a(formatNumberForDisplay, "formatNumberForDisplay");
 function hexToLast4BytesInt(value) {
   assertEx(isHex(value), () => "value must be a hex string");
   const last4Bytes = value.slice(-8);
   return Number.parseInt(last4Bytes, 16);
 }
-__name$9(hexToLast4BytesInt, "hexToLast4BytesInt");
+__name$a(hexToLast4BytesInt, "hexToLast4BytesInt");
 
 // src/interval/IntervalMap.ts
 var IntervalMap = class {
   static {
-    __name$9(this, "IntervalMap");
+    __name$a(this, "IntervalMap");
   }
   map;
   constructor(data) {
@@ -203783,14 +203780,14 @@ var IntervalMap = class {
 function max(a, b) {
   return a > b ? a : b;
 }
-__name$9(max, "max");
+__name$a(max, "max");
 function height(node) {
   return node === void 0 ? -1 : node.height;
 }
-__name$9(height, "height");
+__name$a(height, "height");
 var Node = class _Node {
   static {
-    __name$9(this, "Node");
+    __name$a(this, "Node");
   }
   intervalTree;
   key;
@@ -204134,7 +204131,7 @@ var Node = class _Node {
 };
 var IntervalTree = class {
   static {
-    __name$9(this, "IntervalTree");
+    __name$a(this, "IntervalTree");
   }
   root;
   count = 0;
@@ -204262,7 +204259,7 @@ var IntervalTree = class {
 };
 (class {
   static {
-    __name$9(this, "DataIntervalTree");
+    __name$a(this, "DataIntervalTree");
   }
   tree = new IntervalTree();
   insert(low, high, data) {
@@ -204297,7 +204294,7 @@ var IntervalTree = class {
 });
 var InOrder = class {
   static {
-    __name$9(this, "InOrder");
+    __name$a(this, "InOrder");
   }
   stack = [];
   currentNode;
@@ -204345,7 +204342,7 @@ var InOrder = class {
 };
 var ReverseInOrder = class {
   static {
-    __name$9(this, "ReverseInOrder");
+    __name$a(this, "ReverseInOrder");
   }
   stack = [];
   currentNode;
@@ -204394,7 +204391,7 @@ var ReverseInOrder = class {
 };
 var PreOrder = class {
   static {
-    __name$9(this, "PreOrder");
+    __name$a(this, "PreOrder");
   }
   stack = [];
   currentNode;
@@ -204443,7 +204440,7 @@ function seededRandom(seed) {
     return x - Math.floor(x);
   };
 }
-__name$9(seededRandom, "seededRandom");
+__name$a(seededRandom, "seededRandom");
 function shuffleWithSeed(set, seed) {
   const array = [
     ...set
@@ -204458,7 +204455,7 @@ function shuffleWithSeed(set, seed) {
   }
   return array;
 }
-__name$9(shuffleWithSeed, "shuffleWithSeed");
+__name$a(shuffleWithSeed, "shuffleWithSeed");
 
 // src/telemetry/startupSpanAsync.ts
 async function startupSpanAsync(name, fn, logger) {
@@ -204473,14 +204470,14 @@ async function startupSpanAsync(name, fn, logger) {
     logger?.log(`[${name}] Initialized (${duration}ms)`);
   }
 }
-__name$9(startupSpanAsync, "startupSpanAsync");
+__name$a(startupSpanAsync, "startupSpanAsync");
 function spanDurationInMillis(span) {
   return span.duration[0] * 1e3 + span.duration[1] / 1e6;
 }
-__name$9(spanDurationInMillis, "spanDurationInMillis");
+__name$a(spanDurationInMillis, "spanDurationInMillis");
 (class _XyoConsoleSpanExporter extends ConsoleSpanExporter {
   static {
-    __name$9(this, "XyoConsoleSpanExporter");
+    __name$a(this, "XyoConsoleSpanExporter");
   }
   static durationToLogLevel = [
     0,
@@ -204534,18 +204531,18 @@ __name$9(spanDurationInMillis, "spanDurationInMillis");
   }
 });
 
-var __defProp$a = Object.defineProperty;
-var __name$8 = (target, value) => __defProp$a(target, "name", { value, configurable: true });
+var __defProp$b = Object.defineProperty;
+var __name$9 = (target, value) => __defProp$b(target, "name", { value, configurable: true });
 function _ts_decorate$3(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-__name$8(_ts_decorate$3, "_ts_decorate");
+__name$9(_ts_decorate$3, "_ts_decorate");
 var EvmBlockRewardViewer = class _EvmBlockRewardViewer extends AbstractCreatable {
   static {
-    __name$8(this, "EvmBlockRewardViewer");
+    __name$9(this, "EvmBlockRewardViewer");
   }
   static defaultMoniker = BlockRewardViewerMoniker;
   static monikers = [
@@ -204581,7 +204578,7 @@ EvmBlockRewardViewer = _ts_decorate$3([
 ], EvmBlockRewardViewer);
 (class extends AbstractCreatableProvider {
   static {
-    __name$8(this, "XyoValidator");
+    __name$9(this, "XyoValidator");
   }
   moniker = "Validator";
   _blockViewer;
@@ -204625,10 +204622,10 @@ function _ts_decorate2$1(decorators, target, key, desc) {
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-__name$8(_ts_decorate2$1, "_ts_decorate");
+__name$9(_ts_decorate2$1, "_ts_decorate");
 var BaseElectionService = class _BaseElectionService extends AbstractCreatableProvider {
   static {
-    __name$8(this, "BaseElectionService");
+    __name$9(this, "BaseElectionService");
   }
   static defaultMoniker = "Election";
   static dependencies = [];
@@ -204651,9 +204648,7 @@ var BaseElectionService = class _BaseElectionService extends AbstractCreatablePr
       const candidates = await this.stakeIntentService.getDeclaredCandidatesForBlock(nextBlock, "producer");
       const previousBlockHash = current._hash;
       return this.generateCreatorCommittee(candidates, previousBlockHash);
-    }, {
-      timeBudgetLimit: 200
-    });
+    }, this.context);
   }
   generateCreatorCommittee(candidates, previousBlockHash, maxSize = 3) {
     const creators = new Set(candidates);
@@ -204665,10 +204660,10 @@ var BaseElectionService = class _BaseElectionService extends AbstractCreatablePr
 BaseElectionService = _ts_decorate2$1([
   creatableProvider()
 ], BaseElectionService);
-var canUseChainId$1 = /* @__PURE__ */ __name$8((config) => {
+var canUseChainId$1 = /* @__PURE__ */ __name$9((config) => {
   return isDefined(config.evm.chainId);
 }, "canUseChainId");
-var getChainId$1 = /* @__PURE__ */ __name$8((config) => {
+var getChainId$1 = /* @__PURE__ */ __name$9((config) => {
   const chainId = assertEx(config.evm.chainId, () => "Missing config.evm.chainId");
   if (isHex(chainId, {
     prefix: true
@@ -204684,16 +204679,16 @@ var getChainId$1 = /* @__PURE__ */ __name$8((config) => {
 
 // src/implementation/evm/initInfuraProvider.ts
 var instance$1;
-var initInfuraProvider$1 = /* @__PURE__ */ __name$8((config) => {
+var initInfuraProvider$1 = /* @__PURE__ */ __name$9((config) => {
   if (instance$1) return instance$1;
   const providerConfig = getInfuraProviderConfig$1(config);
   instance$1 = Promise.resolve(new InfuraProvider(...providerConfig));
   return instance$1;
 }, "initInfuraProvider");
-var canUseInfuraProvider$1 = /* @__PURE__ */ __name$8((config) => {
+var canUseInfuraProvider$1 = /* @__PURE__ */ __name$9((config) => {
   return canUseChainId$1(config) && isDefined(config.evm?.infura?.projectId) && isDefined(config.evm?.infura?.projectSecret);
 }, "canUseInfuraProvider");
-var getInfuraProviderConfig$1 = /* @__PURE__ */ __name$8((config) => {
+var getInfuraProviderConfig$1 = /* @__PURE__ */ __name$9((config) => {
   const projectId = assertEx(config.evm?.infura?.projectId, () => "Missing config.evm.infura.projectId");
   const projectSecret = assertEx(config.evm?.infura?.projectSecret, () => "Missing config.evm.infura.projectSecret");
   return [
@@ -204702,14 +204697,14 @@ var getInfuraProviderConfig$1 = /* @__PURE__ */ __name$8((config) => {
     projectSecret
   ];
 }, "getInfuraProviderConfig");
-var initJsonRpcProvider$1 = /* @__PURE__ */ __name$8((config) => {
+var initJsonRpcProvider$1 = /* @__PURE__ */ __name$9((config) => {
   const providerConfig = getJsonRpcProviderConfig$1(config);
   return Promise.resolve(new JsonRpcProvider(...providerConfig));
 }, "initJsonRpcProvider");
-var canUseJsonRpcProvider$1 = /* @__PURE__ */ __name$8((config) => {
+var canUseJsonRpcProvider$1 = /* @__PURE__ */ __name$9((config) => {
   return canUseChainId$1(config) && isDefined(config.evm.jsonRpc?.url);
 }, "canUseJsonRpcProvider");
-var getJsonRpcProviderConfig$1 = /* @__PURE__ */ __name$8((config) => {
+var getJsonRpcProviderConfig$1 = /* @__PURE__ */ __name$9((config) => {
   const jsonRpcUrl = assertEx(config.evm.jsonRpc?.url, () => "Missing config.evm.jsonRpc.url");
   return [
     jsonRpcUrl,
@@ -204719,7 +204714,7 @@ var getJsonRpcProviderConfig$1 = /* @__PURE__ */ __name$8((config) => {
 
 // src/implementation/evm/initEvmProvider.ts
 var provider$1;
-var initEvmProvider$1 = /* @__PURE__ */ __name$8(async ({ config }) => {
+var initEvmProvider$1 = /* @__PURE__ */ __name$9(async ({ config }) => {
   if (provider$1) return provider$1;
   if (canUseInfuraProvider$1(config)) {
     provider$1 = initInfuraProvider$1(config);
@@ -204728,7 +204723,7 @@ var initEvmProvider$1 = /* @__PURE__ */ __name$8(async ({ config }) => {
   }
   return assertEx(await provider$1, () => "No provider available");
 }, "initEvmProvider");
-var createBootstrapHead = /* @__PURE__ */ __name$8(async (account, chainId, genesisBlockRewardAmount, genesisBlockRewardAddress) => {
+var createBootstrapHead = /* @__PURE__ */ __name$9(async (account, chainId, genesisBlockRewardAmount, genesisBlockRewardAddress) => {
   const chain = [];
   const genesisBlock = await createGenesisBlock(account, chainId, genesisBlockRewardAmount, genesisBlockRewardAddress);
   chain.push(genesisBlock);
@@ -204747,10 +204742,10 @@ function _ts_decorate3(decorators, target, key, desc) {
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-__name$8(_ts_decorate3, "_ts_decorate");
+__name$9(_ts_decorate3, "_ts_decorate");
 var BaseNetworkStakeStepRewardService = class _BaseNetworkStakeStepRewardService extends AbstractCreatableProvider {
   static {
-    __name$8(this, "BaseNetworkStakeStepRewardService");
+    __name$9(this, "BaseNetworkStakeStepRewardService");
   }
   static defaultMoniker = NetworkStakeStepRewardViewerMoniker;
   static dependencies = [];
@@ -204816,7 +204811,7 @@ var BaseNetworkStakeStepRewardService = class _BaseNetworkStakeStepRewardService
 BaseNetworkStakeStepRewardService = _ts_decorate3([
   creatableProvider()
 ], BaseNetworkStakeStepRewardService);
-var bundledPayloadToHydratedTransaction = /* @__PURE__ */ __name$8(async (payload) => {
+var bundledPayloadToHydratedTransaction = /* @__PURE__ */ __name$9(async (payload) => {
   const withHashMeta = await PayloadBuilder.addHashMeta(payload.payloads);
   const tx = asSignedTransactionBoundWitnessWithHashMeta(withHashMeta.find((p) => p._hash === payload.root));
   if (tx) {
@@ -204826,11 +204821,11 @@ var bundledPayloadToHydratedTransaction = /* @__PURE__ */ __name$8(async (payloa
     ];
   }
 }, "bundledPayloadToHydratedTransaction");
-var hydratedTransactionToPayloadBundle = /* @__PURE__ */ __name$8((transaction) => {
+var hydratedTransactionToPayloadBundle = /* @__PURE__ */ __name$9((transaction) => {
   const root = transaction[0]._hash;
   return bundle(root, transaction);
 }, "hydratedTransactionToPayloadBundle");
-var bundle = /* @__PURE__ */ __name$8((root, transaction) => {
+var bundle = /* @__PURE__ */ __name$9((root, transaction) => {
   const payloads = flattenHydratedTransaction(transaction).flatMap((p) => PayloadBuilder.omitStorageMeta(p));
   return new PayloadBuilder({
     schema: PayloadBundleSchema
@@ -204847,10 +204842,10 @@ function _ts_decorate4(decorators, target, key, desc) {
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-__name$8(_ts_decorate4, "_ts_decorate");
+__name$9(_ts_decorate4, "_ts_decorate");
 var BasePendingTransactionsService = class _BasePendingTransactionsService extends AbstractCreatableProvider {
   static {
-    __name$8(this, "BasePendingTransactionsService");
+    __name$9(this, "BasePendingTransactionsService");
   }
   static defaultMoniker = MempoolViewerMoniker;
   static dependencies = [];
@@ -204989,9 +204984,7 @@ var BasePendingTransactionsService = class _BasePendingTransactionsService exten
         }
         return foundPendingTransactions;
       }, _BasePendingTransactionsService.MutexPriority.ReadTransactions);
-    }, {
-      timeBudgetLimit: 100
-    });
+    }, this.context);
   }
   async cleanupWorker() {
     return await this._updateCuratedPendingTransactionsArchivistMutex.runExclusive(async () => {
@@ -205037,9 +205030,7 @@ var BasePendingTransactionsService = class _BasePendingTransactionsService exten
           await this.pendingBundledTransactionsLocalArchivist.insert(bundledTransactions);
         }
       }, _BasePendingTransactionsService.MutexPriority.InsertNewTransactions);
-    }, {
-      timeBudgetLimit: 200
-    });
+    }, this.context);
   }
   /**
   * Marks any included transactions in the provided payloads for removal preventing them
@@ -205091,26 +205082,24 @@ var BasePendingTransactionsService = class _BasePendingTransactionsService exten
           this.logger?.log(payload._hash);
         }
       }
-    }, {
-      timeBudgetLimit: 200
-    });
+    }, this.context);
   }
 };
 BasePendingTransactionsService = _ts_decorate4([
   creatableProvider()
 ], BasePendingTransactionsService);
-var isTransactionExpired = /* @__PURE__ */ __name$8((block) => ([txBw]) => txBw.exp < block, "isTransactionExpired");
-var isTransactionActive = /* @__PURE__ */ __name$8((block) => ([txBw]) => txBw.nbf <= block && txBw.exp >= block, "isTransactionActive");
+var isTransactionExpired = /* @__PURE__ */ __name$9((block) => ([txBw]) => txBw.exp < block, "isTransactionExpired");
+var isTransactionActive = /* @__PURE__ */ __name$9((block) => ([txBw]) => txBw.nbf <= block && txBw.exp >= block, "isTransactionActive");
 function _ts_decorate5(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-__name$8(_ts_decorate5, "_ts_decorate");
+__name$9(_ts_decorate5, "_ts_decorate");
 var BaseSchemasService = class _BaseSchemasService extends AbstractCreatableProvider {
   static {
-    __name$8(this, "BaseSchemasService");
+    __name$9(this, "BaseSchemasService");
   }
   static defaultMoniker = "SchemasService";
   static dependencies = [];
@@ -205132,9 +205121,7 @@ var BaseSchemasService = class _BaseSchemasService extends AbstractCreatableProv
         result[schema] = count;
       }
       return result;
-    }, {
-      timeBudgetLimit: 100
-    });
+    }, this.context);
   }
 };
 BaseSchemasService = _ts_decorate5([
@@ -205175,7 +205162,7 @@ async function generateTransactionFeeTransfers(address, transactions) {
   }
   return payloads;
 }
-__name$8(generateTransactionFeeTransfers, "generateTransactionFeeTransfers");
+__name$9(generateTransactionFeeTransfers, "generateTransactionFeeTransfers");
 
 // src/simple/block/runner/SimpleBlockRunner.ts
 function _ts_decorate6(decorators, target, key, desc) {
@@ -205184,13 +205171,13 @@ function _ts_decorate6(decorators, target, key, desc) {
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-__name$8(_ts_decorate6, "_ts_decorate");
+__name$9(_ts_decorate6, "_ts_decorate");
 var DEFAULT_BLOCK_SIZE = 10;
 var XYO_PRODUCER_REDECLARATION_DURATION = 1e4;
 var XYO_PRODUCER_REDECLARATION_WINDOW = 500;
 var SimpleBlockRunner = class _SimpleBlockRunner extends AbstractCreatableProvider {
   static {
-    __name$8(this, "SimpleBlockRunner");
+    __name$9(this, "SimpleBlockRunner");
   }
   static defaultMoniker = BlockRunnerMoniker;
   static dependencies = [
@@ -205388,9 +205375,7 @@ var SimpleBlockRunner = class _SimpleBlockRunner extends AbstractCreatableProvid
         this.logger?.error(`Error proposing next valid block: ${error.message}`);
         throw error;
       }
-    }, {
-      timeBudgetLimit: 200
-    });
+    }, this.context);
   }
   // remove unfunded transactions and block transfers
   async filterByFunded(head, txs, transfers, validateBalances = false) {
@@ -205445,13 +205430,13 @@ function _ts_decorate7(decorators, target, key, desc) {
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-__name$8(_ts_decorate7, "_ts_decorate");
+__name$9(_ts_decorate7, "_ts_decorate");
 var ACTIVE_STAKE_TTL = 1e3 * 60 * 60 * 2;
 var NO_ACTIVE_STAKE_TTL = 1e3 * 2;
 var STAKE_CACHE_MAX_ENTRIES = 1e4;
 var XyoStakeIntentService = class _XyoStakeIntentService extends AbstractCreatableProvider {
   static {
-    __name$8(this, "XyoStakeIntentService");
+    __name$9(this, "XyoStakeIntentService");
   }
   static defaultMoniker = "StakeIntent";
   static dependencies = [];
@@ -205517,9 +205502,7 @@ var XyoStakeIntentService = class _XyoStakeIntentService extends AbstractCreatab
       const requiredMinimumStake = this.getRequiredMinimumStakeForIntent(intent);
       const validCandidates = await this.filterToValidStake(candidates, this.chainStakeViewer, requiredMinimumStake);
       return validCandidates;
-    }, {
-      timeBudgetLimit: 200
-    });
+    }, this.context);
   }
   getRequiredMinimumStakeForIntent(intent) {
     switch (intent) {
@@ -205585,7 +205568,7 @@ var XyoStakeIntentService = class _XyoStakeIntentService extends AbstractCreatab
         ...DEFAULT_FIND_FIRST_MATCHING_NEXT_OPTIONS
       };
       while (true) {
-        const predicate = /* @__PURE__ */ __name$8((p) => {
+        const predicate = /* @__PURE__ */ __name$9((p) => {
           const state2 = asChainIndexingServiceStateWithStorageMeta(p);
           return state2 ? true : false;
         }, "predicate");
@@ -205621,7 +205604,7 @@ var XyoStakeIntentService = class _XyoStakeIntentService extends AbstractCreatab
         if (isUndefined$1(currentHead)) return;
         const currentHeadHash = currentHead._hash;
         const chainMap = readPayloadMapFromStore(this.chainArchivist);
-        const result = await analyzeChain({
+        const result = await analyzeChain(this.context, {
           chainMap
         }, [
           new ChainStakeIntentAnalyzer("producer")
@@ -205640,9 +205623,7 @@ var XyoStakeIntentService = class _XyoStakeIntentService extends AbstractCreatab
           }
         }
         this._lastIndexedBlockHash = currentHeadHash;
-      }, {
-        timeBudgetLimit: 1e3
-      });
+      }, this.context);
     });
   }
 };
@@ -205651,7 +205632,7 @@ XyoStakeIntentService = _ts_decorate7([
 ], XyoStakeIntentService);
 (class _AbstractStepStakeService extends AbstractCreatableProvider {
   static {
-    __name$8(this, "AbstractStepStakeService");
+    __name$9(this, "AbstractStepStakeService");
   }
   static defaultMoniker = StepStakeViewerMoniker;
   static monikers = [
@@ -205666,13 +205647,13 @@ XyoStakeIntentService = _ts_decorate7([
   }
 });
 
-var __defProp$9 = Object.defineProperty;
-var __name$7 = (target, value) => __defProp$9(target, "name", { value, configurable: true });
-var initContextManager = /* @__PURE__ */ __name$7(() => {
+var __defProp$a = Object.defineProperty;
+var __name$8 = (target, value) => __defProp$a(target, "name", { value, configurable: true });
+var initContextManager = /* @__PURE__ */ __name$8(() => {
   const contextManager = new AsyncLocalStorageContextManager();
   context.setGlobalContextManager(contextManager.enable());
 }, "initContextManager");
-var initPropagation = /* @__PURE__ */ __name$7(() => {
+var initPropagation = /* @__PURE__ */ __name$8(() => {
   propagation.setGlobalPropagator(new CompositePropagator({
     propagators: [
       new W3CTraceContextPropagator(),
@@ -205680,7 +205661,7 @@ var initPropagation = /* @__PURE__ */ __name$7(() => {
     ]
   }));
 }, "initPropagation");
-var initResource = /* @__PURE__ */ __name$7((attributes) => {
+var initResource = /* @__PURE__ */ __name$8((attributes) => {
   const detectedResource = detectResources({
     detectors: [
       // hostDetector,
@@ -205696,21 +205677,21 @@ var initResource = /* @__PURE__ */ __name$7((attributes) => {
   const resource = detectedResource.merge(staticResource);
   return resource;
 }, "initResource");
-var initHostMetrics = /* @__PURE__ */ __name$7((meterProvider) => {
+var initHostMetrics = /* @__PURE__ */ __name$8((meterProvider) => {
   const hostMetrics = new HostMetrics({
     meterProvider,
     name: "host-metrics"
   });
   hostMetrics.start();
 }, "initHostMetrics");
-var initNodeMetrics = /* @__PURE__ */ __name$7((meterProvider) => {
+var initNodeMetrics = /* @__PURE__ */ __name$8((meterProvider) => {
   const instrumentation = new RuntimeNodeInstrumentation({
     monitoringPrecision: 5e3
   });
   instrumentation.setMeterProvider(meterProvider);
   instrumentation.enable();
 }, "initNodeMetrics");
-var initMetricsExporter = /* @__PURE__ */ __name$7((metricsConfig) => {
+var initMetricsExporter = /* @__PURE__ */ __name$8((metricsConfig) => {
   const { port, endpoint } = metricsConfig;
   const exporter = new PrometheusExporter({
     port,
@@ -205720,7 +205701,7 @@ var initMetricsExporter = /* @__PURE__ */ __name$7((metricsConfig) => {
   });
   return exporter;
 }, "initMetricsExporter");
-var initMeterProvider = /* @__PURE__ */ __name$7((resource, readers) => {
+var initMeterProvider = /* @__PURE__ */ __name$8((resource, readers) => {
   const meterProvider = new MeterProvider({
     readers,
     resource,
@@ -205736,7 +205717,7 @@ var initMeterProvider = /* @__PURE__ */ __name$7((resource, readers) => {
   metrics$1.setGlobalMeterProvider(meterProvider);
   return meterProvider;
 }, "initMeterProvider");
-var initTraceProvider = /* @__PURE__ */ __name$7((otlpEndpoint, resource) => {
+var initTraceProvider = /* @__PURE__ */ __name$8((otlpEndpoint, resource) => {
   const spanProcessors = [];
   if (isDefined(otlpEndpoint)) {
     const isHttp = otlpEndpoint.includes("/v1/traces") || otlpEndpoint.includes(":4318") || otlpEndpoint.startsWith("http");
@@ -205758,7 +205739,7 @@ var initTraceProvider = /* @__PURE__ */ __name$7((otlpEndpoint, resource) => {
   trace$1.setGlobalTracerProvider(traceProvider);
   return traceProvider;
 }, "initTraceProvider");
-var initTelemetry = /* @__PURE__ */ __name$7((params) => {
+var initTelemetry = /* @__PURE__ */ __name$8((params) => {
   const { attributes, metricsConfig, otlpEndpoint } = params;
   initContextManager();
   initPropagation();
@@ -205776,11 +205757,11 @@ var initTelemetry = /* @__PURE__ */ __name$7((params) => {
   };
 }, "initTelemetry");
 
-var __defProp$8 = Object.defineProperty;
+var __defProp$9 = Object.defineProperty;
 var __getOwnPropDesc$1 = Object.getOwnPropertyDescriptor;
 var __getProtoOf = Object.getPrototypeOf;
 var __reflectGet = Reflect.get;
-var __defNormalProp$1 = (obj, key, value) => key in obj ? __defProp$8(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __defNormalProp$1 = (obj, key, value) => key in obj ? __defProp$9(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __decorateClass$1 = (decorators, target, key, kind) => {
   var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$1(target, key) : target;
   for (var i = decorators.length - 1, decorator; i >= 0; i--)
@@ -205790,12 +205771,10 @@ var __decorateClass$1 = (decorators, target, key, kind) => {
 };
 var __publicField$1 = (obj, key, value) => __defNormalProp$1(obj, typeof key !== "symbol" ? key + "" : key, value);
 var __superGet = (cls, obj, key) => __reflectGet(__getProtoOf(cls), key, obj);
-
-// src/Schema.ts
-var LmdbArchivistSchema = "network.xyo.archivist.lmdb";
+var LmdbArchivistSchema = asSchema("network.xyo.archivist.lmdb", true);
 
 // src/Config.ts
-var LmdbArchivistConfigSchema = `${LmdbArchivistSchema}.config`;
+var LmdbArchivistConfigSchema = asSchema(`${LmdbArchivistSchema}.config`, true);
 
 // src/Archivist.ts
 var LmdbArchivist = class extends AbstractArchivist {
@@ -296268,14 +296247,15 @@ var BaseMongoSdk = class {
 };
 
 // src/Schema.ts
-var MongoDBArchivistConfigSchema = "network.xyo.archivist.mongodb.config";
+var MongoDBArchivistConfigSchema = asSchema("network.xyo.archivist.mongodb.config", true);
 
 // src/Labels.ts
 var MongoDBStorageClassLabels = { "network.xyo.storage.class": "mongodb" };
+asSchema("network.xyo.module.mongodb.config", true);
 
-var __defProp$7 = Object.defineProperty;
+var __defProp$8 = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp$7(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp$8(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __decorateClass = (decorators, target, key, kind) => {
   var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc(target, key) : target;
   for (var i = decorators.length - 1, decorator; i >= 0; i--)
@@ -297171,29 +297151,38 @@ function requireStore2 () {
 var store2Exports = requireStore2();
 var store = /*@__PURE__*/getDefaultExportFromCjs(store2Exports);
 
-// src/boot/boot.ts
-var genericBoot = async (getHardwareAbstractionLayer2) => {
+var __defProp$7 = Object.defineProperty;
+var __name$7 = (target, value) => __defProp$7(target, "name", { value, configurable: true });
+var genericBoot = /* @__PURE__ */ __name$7(async (getHardwareAbstractionLayer2) => {
   const { seedPhraseStore } = await getHardwareAbstractionLayer2();
-  for (const walletName of ["os", "user"]) {
+  for (const walletName of [
+    "os",
+    "user"
+  ]) {
     await findOrCreateWallet(seedPhraseStore, walletName);
   }
-  return { seedPhraseStore };
-};
-var findOrCreateWallet = async (seedPhraseStore, walletKind) => {
+  return {
+    seedPhraseStore
+  };
+}, "genericBoot");
+var findOrCreateWallet = /* @__PURE__ */ __name$7(async (seedPhraseStore, walletKind) => {
   if (await seedPhraseStore.get(walletKind)) return;
   const mnemonic = HDWallet.generateMnemonic();
   await seedPhraseStore.set(walletKind, mnemonic);
-};
+}, "findOrCreateWallet");
 var typedStore = store;
 var StorageKeyValueStore = class _StorageKeyValueStore {
+  static {
+    __name$7(this, "StorageKeyValueStore");
+  }
   _storage;
   /**
-     * The namespace for the storage.
-     */
+  * The namespace for the storage.
+  */
   namespace;
   /**
-     * The type of storage.
-     */
+  * The type of storage.
+  */
   type;
   constructor(namespace = "bios", type = "local") {
     this.namespace = namespace;
@@ -297228,13 +297217,16 @@ var reactManagedStoreType = "local";
 var reactManagedStoreNamespace = "AppSetting";
 var reactManagedStoreKey = "seedPhrase";
 var LocalStorageKeyValueStore = class _LocalStorageKeyValueStore extends StorageKeyValueStore {
+  static {
+    __name$7(this, "LocalStorageKeyValueStore");
+  }
   constructor(namespace = "bios") {
     super(namespace, "local");
     _LocalStorageKeyValueStore.migrateReactManagedOsSeedPhrase(namespace);
   }
   /**
-   * Migrate legacy OS seedPhrase (created in React) to new location which is managed by bios
-   */
+  * Migrate legacy OS seedPhrase (created in React) to new location which is managed by bios
+  */
   static migrateReactManagedOsSeedPhrase(namespace) {
     const legacyStore = StorageKeyValueStore.getStorage(reactManagedStoreType, reactManagedStoreNamespace);
     const seedPhrase = legacyStore.get(reactManagedStoreKey);
@@ -297247,19 +297239,23 @@ var LocalStorageKeyValueStore = class _LocalStorageKeyValueStore extends Storage
 };
 
 // src/hal/getHardwareAbstractionLayer.ts
-var getHardwareAbstractionLayer = () => {
+var getHardwareAbstractionLayer = /* @__PURE__ */ __name$7(() => {
   const seedPhraseStore = new LocalStorageKeyValueStore("bios|seedPhrase");
-  return { seedPhraseStore };
-};
+  return {
+    seedPhraseStore
+  };
+}, "getHardwareAbstractionLayer");
 
 // src/external/getBiosExternalInterface.ts
-var getBiosExternalInterface = async () => {
+var getBiosExternalInterface = /* @__PURE__ */ __name$7(async () => {
   const { seedPhraseStore } = await getHardwareAbstractionLayer();
-  return { seedPhraseStore };
-};
+  return {
+    seedPhraseStore
+  };
+}, "getBiosExternalInterface");
 
 // src/external/boot.ts
-var boot = () => genericBoot(getBiosExternalInterface);
+var boot = /* @__PURE__ */ __name$7(() => genericBoot(getBiosExternalInterface), "boot");
 
 var __defProp$6 = Object.defineProperty;
 var __name$6 = (target, value) => __defProp$6(target, "name", { value, configurable: true });
@@ -297340,7 +297336,8 @@ var ValidatorActor = class extends Actor {
             finalizedArchivist: this.finalizedArchivist
           });
         }, {
-          timeBudgetLimit: 2e3
+          ...this.context,
+          timeBudgetLimit: 1500
         });
       },
       2e3,
@@ -298438,6 +298435,7 @@ var hostname$3 = "::";
 async function getServer$3(params) {
   const { config, node: providedNode } = params;
   const { port } = params.config.api;
+  const { id: configuredChainId } = config.chain;
   const logger = assertEx(params.logger, () => "Logger is required to init server");
   const statusReporter = initStatusReporter({
     logger
@@ -298474,14 +298472,19 @@ async function getServer$3(params) {
   await pendingTransactionsArchivist.start();
   await pendingBlocksArchivist.start();
   const possibleHead = await findMostRecentBlock(readonlyChainArchivist);
+  if (configuredChainId && possibleHead && possibleHead.chain !== configuredChainId) {
+    throw new Error(`Configured chain ID (${configuredChainId}) does not match the existing chain ID (${possibleHead.chain})`);
+  }
+  let possibleChainId = configuredChainId;
   if (!possibleHead) {
-    const chainId2 = (await Account.random()).address;
-    const chain = await createBootstrapHead(wallet, chainId2, asAttoXL1(20000000000000000000000n), config.chain.genesisRewardAddress ?? wallet.address);
+    possibleChainId = possibleChainId ?? (await Account.random()).address;
+    const chain = await createBootstrapHead(wallet, possibleChainId, asAttoXL1(20000000000000000000000n), config.chain.genesisRewardAddress ?? wallet.address);
     const payloads = chain.flatMap((block) => flattenHydratedBlock(block));
     await writableChainArchivist.insert(payloads);
   }
-  const head = assertEx(await findMostRecentBlock(readonlyChainArchivist), () => "No blocks found in chain archivist");
-  const chainId = head.chain;
+  const head = possibleHead ?? assertEx(await findMostRecentBlock(readonlyChainArchivist), () => "No blocks found in chain archivist");
+  const chainId = assertEx(possibleChainId, () => "Chain ID could not be determined");
+  assertEx(head.chain === chainId, () => "Chain ID does not match head block chain ID [init]");
   const mods = await node.resolve("*");
   await Promise.all(mods.map((mod) => {
     return mod.start?.() ?? (() => true);
@@ -298493,6 +298496,7 @@ async function getServer$3(params) {
     summaryMap: balancesSummaryMap,
     head: /* @__PURE__ */ __name$5(async function() {
       const head2 = assertEx(await findMostRecentBlock(writableChainArchivist));
+      assertEx(head2.chain === chainId, () => "Chain ID does not match head block chain ID [balanceSummaryContext]");
       return [
         head2._hash,
         head2.block
@@ -298509,6 +298513,7 @@ async function getServer$3(params) {
     summaryMap: transfersSummaryMap,
     head: /* @__PURE__ */ __name$5(async function() {
       const head2 = assertEx(await findMostRecentBlock(writableChainArchivist));
+      assertEx(head2.chain === chainId, () => "Chain ID does not match head block chain ID [transfersSummaryContext]");
       return [
         head2._hash,
         head2.block
@@ -298526,7 +298531,8 @@ async function getServer$3(params) {
     pendingBlocksArchivist,
     balanceSummaryContext,
     transfersSummaryContext,
-    node
+    node,
+    chainId
   });
   if (canUseEvmProvider({
     config
@@ -298546,6 +298552,10 @@ async function getServer$3(params) {
       contract,
       stakeEventsViewer
     }));
+    locator.register(EvmChainContractViewer.factory(EvmChainContractViewer.dependencies, {
+      address: asAddress(contractAddress, true),
+      runner: provider
+    }));
   }
   const apiContext = {
     ...initContext,
@@ -298834,6 +298844,7 @@ var ProducerActor = class _ProducerActor extends Actor {
         }
       });
     }, {
+      ...this.context,
       timeBudgetLimit: 1e3
     });
   }
@@ -298865,6 +298876,7 @@ var ProducerActor = class _ProducerActor extends Actor {
       await this.submitRedeclarationIntent(currentBlock, redeclarationIntent);
       this._lastRedeclarationIntent = redeclarationIntent;
     }, {
+      ...this.context,
       timeBudgetLimit: 1e3
     });
   }
@@ -298879,7 +298891,7 @@ var ProducerActor = class _ProducerActor extends Actor {
     this.logger?.log("Submitted redeclaration intent for producer:", this.account.address);
   }
   async validateCurrentBalance() {
-    const head = this._lastProducedBlock?.[0]._hash;
+    const head = (await this.blockViewer.currentBlock())?.[0]?._hash;
     if (isDefined(head)) {
       const balances = await this.accountBalanceViewer.accountBalances([
         this.account.address
@@ -320358,7 +320370,7 @@ if (!nativeAccelerationDisabled) {
 	}
 }
 
-const version$2 = '5.67.1';
+const version$2 = '5.67.2';
 
 /**
  * Includes all the scripts needed by the queue and jobs.
@@ -341508,7 +341520,7 @@ var getApp$2 = /* @__PURE__ */ __name$3((node, config) => {
   app.use(standardErrors);
   return app;
 }, "getApp");
-var EVMLiquidityBridgeTransactionCompletionMonitorSentinelConfigSchema = "network.xyo.sentinel.chain.evm.liquidity.bridge.transaction.completion.monitor.config";
+var EVMLiquidityBridgeTransactionCompletionMonitorSentinelConfigSchema = asSchema("network.xyo.sentinel.chain.evm.liquidity.bridge.transaction.completion.monitor.config", true);
 var defaultJobCheckIntervalMs = 15e3;
 var EVMLiquidityBridgeTransactionCompletionMonitorSentinel = class extends AbstractSentinel {
   static {
@@ -341650,7 +341662,7 @@ var EVMLiquidityBridgeTransactionCompletionMonitorSentinel = class extends Abstr
     return result;
   }
 };
-var XL1TransactionCompletionMonitorSentinelConfigSchema = "network.xyo.sentinel.chain.transaction.completion.monitor.config";
+var XL1TransactionCompletionMonitorSentinelConfigSchema = asSchema("network.xyo.sentinel.chain.transaction.completion.monitor.config", true);
 var defaultJobCheckIntervalMs2 = 15e3;
 var XL1TransactionCompletionMonitorSentinel = class extends AbstractSentinel {
   static {
@@ -342694,7 +342706,7 @@ var getApp = /* @__PURE__ */ __name$1((node, config) => {
   app.use(standardErrors);
   return app;
 }, "getApp");
-var ChainStepRewardsClaimSentinelConfigSchema = "network.xyo.sentinel.chain.step.rewards.claim.config";
+var ChainStepRewardsClaimSentinelConfigSchema = asSchema("network.xyo.sentinel.chain.step.rewards.claim.config", true);
 var defaultStepClaimIntervalMs = 15e3;
 var scope = "reward-escrow";
 var RewardableSteps2 = [
@@ -342865,7 +342877,7 @@ var ChainStepRewardsClaimSentinel = class extends AbstractSentinel {
     if (isDefined(result)) return result[1];
   }
 };
-var DerivedAddressWalletTransferSentinelConfigSchema = "network.xyo.sentinel.chain.derived.address.wallet.transfer.config";
+var DerivedAddressWalletTransferSentinelConfigSchema = asSchema("network.xyo.sentinel.chain.derived.address.wallet.transfer.config", true);
 var scope2 = "reward-escrow";
 var ConfirmedClaimValuesZod = z.object({
   "From": EthAddressZod,
@@ -343048,9 +343060,8 @@ var getGateway = /* @__PURE__ */ __name$1(async (config) => {
   locator.register(SimpleXyoSigner.factory(SimpleXyoSigner.dependencies, {
     account
   }));
-  const connection = await locator.getInstance(XyoConnectionMoniker);
-  const signer = await locator.getInstance(XyoSignerMoniker);
-  const gateway = new SimpleXyoGatewayRunner(connection, signer);
+  locator.register(SimpleXyoGatewayRunner.factory(SimpleXyoGatewayRunner.dependencies));
+  const gateway = await locator.getInstance(SimpleXyoGatewayRunner.defaultMoniker);
   return gateway;
 }, "getGateway");
 
@@ -350152,7 +350163,7 @@ var waitForHostPort = /* @__PURE__ */ __name((host, port) => {
 
 // src/runCLI.ts
 var configuration;
-var version = isDefined("1.18.4") ? "1.18.4" : "unknown";
+var version = isDefined("1.18.5") ? "1.18.5" : "unknown";
 var getContextFromConfig = /* @__PURE__ */ __name(async (configuration2) => {
   const logger = initLogger(configuration2);
   const orchestrator = await Orchestrator.create({