@xyo-network/xl1-protocol-sdk 2.1.9 → 2.2.1

package/dist/neutral/index.mjs

@@ -27,11 +27,13 @@ var splitOnDecimalToString = (value, places = 18, maxDecimal = places, maxCharac
   const wholeCharacters = whole.toString(10).length;
   const calcMaxDecimalCharacters = maxCharacters === -1 ? places : wholeCharacters > maxCharacters ? 0 : maxCharacters - wholeCharacters;
   const maxDecimalCharacters = Math.min(maxDecimal, calcMaxDecimalCharacters);
-  const formattedWhole = new Intl.NumberFormat(locale, {
+  const wholeFormatter = new Intl.NumberFormat(locale, {
     maximumFractionDigits: 0,
     useGrouping: true
-  }).format(whole);
-  const decimalSeparator = new Intl.NumberFormat(locale).formatToParts(1.1).find((part) => part.type === "decimal")?.value ?? ".";
+  });
+  const formattedWhole = wholeFormatter.format(whole);
+  const decimalFormatter = new Intl.NumberFormat(locale);
+  const decimalSeparator = decimalFormatter.formatToParts(1.1).find((part) => part.type === "decimal")?.value ?? ".";
   let paddedDecimal = decimal.toString().padStart(places, "0").slice(0, maxDecimalCharacters);
   while (paddedDecimal.length > minDecimals && paddedDecimal.endsWith("0")) {
     paddedDecimal = paddedDecimal.slice(0, -1);
@@ -54,7 +56,7 @@ var ShiftedBigInt = class _ShiftedBigInt {
     this.value = typeof value === "bigint" ? value : value.value;
     this.config = {
       ..._ShiftedBigInt.defaultConfig,
-      ...typeof value === "bigint" ? {} : value.config,
+      ...typeof value !== "bigint" && value.config,
       ...config
     };
   }
@@ -98,7 +100,7 @@ var ShiftedBigInt = class _ShiftedBigInt {
   }
 };
 
-// src/amount/XL1Amount.ts
+// src/amount/xl1Amount.ts
 import { assertEx } from "@xylabs/sdk-js";
 import {
   AttoXL1,
@@ -170,7 +172,7 @@ var XL1Amount = class _XL1Amount {
   }
   toString(places = Number(XL1Places.atto), config = {}) {
     assertEx(allowedPlaces.includes(BigInt(places)), () => `Invalid conversion places (${places} not in ${allowedPlaces.join(", ")})`);
-    return new ShiftedBigInt(
+    const shifted = new ShiftedBigInt(
       this.value,
       {
         places,
@@ -180,7 +182,8 @@ var XL1Amount = class _XL1Amount {
         maxCharacters: places,
         ...config
       }
-    ).toShortString();
+    );
+    return shifted.toShortString();
   }
 };
 
@@ -214,10 +217,11 @@ import { isUndefined } from "@xylabs/sdk-js";
 import { isAnyPayload, PayloadBuilder } from "@xyo-network/sdk-js";
 async function addDataLakePayloadsToPayloads(hashes, payloads, dataLakeViewer) {
   if (isUndefined(dataLakeViewer)) return [payloads, []];
-  const missingPayloadHashes = hashes.filter((hash) => !payloads.some((p) => p._hash === hash));
-  const payloadsFromDataLake = await PayloadBuilder.addHashMeta(
-    await PayloadBuilder.addHashMeta((await dataLakeViewer.get(missingPayloadHashes)).filter(isAnyPayload))
-  );
+  const missingPayloadHashes = hashes.filter((hash) => payloads.every((p) => p._hash !== hash));
+  const dataLakeResults = await dataLakeViewer.get(missingPayloadHashes);
+  const filteredDataLakePayloads = dataLakeResults.filter(isAnyPayload);
+  const payloadsWithHashMeta = await PayloadBuilder.addHashMeta(filteredDataLakePayloads);
+  const payloadsFromDataLake = await PayloadBuilder.addHashMeta(payloadsWithHashMeta);
   return [[...payloads, ...payloadsFromDataLake], payloadsFromDataLake.map((p) => p._hash)];
 }
 
@@ -280,10 +284,7 @@ var PayloadLocator = class {
     const buckets = hashes.map(() => []);
     for (const dl of this.datalakes) {
       const fetched = await Promise.all(hashes.map(async (h) => await this.fetchOne(dl, h)));
-      for (const [i, p] of fetched.entries()) {
-        if (isUndefined2(p)) continue;
-        buckets[i].push({ payload: p, source: dl.name });
-      }
+      collectFetchedIntoBuckets(fetched, dl, buckets);
     }
     for (const [i, h] of hashes.entries()) result.set(h, buckets[i]);
     return result;
@@ -297,16 +298,27 @@ var PayloadLocator = class {
       const needHashes = [];
       for (const h of hashes) if (remaining.has(h)) needHashes.push(h);
       const fetched = await Promise.all(needHashes.map(async (h) => await this.fetchOne(dl, h)));
-      for (const [i, h] of needHashes.entries()) {
-        const p = fetched[i];
-        if (isUndefined2(p)) continue;
-        result.set(h, { payload: p, source: dl.name });
-        remaining.delete(h);
-      }
+      collectFirstFetched(needHashes, fetched, dl, result, remaining);
     }
     return result;
   }
 };
+function collectFetchedIntoBuckets(fetched, dl, buckets) {
+  for (const [i, p] of fetched.entries()) {
+    if (!isUndefined2(p)) {
+      buckets[i].push({ payload: p, source: dl.name });
+    }
+  }
+}
+function collectFirstFetched(needHashes, fetched, dl, result, remaining) {
+  for (const [i, h] of needHashes.entries()) {
+    const p = fetched[i];
+    if (!isUndefined2(p)) {
+      result.set(h, { payload: p, source: dl.name });
+      remaining.delete(h);
+    }
+  }
+}
 
 // src/block/hydrate/BoundWitnessHydrator.ts
 var DEFAULT_CACHE_MAX = 5e3;
@@ -629,15 +641,18 @@ var hydrateBlock = async (context, hash, maxDepth = 1, minDepth = maxDepth) => {
     assertEx5(block, () => `block ${hash} not found`)
   ), () => `hash ${hash} is not a BlockBoundWitness`);
   if (maxDepth === 0) return [bw, []];
-  const blkPayloads = (await chainMap.get(bw.payload_hashes)).map((p) => asAnyPayload(p, true));
+  const blockPayloadResults = await chainMap.get(bw.payload_hashes);
+  const blkPayloads = blockPayloadResults.map((p) => asAnyPayload(p, true));
   if (minDepth === 1) assertEx5(allHashesPresent(bw.payload_hashes, blkPayloads), () => `Unable to find all payloads for block ${hash}`);
   if (maxDepth === 1) return [bw, blkPayloads];
   const transactions = blkPayloads.filter(isTransactionBoundWitnessWithStorageMeta);
   const transactionsPayloadHashes = transactions.flatMap((tx) => tx.payload_hashes);
-  const transactionsPayloads = (await chainMap.get(transactionsPayloadHashes)).map((p) => asAnyPayload(p, true));
+  const transactionPayloadResults = await chainMap.get(transactionsPayloadHashes);
+  const transactionsPayloads = transactionPayloadResults.map((p) => asAnyPayload(p, true));
   assertEx5(allHashesPresent(transactionsPayloadHashes, transactionsPayloads), () => `Unable to find all payloads for transactions in block ${hash}`);
   const allPayloadsHashes = new Set([...blkPayloads, ...transactionsPayloads].flatMap((p) => p._hash));
-  const allPayloads = (await chainMap.get([...allPayloadsHashes])).map((p) => asAnyPayload(p, true));
+  const allPayloadResults = await chainMap.get([...allPayloadsHashes]);
+  const allPayloads = allPayloadResults.map((p) => asAnyPayload(p, true));
   const allPayloadsFiltered = allPayloads.filter((p) => allPayloadsHashes.has(p._hash));
   if (maxDepth === 2) assertEx5(allHashesPresent(
     [...allPayloadsHashes],
@@ -657,7 +672,8 @@ import { assertEx as assertEx6 } from "@xylabs/sdk-js";
 import { isBlockBoundWitnessWithStorageMeta, isTransactionBoundWitnessWithStorageMeta as isTransactionBoundWitnessWithStorageMeta2 } from "@xyo-network/xl1-protocol-lib";
 var tryHydrateBlock = async (archivist, hash, maxDepth = 1) => {
   assertEx6(maxDepth >= 0, () => "maxDepth must be greater than or equal to 0");
-  const bw = (await archivist.get([hash])).find(isBlockBoundWitnessWithStorageMeta);
+  const archivistResults = await archivist.get([hash]);
+  const bw = archivistResults.find(isBlockBoundWitnessWithStorageMeta);
   if (!bw) return void 0;
   if (maxDepth === 0) return [bw, []];
   const blkPayloads = await archivist.get(bw.payload_hashes);
@@ -720,7 +736,7 @@ async function withContextCacheResponse(context, name, key, func, { max = 1e4 }
 // src/block/primitives/blockFromBlockNumber.ts
 async function blockFromBlockNumber(context, blockNumber) {
   return await spanAsync("blockFromBlockNumber", async () => {
-    const cacheKey = `${blockNumber}`;
+    const cacheKey = String(blockNumber);
     const { chainMap, head } = context;
     return await withContextCacheResponse(context, "blockFromBlockNumber", cacheKey, async () => {
       const [result] = await chainMap.get([head._hash]);
@@ -818,7 +834,8 @@ function deepCalculateFramesFromRange(range, startingStep = StepSizes2.length -
 
 // src/block/primitives/hashFromBlockNumber.ts
 async function hashFromBlockNumber(context, blockNumber) {
-  return (await blockFromBlockNumber(context, blockNumber))._hash;
+  const block = await blockFromBlockNumber(context, blockNumber);
+  return block._hash;
 }
 
 // src/block/primitives/model.ts
@@ -847,35 +864,41 @@ import {
   PayloadBuilder as PayloadBuilder3
 } from "@xyo-network/sdk-js";
 import { isExecutable } from "@xyo-network/xl1-protocol-lib";
+async function processElevateOperation(opCode, args, txBw, txPayloads) {
+  const [hash, ...rest] = args;
+  const txPayloadsWithStorageMeta = await PayloadBuilder3.addStorageMeta(txPayloads);
+  assertEx7(rest.length === 0, () => `Invalid elevate operation ${opCode} ${args.join(", ")} - Too many Arguments`);
+  if (isHash(hash)) {
+    assertEx7(
+      txBw.payload_hashes.includes(hash),
+      () => `Invalid elevate operation ${opCode} ${args.join(", ")} - Hash not in payload hashes => ${toSafeJsonString2(txBw, 20)}`
+    );
+    return assertEx7(
+      txPayloadsWithStorageMeta.find((p) => p._hash === hash),
+      () => `Invalid elevate operation ${opCode} ${args.join(", ")} - Payload not found`
+    );
+  }
+  throw new Error(`Invalid elevate operation ${opCode} ${args.join(", ")} - Invalid hash`);
+}
+async function processOperation(opCode, args, txBw, txPayloads) {
+  switch (opCode) {
+    case "elevate": {
+      return await processElevateOperation(opCode, args, txBw, txPayloads);
+    }
+    default: {
+      throw new Error(`Invalid opCode ${opCode}`);
+    }
+  }
+}
 async function validateTransactionsOpcodes(txs) {
   const txElevatedPayloads = [];
   for (const [txBw, txPayloads] of txs) {
     if (isExecutable(txBw)) {
       const operations = txBw.script.map((op) => op.split("|"));
       for (const [opCode, ...args] of operations) {
-        switch (opCode) {
-          case "elevate": {
-            const [hash, ...rest] = args;
-            const txPayloadsWithStorageMeta = await PayloadBuilder3.addStorageMeta(txPayloads);
-            assertEx7(rest.length === 0, () => `Invalid elevate operation ${opCode} ${args.join(", ")} - Too many Arguments`);
-            if (isHash(hash)) {
-              assertEx7(
-                txBw.payload_hashes.includes(hash),
-                () => `Invalid elevate operation ${opCode} ${args.join(", ")} - Hash not in payload hashes => ${toSafeJsonString2(txBw, 20)}`
-              );
-              const txPayload = assertEx7(
-                txPayloadsWithStorageMeta.find((p) => p._hash === hash),
-                () => `Invalid elevate operation ${opCode} ${args.join(", ")} - Payload not found`
-              );
-              txElevatedPayloads.push(txPayload);
-            } else {
-              throw new Error(`Invalid elevate operation ${opCode} ${args.join(", ")} - Invalid hash`);
-            }
-            break;
-          }
-          default: {
-            throw new Error(`Invalid opCode ${opCode}`);
-          }
+        const txPayload = await processOperation(opCode, args, txBw, txPayloads);
+        if (txPayload !== void 0) {
+          txElevatedPayloads.push(txPayload);
         }
       }
     }
@@ -893,7 +916,7 @@ function backingsSatisfied(required, available) {
 }
 function unmetBackings(required, available) {
   return required.filter((need) => {
-    return !available.some((a) => a.backing === need.backing && (a.mode === "write" || need.mode === "read"));
+    return available.every((a) => !(a.backing === need.backing && (a.mode === "write" || need.mode === "read")));
   });
 }
 
@@ -914,7 +937,7 @@ var CapabilityRegistry = class {
   }
   toJson() {
     const result = {};
-    for (const [id, cap] of this._entries.entries()) {
+    for (const [id, cap] of this._entries) {
       const { id: _, ...rest } = cap;
       result[id] = rest;
     }
@@ -1023,8 +1046,8 @@ function resolveProviders(needs, candidates, ctx, options = {}) {
   const { surviving, rejected: preconditionRejected } = filterByPreconditions(backingFiltered, ctx);
   const rejected = [...backingRejected, ...preconditionRejected];
   const byCapability = groupByCapability(surviving, wanted);
-  const { bindings, selectedById } = pickWinners(wanted, byCapability, rejected, candidates);
-  const selected = topoSort([...selectedById.values()], ctx);
+  const { bindings, selectedById } = pickWinners(wanted, byCapability, rejected, candidates, options);
+  const selected = topoSort(selectedById.values().toArray(), ctx);
   return {
     bindings,
     rejected,
@@ -1083,23 +1106,36 @@ function filterByPreconditions(candidates, ctx) {
   }
   return { surviving, rejected };
 }
+function addDescriptorCapabilities(byCapability, descriptor, wanted) {
+  for (const moniker of descriptor.satisfies) {
+    if (!wanted.has(moniker)) {
+      continue;
+    }
+    const list = byCapability.get(moniker) ?? [];
+    list.push(descriptor);
+    byCapability.set(moniker, list);
+  }
+}
 function groupByCapability(surviving, wanted) {
   const byCapability = /* @__PURE__ */ new Map();
   for (const descriptor of surviving) {
-    for (const moniker of descriptor.satisfies) {
-      if (!wanted.has(moniker)) continue;
-      const list = byCapability.get(moniker) ?? [];
-      list.push(descriptor);
-      byCapability.set(moniker, list);
-    }
+    addDescriptorCapabilities(byCapability, descriptor, wanted);
   }
   return byCapability;
 }
-function pickWinners(wanted, byCapability, rejected, allCandidates) {
+function pickWinners(wanted, byCapability, rejected, allCandidates, options) {
   const bindings = {};
   const selectedById = /* @__PURE__ */ new Map();
   for (const moniker of wanted) {
-    const group = byCapability.get(moniker);
+    let group = byCapability.get(moniker);
+    const pinned = options.implementations?.[moniker];
+    if (pinned !== void 0 && pinned !== "") {
+      const pinnedGroup = group?.filter((descriptor) => descriptor.id === pinned);
+      if (!pinnedGroup || pinnedGroup.length === 0) {
+        throw new MissingCapabilityError(moniker, [`requested implementation '${pinned}' not available`]);
+      }
+      group = pinnedGroup;
+    }
     if (!group || group.length === 0) {
       throw new MissingCapabilityError(moniker, reasonsFor(moniker, rejected, allCandidates));
     }
@@ -1162,14 +1198,14 @@ import {
   zodIsFactory as zodIsFactory2,
   zodToFactory as zodToFactory2
 } from "@xylabs/sdk-js";
-import { globalRegistry as globalRegistry12, z as z18 } from "zod/mini";
+import { globalRegistry as globalRegistry14, z as z20 } from "zod/mini";
 
 // src/config/Base.ts
-import { z as z17 } from "zod/mini";
+import { z as z19 } from "zod/mini";
 
 // src/config/Chain.ts
 import { HexZod } from "@xylabs/sdk-js";
-import { XyoAddressZod } from "@xyo-network/address";
+import { XyoAddressZod } from "@xyo-network/sdk-js";
 import { globalRegistry, z as z2 } from "zod/mini";
 var ChainConfigZod = z2.object({
   id: z2.optional(HexZod).register(globalRegistry, {
@@ -1278,8 +1314,24 @@ var LogConfigZod = z8.object({
   })
 });
 
+// src/config/ProviderBinding.ts
+import { globalRegistry as globalRegistry7, z as z9 } from "zod";
+var ProviderBindingConfigZod = z9.object({
+  implementation: z9.string().optional().register(globalRegistry7, {
+    description: "Installed provider implementation id (descriptor id)",
+    title: "providerBindings.implementation",
+    type: "string"
+  }),
+  transport: z9.string().optional().register(globalRegistry7, {
+    description: "Named transport from the top-level transports map",
+    title: "providerBindings.transport",
+    type: "string"
+  })
+}).describe("Provider implementation and transport binding");
+var ProviderBindingsConfigZod = z9.record(z9.string(), ProviderBindingConfigZod).default({});
+
 // src/config/Providers.ts
-import z10 from "zod";
+import z11 from "zod";
 
 // src/config/Provider.ts
 import {
@@ -1287,83 +1339,83 @@ import {
   zodIsFactory,
   zodToFactory
 } from "@xylabs/sdk-js";
-import { z as z9 } from "zod";
-var ProviderConfigZod = z9.object({
-  moniker: z9.string(),
-  labels: z9.array(z9.string()).optional()
+import { z as z10 } from "zod";
+var ProviderConfigZod = z10.object({
+  moniker: z10.string(),
+  labels: z10.array(z10.string()).optional()
 }).describe("Configuration for a Provider");
 var isProviderConfig = zodIsFactory(ProviderConfigZod);
 var asProviderConfig = zodAsFactory2(ProviderConfigZod, "asProviderConfig");
 var toProviderConfig = zodToFactory(ProviderConfigZod, "toProviderConfig");
 
 // src/config/Providers.ts
-var ProvidersConfigZod = z10.array(ProviderConfigZod.loose()).describe("Configuration for providers").default([]);
+var ProvidersConfigZod = z11.array(ProviderConfigZod.loose()).describe("Configuration for providers").default([]);
 
 // src/config/Remote.ts
-import { globalRegistry as globalRegistry7, z as z11 } from "zod";
-var RpcRemoteConfigBaseZod = z11.object({
-  protocol: z11.string("http").register(globalRegistry7, {
+import { globalRegistry as globalRegistry8, z as z12 } from "zod";
+var RpcRemoteConfigBaseZod = z12.object({
+  protocol: z12.string("http").register(globalRegistry8, {
     description: "Protocol for the RPC connection",
     type: "string"
   })
 }).describe("Base configuration for the remote RPC");
 var HttpRpcRemoteConfigZod = RpcRemoteConfigBaseZod.extend({
-  protocol: z11.string("http").register(globalRegistry7, {
+  protocol: z12.string("http").register(globalRegistry8, {
     description: "Protocol for the RPC connection",
     type: "string"
   }).default("http"),
-  url: z11.string().register(globalRegistry7, {
+  url: z12.string().register(globalRegistry8, {
     description: "URL for the Chain RPC API",
     type: "string"
   })
 }).describe("Configuration for the remote RPC using Http");
 var PostMessageRpcRemoteConfigZod = RpcRemoteConfigBaseZod.extend({
-  protocol: z11.string().register(globalRegistry7, {
+  protocol: z12.string().register(globalRegistry8, {
     description: "Protocol for the RPC connection",
     type: "string"
   }).default("postMessage"),
-  networkId: z11.string().register(globalRegistry7, {
+  networkId: z12.string().register(globalRegistry8, {
     description: "Network ID to use for the postMessage RPC connection",
     type: "string"
   }),
-  sessionId: z11.string().register(globalRegistry7, {
+  sessionId: z12.string().register(globalRegistry8, {
     description: "Session ID to use for the postMessage RPC connection",
     type: "string"
   })
 }).describe("Configuration for the remote RPC using postMessage");
-var RpcRemoteConfigZod = z11.union([HttpRpcRemoteConfigZod, PostMessageRpcRemoteConfigZod]).describe("Configuration for a remote RPC connection, either Http or postMessage");
-var RemoteConfigZod = z11.object({ rpc: RpcRemoteConfigZod.optional() }).describe("Configuration for remote connections, including RPC");
+var RpcRemoteConfigZod = z12.union([HttpRpcRemoteConfigZod, PostMessageRpcRemoteConfigZod]).describe("Configuration for a remote RPC connection, either Http or postMessage");
+var RemoteConfigZod = z12.object({ rpc: RpcRemoteConfigZod.optional() }).describe("Configuration for remote connections, including RPC");
 
 // src/config/storage/driver/Mongo.ts
 import { isDefined as isDefined4, isUndefined as isUndefined5 } from "@xylabs/sdk-js";
-import { globalRegistry as globalRegistry8, z as z12 } from "zod";
+import { globalRegistry as globalRegistry9, z as z13 } from "zod";
 var hasMongoConfig = (config) => {
   if (isUndefined5(config)) return false;
   return isDefined4(config.connectionString) && isDefined4(config.database) && isDefined4(config.domain);
 };
-var MongoConfigZod = z12.object({
+var MongoConfigZod = z13.object({
   // TODO: Create from other arguments
-  connectionString: z12.string().nonempty().optional().register(globalRegistry8, {
+  connectionString: z13.string().nonempty().optional().register(globalRegistry9, {
     description: "MongoDB connection string",
     title: "storage.mongo.connectionString",
     type: "string"
   }),
-  database: z12.string().nonempty().optional().register(globalRegistry8, {
+  database: z13.string().nonempty().optional().register(globalRegistry9, {
     description: "MongoDB database name",
     title: "storage.mongo.database",
     type: "string"
   }),
-  domain: z12.string().nonempty().optional().register(globalRegistry8, {
+  domain: z13.string().nonempty().optional().register(globalRegistry9, {
     description: "MongoDB domain",
     title: "storage.mongo.domain",
     type: "string"
   }),
-  password: z12.string().nonempty().optional().register(globalRegistry8, {
+  password: z13.string().nonempty().optional().register(globalRegistry9, {
     description: "MongoDB password",
     title: "storage.mongo.password",
     type: "string"
   }),
-  username: z12.string().nonempty().optional().register(globalRegistry8, {
+  username: z13.string().nonempty().optional().register(globalRegistry9, {
     description: "MongoDB username",
     title: "storage.mongo.username",
     type: "string"
@@ -1372,23 +1424,23 @@ var MongoConfigZod = z12.object({
 
 // src/config/storage/driver/S3.ts
 import { isDefined as isDefined5 } from "@xylabs/sdk-js";
-import { z as z13 } from "zod";
-var S3BucketConfigZod = z13.object({
-  accessKeyId: z13.string().nonempty().optional().describe("S3-compatible access key id for this bucket (overrides the shared default)"),
-  accountId: z13.string().nonempty().optional().describe("Account id for this bucket; on Cloudflare R2 it forms the endpoint (overrides the shared default)"),
-  bucket: z13.string().nonempty().optional().describe("S3-compatible bucket name"),
-  prefix: z13.string().nonempty().optional().describe("Optional key prefix within the bucket"),
-  readUrl: z13.string().nonempty().optional().describe("Public HTTP/CDN base URL for anonymous reads of this bucket"),
-  secretAccessKey: z13.string().nonempty().optional().describe("S3-compatible secret access key for this bucket (overrides the shared default)")
+import { z as z14 } from "zod";
+var S3BucketConfigZod = z14.object({
+  accessKeyId: z14.string().nonempty().optional().describe("S3-compatible access key id for this bucket (overrides the shared default)"),
+  accountId: z14.string().nonempty().optional().describe("Account id for this bucket; on Cloudflare R2 it forms the endpoint (overrides the shared default)"),
+  bucket: z14.string().nonempty().optional().describe("S3-compatible bucket name"),
+  prefix: z14.string().nonempty().optional().describe("Optional key prefix within the bucket"),
+  readUrl: z14.string().nonempty().optional().describe("Public HTTP/CDN base URL for anonymous reads of this bucket"),
+  secretAccessKey: z14.string().nonempty().optional().describe("S3-compatible secret access key for this bucket (overrides the shared default)")
 });
-var S3ConfigZod = z13.object({
-  accessKeyId: z13.string().nonempty().optional().describe("Shared S3-compatible access key id (default for all buckets)"),
-  accountId: z13.string().nonempty().optional().describe("Shared account id (default for all buckets; on Cloudflare R2 it forms the endpoint)"),
+var S3ConfigZod = z14.object({
+  accessKeyId: z14.string().nonempty().optional().describe("Shared S3-compatible access key id (default for all buckets)"),
+  accountId: z14.string().nonempty().optional().describe("Shared account id (default for all buckets; on Cloudflare R2 it forms the endpoint)"),
   chainState: S3BucketConfigZod.optional().describe("Bucket for the mutable chain state (the head pointer)"),
   finalized: S3BucketConfigZod.optional().describe("Bucket for the finalized files (blocks, payloads, manifest)"),
   index: S3BucketConfigZod.optional().describe("Bucket for the chain index (the step-summary families)"),
-  prefix: z13.string().nonempty().optional().describe("Shared key prefix (default for all buckets)"),
-  secretAccessKey: z13.string().nonempty().optional().describe("Shared S3-compatible secret access key (default for all buckets)")
+  prefix: z14.string().nonempty().optional().describe("Shared key prefix (default for all buckets)"),
+  secretAccessKey: z14.string().nonempty().optional().describe("Shared S3-compatible secret access key (default for all buckets)")
 });
 function resolveS3Bucket(config, which) {
   if (config === void 0) return void 0;
@@ -1412,10 +1464,10 @@ function hasS3Config(config, which = "finalized") {
 }
 
 // src/config/storage/Storage.ts
-import { globalRegistry as globalRegistry9, z as z14 } from "zod";
-var StorageConfigZod = z14.object({
+import { globalRegistry as globalRegistry10, z as z15 } from "zod";
+var StorageConfigZod = z15.object({
   mongo: MongoConfigZod.optional().describe("Configuration for the MongoD storage driver"),
-  root: z14.string().optional().register(globalRegistry9, {
+  root: z15.string().optional().register(globalRegistry10, {
     description: "Root directory for local storage",
     title: "storage.root",
     type: "string"
@@ -1424,7 +1476,7 @@ var StorageConfigZod = z14.object({
 }).describe("Storage configuration options");
 
 // src/config/Telemetry.ts
-import { globalRegistry as globalRegistry10, z as z15 } from "zod";
+import { globalRegistry as globalRegistry11, z as z16 } from "zod";
 var DefaultMetricsScrapePorts = {
   api: 9465,
   bridge: 9468,
@@ -1432,38 +1484,89 @@ var DefaultMetricsScrapePorts = {
   producer: 9464,
   rewardRedemptionApi: 9467
 };
-var MetricsScrapeConfigZod = z15.object({
-  path: z15.string().default("/metrics").register(globalRegistry10, {
+var MetricsScrapeConfigZod = z16.object({
+  path: z16.string().default("/metrics").register(globalRegistry11, {
     default: "/metrics",
     description: "Path for the metrics scrape endpoint",
     title: "telemetry.metrics.scrape.path",
     type: "string"
   }),
-  port: z15.coerce.number().int().positive().optional().register(globalRegistry10, {
+  port: z16.coerce.number().int().positive().optional().register(globalRegistry11, {
     description: "Port for the metrics scrape endpoint",
     title: "telemetry.metrics.scrape.port",
     type: "number"
   })
 }).describe("Metrics scrape configuration");
-var MetricsConfigZod = z15.object({ scrape: MetricsScrapeConfigZod }).describe("Metrics configuration options");
-var OpenTelemetryConfigZod = z15.object({
+var MetricsConfigZod = z16.object({ scrape: MetricsScrapeConfigZod }).describe("Metrics configuration options");
+var OpenTelemetryConfigZod = z16.object({
   // OpenTelemetry options
-  otlpEndpoint: z15.url().optional().register(globalRegistry10, {
+  otlpEndpoint: z16.url().optional().register(globalRegistry11, {
     description: "OTLP endpoint for exporting telemetry data",
     title: "telemetry.otel.otlpEndpoint",
     type: "string"
   })
 });
-var TelemetryConfigZod = z15.object({
+var TelemetryConfigZod = z16.object({
   // Metrics configuration
   metrics: MetricsConfigZod.optional().describe("Metrics configuration"),
   // OpenTelemetry configuration
   otel: OpenTelemetryConfigZod.optional().describe("OpenTelemetry configuration")
 }).describe("Telemetry configuration options");
 
+// src/config/transports/Transport.ts
+import { globalRegistry as globalRegistry12, z as z17 } from "zod";
+var LmdbTransportConfigZod = z17.object({
+  type: z17.literal("lmdb"),
+  root: z17.string().register(globalRegistry12, {
+    description: "Root directory for local LMDB storage",
+    title: "transports.lmdb.root",
+    type: "string"
+  })
+}).describe("LMDB local storage transport");
+var MongoTransportConfigZod = z17.object({
+  type: z17.literal("mongo"),
+  connectionString: MongoConfigZod.shape.connectionString,
+  database: MongoConfigZod.shape.database,
+  domain: MongoConfigZod.shape.domain,
+  password: MongoConfigZod.shape.password,
+  username: MongoConfigZod.shape.username
+}).describe("MongoDB storage transport");
+var RpcTransportConfigZod = HttpRpcRemoteConfigZod.extend({ type: z17.literal("rpc") }).describe("XL1 JSON-RPC transport");
+var RestTransportConfigZod = z17.object({
+  type: z17.literal("rest"),
+  baseUrl: z17.string().register(globalRegistry12, {
+    description: "HTTP base URL for REST reads",
+    title: "transports.rest.baseUrl",
+    type: "string"
+  })
+}).describe("HTTP REST read transport");
+var S3TransportConfigZod = S3BucketConfigZod.extend({
+  type: z17.literal("s3"),
+  accessKeyId: z17.string().optional(),
+  accountId: z17.string().optional(),
+  secretAccessKey: z17.string().optional()
+}).describe("S3-compatible object storage transport");
+var EvmRpcTransportConfigZod = z17.object({
+  type: z17.literal("evm-rpc"),
+  url: z17.string().register(globalRegistry12, {
+    description: "EVM JSON-RPC URL",
+    title: "transports.evm-rpc.url",
+    type: "string"
+  })
+}).describe("EVM JSON-RPC transport");
+var TransportConfigZod = z17.discriminatedUnion("type", [
+  LmdbTransportConfigZod,
+  MongoTransportConfigZod,
+  RpcTransportConfigZod,
+  RestTransportConfigZod,
+  S3TransportConfigZod,
+  EvmRpcTransportConfigZod
+]);
+var TransportsConfigZod = z17.record(z17.string(), TransportConfigZod).default({});
+
 // src/config/Validation.ts
-import { XyoAddressZod as XyoAddressZod2 } from "@xyo-network/address";
-import { globalRegistry as globalRegistry11, z as z16 } from "zod";
+import { XyoAddressZod as XyoAddressZod2 } from "@xyo-network/sdk-js";
+import { globalRegistry as globalRegistry13, z as z18 } from "zod";
 
 // src/primitives/block/range/blockRangeSteps.ts
 import { asXL1BlockNumber as asXL1BlockNumber2, StepSizes as StepSizes3 } from "@xyo-network/xl1-protocol-lib";
@@ -1608,7 +1711,9 @@ var DEFAULT_MAX_ATTEMPTS = 10;
 var calculateTimeRate = async (viewer, timeConfig, startBlockNumber, timeUnit, toleranceMs = DEFAULT_TOLERANCE_MS, maxAttempts = DEFAULT_MAX_ATTEMPTS) => {
   assertEx10(Object.keys(timeConfig ?? {}).length === 1, () => "Only one time unit should be specified in timeConfig");
   const startBlock = isDefinedNotNull(startBlockNumber) ? await viewer.blockByNumber(startBlockNumber) : null;
-  const resolvedStartBlock = isDefinedNotNull(startBlock) ? startBlock[0] : (await viewer.currentBlock())[0];
+  const currentBlockResult = await viewer.currentBlock();
+  const blockResult = isDefinedNotNull(startBlock) ? startBlock : currentBlockResult;
+  const resolvedStartBlock = blockResult[0];
   const timeInMilliseconds = getTimeConfigInMilliseconds(timeConfig);
   assertEx10(timeInMilliseconds > 0, () => "Time duration must be greater than zero");
   const blocksPerMillisecondRate = 1 / (12 * 1e3);
@@ -1709,7 +1814,7 @@ async function getWindowedChain(context, blockViewer, maxWindowSize, previousCha
 
 // src/primitives/chain/step/chainStepRewardAddress.ts
 import { assertEx as assertEx14, exists } from "@xylabs/sdk-js";
-import { toXyoAddress as toXyoAddress2 } from "@xyo-network/address";
+import { toXyoAddress as toXyoAddress2 } from "@xyo-network/sdk-js";
 import {
   asTransfer,
   isTransfer,
@@ -1718,7 +1823,7 @@ import {
 
 // src/primitives/payload/mergeTransfers.ts
 import { hexToBigInt } from "@xylabs/sdk-js";
-import { toXyoAddress } from "@xyo-network/address";
+import { toXyoAddress } from "@xyo-network/sdk-js";
 function mergeTransfers(transfers) {
   const result = {};
   for (const transfer of transfers) {
@@ -1772,7 +1877,9 @@ async function chainStepRewardAddress(context, blockViewer, { block, step }) {
   const [transferIndex, transferCount] = stepTransferIndex(block, step);
   const [blockBw, payloads] = hydratedBlock;
   const transfersFromPool = payloads.filter(isTransfer).map((p) => asTransfer(p)).filter(exists).filter((t) => t.from === XYO_STEP_REWARD_ADDRESS);
-  const fromEntries = Object.entries(mergeTransfers(transfersFromPool)[XYO_STEP_REWARD_ADDRESS]);
+  const mergedTransfers = mergeTransfers(transfersFromPool);
+  const rewardEntry = Object.entries(mergedTransfers).find(([address]) => address === XYO_STEP_REWARD_ADDRESS);
+  const fromEntries = Object.entries(rewardEntry?.[1] ?? {});
   const sortedTransferAmounts = fromEntries.toSorted(([, a], [, b]) => a > b ? -1 : a < b ? 1 : 0);
   assertEx14(
     sortedTransferAmounts.length === transferCount,
@@ -1804,7 +1911,9 @@ var asOptionalAddressPairPayload = AsObjectFactory.createOptional(isAddressPairP
 // src/payloads/netBalancesForPayloads.ts
 import { hexToBigInt as hexToBigInt2 } from "@xylabs/sdk-js";
 import { span } from "@xylabs/sdk-js";
-import { toXyoAddress as toXyoAddress3 } from "@xyo-network/address";
+import {
+  toXyoAddress as toXyoAddress3
+} from "@xyo-network/sdk-js";
 import { isTransfer as isTransfer2 } from "@xyo-network/xl1-protocol-lib";
 var netBalancesForPayloads = (context, payloads) => {
   return span("netBalancesForPayloads", () => {
@@ -1825,7 +1934,9 @@ var netBalancesForPayloads = (context, payloads) => {
 // src/payloads/netSchemasForPayloads.ts
 import { hexToBigInt as hexToBigInt3 } from "@xylabs/sdk-js";
 import { span as span2 } from "@xylabs/sdk-js";
-import { toXyoAddress as toXyoAddress4 } from "@xyo-network/address";
+import {
+  toXyoAddress as toXyoAddress4
+} from "@xyo-network/sdk-js";
 import { isTransfer as isTransfer3 } from "@xyo-network/xl1-protocol-lib";
 var netSchemasForPayloads = (context, payloads) => {
   return span2("netSchemasForPayloads", () => {
@@ -1880,8 +1991,10 @@ async function stepRewardTotal(context, blockViewer, { block, step }, multiplier
       payloads.find((p) => isTransfer5(p) && p.from === XYO_STEP_REWARD_ADDRESS2),
       () => `No step transfer found for step ${step} at block ${block} (${blockBw._hash})`
     );
+    const netTransfers = netTransfersForPayloads(context, [stepTransfer]);
+    const rewardEntry = Object.entries(netTransfers).find(([address]) => address === XYO_STEP_REWARD_ADDRESS2);
     const rewards = assertEx15(
-      netTransfersForPayloads(context, [stepTransfer])[XYO_STEP_REWARD_ADDRESS2],
+      rewardEntry?.[1],
       () => `No rewards found for step reward address ${XYO_STEP_REWARD_ADDRESS2} at block ${block} (${blockBw._hash})`
     );
     const sortedTransfers = Object.entries(rewards).toSorted(([, a], [, b]) => a > b ? -1 : a < b ? 1 : 0);
@@ -1922,7 +2035,7 @@ async function stepsRewardTotal(context, blockViewer, steps, multipliers) {
   return asAttoXL12(totalRewards);
 }
 
-// src/primitives/chain/time/externalBlockNumberFromXL1BlockNumber.ts
+// src/primitives/chain/time/externalBlockNumberFromXl1BlockNumber.ts
 import { assertEx as assertEx16, isArray } from "@xylabs/sdk-js";
 import {
   asBlockNumber,
@@ -1943,7 +2056,7 @@ async function externalBlockNumberFromXL1BlockNumber(context, blockViewer, xl1Bl
   });
 }
 
-// src/primitives/chain/time/externalBlockRangeFromXL1BlockRange.ts
+// src/primitives/chain/time/externalBlockRangeFromXl1BlockRange.ts
 async function externalBlockRangeFromXL1BlockRange(context, blockViewer, xl1BlockRange, externalTimeName = "ethereum") {
   const start = await externalBlockNumberFromXL1BlockNumber(context, blockViewer, xl1BlockRange[0], externalTimeName);
   const end = await externalBlockNumberFromXL1BlockNumber(context, blockViewer, xl1BlockRange[1], externalTimeName);
@@ -1999,13 +2112,15 @@ function readPayloadMapFromStore(store) {
   if (isReadArchivist(store)) {
     return {
       get: async (hash) => {
-        return (await store.get([hash]))[0];
+        const results = await store.get([hash]);
+        return results[0];
       },
       getMany: async (hashes) => {
         return await store.get(hashes);
       },
       has: async (hash) => {
-        return isDefined12((await store.get([hash]))[0]);
+        const results = await store.get([hash]);
+        return isDefined12(results[0]);
       }
     };
   }
@@ -2015,13 +2130,15 @@ function payloadMapFromStore(store) {
   if (isReadWriteArchivist(store)) {
     return {
       get: async (hash) => {
-        return (await store.get([hash]))[0];
+        const results = await store.get([hash]);
+        return results[0];
       },
       getMany: async (hashes) => {
         return await store.get(hashes);
       },
       has: async (hash) => {
-        return isDefined12((await store.get([hash]))[0]);
+        const results = await store.get([hash]);
+        return isDefined12(results[0]);
       },
       clear: async () => {
         return await store.clear();
@@ -2081,7 +2198,8 @@ async function mergedAddRemoveStakeEventsByStaker(chainEvents, range, staked, st
 
 // src/primitives/stake/activeStakeAtTimeByAddress.ts
 async function activeStakeAtTimeByAddress(chain, staked, time, staker) {
-  const stakeEvents = (await mergedAddRemoveStakeEventsByStaker(chain, [0, time], staked, staker)).toSorted((a, b) => a.time - b.time);
+  const mergedEvents = await mergedAddRemoveStakeEventsByStaker(chain, [0, time], staked, staker);
+  const stakeEvents = mergedEvents.toSorted((a, b) => a.time - b.time);
   let result = 0n;
   for (const event of stakeEvents) {
     if (event.time > time) break;
@@ -2111,7 +2229,8 @@ async function mergedAddRemoveStakeEventsByPosition(chainEvents, range, position
 
 // src/primitives/stake/activeStakeAtTimeByPosition.ts
 async function activeStakeAtTimeByPosition(chainStakeEvents, externalTime, position) {
-  const stakeEvents = (await mergedAddRemoveStakeEventsByPosition(chainStakeEvents, [0, externalTime], position)).toSorted((a, b) => a.time - b.time);
+  const mergedEvents = await mergedAddRemoveStakeEventsByPosition(chainStakeEvents, [0, externalTime], position);
+  const stakeEvents = mergedEvents.toSorted((a, b) => a.time - b.time);
   let result = 0n;
   for (const event of stakeEvents) {
     if (event.time > externalTime) break;
@@ -2127,7 +2246,7 @@ async function activeStakeAtTimeByPosition(chainStakeEvents, externalTime, posit
 }
 
 // src/primitives/stake/allStakersForRange.ts
-import { toXyoAddress as toXyoAddress5 } from "@xyo-network/address";
+import { toXyoAddress as toXyoAddress5 } from "@xyo-network/sdk-js";
 async function allStakersForRange(chain, externalRange, staked) {
   const mergedEvents = await mergedAddRemoveStakeEventsByStaker(chain, [0, externalRange[1]], staked);
   const resultWithZeros = {};
@@ -2166,16 +2285,17 @@ async function weightedStakeForRangeByPosition(context, blockViewer, stakeEvents
   return await withContextCacheResponse(context, "weightedStakeForRangeByPosition", cacheKey, async () => {
     let weightedStakeSum = 0n;
     if (isDefined14(positionId)) {
-      const mergedEvents = (await mergedAddRemoveStakeEventsByPosition(
+      const mergedEventsResult = await mergedAddRemoveStakeEventsByPosition(
         stakeEventsViewer,
         [0, externalRange[1]],
         positionId
-      )).toSorted((a, b) => a.time - b.time);
-      let currentTime = externalRange[0];
-      let currentStake = 0n;
+      );
+      const mergedEvents = mergedEventsResult.toSorted((a, b) => a.time - b.time);
       if (isDefined14(staked) && mergedEvents.at(0)?.args.staked !== staked) {
         return 0n;
       }
+      let currentTime = externalRange[0];
+      let currentStake = 0n;
       for (const event of mergedEvents) {
         if (event.time > currentTime) {
           weightedStakeSum += currentStake * BigInt(event.time - currentTime);
@@ -2220,7 +2340,7 @@ async function networkStakeStepRewardPositionWeight(context, blockViewer, stakeE
 // src/primitives/state/findMostRecentBlock.ts
 import { isSignedBlockBoundWitnessWithStorageMeta } from "@xyo-network/xl1-protocol-lib";
 var DEFAULT_NEXT_OPTIONS = { limit: 50 };
-var findMostRecentBlock = async (chainArchivist, nextOptions = DEFAULT_NEXT_OPTIONS, maxIterations = Number.POSITIVE_INFINITY) => {
+var findMostRecentBlock = async (chainArchivist, nextOptions = DEFAULT_NEXT_OPTIONS, maxIterations = Infinity) => {
   let mostRecentBlock;
   let cursor;
   let batch;
@@ -2236,9 +2356,8 @@ var findMostRecentBlock = async (chainArchivist, nextOptions = DEFAULT_NEXT_OPTI
     if (last) {
       mostRecentBlock = last;
       break;
-    } else {
-      cursor = batch.at(-1)?._sequence;
     }
+    cursor = batch.at(-1)?._sequence;
     iterations = iterations + 1;
   } while (batch.length > 0 && iterations < maxIterations);
   return mostRecentBlock;
@@ -2251,7 +2370,7 @@ async function hydratedBlockByNumber(context, blockNumber) {
     if (blockNumber < 0) throw new Error(`Block number ${blockNumber} is less than 0`);
     if (blockNumber > Number.MAX_SAFE_INTEGER) throw new Error(`Block number ${blockNumber} is greater than the maximum safe integer`);
     if (blockNumber % 1 !== 0) throw new Error(`Block number ${blockNumber} is not an integer`);
-    const cacheKey = `${blockNumber}`;
+    const cacheKey = String(blockNumber);
     return await withContextCacheResponse(context, "hydratedBlockByNumber", cacheKey, async () => {
       const block = assertEx17(
         await blockFromBlockNumber(context, blockNumber),
@@ -2264,7 +2383,7 @@ async function hydratedBlockByNumber(context, blockNumber) {
 
 // src/primitives/uncle/getProducerKey.ts
 function getProducerKey(block) {
-  return block[0].addresses.toSorted().join(",");
+  return block[0].addresses.toSorted((a, b) => a.localeCompare(b)).join(",");
 }
 
 // src/primitives/uncle/scoreUncle.ts
@@ -2273,7 +2392,7 @@ function scoreUncle(finalizedWindowedChain, blocks) {
   if (blocks.length === 0) return 0;
   let score = blocks.length;
   const head = finalizedWindowedChain.at(-1);
-  if (head && blocks[0]) {
+  if (head !== void 0 && blocks[0] !== void 0) {
     const headProducer = getProducerKey(head);
     const candidateProducer = getProducerKey(blocks[0]);
     if (headProducer !== candidateProducer) {
@@ -2308,6 +2427,19 @@ import {
   exists as exists2
 } from "@xylabs/sdk-js";
 import { isTransactionBoundWitness as isTransactionBoundWitness2 } from "@xyo-network/xl1-protocol-lib";
+function extendUncleChain(block, map) {
+  const uncle = [block];
+  let previous = block[0].previous ? map.get(block[0].previous) : void 0;
+  while (previous) {
+    if (previous[0].block === uncle[0][0].block - 1) {
+      uncle.unshift(previous);
+      previous = previous[0].previous ? map.get(previous[0].previous) : void 0;
+    } else {
+      return [];
+    }
+  }
+  return uncle;
+}
 function blocksToChains(blocks) {
   const chains = [];
   const map = /* @__PURE__ */ new Map();
@@ -2315,17 +2447,7 @@ function blocksToChains(blocks) {
     map.set(block[0]._hash, block);
   }
   for (const block of blocks) {
-    let uncle = [block];
-    let previous = block[0].previous ? map.get(block[0].previous) : void 0;
-    while (previous) {
-      if (previous[0].block === uncle[0][0].block - 1) {
-        uncle.unshift(previous);
-        previous = previous[0].previous ? map.get(previous[0].previous) : void 0;
-      } else {
-        uncle = [];
-        break;
-      }
-    }
+    const uncle = extendUncleChain(block, map);
     if (uncle.length > 0) {
       chains.push(uncle);
     }
@@ -2362,24 +2484,24 @@ function findUncles(context, finalizedWindowedChain, blocks) {
 }
 
 // src/config/Validation.ts
-var ValidationConfigZod = z16.object({
-  allowedRewardRedeemers: z16.array(XyoAddressZod2).optional().register(globalRegistry11, {
+var ValidationConfigZod = z18.object({
+  allowedRewardRedeemers: z18.array(XyoAddressZod2).optional().register(globalRegistry13, {
     description: "List of allowed reward redeemer addresses, if undefined anyone can participate",
     title: "allowedRewardRedeemers",
     type: "array"
   }),
-  allowedRewardEscrowAccountSigners: z16.array(XyoAddressZod2).optional().register(globalRegistry11, {
+  allowedRewardEscrowAccountSigners: z18.array(XyoAddressZod2).optional().register(globalRegistry13, {
     description: "List of allowed reward escrow account signer addresses, if undefined anyone can participate",
     title: "allowedRewardEscrowAccountSigners",
     type: "array"
   }),
-  minCandidates: z16.coerce.number().default(DEFAULT_MIN_CANDIDATES).register(globalRegistry11, {
+  minCandidates: z18.coerce.number().default(DEFAULT_MIN_CANDIDATES).register(globalRegistry13, {
     default: DEFAULT_MIN_CANDIDATES,
     description: "Minimum number of uncle candidates before selecting the best uncle",
     title: "validation.minCandidates",
     type: "number"
   }),
-  backoffMs: z16.coerce.number().default(DEFAULT_BACKOFF_MS).register(globalRegistry11, {
+  backoffMs: z18.coerce.number().default(DEFAULT_BACKOFF_MS).register(globalRegistry13, {
     default: DEFAULT_BACKOFF_MS,
     description: "Back-off timeout in ms. If head age exceeds this, minCandidates is ignored",
     title: "validation.backoffMs",
@@ -2388,26 +2510,28 @@ var ValidationConfigZod = z16.object({
 });
 
 // src/config/Base.ts
-var BaseConfigZod = z17.object({
-  chain: z17._default(ChainConfigZod, ChainConfigZod.parse({})).check(z17.describe("Configuration for the chain")),
-  dataLake: z17.optional(DataLakeConfigZod).check(z17.describe("Configuration for data lakes")),
-  evm: z17._default(EvmConfigZod, EvmConfigZod.parse({})).check(z17.describe("Configuration for EVM-backed services")),
-  log: z17._default(LogConfigZod, LogConfigZod.parse({})).check(z17.describe("Configuration for logging")),
-  providers: z17._default(ProvidersConfigZod, ProvidersConfigZod.parse([])).check(z17.describe("Configuration for providers")),
-  remote: z17._default(RemoteConfigZod, RemoteConfigZod.parse({})).check(z17.describe("Configuration for remote services")),
-  storage: z17._default(StorageConfigZod, StorageConfigZod.parse({})).check(z17.describe("Configuration for the storage")),
-  telemetry: z17._default(TelemetryConfigZod, TelemetryConfigZod.parse({})).check(z17.describe("Configuration for telemetry")),
-  validation: z17._default(ValidationConfigZod, ValidationConfigZod.parse({})).check(z17.describe("Configuration for validation"))
+var BaseConfigZod = z19.object({
+  chain: z19._default(ChainConfigZod, ChainConfigZod.parse({})).check(z19.describe("Configuration for the chain")),
+  dataLake: z19.optional(DataLakeConfigZod).check(z19.describe("Configuration for data lakes")),
+  evm: z19._default(EvmConfigZod, EvmConfigZod.parse({})).check(z19.describe("Configuration for EVM-backed services")),
+  log: z19._default(LogConfigZod, LogConfigZod.parse({})).check(z19.describe("Configuration for logging")),
+  providerBindings: z19._default(ProviderBindingsConfigZod, ProviderBindingsConfigZod.parse({})).check(z19.describe("Per-moniker provider implementation and transport bindings")),
+  providers: z19._default(ProvidersConfigZod, ProvidersConfigZod.parse([])).check(z19.describe("Configuration for providers")),
+  remote: z19._default(RemoteConfigZod, RemoteConfigZod.parse({})).check(z19.describe("Configuration for remote services")),
+  transports: z19._default(TransportsConfigZod, TransportsConfigZod.parse({})).check(z19.describe("Named connection profiles (rpc, rest, s3, lmdb, mongo, evm-rpc)")),
+  storage: z19._default(StorageConfigZod, StorageConfigZod.parse({})).check(z19.describe("Configuration for the storage")),
+  telemetry: z19._default(TelemetryConfigZod, TelemetryConfigZod.parse({})).check(z19.describe("Configuration for telemetry")),
+  validation: z19._default(ValidationConfigZod, ValidationConfigZod.parse({})).check(z19.describe("Configuration for validation"))
 });
 
 // src/config/Actor.ts
-var AccountPathZod = z18.string().check(z18.regex(
+var AccountPathZod = z20.string().check(z20.regex(
   /^(m(\/\d+'?)+|\d+'?(\/\d+'?)*)$/,
   `Invalid BIP-32 derivation path. Use either an absolute path like "m/44'/60'/0'/0/0" or a relative path like "0", "0/1", or "44'/60'/0'/0/0".`
 ));
-var ActorConfigZod = z18.extend(BaseConfigZod, {
-  name: z18.string(),
-  accountPath: z18.optional(AccountPathZod).register(globalRegistry12, {
+var ActorConfigZod = z20.extend(BaseConfigZod, {
+  name: z20.string(),
+  accountPath: z20.optional(AccountPathZod).register(globalRegistry14, {
     description: 'BIP-32 derivation path for the actor wallet. Absolute when it starts with "m/"; otherwise relative to the root wallet base path. Each actor must derive to a distinct path.',
     title: "accountPath",
     type: "string"
@@ -2418,22 +2542,25 @@ var asActorConfig = zodAsFactory3(ActorConfigZod, "asActorConfig");
 var toActorConfig = zodToFactory2(ActorConfigZod, "toActorConfig");
 
 // src/config/Actors.ts
-import { z as z19 } from "zod/mini";
-var ActorsConfigZod = z19._default(
-  z19.array(z19.looseObject(ActorConfigZod.shape)).check(z19.describe("Actor-specific configurations that override the base configuration when the actor is running")),
+import { z as z21 } from "zod/mini";
+var ActorsConfigZod = z21._default(
+  z21.array(z21.looseObject(ActorConfigZod.shape)).check(z21.describe("Actor-specific configurations that override the base configuration when the actor is running")),
   []
 );
 
+// src/config/adaptLegacyConfig.ts
+import { isDefined as isDefined15 } from "@xylabs/sdk-js";
+
 // src/config/Config.ts
-import { globalRegistry as globalRegistry13, z as z20 } from "zod/mini";
-var ConfigZod = z20.extend(BaseConfigZod, {
+import { globalRegistry as globalRegistry15, z as z22 } from "zod/mini";
+var ConfigZod = z22.extend(BaseConfigZod, {
   actors: ActorsConfigZod,
-  healthCheckPort: z20.optional(z20.coerce.number()).register(globalRegistry13, {
+  healthCheckPort: z22.optional(z22.coerce.number()).register(globalRegistry15, {
     description: "Port for the system-wide health, readiness, and liveness endpoints (/healthz, /livez, /readyz). Set to 0 to disable.",
     title: "healthCheckPort",
     type: "number"
   })
-}).check(z20.describe("The complete configuration for the protocol, including global settings and actor-specific overrides"));
+}).check(z22.describe("The complete configuration for the protocol, including global settings and actor-specific overrides"));
 function resolveConfig(config) {
   const parsedConfig = ConfigZod.parse(config);
   const {
@@ -2442,26 +2569,148 @@ function resolveConfig(config) {
     ...rootConfig
   } = parsedConfig;
   parsedConfig.actors = actors.map((actorConfig) => {
-    return z20.looseObject(ActorConfigZod.shape).parse({ ...rootConfig, ...actorConfig });
+    return z22.looseObject(ActorConfigZod.shape).parse({ ...rootConfig, ...actorConfig });
   });
   return parsedConfig;
 }
 
+// src/config/adaptLegacyConfig.ts
+var DEFAULT_LMDB_TRANSPORT = "local-store";
+var DEFAULT_RPC_TRANSPORT = "default-rpc";
+var DEFAULT_EVM_RPC_TRANSPORT = "default-evm-rpc";
+var S3_FINALIZED_TRANSPORT = "s3-finalized";
+var S3_CHAIN_STATE_TRANSPORT = "s3-chain-state";
+var S3_INDEX_TRANSPORT = "s3-index";
+function rpcTransportFromRemote(rpc) {
+  if (rpc.protocol === "http" && "url" in rpc) {
+    const http = rpc;
+    return {
+      type: "rpc",
+      protocol: "http",
+      url: http.url
+    };
+  }
+  return {
+    type: "rpc",
+    protocol: rpc.protocol,
+    url: "url" in rpc ? String(rpc.url) : ""
+  };
+}
+function s3TransportFromBucket(shared, entry, fallbackBucket) {
+  if (!isDefined15(entry?.bucket) && !isDefined15(entry?.readUrl)) {
+    return void 0;
+  }
+  return {
+    type: "s3",
+    accessKeyId: entry?.accessKeyId ?? shared.accessKeyId,
+    accountId: entry?.accountId ?? shared.accountId,
+    bucket: entry?.bucket ?? fallbackBucket,
+    prefix: entry?.prefix ?? shared.prefix,
+    readUrl: entry?.readUrl,
+    secretAccessKey: entry?.secretAccessKey ?? shared.secretAccessKey
+  };
+}
+function synthesizeS3Transports(s3) {
+  const shared = {
+    accessKeyId: s3.accessKeyId,
+    accountId: s3.accountId,
+    prefix: s3.prefix,
+    secretAccessKey: s3.secretAccessKey
+  };
+  const transports = {};
+  const finalized = s3TransportFromBucket(shared, s3.finalized);
+  const fallbackBucket = s3.finalized?.bucket;
+  if (finalized) {
+    transports[S3_FINALIZED_TRANSPORT] = finalized;
+  }
+  const chainState = s3TransportFromBucket(shared, s3.chainState, fallbackBucket);
+  if (chainState) {
+    transports[S3_CHAIN_STATE_TRANSPORT] = chainState;
+  }
+  const index = s3TransportFromBucket(shared, s3.index, fallbackBucket);
+  if (index) {
+    transports[S3_INDEX_TRANSPORT] = index;
+  }
+  return transports;
+}
+function hasTransport(transports, key) {
+  return Object.hasOwn(transports, key) && transports[key] !== void 0;
+}
+function synthesizeProviderBindings(transports) {
+  const bindings = {};
+  if (hasTransport(transports, DEFAULT_RPC_TRANSPORT)) {
+    bindings.BlockViewer = { transport: DEFAULT_RPC_TRANSPORT };
+    bindings.MempoolViewer = { transport: DEFAULT_RPC_TRANSPORT };
+    bindings.FinalizationViewer = { transport: DEFAULT_RPC_TRANSPORT };
+    bindings.TransactionViewer = { transport: DEFAULT_RPC_TRANSPORT };
+    bindings.AccountBalanceViewer = { transport: DEFAULT_RPC_TRANSPORT };
+  }
+  if (hasTransport(transports, S3_FINALIZED_TRANSPORT)) {
+    bindings.BlockPublishRunner = { transport: S3_FINALIZED_TRANSPORT };
+  }
+  if (hasTransport(transports, S3_CHAIN_STATE_TRANSPORT)) {
+    bindings.ChainStateViewer = { transport: S3_CHAIN_STATE_TRANSPORT };
+    bindings.ChainStatePublishRunner = { transport: S3_CHAIN_STATE_TRANSPORT };
+  }
+  if (hasTransport(transports, S3_INDEX_TRANSPORT)) {
+    bindings.IndexPublishRunner = { transport: S3_INDEX_TRANSPORT };
+  }
+  return bindings;
+}
+function adaptLegacyConfig(config) {
+  const parsed = ConfigZod.parse(config);
+  if (Object.keys(parsed.transports).length > 0) {
+    return parsed;
+  }
+  const transports = { ...parsed.transports };
+  if (isDefined15(parsed.storage?.root) && parsed.storage.root !== "") {
+    transports[DEFAULT_LMDB_TRANSPORT] = { type: "lmdb", root: parsed.storage.root };
+  }
+  if (hasMongoConfig(parsed.storage?.mongo)) {
+    transports["chain-mongo"] = {
+      type: "mongo",
+      connectionString: parsed.storage.mongo.connectionString,
+      database: parsed.storage.mongo.database,
+      domain: parsed.storage.mongo.domain,
+      password: parsed.storage.mongo.password,
+      username: parsed.storage.mongo.username
+    };
+  }
+  if (isDefined15(parsed.remote?.rpc)) {
+    transports[DEFAULT_RPC_TRANSPORT] = rpcTransportFromRemote(parsed.remote.rpc);
+  }
+  if (isDefined15(parsed.evm?.jsonRpc?.url)) {
+    transports[DEFAULT_EVM_RPC_TRANSPORT] = { type: "evm-rpc", url: parsed.evm.jsonRpc.url };
+  }
+  if (isDefined15(parsed.storage?.s3)) {
+    Object.assign(transports, synthesizeS3Transports(parsed.storage.s3));
+  }
+  const providerBindings = {
+    ...synthesizeProviderBindings(transports),
+    ...parsed.providerBindings
+  };
+  return ConfigZod.parse({
+    ...parsed,
+    providerBindings,
+    transports
+  });
+}
+
 // src/config/HostActor.ts
 import {
   zodAsFactory as zodAsFactory4,
   zodIsFactory as zodIsFactory3,
   zodToFactory as zodToFactory3
 } from "@xylabs/sdk-js";
-import { globalRegistry as globalRegistry14, z as z21 } from "zod/mini";
-var HostActorConfigZod = z21.extend(ActorConfigZod, {
-  host: z21._default(z21.string(), "localhost").register(globalRegistry14, {
+import { globalRegistry as globalRegistry16, z as z23 } from "zod/mini";
+var HostActorConfigZod = z23.extend(ActorConfigZod, {
+  host: z23._default(z23.string(), "localhost").register(globalRegistry16, {
     default: "localhost",
     description: "Host for the Actor",
     title: "host",
     type: "string"
   }),
-  port: z21._default(z21.coerce.number(), 8080).register(globalRegistry14, {
+  port: z23._default(z23.coerce.number(), 8080).register(globalRegistry16, {
     default: 8080,
     description: "Port for the Actor",
     title: "port",
@@ -2473,30 +2722,30 @@ var asHostActorConfig = zodAsFactory4(HostActorConfigZod, "asHostActorConfig");
 var toHostActorConfig = zodToFactory3(HostActorConfigZod, "toHostActorConfig");
 
 // src/config/UsageMeta.ts
-import { z as z22 } from "zod";
-var DescriptionSchema = z22.string();
-var TitleSchema = z22.string();
-var JSONSchemaMetaSchema = z22.object({
-  id: z22.string().optional(),
+import { z as z24 } from "zod";
+var DescriptionSchema = z24.string();
+var TitleSchema = z24.string();
+var JSONSchemaMetaSchema = z24.object({
+  id: z24.string().optional(),
   title: TitleSchema.optional(),
   description: DescriptionSchema.optional(),
-  deprecated: z22.boolean().optional()
-}).catchall(z22.unknown());
+  deprecated: z24.boolean().optional()
+}).catchall(z24.unknown());
 var GlobalMetaSchema = JSONSchemaMetaSchema.extend({});
-var ChoicesSchema = z22.array(z22.union([z22.string(), z22.number(), z22.literal(true), z22.undefined()])).readonly();
+var ChoicesSchema = z24.array(z24.union([z24.string(), z24.number(), z24.literal(true), z24.undefined()])).readonly();
 var UsageMetaSchema = GlobalMetaSchema.extend({
   choices: ChoicesSchema.optional(),
-  default: z22.unknown().optional(),
+  default: z24.unknown().optional(),
   description: DescriptionSchema,
-  group: z22.string().optional(),
-  hidden: z22.boolean().optional(),
+  group: z24.string().optional(),
+  hidden: z24.boolean().optional(),
   title: TitleSchema,
-  type: z22.union([
-    z22.literal("array"),
-    z22.literal("count"),
-    z22.literal("boolean"),
-    z22.literal("number"),
-    z22.literal("string")
+  type: z24.union([
+    z24.literal("array"),
+    z24.literal("count"),
+    z24.literal("boolean"),
+    z24.literal("number"),
+    z24.literal("string")
   ])
 });
 function isUsageMeta(v) {
@@ -2509,7 +2758,7 @@ import {
   zodIsFactory as zodIsFactory5,
   zodToFactory as zodToFactory5
 } from "@xylabs/sdk-js";
-import { z as z24 } from "zod/mini";
+import { z as z26 } from "zod/mini";
 
 // src/model/CreatableProviderContext.zod.ts
 import {
@@ -2518,17 +2767,17 @@ import {
   zodToFactory as zodToFactory4
 } from "@xylabs/sdk-js";
 import { CachingContextZod } from "@xyo-network/xl1-protocol-lib";
-import { z as z23 } from "zod/mini";
-var RuntimeStatusMonitorZod = z23.custom((val) => val && typeof val === "object");
-var ProviderFactoryLocatorZod = z23.lazy(() => z23.custom((val) => val && typeof val === "object" && "context" in val && "registry" in val));
-var BaseConfigContextZod = z23.extend(CachingContextZod, {
-  config: z23.looseObject(BaseConfigZod.shape),
-  locator: z23.optional(ProviderFactoryLocatorZod)
+import { z as z25 } from "zod/mini";
+var RuntimeStatusMonitorZod = z25.custom((val) => val !== null && val !== void 0 && typeof val === "object");
+var ProviderFactoryLocatorZod = z25.lazy(() => z25.custom((val) => val !== null && val !== void 0 && typeof val === "object" && "context" in val && "registry" in val));
+var BaseConfigContextZod = z25.extend(CachingContextZod, {
+  config: z25.looseObject(BaseConfigZod.shape),
+  locator: z25.optional(ProviderFactoryLocatorZod)
 });
-var CreatableProviderContextZod = z23.lazy(() => z23.extend(BaseConfigContextZod, {
-  _id: z23.optional(z23.string()),
+var CreatableProviderContextZod = z25.lazy(() => z25.extend(BaseConfigContextZod, {
+  _id: z25.optional(z25.string()),
   locator: ProviderFactoryLocatorZod,
-  statusReporter: z23.optional(RuntimeStatusMonitorZod)
+  statusReporter: z25.optional(RuntimeStatusMonitorZod)
 }));
 var isBaseConfigContext = zodIsFactory4(BaseConfigContextZod);
 var asBaseConfigContext = zodAsFactory5(BaseConfigContextZod, "asBaseConfigContext");
@@ -2568,7 +2817,9 @@ var hydratedBlockToPayloadBundle = (transaction) => {
 };
 var bundle = (root, transaction) => {
   const payloads = flattenHydratedBlock(transaction).flatMap((p) => PayloadBuilder6.omitStorageMeta(p));
-  return new PayloadBuilder6({ schema: PayloadBundleSchema }).fields({ payloads, root }).build();
+  const payloadBuilder = new PayloadBuilder6({ schema: PayloadBundleSchema });
+  const builder = payloadBuilder.fields({ payloads, root });
+  return builder.build();
 };
 
 // src/model/PayloadBundle/hydratedTransactionToPayloadBundle.ts
@@ -2599,10 +2850,7 @@ async function buildTransaction(chain, onChainPayloads, offChainPayloads, signer
     exp
   };
   const elevatedHashes = await PayloadBuilder7.hashes(onChainPayloads);
-  const script = [];
-  for (const elevatedHash of elevatedHashes) {
-    script.push(`elevate|${elevatedHash}`);
-  }
+  const script = Array.from(elevatedHashes, (elevatedHash) => `elevate|${elevatedHash}`);
   const fields = {
     ...txBoundWitnessFields,
     from: from ?? (Array.isArray(signer) ? assertEx19(signer.at(0)?.address) : signer.address)
@@ -2610,7 +2858,9 @@ async function buildTransaction(chain, onChainPayloads, offChainPayloads, signer
   if (script.length > 0) {
     fields.script = script;
   }
-  const [tx, txPayloads] = await new BoundWitnessBuilder().fields(fields).meta({ $signatures: [] }).payloads([...onChainPayloads, ...offChainPayloads]).signers(Array.isArray(signer) ? signer : [signer]).build();
+  const boundWitnessBuilder = new BoundWitnessBuilder();
+  const builder = boundWitnessBuilder.fields(fields).meta({ $signatures: [] }).payloads([...onChainPayloads, ...offChainPayloads]).signers(Array.isArray(signer) ? signer : [signer]);
+  const [tx, txPayloads] = await builder.build();
   return [await PayloadBuilder7.addHashMeta(tx), await PayloadBuilder7.addHashMeta(txPayloads.map((p) => asAnyPayload2(p, true)))];
 }
 
@@ -2631,10 +2881,7 @@ async function buildUnsignedTransaction(chain, onChainPayloads, offChainPayloads
     exp
   };
   const elevatedHashes = await PayloadBuilder8.hashes(onChainPayloads);
-  const script = [];
-  for (const elevatedHash of elevatedHashes) {
-    script.push(`elevate|${elevatedHash}`);
-  }
+  const script = Array.from(elevatedHashes, (elevatedHash) => `elevate|${elevatedHash}`);
   const fields = {
     ...txBoundWitnessFields,
     from
@@ -2642,14 +2889,16 @@ async function buildUnsignedTransaction(chain, onChainPayloads, offChainPayloads
   if (script.length > 0) {
     fields.script = script;
   }
-  const [tx, txPayloads] = await new BoundWitnessBuilder2().fields(fields).meta({ $signatures: [] }).payloads([...onChainPayloads, ...offChainPayloads]).build(false);
+  const boundWitnessBuilder = new BoundWitnessBuilder2();
+  const builder = boundWitnessBuilder.fields(fields).meta({ $signatures: [] }).payloads([...onChainPayloads, ...offChainPayloads]);
+  const [tx, txPayloads] = await builder.build(false);
   return [tx, txPayloads];
 }
 
 // src/transaction/confirmSubmittedTransaction.ts
 import {
   delay,
-  isDefined as isDefined15,
+  isDefined as isDefined16,
   isNumber
 } from "@xylabs/sdk-js";
 var DEFAULT_CONFIRMATION_ATTEMPTS = 20;
@@ -2671,22 +2920,20 @@ var confirmSubmittedTransaction = async (viewer, txHash, options) => {
   let attempts = 0;
   while (true) {
     const tx = await viewer.transaction.byHash(txHash) ?? void 0;
-    if (isDefined15(tx)) {
+    if (isDefined16(tx)) {
       options?.logger?.debug("Transaction confirmed", txHash);
       return tx;
-    } else {
-      if (isNumber(exp)) {
-        await assertNotExpired(viewer, txHash, exp, options);
-      }
-      attempts++;
-      if (attempts > maxAttempts) {
-        options?.logger?.error(`\u26A0\uFE0F Transaction not confirmed after ${maxAttempts} attempts`);
-        throw new Error(`Transaction ${txHash} not confirmed after ${maxAttempts} attempts`);
-      } else {
-        options?.logger?.debug(`Transaction not confirmed yet, attempt ${attempts}. Retrying...`, txHash);
-        await delay(attemptDelay);
-      }
     }
+    if (isNumber(exp)) {
+      await assertNotExpired(viewer, txHash, exp, options);
+    }
+    attempts++;
+    if (attempts > maxAttempts) {
+      options?.logger?.error(`\u26A0\uFE0F Transaction not confirmed after ${maxAttempts} attempts`);
+      throw new Error(`Transaction ${txHash} not confirmed after ${maxAttempts} attempts`);
+    }
+    options?.logger?.debug(`Transaction not confirmed yet, attempt ${attempts}. Retrying...`, txHash);
+    await delay(attemptDelay);
   }
 };
 
@@ -2705,9 +2952,7 @@ import {
 var tryHydrateTransaction = async ({ chainMap }, hash) => {
   return await tryHydrateTypedBoundWitness(
     {
-      get(hashes) {
-        return chainMap.get(hashes);
-      },
+      get: (hashes) => chainMap.get(hashes),
       next() {
         throw new Error("Not implemented");
       }
@@ -2719,9 +2964,7 @@ var tryHydrateTransaction = async ({ chainMap }, hash) => {
 var hydrateTransaction = async ({ chainMap }, hash) => {
   return await hydrateTypedBoundWitness(
     {
-      get(hashes) {
-        return chainMap.get(hashes);
-      },
+      get: (hashes) => chainMap.get(hashes),
       next() {
         throw new Error("Not implemented");
       }
@@ -2982,11 +3225,13 @@ var hydratedTransactionToPayloadBundle = (transaction) => {
 };
 var bundle2 = (root, transaction) => {
   const payloads = flattenHydratedTransaction(transaction);
-  return new PayloadBuilder12({ schema: PayloadBundleSchema2 }).fields({ payloads, root }).build();
+  const payloadBuilder = new PayloadBuilder12({ schema: PayloadBundleSchema2 });
+  const builder = payloadBuilder.fields({ payloads, root });
+  return builder.build();
 };
 
 // src/context/Actor.ts
-var ActorConfigContext = z24.extend(BaseConfigContextZod, { config: ActorConfigZod });
+var ActorConfigContext = z26.extend(BaseConfigContextZod, { config: ActorConfigZod });
 var isActorConfigContext = zodIsFactory5(ActorConfigContext);
 var asActorConfigContext = zodAsFactory6(ActorConfigContext, "asActorConfigContext");
 var toActorConfigContext = zodToFactory5(ActorConfigContext, "toActorConfigContext");
@@ -3028,7 +3273,7 @@ var ProviderFactory = class _ProviderFactory {
   get resolvedMoniker() {
     const labels = this.labels ?? {};
     const labelString = Object.entries(labels).map(([key, value]) => `${key}=${value}`).join(",");
-    return labelString.length === 0 ? `${this.defaultMoniker}` : `${this.defaultMoniker}|${labelString}`;
+    return labelString.length === 0 ? this.defaultMoniker : `${this.defaultMoniker}|${labelString}`;
   }
   get uniqueId() {
     return this._uniqueId;
@@ -3043,8 +3288,7 @@ var ProviderFactory = class _ProviderFactory {
     let scopeObject;
     switch (this.scope) {
       case "global": {
-        globalThis.xyoServiceSingletons ??= {};
-        scopeObject = globalThis.xyoServiceSingletons;
+        scopeObject = getOrCreateGlobalSingletons();
         break;
       }
       case "context": {
@@ -3081,6 +3325,15 @@ var ProviderFactory = class _ProviderFactory {
     }
   }
 };
+function getOrCreateGlobalSingletons() {
+  const existing = globalThis.xyoServiceSingletons;
+  if (existing !== void 0) {
+    return existing;
+  }
+  const singletons = {};
+  Reflect.set(globalThis, "xyoServiceSingletons", singletons);
+  return singletons;
+}
 
 // src/CreatableProvider/AbstractCreatableProvider.ts
 var AbstractCreatableProvider = class extends AbstractCreatable {
@@ -3266,7 +3519,7 @@ var ProviderFactoryLocator = class _ProviderFactoryLocator {
     );
   }
   has(moniker) {
-    return !!this._registry[moniker];
+    return Object.hasOwn(this._registry, moniker);
   }
   /**
    * Locates a provider factory that matches the supplied moniker and labels
@@ -3283,10 +3536,11 @@ var ProviderFactoryLocator = class _ProviderFactoryLocator {
   merge(locator) {
     const registry = { ...this.registry };
     for (const moniker in locator.registry) {
-      if (registry[moniker]) {
-        registry[moniker].push(...locator.registry[moniker] ?? []);
-      } else {
+      const existing = registry[moniker];
+      if (existing === void 0) {
         registry[moniker] = locator.registry[moniker];
+      } else {
+        existing.push(...locator.registry[moniker] ?? []);
       }
     }
     return new _ProviderFactoryLocator(this.context, registry);
@@ -3316,13 +3570,13 @@ var ProviderFactoryLocator = class _ProviderFactoryLocator {
     return this;
   }
   registered(moniker) {
-    return !!this.registry[moniker] || (this._parent?.registered(moniker) ?? false);
+    return Object.hasOwn(this.registry, moniker) || (this._parent?.registered(moniker) ?? false);
   }
   async tryGetInstance(moniker, { start = true, labels } = {}) {
     const resolvedParams = { context: this.context };
     const factory = this.tryLocate(moniker, labels);
-    if (factory) {
-      if (this.context.singletons[factory.uniqueId]) {
+    if (factory !== void 0) {
+      if (Object.hasOwn(this.context.singletons, factory.uniqueId)) {
         return this.context.singletons[factory.uniqueId];
       }
       this.logger?.debug(`Creating provider instance for moniker [${moniker}]${labels ? ` with labels [${JSON.stringify(labels)}]` : ""} using factory [${factory.uniqueId.description}]`);
@@ -3376,27 +3630,28 @@ import {
   zodIsFactory as zodIsFactory6,
   zodToFactory as zodToFactory6
 } from "@xylabs/sdk-js";
-import { z as z25 } from "zod/mini";
-var HostActorConfigContext = z25.extend(BaseConfigContextZod, { config: HostActorConfigZod });
+import { z as z27 } from "zod/mini";
+var HostActorConfigContext = z27.extend(BaseConfigContextZod, { config: HostActorConfigZod });
 var isHostActorConfigContext = zodIsFactory6(HostActorConfigContext);
 var asHostActorConfigContext = zodAsFactory7(HostActorConfigContext, "asHostActorConfigContext");
 var toHostActorConfigContext = zodToFactory6(HostActorConfigContext, "toHostActorConfigContext");
 
 // src/createDeclarationPayload.ts
-import { isDefined as isDefined16 } from "@xylabs/sdk-js";
+import { isDefined as isDefined17 } from "@xylabs/sdk-js";
 import { PayloadBuilder as PayloadBuilder13 } from "@xyo-network/sdk-js";
 import {
   ChainStakeIntentSchema
 } from "@xyo-network/xl1-protocol-lib";
 var createDeclarationIntent = (address, intent, nbf, exp) => {
-  const expiration = isDefined16(exp) ? exp : nbf + 1e4;
-  const redeclarationIntent = new PayloadBuilder13({ schema: ChainStakeIntentSchema }).fields({
+  const expiration = isDefined17(exp) ? exp : nbf + 1e4;
+  const payloadBuilder = new PayloadBuilder13({ schema: ChainStakeIntentSchema });
+  const builder = payloadBuilder.fields({
     from: address,
     intent,
     nbf,
     exp: expiration
-  }).build();
-  return redeclarationIntent;
+  });
+  return builder.build();
 };
 
 // src/createTransferPayload.ts
@@ -3404,12 +3659,14 @@ import { toHex as toHex3 } from "@xylabs/sdk-js";
 import { PayloadBuilder as PayloadBuilder14 } from "@xyo-network/sdk-js";
 import { TransferSchema } from "@xyo-network/xl1-protocol-lib";
 function createTransferPayload(from, transfers, context) {
-  return new PayloadBuilder14({ schema: TransferSchema }).fields({
+  const payloadBuilder = new PayloadBuilder14({ schema: TransferSchema });
+  const builder = payloadBuilder.fields({
     epoch: Date.now(),
     from,
     transfers: Object.fromEntries(Object.entries(transfers).map(([k, v]) => [k, toHex3(v)])),
     context
-  }).build();
+  });
+  return builder.build();
 }
 
 // src/eip-712/Payloads/EIP712Data.ts
@@ -3418,26 +3675,26 @@ import {
   asSchema as asSchema2,
   isPayloadOfZodType
 } from "@xyo-network/sdk-js";
-import { z as z27 } from "zod";
+import { z as z29 } from "zod";
 
 // src/eip-712/Types.ts
-import { z as z26 } from "zod";
-var TypedDataDomainZod = z26.object({
-  name: z26.string().nullable().optional(),
-  version: z26.string().nullable().optional(),
-  chainId: z26.union([z26.string(), z26.number(), z26.bigint()]).nullable().optional(),
-  verifyingContract: z26.string().nullable().optional(),
-  salt: z26.union([z26.string(), z26.instanceof(Uint8Array)]).nullable().optional()
+import { z as z28 } from "zod";
+var TypedDataDomainZod = z28.object({
+  name: z28.string().nullable().optional(),
+  version: z28.string().nullable().optional(),
+  chainId: z28.union([z28.string(), z28.number(), z28.bigint()]).nullable().optional(),
+  verifyingContract: z28.string().nullable().optional(),
+  salt: z28.union([z28.string(), z28.instanceof(Uint8Array)]).nullable().optional()
 });
-var TypedDataFieldZod = z26.object({
-  name: z26.string(),
-  type: z26.string()
+var TypedDataFieldZod = z28.object({
+  name: z28.string(),
+  type: z28.string()
 });
-var TypedDataTypesZod = z26.record(z26.string(), z26.array(TypedDataFieldZod));
-var TypedDataValueZod = z26.record(z26.string(), z26.any());
+var TypedDataTypesZod = z28.record(z28.string(), z28.array(TypedDataFieldZod));
+var TypedDataValueZod = z28.record(z28.string(), z28.any());
 
 // src/eip-712/Payloads/EIP712Data.ts
-var EIP712DataPayloadFieldsZod = z27.object({
+var EIP712DataPayloadFieldsZod = z29.object({
   domain: TypedDataDomainZod,
   types: TypedDataTypesZod,
   values: TypedDataValueZod
@@ -3455,11 +3712,11 @@ import {
   asSchema as asSchema3,
   isPayloadOfZodType as isPayloadOfZodType2
 } from "@xyo-network/sdk-js";
-import { z as z28 } from "zod";
-var EIP712SignaturePayloadFieldsZod = z28.object({
-  address: z28.string(),
+import { z as z30 } from "zod";
+var EIP712SignaturePayloadFieldsZod = z30.object({
+  address: z30.string(),
   hash: HashZod,
-  signature: z28.string()
+  signature: z30.string()
 });
 var EIP712SignaturePayloadSchema = asSchema3("network.xyo.chains.ethereum.eip712.signature", true);
 var isEIP712SignaturePayload = isPayloadOfZodType2(
@@ -3543,11 +3800,11 @@ var isPositiveBigInt = (value) => {
 var parseSignedBigInt = (value) => {
   if (isNegativeBigInt(value)) {
     return -hexToBigInt5(value.negative);
-  } else if (isPositiveBigInt(value)) {
+  }
+  if (isPositiveBigInt(value)) {
     return hexToBigInt5(value.positive);
-  } else {
-    throw new Error("Invalid balance type");
   }
+  throw new Error("Invalid balance type");
 };
 var toSignedBigInt = (value) => {
   return value < 0n ? { negative: toHex4(-value) } : { positive: toHex4(value) };
@@ -3570,7 +3827,7 @@ import {
   asHash as asHash4,
   assertEx as assertEx33,
   exists as exists3,
-  isDefined as isDefined17,
+  isDefined as isDefined18,
   ZERO_ADDRESS
 } from "@xylabs/sdk-js";
 import {
@@ -3664,39 +3921,38 @@ async function balancesStepSummaryFromRange(context, semaphores, blockViewer, su
         const summaryResult = await summaryMap.get(`${frameHead._hash}|${frameSize}`);
         if (isAnyPayload3(summaryResult)) {
           return summaryResult;
-        } else {
-          await semaphores[step].acquire();
-          try {
-            const subRanges = deepCalculateFramesFromRange(range, step - 1);
-            const promises = subRanges.map((subRange) => balancesStepSummaryFromRange(
-              context,
-              semaphores,
-              blockViewer,
-              summaryMap,
-              subRange
-            ));
-            const subResults = await Promise.all(promises);
-            const bigIntBalances = {};
-            for (const subResult of subResults) {
-              for (const [address, balance] of Object.entries(subResult.balances)) {
-                bigIntBalances[address] = (bigIntBalances[address] ?? 0n) + parseSignedBigInt(balance);
-              }
-            }
-            const balances = {};
-            for (const [address, balance] of Object.entries(bigIntBalances)) {
-              balances[address] = toSignedBigInt(balance);
+        }
+        await semaphores[step].acquire();
+        try {
+          const subRanges = deepCalculateFramesFromRange(range, step - 1);
+          const promises = subRanges.map((subRange) => balancesStepSummaryFromRange(
+            context,
+            semaphores,
+            blockViewer,
+            summaryMap,
+            subRange
+          ));
+          const subResults = await Promise.all(promises);
+          const bigIntBalances = {};
+          for (const subResult of subResults) {
+            for (const [address, balance] of Object.entries(subResult.balances)) {
+              bigIntBalances[address] = (bigIntBalances[address] ?? 0n) + parseSignedBigInt(balance);
             }
-            const result = {
-              schema: BalancesStepSummarySchema,
-              hash: frameHead._hash,
-              stepSize: frameSize,
-              balances
-            };
-            await summaryMap.set(key, result);
-            return result;
-          } finally {
-            semaphores[step].release();
           }
+          const balances = {};
+          for (const [address, balance] of Object.entries(bigIntBalances)) {
+            balances[address] = toSignedBigInt(balance);
+          }
+          const result = {
+            schema: BalancesStepSummarySchema,
+            hash: frameHead._hash,
+            stepSize: frameSize,
+            balances
+          };
+          await summaryMap.set(key, result);
+          return result;
+        } finally {
+          semaphores[step].release();
         }
       }, { ...context, timeBudgetLimit: 500 });
     }, { ...context, timeBudgetLimit: 500 });
@@ -3705,7 +3961,7 @@ async function balancesStepSummaryFromRange(context, semaphores, blockViewer, su
 
 // src/summary/primitives/balances/balancesSummary.ts
 import { assertEx as assertEx27, spanRootAsync as spanRootAsync3 } from "@xylabs/sdk-js";
-import { asXyoAddress } from "@xyo-network/address";
+import { asXyoAddress } from "@xyo-network/sdk-js";
 import {
   asBlockBoundWitnessWithStorageMeta as asBlockBoundWitnessWithStorageMeta3,
   asXL1BlockRange as asXL1BlockRange7,
@@ -3991,7 +4247,7 @@ async function transfersStepSummaryFromRange(context, semaphores, blockViewer, s
 
 // src/summary/primitives/transfers/transfersSummary.ts
 import { assertEx as assertEx32, spanRootAsync as spanRootAsync7 } from "@xylabs/sdk-js";
-import { asXyoAddress as asXyoAddress2 } from "@xyo-network/address";
+import { asXyoAddress as asXyoAddress2 } from "@xyo-network/sdk-js";
 import {
   asBlockBoundWitnessWithStorageMeta as asBlockBoundWitnessWithStorageMeta5,
   asXL1BlockRange as asXL1BlockRange9,
@@ -4051,14 +4307,16 @@ var SimpleAccountBalanceViewer = class extends AbstractCreatableProvider {
     return balances[address] ?? AttoXL13(0n);
   }
   async accountBalanceHistories(addresses, config = {}) {
-    return (await this.qualifiedAccountBalanceHistories(addresses, config))[0];
+    const [histories] = await this.qualifiedAccountBalanceHistories(addresses, config);
+    return histories;
   }
   async accountBalanceHistory(address, config) {
     return await this.spanAsync("accountBalanceHistory", async () => {
       const range = isChainQualifiedRangeConfig4(config) ? config.range : void 0;
       const startingRange = asXL1BlockRange10(range ?? [0, await this.blockViewer.currentBlockNumber()], true);
       const blockNumbers = await this.distillTransferHistory(address, startingRange);
-      const blocks = (await Promise.all(blockNumbers.map(async (bn) => await this.blockViewer.blockByNumber(bn)))).filter(exists3);
+      const blockResults = await Promise.all(blockNumbers.map(async (bn) => await this.blockViewer.blockByNumber(bn)));
+      const blocks = blockResults.filter(exists3);
       const result = [];
       for (const block of blocks) {
         const transferIndexes = block[0].payload_schemas.map((schema, index) => schema === TransferSchema2 ? index : void 0).filter(exists3);
@@ -4068,7 +4326,7 @@ var SimpleAccountBalanceViewer = class extends AbstractCreatableProvider {
             block[1].find((p) => p._hash === hash),
             () => `Error: Could not find Transfer with hash ${hash} in block ${block[0]._hash}`
           );
-        }).filter(exists3).filter((t) => t.from === address || isDefined17(t.transfers[address]));
+        }).filter(exists3).filter((t) => t.from === address || isDefined18(t.transfers[address]));
         if (transfers.length === 0) {
           continue;
         }
@@ -4187,10 +4445,11 @@ var SimpleAccountBalanceViewer = class extends AbstractCreatableProvider {
     return await this.spanAsync("qualifiedAccountBalanceHistory", async () => {
       const range = asRange(headOrRange);
       const headHash = asHash4(headOrRange);
-      const [head] = assertEx33(isDefined17(headHash) ? await this.blockViewer.blockByHash(headHash) : await this.blockViewer.currentBlock(), () => "Could not resolve head block");
+      const [head] = assertEx33(isDefined18(headHash) ? await this.blockViewer.blockByHash(headHash) : await this.blockViewer.currentBlock(), () => "Could not resolve head block");
       const startingRange = asXL1BlockRange10(range ?? [0, head.block], true);
       const blockNumbers = await this.distillTransferHistory(address, startingRange);
-      const blocks = (await Promise.all(blockNumbers.map(async (bn) => await this.blockViewer.blockByNumber(bn)))).filter(exists3);
+      const blockResults = await Promise.all(blockNumbers.map(async (bn) => await this.blockViewer.blockByNumber(bn)));
+      const blocks = blockResults.filter(exists3);
       const result = [];
       for (const block of blocks) {
         const transferIndexes = block[0].payload_schemas.map((schema, index) => schema === TransferSchema2 ? index : void 0).filter(exists3);
@@ -4200,7 +4459,7 @@ var SimpleAccountBalanceViewer = class extends AbstractCreatableProvider {
             block[1].find((p) => p._hash === hash),
             () => `Error: Could not find Transfer with hash ${hash} in block ${block[0]._hash}`
           );
-        }).filter(exists3).filter((t) => t.from === address || isDefined17(t.transfers[address]));
+        }).filter(exists3).filter((t) => t.from === address || isDefined18(t.transfers[address]));
         if (transfers.length === 0) {
           continue;
         }
@@ -4267,12 +4526,12 @@ var HydratedCache = class {
 };
 
 // src/utils/isZodError.ts
-import { z as z29 } from "zod";
+import { z as z31 } from "zod";
 var isZodError = (error) => {
-  return error instanceof z29.ZodError;
+  return error instanceof z31.ZodError;
 };
 var prettifyZodError = (error) => {
-  return z29.prettifyError(error);
+  return z31.prettifyError(error);
 };
 
 // src/simple/block/SimpleBlockViewer.ts
@@ -4382,7 +4641,7 @@ var SimpleBlockViewer = class extends AbstractCreatableProvider {
   }
   async blocksByStep(stepLevel, stepIndex) {
     return await this.spanAsync("blocksByStep", async () => {
-      assertEx34(Number.isInteger(stepIndex) && stepIndex >= 0, () => "stepIndex must be a non-negative integer");
+      assertEx34(Number.isSafeInteger(stepIndex) && stepIndex >= 0, () => "stepIndex must be a non-negative integer");
       const size = stepSize2(stepLevel);
       assertEx34(
         stepLevel <= blocksMaxStep,
@@ -4406,7 +4665,12 @@ var SimpleBlockViewer = class extends AbstractCreatableProvider {
   }
   async chainId(blockNumber = "latest") {
     return await this.spanAsync("chainId", async () => {
-      return blockNumber === "latest" ? (await this.finalizationViewer.headBlock()).chain : assertEx34(await this.blockByNumber(blockNumber), () => `Block not found [${blockNumber}]`)[0].chain;
+      if (blockNumber === "latest") {
+        const headBlock = await this.finalizationViewer.headBlock();
+        return headBlock.chain;
+      }
+      const block = assertEx34(await this.blockByNumber(blockNumber), () => `Block not found [${blockNumber}]`);
+      return block[0].chain;
     }, this.context);
   }
   async createHandler() {
@@ -4455,9 +4719,10 @@ var SimpleBlockViewer = class extends AbstractCreatableProvider {
     };
   }
   async getChainContextRead() {
+    const headBlock = await this.finalizationViewer.head();
     return {
       ...this.getBlockContextRead(),
-      head: (await this.finalizationViewer.head())[0]
+      head: headBlock[0]
     };
   }
   async startHandler() {
@@ -4504,10 +4769,11 @@ var SimpleBlockViewer = class extends AbstractCreatableProvider {
     }, this.headPollIntervalMs);
   }
   stopHeadPolling() {
-    if (this._headPollTimer) {
-      clearInterval(this._headPollTimer);
-      this._headPollTimer = null;
+    if (!this._headPollTimer) {
+      return;
     }
+    clearInterval(this._headPollTimer);
+    this._headPollTimer = null;
   }
 };
 __publicField(SimpleBlockViewer, "defaultMoniker", BlockViewerMoniker2);
@@ -4588,13 +4854,18 @@ var SimpleBlockValidationViewer = class extends AbstractCreatableProvider {
       head: void 0
     };
     const blocksWithMeta = await Promise.all(blocks.map((b) => Promise.all([PayloadBuilder18.addHashMeta(b[0]), PayloadBuilder18.addHashMeta(b[1])])));
-    const head = isChainQualifiedHeadConfig5(config) ? assertEx35(
-      (await this.blockViewer.blockByHash(config.head))?.[0],
-      () => `Specified a head that is not in the chain [${config.head}]`
-    ) : void 0;
-    const headBlock = head ?? (await this.blockViewer.currentBlock())[0];
-    const validateProtocol = value ? this.doValidateProtocol.bind(this) : void 0;
-    const validateState = state ? this.doValidateState.bind(this) : void 0;
+    let head;
+    if (isChainQualifiedHeadConfig5(config)) {
+      const headBlockResult = await this.blockViewer.blockByHash(config.head);
+      head = headBlockResult == null ? assertEx35(
+        void 0,
+        () => `Specified a head that is not in the chain [${config.head}]`
+      ) : headBlockResult[0];
+    }
+    const currentBlock = await this.blockViewer.currentBlock();
+    const headBlock = head ?? currentBlock[0];
+    const validateProtocol = value === true ? this.doValidateProtocol.bind(this) : void 0;
+    const validateState = state === true ? this.doValidateState.bind(this) : void 0;
     const chainIdAtBlockNumber = (blockNumber) => this.chainContractViewer.chainIdAtBlockNumber(blockNumber);
     const qualification = { head: headBlock._hash, range: asXL1BlockRange12([0, headBlock.block], true) };
     const [protocolResults, stateResults] = await Promise.all([
@@ -4617,13 +4888,16 @@ var SimpleBlockValidationViewer = class extends AbstractCreatableProvider {
     throw new Error("Method not implemented.");
   }
   async validateBlock(block, config) {
-    return (await this.validateBlocks([block], config))[0];
+    const results = await this.validateBlocks([block], config);
+    return results[0];
   }
   async validateBlocks(blocks, config) {
-    return (await this.qualifiedValidateBlocks(blocks, config))[0];
+    const results = await this.qualifiedValidateBlocks(blocks, config);
+    return results[0];
   }
   async validateUncle(blocks, config) {
-    return (await this.qualifiedValidateUncle(blocks, config))[0];
+    const results = await this.qualifiedValidateUncle(blocks, config);
+    return results[0];
   }
   async doValidateProtocol(blocks, chainIdAtBlockNumber) {
     return await Promise.all(blocks.map(async (block) => {
@@ -4681,7 +4955,7 @@ var SimpleChainContractViewer = class extends AbstractCreatableProvider {
     return this.finalizationViewer.chainId();
   }
   async chainIdAtBlockNumber(blockNumber) {
-    return await withContextCacheResponse(this.context, "chainIdAtBlockNumber", `${blockNumber}`, async () => {
+    return await withContextCacheResponse(this.context, "chainIdAtBlockNumber", String(blockNumber), async () => {
       let chainId = this.chainId();
       let contractViewer = this;
       let forkedAtBlockNumber = await contractViewer.forkedAtBlockNumber();
@@ -4742,7 +5016,7 @@ var SimpleXyoClient = class {
 import { assertEx as assertEx37, exists as exists6 } from "@xylabs/sdk-js";
 import { isAnyPayload as isAnyPayload8, PayloadZodLoose } from "@xyo-network/sdk-js";
 import { DataLakeRunnerMoniker } from "@xyo-network/xl1-protocol-lib";
-import { z as z30 } from "zod/mini";
+import { z as z32 } from "zod/mini";
 
 // src/simple/datalake/AbstractRestDataLake.ts
 import { FetchClientError, FetchJsonClient } from "@xylabs/sdk-js";
@@ -4764,14 +5038,16 @@ var AbstractRestDataLake = class extends AbstractCreatableProvider {
     return this.params.endpoint;
   }
   async get(hashes) {
-    return (await Promise.all(hashes.map((hash) => this.getOne(hash)))).filter(exists5);
+    const results = await Promise.all(hashes.map((hash) => this.getOne(hash)));
+    return results.filter(exists5);
   }
   next(_options) {
     throw new Error("Method not implemented.");
   }
   async getOne(hash) {
     try {
-      return asAnyPayload4((await this.client.get(`${this.params.endpoint}/get/${hash}`)).data);
+      const response = await this.client.get(`${this.params.endpoint}/get/${hash}`);
+      return asAnyPayload4(response.data);
     } catch (ex) {
       if (ex instanceof FetchClientError && (ex.response.status === 400 || ex.response.status === 404)) {
         return void 0;
@@ -4789,7 +5065,7 @@ var AbstractRestDataLake = class extends AbstractCreatableProvider {
     if (this.allowedSchemas && !this.allowedSchemas.includes(schema)) {
       return false;
     }
-    if (this.disallowedSchemas?.includes(schema)) {
+    if (this.disallowedSchemas?.includes(schema) === true) {
       return false;
     }
     return true;
@@ -4815,10 +5091,9 @@ var RestDataLakeRunner = class extends AbstractRestDataLake {
     }).filter(exists6);
     if (allowedItems.length > 0) {
       const result = await this.client.post(`${this.params.endpoint}/insert`, allowedItems);
-      return z30.array(PayloadZodLoose).parse(result.data);
-    } else {
-      return [];
+      return z32.array(PayloadZodLoose).parse(result.data);
     }
+    return [];
   }
 };
 __publicField(RestDataLakeRunner, "defaultMoniker", DataLakeRunnerMoniker);
@@ -4874,7 +5149,7 @@ var AbstractSimpleDataLake = class extends AbstractCreatableProvider {
     if (this.allowedSchemas && !this.allowedSchemas.includes(schema)) {
       return false;
     }
-    if (this.disallowedSchemas?.includes(schema)) {
+    if (this.disallowedSchemas?.includes(schema) === true) {
       return false;
     }
     return true;
@@ -4888,10 +5163,12 @@ var SimpleDataLakeRunner = class extends AbstractSimpleDataLake {
     await this.map.clear();
   }
   async delete(hashes) {
-    return (await Promise.all(hashes.map(async (hash) => {
+    const deleteResults = await Promise.all(hashes.map(async (hash) => {
       const payload = await this.map.get(hash);
-      return await this.map.delete(hash) ? payload : void 0;
-    }))).filter(exists7);
+      const deleted = await this.map.delete(hash);
+      return deleted ? payload : void 0;
+    }));
+    return deleteResults.filter(exists7);
   }
   async insert(items) {
     const payloads = items.filter(isAnyPayload10).filter((i) => this.isAllowed(i));
@@ -4934,7 +5211,8 @@ var SimpleFinalizationRunner = class extends AbstractCreatableProvider {
     this._store = { chainMap: this.params.finalizedArchivist };
   }
   async finalizeBlock(block) {
-    return (await this.finalizeBlocks([block]))[0];
+    const results = await this.finalizeBlocks([block]);
+    return results[0];
   }
   async finalizeBlocks(blocks) {
     const sortedBlocks = blocks.toSorted((a, b) => a[0].block - b[0].block);
@@ -4988,7 +5266,8 @@ var SimpleFinalizationViewer = class extends AbstractCreatableProvider {
   }
   async createHandler() {
     await super.createHandler();
-    this._chainId = assertEx38(this.config.chain.id ?? (await findMostRecentBlock(this.params.finalizedArchivist))?.chain, () => "chain.id is required if empty archivist");
+    const mostRecentBlock = await findMostRecentBlock(this.params.finalizedArchivist);
+    this._chainId = assertEx38(this.config.chain.id ?? mostRecentBlock?.chain, () => "chain.id is required if empty archivist");
     this._store = { chainMap: this.params.finalizedArchivist };
   }
   async head() {
@@ -5003,13 +5282,16 @@ var SimpleFinalizationViewer = class extends AbstractCreatableProvider {
     }, this.context);
   }
   async headBlock() {
-    return (await this.head())[0];
+    const headBlock = await this.head();
+    return headBlock[0];
   }
   async headHash() {
-    return (await this.headBlock())._hash;
+    const headBlock = await this.headBlock();
+    return headBlock._hash;
   }
   async headNumber() {
-    return (await this.headBlock()).block;
+    const headBlock = await this.headBlock();
+    return headBlock.block;
   }
   getBlockContextRead() {
     return {
@@ -5018,9 +5300,10 @@ var SimpleFinalizationViewer = class extends AbstractCreatableProvider {
     };
   }
   async getChainContextRead() {
+    const headBlock = await this.head();
     return {
       ...this.getBlockContextRead(),
-      head: (await this.head())[0]
+      head: headBlock[0]
     };
   }
   async getCurrentHead() {
@@ -5058,7 +5341,7 @@ var SimpleXyoGateway = class _SimpleXyoGateway extends AbstractCreatableProvider
 import {
   assertEx as assertEx39,
   BigIntToJsonZod,
-  isDefined as isDefined18
+  isDefined as isDefined19
 } from "@xylabs/sdk-js";
 import { PayloadBuilder as PayloadBuilder20 } from "@xyo-network/sdk-js";
 import {
@@ -5096,9 +5379,9 @@ var SimpleXyoGatewayRunner = class _SimpleXyoGatewayRunner extends AbstractCreat
       chain,
       fees
     } = options ?? {};
-    const resolvedChainId = isDefined18(chain) ? chain : await viewer.chainId();
-    const resolvedNbf = asXL1BlockNumber10(isDefined18(nbf) ? nbf : await viewer.currentBlockNumber(), true);
-    const resolvedExp = asXL1BlockNumber10(isDefined18(exp) ? exp : resolvedNbf + 10, true);
+    const resolvedChainId = isDefined19(chain) ? chain : await viewer.chainId();
+    const resolvedNbf = asXL1BlockNumber10(isDefined19(nbf) ? nbf : await viewer.currentBlockNumber(), true);
+    const resolvedExp = asXL1BlockNumber10(isDefined19(exp) ? exp : resolvedNbf + 10, true);
     const tx = await buildUnsignedTransaction(resolvedChainId, onChain, offChain, resolvedNbf, resolvedExp, await this.signer.address(), fees);
     return await this.addTransactionToChain(tx, await PayloadBuilder20.addHashMeta(offChain));
   }
@@ -5142,11 +5425,13 @@ var SimpleXyoGatewayRunner = class _SimpleXyoGatewayRunner extends AbstractCreat
         BigIntToJsonZod.parse(amount)
       ])
     );
-    const transfer = new PayloadBuilder20({ schema: TransferSchema3 }).fields({
+    const payloadBuilder = new PayloadBuilder20({ schema: TransferSchema3 });
+    const transferBuilder = payloadBuilder.fields({
       from,
       transfers: hexTransfers,
       epoch: Date.now()
-    }).build();
+    });
+    const transfer = transferBuilder.build();
     const [hash] = await this.addPayloadsToChain([transfer], [], options);
     return hash;
   }
@@ -5267,10 +5552,11 @@ var SimpleMempoolRunner = class extends AbstractCreatableProvider {
       const valid = blocks.map((b) => !!b);
       const remainingBlockMap = [];
       const remainingBlocks = blocks.map((b, i) => {
-        if (b) {
-          remainingBlockMap.push(i);
-          return b;
+        if (!b) {
+          return;
         }
+        remainingBlockMap.push(i);
+        return b;
       }).filter(exists8);
       assertEx40(
         remainingBlockMap.length === remainingBlocks.length,
@@ -5289,7 +5575,7 @@ var SimpleMempoolRunner = class extends AbstractCreatableProvider {
         valid[remainingBlockMap[i]] = validated;
       }
       const pruneHashes = bundles.map((p, i) => {
-        if (!valid[i]) {
+        if (valid.at(i) !== true) {
           return p._hash;
         }
       }).filter(exists8);
@@ -5329,10 +5615,11 @@ var SimpleMempoolRunner = class extends AbstractCreatableProvider {
       const valid = transactions.map((t) => !!t);
       const remainingTransactionMap = [];
       const remainingTransactions = transactions.map((t, i) => {
-        if (t) {
-          remainingTransactionMap.push(i);
-          return t;
+        if (!t) {
+          return;
         }
+        remainingTransactionMap.push(i);
+        return t;
       }).filter(exists8);
       assertEx40(
         remainingTransactionMap.length === remainingTransactions.length,
@@ -5352,7 +5639,7 @@ var SimpleMempoolRunner = class extends AbstractCreatableProvider {
         valid[remainingTransactionMap[i]] = validated;
       }
       const pruneHashes = bundles.map((p, i) => {
-        if (!valid[i]) {
+        if (valid.at(i) !== true) {
           return p._hash;
         }
       }).filter(exists8);
@@ -5586,7 +5873,7 @@ SimpleMempoolRunner = __decorateClass([
 // src/simple/mempool/SimpleMempoolViewer.ts
 import {
   exists as exists9,
-  isDefined as isDefined19,
+  isDefined as isDefined20,
   isHash as isHash2
 } from "@xylabs/sdk-js";
 import { isHashMeta as isHashMeta2, isPayloadBundle as isPayloadBundle2 } from "@xyo-network/sdk-js";
@@ -5647,7 +5934,7 @@ var SimpleMempoolViewer = class extends AbstractCreatableProvider {
     let cursor = void 0;
     if (isHash2(providedCursor)) {
       const [p] = await this.pendingBlocksArchivist.get([providedCursor]);
-      if (isDefined19(p)) {
+      if (isDefined20(p)) {
         cursor = p._sequence;
       }
     }
@@ -5657,7 +5944,8 @@ var SimpleMempoolViewer = class extends AbstractCreatableProvider {
       cursor
     });
     const filteredBundles = bundles.filter(isPayloadBundle2).filter(isHashMeta2);
-    return (await Promise.all(filteredBundles.map(async (bundle3) => await bundledPayloadToHydratedBlock(bundle3)))).filter(exists9);
+    const hydratedBlocks = await Promise.all(filteredBundles.map(async (bundle3) => await bundledPayloadToHydratedBlock(bundle3)));
+    return hydratedBlocks.filter(exists9);
   }
   async pendingTransactions({
     cursor: providedCursor,
@@ -5666,7 +5954,7 @@ var SimpleMempoolViewer = class extends AbstractCreatableProvider {
     let cursor = void 0;
     if (isHash2(providedCursor)) {
       const [p] = await this.pendingTransactionsArchivist.get([providedCursor]);
-      if (isDefined19(p)) {
+      if (isDefined20(p)) {
         cursor = p._sequence;
       }
     }
@@ -5678,12 +5966,7 @@ var SimpleMempoolViewer = class extends AbstractCreatableProvider {
     });
     this.logger?.debug(`Fetched pending transactions: ${bundles.length} bundles`);
     const filteredBundles = bundles.filter(isPayloadBundle2).filter(isHashMeta2);
-    const hydratedWithBundle = (await Promise.all(
-      filteredBundles.map(async (bundle3) => {
-        const tx = await bundledPayloadToHydratedTransaction(bundle3);
-        return isDefined19(tx) ? { bundle: bundle3, tx } : void 0;
-      })
-    )).filter(exists9);
+    const hydratedWithBundle = await this.hydratePendingBundles(filteredBundles);
     const currentBlock = await this.windowedBlockViewer.currentBlock();
     const currentBlockNumber = currentBlock[0].block;
     const evaluated = await Promise.all(
@@ -5704,9 +5987,7 @@ var SimpleMempoolViewer = class extends AbstractCreatableProvider {
       })
     );
     this.gcHandoutStats(currentBlockNumber);
-    const inclusionCandidates = (await Promise.all(validTransactions.map(async ({ bundle: bundle3, tx }) => {
-      if (await this.isInclusionCandidate(tx, currentBlock, false)) return { bundle: bundle3, tx };
-    }))).filter(exists9);
+    const inclusionCandidates = await this.filterInclusionCandidates(validTransactions, currentBlock);
     const selectionRatio = this.params.mempoolSelectionRatio ?? DEFAULT_MEMPOOL_SELECTION_RATIO;
     const nonDemoted = inclusionCandidates.filter(({ bundle: bundle3 }) => !this.isDemoted(bundle3._hash));
     const demoted = inclusionCandidates.filter(({ bundle: bundle3 }) => this.isDemoted(bundle3._hash));
@@ -5730,12 +6011,27 @@ var SimpleMempoolViewer = class extends AbstractCreatableProvider {
   async deleteBundledTransaction(bundle3) {
     await this.pendingTransactionsArchivist.delete([bundle3._hash]);
   }
+  async filterInclusionCandidates(validTransactions, currentBlock) {
+    const inclusionResults = await Promise.all(validTransactions.map(async ({ bundle: bundle3, tx }) => {
+      if (await this.isInclusionCandidate(tx, currentBlock, false)) return { bundle: bundle3, tx };
+    }));
+    return inclusionResults.filter(exists9);
+  }
   gcHandoutStats(currentBlockNumber) {
     const ttl = this.handoutStatsTtlBlocks;
     for (const [hash, stats] of this._handoutStats) {
       if (currentBlockNumber - stats.firstHandoutAt > ttl) this._handoutStats.delete(hash);
     }
   }
+  async hydratePendingBundles(filteredBundles) {
+    const hydratedResults = await Promise.all(
+      filteredBundles.map(async (bundle3) => {
+        const tx = await bundledPayloadToHydratedTransaction(bundle3);
+        return isDefined20(tx) ? { bundle: bundle3, tx } : void 0;
+      })
+    );
+    return hydratedResults.filter(exists9);
+  }
   /**
    * Evaluates a transaction to determine if it should be purged from the mempool.
    * @param tx The transaction to evaluate
@@ -5793,7 +6089,7 @@ SimpleMempoolViewer = __decorateClass([
 function deduplicateWithBundleBySigner(items) {
   const seen = /* @__PURE__ */ new Set();
   return items.filter(({ tx }) => {
-    const key = tx[0].addresses.toSorted().join(",");
+    const key = tx[0].addresses.toSorted((a, b) => a.localeCompare(b)).join(",");
     if (seen.has(key)) return false;
     seen.add(key);
     return true;
@@ -5859,13 +6155,12 @@ var SimpleXyoNetwork = class {
       const response = await fetchJsonGet(url);
       if (isNetworkStatus(response.data)) {
         return response.data;
-      } else {
-        if (response.status === 200) {
-          this.logger?.error("Unknown network status response", response.data);
-          return unknownStatus;
-        }
-        return errorStatus;
       }
+      if (response.status === 200) {
+        this.logger?.error("Unknown network status response", response.data);
+        return unknownStatus;
+      }
+      return errorStatus;
     } catch (error) {
       this.logger?.error("Error fetching network status", error);
       return errorStatus;
@@ -6032,7 +6327,7 @@ var SimpleXyoSigner = class _SimpleXyoSigner extends AbstractCreatableProvider {
 };
 
 // src/simple/StakeEventsViewer/SimpleStakeEventsViewer.ts
-import { isDefined as isDefined20 } from "@xylabs/sdk-js";
+import { isDefined as isDefined21 } from "@xylabs/sdk-js";
 import { StakeEventsViewerMoniker } from "@xyo-network/xl1-protocol-lib";
 var SimpleStakeEventsViewer = class extends AbstractCreatableProvider {
   moniker = SimpleStakeEventsViewer.defaultMoniker;
@@ -6045,7 +6340,7 @@ var SimpleStakeEventsViewer = class extends AbstractCreatableProvider {
   stakeEvents(range, { name } = {}) {
     const positions = this.positionsFromRange(range);
     const events = this.eventsFromPositions(positions);
-    if (isDefined20(name)) {
+    if (isDefined21(name)) {
       return events.filter((event) => event.name === name);
     }
     return events;
@@ -6111,7 +6406,7 @@ SimpleStakeEventsViewer = __decorateClass([
 
 // src/simple/StakeTotalsViewer/SimpleStakeTotalsViewer.ts
 import { assertEx as assertEx43 } from "@xylabs/sdk-js";
-import { asXyoAddress as asXyoAddress3 } from "@xyo-network/address";
+import { asXyoAddress as asXyoAddress3 } from "@xyo-network/sdk-js";
 import {
   StakeTotalsViewerMoniker,
   StakeViewerMoniker
@@ -6209,7 +6504,7 @@ SimpleStakeTotalsViewer = __decorateClass([
 
 // src/simple/StakeViewer/SimpleStakeViewer.ts
 import { assertEx as assertEx44, toAddress } from "@xylabs/sdk-js";
-import { asXyoAddress as asXyoAddress4 } from "@xyo-network/address";
+import { asXyoAddress as asXyoAddress4 } from "@xyo-network/sdk-js";
 import { StakeEventsViewerMoniker as StakeEventsViewerMoniker2, StakeViewerMoniker as StakeViewerMoniker2 } from "@xyo-network/xl1-protocol-lib";
 var SimpleStakeViewer = class extends AbstractCreatableProvider {
   moniker = SimpleStakeViewer.defaultMoniker;
@@ -6393,7 +6688,7 @@ RestSyncViewer = __decorateClass([
 import {
   asHash as asHash5,
   assertEx as assertEx45,
-  isDefined as isDefined21
+  isDefined as isDefined22
 } from "@xylabs/sdk-js";
 import {
   asTimePayload as asTimePayload2,
@@ -6417,7 +6712,7 @@ var SimpleTimeSyncViewer = class extends AbstractCreatableProvider {
         const [block, payloads] = assertEx45(await this.blockViewer.blockByNumber(asXL1BlockNumber11(from, true)), () => "Block not found");
         const timeSchemaIndex = block.payload_schemas.indexOf(TimeSchema);
         const hash = timeSchemaIndex === -1 ? void 0 : block.payload_hashes[timeSchemaIndex];
-        const timePayload = asTimePayload2(isDefined21(hash) ? payloads.find((p) => p._hash === hash) : void 0);
+        const timePayload = asTimePayload2(isDefined22(hash) ? payloads.find((p) => p._hash === hash) : void 0);
         if (timePayload === void 0) return 0;
         switch (toDomain) {
           case "xl1": {
@@ -6446,7 +6741,8 @@ var SimpleTimeSyncViewer = class extends AbstractCreatableProvider {
   async currentTime(domain) {
     switch (domain) {
       case "xl1": {
-        return ["xl1", (await this.blockViewer.currentBlock())?.[0].block ?? -1];
+        const currentBlock = await this.blockViewer.currentBlock();
+        return ["xl1", currentBlock?.[0].block ?? -1];
       }
       case "epoch": {
         return ["epoch", Date.now()];
@@ -6490,7 +6786,7 @@ var SimpleTimeSyncViewer = class extends AbstractCreatableProvider {
       xl1Hash: assertEx45(xl1Hash, () => "No xl1 hash available from time sync service"),
       epoch: Date.now()
     };
-    if (isDefined21(this.ethProvider)) {
+    if (isDefined22(this.ethProvider)) {
       const [ethereum, ethHashOrNull] = await this.currentTimeAndHash("ethereum");
       const ethereumHash = asHash5(ethHashOrNull, () => "No ethereum hash available from time sync service");
       timePayload.ethereum = ethereum;
@@ -6558,13 +6854,18 @@ var SimpleTransactionValidationViewer = class extends AbstractCreatableProvider
       head: void 0
     };
     const transactionsWithMeta = await Promise.all(transactions.map((b) => Promise.all([PayloadBuilder24.addHashMeta(b[0]), PayloadBuilder24.addHashMeta(b[1])])));
-    const head = isChainQualifiedHeadConfig6(config) ? assertEx46(
-      (await this.blockViewer.blockByHash(config.head))?.[0],
-      () => `Specified a head that is not in the chain [${config.head}]`
-    ) : void 0;
-    const headBlock = head ?? (await this.blockViewer.currentBlock())[0];
-    const validateProtocol = value ? this.doValidateProtocol.bind(this) : void 0;
-    const validateState = state ? this.doValidateState.bind(this) : void 0;
+    let head;
+    if (isChainQualifiedHeadConfig6(config)) {
+      const headBlockResult = await this.blockViewer.blockByHash(config.head);
+      head = headBlockResult == null ? assertEx46(
+        void 0,
+        () => `Specified a head that is not in the chain [${config.head}]`
+      ) : headBlockResult[0];
+    }
+    const currentBlock = await this.blockViewer.currentBlock();
+    const headBlock = head ?? currentBlock[0];
+    const validateProtocol = value === true ? this.doValidateProtocol.bind(this) : void 0;
+    const validateState = state === true ? this.doValidateState.bind(this) : void 0;
     const chainId = headBlock.chain;
     const qualification = { head: headBlock._hash, range: asXL1BlockRange13([0, headBlock.block], true) };
     const [protocolResults, stateResults] = await Promise.all([
@@ -6587,10 +6888,12 @@ var SimpleTransactionValidationViewer = class extends AbstractCreatableProvider
     throw new Error("Method not implemented.");
   }
   async validateTransaction(block, config) {
-    return (await this.validateTransactions([block], config))[0];
+    const results = await this.validateTransactions([block], config);
+    return results[0];
   }
   async validateTransactions(transactions, config) {
-    return (await this.qualifiedValidateTransactions(transactions, config))[0];
+    const results = await this.qualifiedValidateTransactions(transactions, config);
+    return results[0];
   }
   async doValidateProtocol(transactions, chainId) {
     return await Promise.all(transactions.map(async (tx) => {
@@ -6888,8 +7191,8 @@ var LoggerStatusReporter = class {
   }
   report(name, status, progress) {
     this.statusMap[name] = status;
-    const starting = Object.entries(this.statusMap).map(([, value]) => value === "starting" ? 1 : 0).reduce((a, b) => a + b, 0);
-    const started = Object.entries(this.statusMap).map(([, value]) => value === "started" ? 1 : 0).reduce((a, b) => a + b, 0);
+    const starting = Object.values(this.statusMap).map((value) => value === "starting" ? 1 : 0).reduce((a, b) => a + b, 0);
+    const started = Object.values(this.statusMap).map((value) => value === "started" ? 1 : 0).reduce((a, b) => a + b, 0);
     this.logger.info(`${started}/${starting + started} ${name} status: ${status}`, { progress });
   }
 };
@@ -6980,7 +7283,7 @@ import {
 } from "@xyo-network/xl1-protocol-lib";
 
 // src/test/buildBlock.ts
-import { assertEx as assertEx49, isDefined as isDefined22 } from "@xylabs/sdk-js";
+import { assertEx as assertEx49, isDefined as isDefined23 } from "@xylabs/sdk-js";
 import {
   asAnyPayload as asAnyPayload5,
   BoundWitnessBuilder as BoundWitnessBuilder3,
@@ -7050,6 +7353,26 @@ var isBuildNextBlockOptions = (value) => {
 function calculateCompletedStepReward(step, balance) {
   return AttoXL14(StepRewardFractions[step][0] * balance / StepRewardFractions[step][1]);
 }
+function buildStepHashes(blockNumber, inStepHashes, previousBlockHash, chainStepRewardAddress2, stepRewardPoolBalance) {
+  const completedStepRewardTransfers = [];
+  const step_hashes = [];
+  for (const [i, step] of StepSizes14.entries()) {
+    if (blockNumber < step) {
+      break;
+    }
+    if (blockNumber % step === 0) {
+      if (StepRewardFractions[i][0] > 0 && chainStepRewardAddress2 !== XYO_ZERO_ADDRESS2) {
+        const completedStepRewardHolderAddress = rewardAddressFromStepIdentity({ block: blockNumber, step });
+        const completedStepReward = calculateCompletedStepReward(i, stepRewardPoolBalance);
+        completedStepRewardTransfers.push(createTransferPayload(chainStepRewardAddress2, { [completedStepRewardHolderAddress]: completedStepReward }));
+      }
+      step_hashes.push(assertEx49(previousBlockHash, () => `Previous block hash is required for step ${step} at block ${blockNumber}`));
+    } else if (isDefined23(inStepHashes.at(i))) {
+      step_hashes.push(inStepHashes[i]);
+    }
+  }
+  return { completedStepRewardTransfers, step_hashes };
+}
 async function buildBlock(options) {
   const previousBlockNumber = isBuildGenesisBlockOptions(options) ? -1 : options.previousBlockNumber;
   const blockNumber = asXL1BlockNumber13(previousBlockNumber + 1, true);
@@ -7064,7 +7387,6 @@ async function buildBlock(options) {
     protocol = XL1_PROTOCOL_VERSION,
     signers
   } = options;
-  const step_hashes = [];
   for (const [tx] of txs) {
     if (tx.nbf > blockNumber) {
       throw new Error(`Transaction ${await PayloadBuilder25.hash(tx)} not valid for block ${blockNumber} - NBF is ${tx.nbf}`);
@@ -7073,24 +7395,13 @@ async function buildBlock(options) {
       throw new Error(`Transaction ${await PayloadBuilder25.hash(tx)} not valid for block ${blockNumber} - EXP is ${tx.exp}`);
     }
   }
-  const completedStepRewardTransfers = [];
-  for (const [i, step] of StepSizes14.entries()) {
-    if (blockNumber < step) {
-      break;
-    }
-    if (blockNumber % step === 0) {
-      if (StepRewardFractions[i][0] > 0 && chainStepRewardAddress2 !== XYO_ZERO_ADDRESS2) {
-        const completedStepRewardHolderAddress = rewardAddressFromStepIdentity({ block: blockNumber, step });
-        const completedStepReward = calculateCompletedStepReward(i, stepRewardPoolBalance);
-        completedStepRewardTransfers.push(createTransferPayload(chainStepRewardAddress2, { [completedStepRewardHolderAddress]: completedStepReward }));
-      }
-      step_hashes.push(assertEx49(previousBlockHash, () => `Previous block hash is required for step ${step} at block ${blockNumber}`));
-    } else {
-      if (isDefined22(inStepHashes.at(i))) {
-        step_hashes.push(inStepHashes[i]);
-      }
-    }
-  }
+  const { step_hashes, completedStepRewardTransfers } = buildStepHashes(
+    blockNumber,
+    inStepHashes,
+    previousBlockHash,
+    chainStepRewardAddress2,
+    stepRewardPoolBalance
+  );
   const previous = previousBlockHash ?? null;
   const block = blockNumber;
   const txElevatedPayloads = await validateTransactionsOpcodes(txs);
@@ -7100,13 +7411,15 @@ async function buildBlock(options) {
     ...txElevatedPayloads,
     ...completedStepRewardTransfers
   ];
-  const [bw, txPayloads] = await new BoundWitnessBuilder3().fields({
+  const boundWitnessBuilder = new BoundWitnessBuilder3();
+  const builder = boundWitnessBuilder.fields({
     block,
     chain: chainId,
     previous,
     step_hashes,
     protocol
-  }).meta({ $epoch: Date.now(), $signatures: [] }).signers(signers).payloads(await PayloadBuilder25.addStorageMeta(payloads)).build();
+  }).meta({ $epoch: Date.now(), $signatures: [] }).signers(signers).payloads(await PayloadBuilder25.addStorageMeta(payloads));
+  const [bw, txPayloads] = await builder.build();
   assertEx49(isBlockBoundWitness(bw), () => "Build of BlockBoundWitness failed");
   return [await PayloadBuilder25.addStorageMeta(bw), txPayloads.map((p) => asAnyPayload5(p, true))];
 }
@@ -7162,7 +7475,8 @@ var buildRandomTransaction = async (chain, payloads, account, nbf = asXL1BlockNu
   const additionalPayloads = (payloads ?? []).filter((payload) => !isAllowedBlockPayload3(payload));
   const sender = account ?? await Account2.random();
   if (elevatedPayloads.length === 0) {
-    const receiver = receiverAddress ?? (await Account2.random()).address;
+    const defaultReceiver = await Account2.random();
+    const receiver = receiverAddress ?? defaultReceiver.address;
     const transferPayload = createTransferPayload(sender.address, { [receiver]: 1n });
     elevatedPayloads.push(transferPayload);
   }
@@ -7193,12 +7507,14 @@ import {
   defaultTransactionFees as defaultTransactionFees4
 } from "@xyo-network/xl1-protocol-lib";
 async function createProducerChainStakeIntent(from, exp, nbf = 0) {
-  return await PayloadBuilder27.addHashMeta(new PayloadBuilder27({ schema: ChainStakeIntentSchema2 }).fields({
+  const payloadBuilder = new PayloadBuilder27({ schema: ChainStakeIntentSchema2 });
+  const builder = payloadBuilder.fields({
     from,
     exp,
     nbf,
     intent: "producer"
-  }).build());
+  });
+  return await PayloadBuilder27.addHashMeta(builder.build());
 }
 
 // src/test/createGenesisBlock.ts
@@ -7242,13 +7558,20 @@ var buildRandomChain = async (blockProducer, count = 10, previousBlock, chainId,
     remaining = remaining - 1;
     lastBlock = block;
   }
-  const resolvedReceiverAddresses = receiverAddresses ?? [(await Account4.random()).address];
+  const defaultReceiver = await Account4.random();
+  const resolvedReceiverAddresses = receiverAddresses ?? [defaultReceiver.address];
   let saltCounter = 0;
   while (remaining > 0) {
     saltCounter += 1;
-    const payloads = [new PayloadBuilder29({ schema: IdSchema2 }).fields({ salt: `${Date.now()}-${saltCounter}` }).build()];
+    const idPayloadBuilder = new PayloadBuilder29({ schema: IdSchema2 });
+    const idBuilder = idPayloadBuilder.fields({ salt: `${Date.now()}-${saltCounter}` });
+    const payloads = [idBuilder.build()];
     saltCounter += 1;
-    const additionalPrivatePayloads = remaining % 2 === 0 ? [new PayloadBuilder29({ schema: asSchema9("network.xyo.private", true) }).fields({ salt: `${Date.now()}-${saltCounter}` }).build()] : [];
+    const additionalPrivatePayloads = remaining % 2 === 0 ? (() => {
+      const privatePayloadBuilder = new PayloadBuilder29({ schema: asSchema9("network.xyo.private", true) });
+      const privateBuilder = privatePayloadBuilder.fields({ salt: `${Date.now()}-${saltCounter}` });
+      return [privateBuilder.build()];
+    })() : [];
     const txs = [];
     for (const receiverAddress of resolvedReceiverAddresses) {
       txs.push(await buildRandomTransaction(
@@ -7346,8 +7669,8 @@ var getUrl = (host, port) => {
 var TODO = true;
 
 // src/validation/schema/Mnemonic.ts
-import { z as z31 } from "zod";
-var MnemonicStringZod = z31.string().transform((s) => s.trim().replaceAll(/\s+/g, " ")).refine(
+import { z as z33 } from "zod";
+var MnemonicStringZod = z33.string().transform((s) => s.trim().replaceAll(/\s+/g, " ")).refine(
   (s) => [12, 15, 18, 21, 24].includes(s.split(" ").length),
   { message: "Mnemonic must contain 12, 15, 18, 21, or 24 words." }
 ).describe("BIP-39 mnemonic string");
@@ -7402,6 +7725,7 @@ export {
   EIP712DataPayloadSchema,
   EIP712SignaturePayloadFieldsZod,
   EIP712SignaturePayloadSchema,
+  EvmRpcTransportConfigZod,
   GlobalMetaSchema,
   HostActorConfigContext,
   HostActorConfigZod,
@@ -7409,13 +7733,17 @@ export {
   HydratedBoundWitnessWithStorageMetaZod,
   HydratedCache,
   JSONSchemaMetaSchema,
+  LmdbTransportConfigZod,
   LoggerStatusReporter,
   MemoryPermissionsStore,
   MissingCapabilityError,
   MnemonicStringZod,
+  MongoTransportConfigZod,
   PRODUCER_DIVERSITY_BONUS,
   PayloadLocator,
   PostMessageRpcRemoteConfigZod,
+  ProviderBindingConfigZod,
+  ProviderBindingsConfigZod,
   ProviderConfigZod,
   ProviderFactory,
   ProviderFactoryLocator,
@@ -7426,12 +7754,15 @@ export {
   RestDataLakeRunner,
   RestDataLakeViewer,
   RestSyncViewer,
+  RestTransportConfigZod,
   RewardMultipliers,
   RouterDataLakeConfigZod,
   RpcRemoteConfigBaseZod,
   RpcRemoteConfigZod,
+  RpcTransportConfigZod,
   RuntimeStatusMonitor,
   RuntimeStatusMonitorZod,
+  S3TransportConfigZod,
   SchemasStepSummarySchema,
   ShiftedBigInt,
   SimpleAccountBalanceViewer,
@@ -7463,6 +7794,8 @@ export {
   TestGenesisBlockRewardAddress,
   TransactionBuilder,
   TransfersStepSummarySchema,
+  TransportConfigZod,
+  TransportsConfigZod,
   TypedDataDomainZod,
   TypedDataFieldZod,
   TypedDataTypesZod,
@@ -7478,6 +7811,7 @@ export {
   XL1_NETWORK_STAKING_GENESIS_PERIOD_TOTAL_REWARDS,
   activeStakeAtTimeByAddress,
   activeStakeAtTimeByPosition,
+  adaptLegacyConfig,
   addDataLakePayloads,
   addDataLakePayloadsToPayloads,
   allHashesPresent,