@xyo-network/xl1-protocol-sdk 2.2.0 → 3.0.0

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;
     }
@@ -994,6 +1017,18 @@ function filterViewerBySurface(viewer, surface) {
   };
 }
 
+// src/capabilities/connectionTypes.ts
+function descriptorConnectionTypes(descriptor) {
+  return descriptor.connectionTypes ?? [];
+}
+function descriptorMatchesConnectionType(descriptor, connectionType) {
+  const types = descriptorConnectionTypes(descriptor);
+  if (types.length === 0) {
+    return true;
+  }
+  return types.includes(connectionType);
+}
+
 // src/capabilities/factoryBrand.ts
 function backedFactory(_backings, factory) {
   return factory;
@@ -1006,6 +1041,7 @@ function factoryBackingsCompatible(declared, available) {
 }
 
 // src/capabilities/resolveProviders.ts
+import { isDefined as isDefined4 } from "@xylabs/sdk-js";
 var MissingCapabilityError = class extends Error {
   moniker;
   reasons;
@@ -1017,150 +1053,206 @@ var MissingCapabilityError = class extends Error {
     this.reasons = reasons;
   }
 };
+var AmbiguousProviderError = class extends Error {
+  candidates;
+  moniker;
+  constructor(moniker, candidates) {
+    const ids = candidates.map((descriptor) => descriptor.id);
+    super(
+      `Multiple providers satisfy capability '${moniker}' for the requested connection: ${ids.join(", ")}`
+    );
+    this.name = "AmbiguousProviderError";
+    this.moniker = moniker;
+    this.candidates = ids;
+  }
+};
+var UnboundProviderError = class extends Error {
+  moniker;
+  constructor(moniker) {
+    super(`Provider "${moniker}" has no providerBindings.connection`);
+    this.name = "UnboundProviderError";
+    this.moniker = moniker;
+  }
+};
+var UnknownConnectionError = class extends Error {
+  connectionName;
+  moniker;
+  constructor(moniker, connectionName) {
+    super(
+      `providerBindings.${moniker}.connection references unknown connection "${connectionName}"`
+    );
+    this.name = "UnknownConnectionError";
+    this.moniker = moniker;
+    this.connectionName = connectionName;
+  }
+};
 function resolveProviders(needs, candidates, ctx, options = {}) {
-  const wanted = expandNeeds(needs, ctx);
-  const { backingFiltered, backingRejected } = filterByBackings(candidates, options.availableBackings);
-  const { surviving, rejected: preconditionRejected } = filterByPreconditions(backingFiltered, ctx);
-  const rejected = [...backingRejected, ...preconditionRejected];
-  const byCapability = groupByCapability(surviving, wanted);
-  const { bindings, selectedById } = pickWinners(wanted, byCapability, rejected, candidates, options);
-  const selected = topoSort([...selectedById.values()], ctx);
+  const rejected = [];
+  const { preconditionFiltered, preconditionRejected } = filterByPreconditions(candidates, ctx);
+  rejected.push(...preconditionRejected);
+  const wanted = new Set(needs);
+  const bindings = {};
+  const selectedById = /* @__PURE__ */ new Map();
+  const candidatesByMoniker = indexCandidatesByMoniker(preconditionFiltered);
+  expandBindingClosure(
+    wanted,
+    bindings,
+    selectedById,
+    candidatesByMoniker,
+    rejected,
+    candidates,
+    options
+  );
+  const selected = topoSort(selectedById.values().toArray(), bindings, selectedById);
   return {
     bindings,
     rejected,
     selected
   };
 }
-function filterByBackings(candidates, availableBackings) {
-  if (!availableBackings) {
-    return { backingFiltered: [...candidates], backingRejected: [] };
+function expandBindingClosure(wanted, bindings, selectedById, candidatesByMoniker, rejected, allCandidates, options) {
+  let grew = true;
+  while (grew) {
+    grew = false;
+    for (const moniker of [...wanted].toSorted((a, b) => a.localeCompare(b))) {
+      if (!Object.hasOwn(bindings, moniker)) {
+        grew = bindMoniker(
+          moniker,
+          wanted,
+          bindings,
+          selectedById,
+          candidatesByMoniker,
+          rejected,
+          allCandidates,
+          options
+        ) || grew;
+      }
+    }
   }
-  const backingFiltered = [];
-  const backingRejected = [];
-  for (const descriptor of candidates) {
-    if (backingsSatisfied(descriptor.backings, availableBackings)) {
-      backingFiltered.push(descriptor);
-    } else {
-      const missing = unmetBackings(descriptor.backings, availableBackings);
-      const rendered = missing.map((m) => `${m.backing}:${m.mode}`).join(", ");
-      backingRejected.push({ descriptor, reason: `missing backings [${rendered}]` });
+}
+function bindMoniker(moniker, wanted, bindings, selectedById, candidatesByMoniker, rejected, allCandidates, options) {
+  const connectionName = connectionNameForMoniker(moniker, options);
+  const connection = options.connections?.[connectionName];
+  if (!isDefined4(connection)) {
+    throw new UnknownConnectionError(moniker, connectionName);
+  }
+  const group = candidatesByMoniker.get(moniker) ?? [];
+  const { filtered, rejected: connectionRejected } = filterByConnection(
+    group,
+    connection.type,
+    connectionName
+  );
+  rejected.push(...connectionRejected);
+  if (filtered.length === 0) {
+    throw new MissingCapabilityError(moniker, reasonsFor(moniker, rejected, allCandidates));
+  }
+  if (filtered.length > 1) {
+    throw new AmbiguousProviderError(moniker, filtered);
+  }
+  const winner = filtered[0];
+  bindings[moniker] = winner.id;
+  selectedById.set(winner.id, winner);
+  let grew = false;
+  for (const dep of winner.dependencies ?? []) {
+    if (!wanted.has(dep)) {
+      wanted.add(dep);
+      grew = true;
     }
   }
-  return { backingFiltered, backingRejected };
+  return grew;
 }
-function expandNeeds(needs, ctx) {
-  const wanted = new Set(needs);
-  const stack = [...needs];
-  while (stack.length > 0) {
-    const moniker = stack.pop();
-    const cap = ctx.capabilities.tryGet(moniker);
-    if (!cap?.implies) continue;
-    for (const dep of cap.implies) {
-      if (!wanted.has(dep)) {
-        wanted.add(dep);
-        stack.push(dep);
-      }
+function connectionNameForMoniker(moniker, options) {
+  const binding = options.providerBindings?.[moniker];
+  const connectionName = binding?.connection ?? binding?.transport;
+  if (!isDefined4(connectionName) || connectionName === "") {
+    throw new UnboundProviderError(moniker);
+  }
+  return connectionName;
+}
+function indexCandidatesByMoniker(candidates) {
+  const byMoniker = /* @__PURE__ */ new Map();
+  for (const descriptor of candidates) {
+    for (const moniker of descriptor.satisfies) {
+      const list = byMoniker.get(moniker) ?? [];
+      list.push(descriptor);
+      byMoniker.set(moniker, list);
     }
   }
-  return wanted;
+  return byMoniker;
 }
-function filterByPreconditions(candidates, ctx) {
-  const surviving = [];
+function filterByConnection(group, connectionType, connectionName) {
   const rejected = [];
+  const filtered = group.filter((descriptor) => {
+    const matches = descriptorMatchesConnectionType(descriptor, connectionType);
+    if (!matches) {
+      const types = descriptor.connectionTypes;
+      rejected.push({
+        descriptor,
+        reason: `connection "${connectionName}" is type "${connectionType}" but descriptor supports [${types.join(", ")}]`
+      });
+    }
+    return matches;
+  });
+  return { filtered, rejected };
+}
+function filterByPreconditions(candidates, ctx) {
+  const preconditionFiltered = [];
+  const preconditionRejected = [];
   for (const descriptor of candidates) {
     try {
       if (descriptor.preconditions(ctx)) {
-        surviving.push(descriptor);
+        preconditionFiltered.push(descriptor);
       } else {
-        rejected.push({ descriptor, reason: "preconditions returned false" });
+        preconditionRejected.push({ descriptor, reason: "preconditions returned false" });
       }
     } catch (err) {
-      rejected.push({
+      preconditionRejected.push({
         descriptor,
         reason: `preconditions threw: ${err instanceof Error ? err.message : String(err)}`
       });
     }
   }
-  return { surviving, rejected };
+  return { preconditionFiltered, preconditionRejected };
 }
-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);
-    }
+function reasonsFor(moniker, rejected, allCandidates) {
+  const candidatesForMoniker = allCandidates.filter((candidate) => candidate.satisfies.includes(moniker));
+  if (candidatesForMoniker.length === 0) {
+    return [];
   }
-  return byCapability;
+  return rejected.filter((rejection) => rejection.descriptor.satisfies.includes(moniker)).map((rejection) => `${rejection.descriptor.id}: ${rejection.reason}`);
 }
-function pickWinners(wanted, byCapability, rejected, allCandidates, options) {
-  const bindings = {};
-  const selectedById = /* @__PURE__ */ new Map();
-  for (const moniker of wanted) {
-    let group = byCapability.get(moniker);
-    const pinned = options.implementations?.[moniker];
-    if (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));
-    }
-    const sorted = group.toSorted(compareDescriptors);
-    const winner = sorted[0];
-    bindings[moniker] = winner.id;
-    selectedById.set(winner.id, winner);
-    for (const loser of sorted.slice(1)) {
-      rejected.push({
-        descriptor: loser,
-        reason: `tier ${loser.tier} lost to ${winner.id} (tier ${winner.tier}) for ${moniker}`
-      });
+function topoSort(descriptors, bindings, selectedById) {
+  const monikerToDescriptor = /* @__PURE__ */ new Map();
+  for (const [moniker, id] of Object.entries(bindings)) {
+    const descriptor = selectedById.get(id);
+    if (descriptor !== void 0) {
+      monikerToDescriptor.set(moniker, descriptor);
     }
   }
-  return { bindings, selectedById };
-}
-function reasonsFor(moniker, rejected, allCandidates) {
-  const candidatesForMoniker = allCandidates.filter((c) => c.satisfies.includes(moniker));
-  if (candidatesForMoniker.length === 0) return [];
-  return rejected.filter((r) => r.descriptor.satisfies.includes(moniker)).map((r) => `${r.descriptor.id}: ${r.reason}`);
-}
-function compareDescriptors(a, b) {
-  if (a.tier !== b.tier) return a.tier - b.tier;
-  const pa = a.priority ?? 0;
-  const pb = b.priority ?? 0;
-  if (pa !== pb) return pb - pa;
-  return a.id < b.id ? -1 : a.id > b.id ? 1 : 0;
-}
-function topoSort(descriptors, ctx) {
-  const byMoniker = /* @__PURE__ */ new Map();
-  for (const d of descriptors) for (const m of d.satisfies) byMoniker.set(m, d);
   const order = [];
   const seen = /* @__PURE__ */ new Set();
   const visiting = /* @__PURE__ */ new Set();
-  const visit = (d) => {
-    if (seen.has(d.id)) return;
-    if (visiting.has(d.id)) {
-      throw new Error(`Cycle detected through provider ${d.id}`);
-    }
-    visiting.add(d.id);
-    for (const moniker of d.satisfies) {
-      const cap = ctx.capabilities.tryGet(moniker);
-      if (!cap?.implies) continue;
-      for (const dep of cap.implies) {
-        const depDesc = byMoniker.get(dep);
-        if (depDesc) visit(depDesc);
+  const visit = (descriptor) => {
+    if (seen.has(descriptor.id)) {
+      return;
+    }
+    if (visiting.has(descriptor.id)) {
+      return;
+    }
+    visiting.add(descriptor.id);
+    for (const depMoniker of descriptor.dependencies ?? []) {
+      const depDescriptor = monikerToDescriptor.get(depMoniker);
+      if (depDescriptor !== void 0) {
+        visit(depDescriptor);
       }
     }
-    visiting.delete(d.id);
-    seen.add(d.id);
-    order.push(d);
+    visiting.delete(descriptor.id);
+    seen.add(descriptor.id);
+    order.push(descriptor);
   };
-  for (const d of descriptors) visit(d);
+  for (const descriptor of descriptors) {
+    visit(descriptor);
+  }
   return order;
 }
 
@@ -1192,16 +1284,191 @@ var ChainConfigZod = z2.object({
   })
 });
 
+// src/config/transports/Transport.ts
+import { globalRegistry as globalRegistry4, z as z6 } from "zod";
+
+// src/config/Remote.ts
+import { globalRegistry as globalRegistry2, z as z3 } from "zod";
+var RpcRemoteConfigBaseZod = z3.object({
+  protocol: z3.string("http").register(globalRegistry2, {
+    description: "Protocol for the RPC connection",
+    type: "string"
+  })
+}).describe("Base configuration for the remote RPC");
+var HttpRpcRemoteConfigZod = RpcRemoteConfigBaseZod.extend({
+  protocol: z3.string("http").register(globalRegistry2, {
+    description: "Protocol for the RPC connection",
+    type: "string"
+  }).default("http"),
+  url: z3.string().register(globalRegistry2, {
+    description: "URL for the Chain RPC API",
+    type: "string"
+  })
+}).describe("Configuration for the remote RPC using Http");
+var PostMessageRpcRemoteConfigZod = RpcRemoteConfigBaseZod.extend({
+  protocol: z3.string().register(globalRegistry2, {
+    description: "Protocol for the RPC connection",
+    type: "string"
+  }).default("postMessage"),
+  networkId: z3.string().register(globalRegistry2, {
+    description: "Network ID to use for the postMessage RPC connection",
+    type: "string"
+  }),
+  sessionId: z3.string().register(globalRegistry2, {
+    description: "Session ID to use for the postMessage RPC connection",
+    type: "string"
+  })
+}).describe("Configuration for the remote RPC using postMessage");
+var RpcRemoteConfigZod = z3.union([HttpRpcRemoteConfigZod, PostMessageRpcRemoteConfigZod]).describe("Configuration for a remote RPC connection, either Http or postMessage");
+var RemoteConfigZod = z3.object({ rpc: RpcRemoteConfigZod.optional() }).describe("Configuration for remote connections, including RPC");
+
+// src/config/storage/driver/Mongo.ts
+import { isDefined as isDefined5, isUndefined as isUndefined5 } from "@xylabs/sdk-js";
+import { globalRegistry as globalRegistry3, z as z4 } from "zod";
+var hasMongoConfig = (config) => {
+  if (isUndefined5(config)) return false;
+  return isDefined5(config.connectionString) && isDefined5(config.database) && isDefined5(config.domain);
+};
+var MongoConfigZod = z4.object({
+  // TODO: Create from other arguments
+  connectionString: z4.string().nonempty().optional().register(globalRegistry3, {
+    description: "MongoDB connection string",
+    title: "storage.mongo.connectionString",
+    type: "string"
+  }),
+  database: z4.string().nonempty().optional().register(globalRegistry3, {
+    description: "MongoDB database name",
+    title: "storage.mongo.database",
+    type: "string"
+  }),
+  domain: z4.string().nonempty().optional().register(globalRegistry3, {
+    description: "MongoDB domain",
+    title: "storage.mongo.domain",
+    type: "string"
+  }),
+  password: z4.string().nonempty().optional().register(globalRegistry3, {
+    description: "MongoDB password",
+    title: "storage.mongo.password",
+    type: "string"
+  }),
+  username: z4.string().nonempty().optional().register(globalRegistry3, {
+    description: "MongoDB username",
+    title: "storage.mongo.username",
+    type: "string"
+  })
+});
+
+// src/config/storage/driver/S3.ts
+import { isDefined as isDefined6 } from "@xylabs/sdk-js";
+import { z as z5 } from "zod";
+var S3BucketConfigZod = z5.object({
+  accessKeyId: z5.string().nonempty().optional().describe("S3-compatible access key id for this bucket (overrides the shared default)"),
+  accountId: z5.string().nonempty().optional().describe("Account id for this bucket; on Cloudflare R2 it forms the endpoint (overrides the shared default)"),
+  bucket: z5.string().nonempty().optional().describe("S3-compatible bucket name"),
+  prefix: z5.string().nonempty().optional().describe("Optional key prefix within the bucket"),
+  readUrl: z5.string().nonempty().optional().describe("Public HTTP/CDN base URL for anonymous reads of this bucket"),
+  secretAccessKey: z5.string().nonempty().optional().describe("S3-compatible secret access key for this bucket (overrides the shared default)")
+});
+var S3ConfigZod = z5.object({
+  accessKeyId: z5.string().nonempty().optional().describe("Shared S3-compatible access key id (default for all buckets)"),
+  accountId: z5.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: z5.string().nonempty().optional().describe("Shared key prefix (default for all buckets)"),
+  secretAccessKey: z5.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;
+  const entry = config[which];
+  const accessKeyId = entry?.accessKeyId ?? config.accessKeyId;
+  const accountId = entry?.accountId ?? config.accountId;
+  const secretAccessKey = entry?.secretAccessKey ?? config.secretAccessKey;
+  const bucket = entry?.bucket ?? config.finalized?.bucket;
+  if (!isDefined6(accessKeyId) || !isDefined6(accountId) || !isDefined6(secretAccessKey) || !isDefined6(bucket)) return void 0;
+  return {
+    accessKeyId,
+    accountId,
+    bucket,
+    prefix: entry?.prefix ?? config.prefix,
+    readUrl: entry?.readUrl,
+    secretAccessKey
+  };
+}
+function hasS3Config(config, which = "finalized") {
+  return resolveS3Bucket(config, which) !== void 0;
+}
+
+// src/config/transports/Transport.ts
+var LmdbTransportConfigZod = z6.object({
+  access: z6.enum(["read", "write"]).optional().register(globalRegistry4, {
+    description: "Access mode for this LMDB connection (read or write)",
+    title: "transports.lmdb.access",
+    type: "string"
+  }),
+  root: z6.string().register(globalRegistry4, {
+    description: "Root directory for local LMDB storage",
+    title: "transports.lmdb.root",
+    type: "string"
+  }),
+  store: z6.string().optional().register(globalRegistry4, {
+    description: "Logical store name within the LMDB root (e.g. finalized-chain, mempool)",
+    title: "transports.lmdb.store",
+    type: "string"
+  }),
+  type: z6.literal("lmdb")
+}).describe("LMDB local storage transport");
+var MongoTransportConfigZod = z6.object({
+  type: z6.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: z6.literal("rpc") }).describe("XL1 JSON-RPC transport");
+var RestTransportConfigZod = z6.object({
+  type: z6.literal("rest"),
+  baseUrl: z6.string().register(globalRegistry4, {
+    description: "HTTP base URL for REST reads",
+    title: "transports.rest.baseUrl",
+    type: "string"
+  })
+}).describe("HTTP REST read transport");
+var S3TransportConfigZod = S3BucketConfigZod.extend({
+  type: z6.literal("s3"),
+  accessKeyId: z6.string().optional(),
+  accountId: z6.string().optional(),
+  secretAccessKey: z6.string().optional()
+}).describe("S3-compatible object storage transport");
+var EvmRpcTransportConfigZod = z6.object({
+  type: z6.literal("evm-rpc"),
+  url: z6.string().register(globalRegistry4, {
+    description: "EVM JSON-RPC URL",
+    title: "transports.evm-rpc.url",
+    type: "string"
+  })
+}).describe("EVM JSON-RPC transport");
+var TransportConfigZod = z6.discriminatedUnion("type", [
+  LmdbTransportConfigZod,
+  MongoTransportConfigZod,
+  RpcTransportConfigZod,
+  RestTransportConfigZod,
+  S3TransportConfigZod,
+  EvmRpcTransportConfigZod
+]);
+var TransportsConfigZod = z6.record(z6.string(), TransportConfigZod).default({});
+
 // src/config/DataLake/DataLake.ts
-import { z as z6 } from "zod";
+import { z as z10 } from "zod";
 
 // src/config/DataLake/RestDataLakeConfig.ts
-import { globalRegistry as globalRegistry3, z as z4 } from "zod";
+import { globalRegistry as globalRegistry6, z as z8 } from "zod";
 
 // src/config/DataLake/DataLakeRemoteConfig.ts
-import { globalRegistry as globalRegistry2, z as z3 } from "zod";
-var DataLakeDriverConfigBaseZod = z3.object({
-  driver: z3.string().register(globalRegistry2, {
+import { globalRegistry as globalRegistry5, z as z7 } from "zod";
+var DataLakeDriverConfigBaseZod = z7.object({
+  driver: z7.string().register(globalRegistry5, {
     description: "Driver for the data lake",
     type: "string"
   })
@@ -1209,55 +1476,55 @@ var DataLakeDriverConfigBaseZod = z3.object({
 
 // src/config/DataLake/RestDataLakeConfig.ts
 var RestDataLakeConfigZod = DataLakeDriverConfigBaseZod.extend({
-  driver: z4.literal("rest").register(globalRegistry3, {
+  driver: z8.literal("rest").register(globalRegistry6, {
     description: "Driver for the REST data lake",
     type: "string"
   }),
-  url: z4.string().register(globalRegistry3, {
+  url: z8.string().register(globalRegistry6, {
     description: "URL for the REST data lake",
     type: "string"
   })
 }).describe("Configuration for the REST data lake driver");
 
 // src/config/DataLake/RouterDataLakeConfig.ts
-import { globalRegistry as globalRegistry4, z as z5 } from "zod";
-var RouterDataLakeConfigZod = z5.object({
-  driver: z5.literal("router").register(globalRegistry4, {
+import { globalRegistry as globalRegistry7, z as z9 } from "zod";
+var RouterDataLakeConfigZod = z9.object({
+  driver: z9.literal("router").register(globalRegistry7, {
     description: "Driver for the router data lake",
     type: "string"
   }),
-  children: z5.array(z5.lazy(() => DataLakeConfigZod)).register(globalRegistry4, {
+  children: z9.array(z9.lazy(() => DataLakeConfigZod)).register(globalRegistry7, {
     description: "Child data lake drivers",
     type: "array"
   })
 }).describe("Configuration for the router data lake driver");
 
 // src/config/DataLake/DataLake.ts
-var DataLakeConfigZod = z6.lazy(() => z6.union([RestDataLakeConfigZod, RouterDataLakeConfigZod])).describe("Configuration for a data lake");
+var DataLakeConfigZod = z10.lazy(() => z10.union([RestDataLakeConfigZod, RouterDataLakeConfigZod])).describe("Configuration for a data lake");
 
 // src/config/Evm.ts
-import { globalRegistry as globalRegistry5, z as z7 } from "zod";
-var EvmInfuraConfigZod = z7.object({
-  projectId: z7.string().optional().register(globalRegistry5, {
+import { globalRegistry as globalRegistry8, z as z11 } from "zod";
+var EvmInfuraConfigZod = z11.object({
+  projectId: z11.string().optional().register(globalRegistry8, {
     description: "Infura project ID",
     title: "evm.infura.projectId",
     type: "string"
   }),
-  projectSecret: z7.string().optional().register(globalRegistry5, {
+  projectSecret: z11.string().optional().register(globalRegistry8, {
     description: "Infura project secret",
     title: "evm.infura.projectSecret",
     type: "string"
   })
 });
-var EvmJsonRpcConfigZod = z7.object({
-  url: z7.url().optional().register(globalRegistry5, {
+var EvmJsonRpcConfigZod = z11.object({
+  url: z11.url().optional().register(globalRegistry8, {
     description: "JSON-RPC URL",
     title: "evm.jsonRpc.url",
     type: "string"
   })
 });
-var EvmConfigZod = z7.object({
-  chainId: z7.string().optional().register(globalRegistry5, {
+var EvmConfigZod = z11.object({
+  chainId: z11.string().optional().register(globalRegistry8, {
     description: "EVM chain ID",
     title: "evm.chainId",
     type: "string"
@@ -1268,17 +1535,17 @@ var EvmConfigZod = z7.object({
 
 // src/config/Log.ts
 import { LogLevel } from "@xylabs/sdk-js";
-import { globalRegistry as globalRegistry6, z as z8 } from "zod";
+import { globalRegistry as globalRegistry9, z as z12 } from "zod";
 var LogLevelNames = Object.keys(LogLevel);
-var LogConfigZod = z8.object({
-  logLevel: z8.enum(LogLevelNames).default("info").register(globalRegistry6, {
+var LogConfigZod = z12.object({
+  logLevel: z12.enum(LogLevelNames).default("info").register(globalRegistry9, {
     choices: LogLevelNames,
     default: "info",
     description: "Desired process verbosity",
     title: "logLevel",
     type: "string"
   }),
-  silent: z8.boolean().default(false).register(globalRegistry6, {
+  silent: z12.boolean().default(false).register(globalRegistry9, {
     default: false,
     description: "Whether to run in silent mode",
     title: "silent",
@@ -1287,23 +1554,23 @@ 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",
+import { globalRegistry as globalRegistry10, z as z13 } from "zod";
+var ProviderBindingConfigZod = z13.object({
+  connection: z13.string().optional().register(globalRegistry10, {
+    description: "Named connection from the top-level connections map",
+    title: "providerBindings.connection",
     type: "string"
   }),
-  transport: z9.string().optional().register(globalRegistry7, {
-    description: "Named transport from the top-level transports map",
+  transport: z13.string().optional().register(globalRegistry10, {
+    description: "Deprecated alias for connection (kept in sync during migration)",
     title: "providerBindings.transport",
     type: "string"
   })
-}).describe("Provider implementation and transport binding");
-var ProviderBindingsConfigZod = z9.record(z9.string(), ProviderBindingConfigZod).default({});
+}).describe("Provider connection binding");
+var ProviderBindingsConfigZod = z13.record(z13.string(), ProviderBindingConfigZod).default({});
 
 // src/config/Providers.ts
-import z11 from "zod";
+import z15 from "zod";
 
 // src/config/Provider.ts
 import {
@@ -1311,135 +1578,23 @@ import {
   zodIsFactory,
   zodToFactory
 } from "@xylabs/sdk-js";
-import { z as z10 } from "zod";
-var ProviderConfigZod = z10.object({
-  moniker: z10.string(),
-  labels: z10.array(z10.string()).optional()
+import { z as z14 } from "zod";
+var ProviderConfigZod = z14.object({
+  moniker: z14.string(),
+  labels: z14.array(z14.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 = z11.array(ProviderConfigZod.loose()).describe("Configuration for providers").default([]);
-
-// src/config/Remote.ts
-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: z12.string("http").register(globalRegistry8, {
-    description: "Protocol for the RPC connection",
-    type: "string"
-  }).default("http"),
-  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: z12.string().register(globalRegistry8, {
-    description: "Protocol for the RPC connection",
-    type: "string"
-  }).default("postMessage"),
-  networkId: z12.string().register(globalRegistry8, {
-    description: "Network ID to use for the postMessage RPC connection",
-    type: "string"
-  }),
-  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 = 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 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 = z13.object({
-  // TODO: Create from other arguments
-  connectionString: z13.string().nonempty().optional().register(globalRegistry9, {
-    description: "MongoDB connection string",
-    title: "storage.mongo.connectionString",
-    type: "string"
-  }),
-  database: z13.string().nonempty().optional().register(globalRegistry9, {
-    description: "MongoDB database name",
-    title: "storage.mongo.database",
-    type: "string"
-  }),
-  domain: z13.string().nonempty().optional().register(globalRegistry9, {
-    description: "MongoDB domain",
-    title: "storage.mongo.domain",
-    type: "string"
-  }),
-  password: z13.string().nonempty().optional().register(globalRegistry9, {
-    description: "MongoDB password",
-    title: "storage.mongo.password",
-    type: "string"
-  }),
-  username: z13.string().nonempty().optional().register(globalRegistry9, {
-    description: "MongoDB username",
-    title: "storage.mongo.username",
-    type: "string"
-  })
-});
-
-// src/config/storage/driver/S3.ts
-import { isDefined as isDefined5 } from "@xylabs/sdk-js";
-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 = 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: 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;
-  const entry = config[which];
-  const accessKeyId = entry?.accessKeyId ?? config.accessKeyId;
-  const accountId = entry?.accountId ?? config.accountId;
-  const secretAccessKey = entry?.secretAccessKey ?? config.secretAccessKey;
-  const bucket = entry?.bucket ?? config.finalized?.bucket;
-  if (!isDefined5(accessKeyId) || !isDefined5(accountId) || !isDefined5(secretAccessKey) || !isDefined5(bucket)) return void 0;
-  return {
-    accessKeyId,
-    accountId,
-    bucket,
-    prefix: entry?.prefix ?? config.prefix,
-    readUrl: entry?.readUrl,
-    secretAccessKey
-  };
-}
-function hasS3Config(config, which = "finalized") {
-  return resolveS3Bucket(config, which) !== void 0;
-}
+var ProvidersConfigZod = z15.array(ProviderConfigZod.loose()).describe("Configuration for providers").default([]);
 
 // src/config/storage/Storage.ts
-import { globalRegistry as globalRegistry10, z as z15 } from "zod";
-var StorageConfigZod = z15.object({
+import { globalRegistry as globalRegistry11, z as z16 } from "zod";
+var StorageConfigZod = z16.object({
   mongo: MongoConfigZod.optional().describe("Configuration for the MongoD storage driver"),
-  root: z15.string().optional().register(globalRegistry10, {
+  root: z16.string().optional().register(globalRegistry11, {
     description: "Root directory for local storage",
     title: "storage.root",
     type: "string"
@@ -1448,7 +1603,7 @@ var StorageConfigZod = z15.object({
 }).describe("Storage configuration options");
 
 // src/config/Telemetry.ts
-import { globalRegistry as globalRegistry11, z as z16 } from "zod";
+import { globalRegistry as globalRegistry12, z as z17 } from "zod";
 var DefaultMetricsScrapePorts = {
   api: 9465,
   bridge: 9468,
@@ -1456,86 +1611,35 @@ var DefaultMetricsScrapePorts = {
   producer: 9464,
   rewardRedemptionApi: 9467
 };
-var MetricsScrapeConfigZod = z16.object({
-  path: z16.string().default("/metrics").register(globalRegistry11, {
+var MetricsScrapeConfigZod = z17.object({
+  path: z17.string().default("/metrics").register(globalRegistry12, {
     default: "/metrics",
     description: "Path for the metrics scrape endpoint",
     title: "telemetry.metrics.scrape.path",
     type: "string"
   }),
-  port: z16.coerce.number().int().positive().optional().register(globalRegistry11, {
+  port: z17.coerce.number().int().positive().optional().register(globalRegistry12, {
     description: "Port for the metrics scrape endpoint",
     title: "telemetry.metrics.scrape.port",
     type: "number"
   })
 }).describe("Metrics scrape configuration");
-var MetricsConfigZod = z16.object({ scrape: MetricsScrapeConfigZod }).describe("Metrics configuration options");
-var OpenTelemetryConfigZod = z16.object({
+var MetricsConfigZod = z17.object({ scrape: MetricsScrapeConfigZod }).describe("Metrics configuration options");
+var OpenTelemetryConfigZod = z17.object({
   // OpenTelemetry options
-  otlpEndpoint: z16.url().optional().register(globalRegistry11, {
+  otlpEndpoint: z17.url().optional().register(globalRegistry12, {
     description: "OTLP endpoint for exporting telemetry data",
     title: "telemetry.otel.otlpEndpoint",
     type: "string"
   })
 });
-var TelemetryConfigZod = z16.object({
+var TelemetryConfigZod = z17.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/sdk-js";
 import { globalRegistry as globalRegistry13, z as z18 } from "zod";
@@ -1559,11 +1663,11 @@ function blockRangeSteps(range, steps) {
 }
 
 // src/primitives/block/rate/blockRate.ts
-import { isDefined as isDefined7, isFalsy } from "@xylabs/sdk-js";
+import { isDefined as isDefined8, isFalsy } from "@xylabs/sdk-js";
 import { asXL1BlockRange } from "@xyo-network/xl1-protocol-lib";
 
 // src/primitives/block/rate/timeHelpers.ts
-import { assertEx as assertEx8, isDefined as isDefined6 } from "@xylabs/sdk-js";
+import { assertEx as assertEx8, isDefined as isDefined7 } from "@xylabs/sdk-js";
 var rateMultipliers = {
   millis: 1,
   seconds: 1e3,
@@ -1581,7 +1685,7 @@ var timeDurations = (timeInMs) => ({
   weeks: timeInMs / (1e3 * 60 * 60 * 24 * 7)
 });
 var getTimeConfigInMilliseconds = (timeConfig) => {
-  const assertedTimeConfig = assertEx8(isDefined6(timeConfig) ? timeConfig : void 0, () => "Time configuration must be provided");
+  const assertedTimeConfig = assertEx8(isDefined7(timeConfig) ? timeConfig : void 0, () => "Time configuration must be provided");
   let totalMilliseconds = 0;
   if ("years" in assertedTimeConfig) {
     totalMilliseconds += assertedTimeConfig.years * 31536e6;
@@ -1620,13 +1724,13 @@ var blockRate = (startBlock, endBlock, timeUnit) => {
     throw new Error("Time difference must be greater than 0");
   }
   const rate = heightDifference / timeDifference;
-  const timeUnitValue = isDefined7(timeUnit) ? timeUnit : "millis";
-  const returnedTimeDifference = isDefined7(timeUnit) ? timeDurations(timeDifference)[timeUnit] : timeDifference;
+  const timeUnitValue = isDefined8(timeUnit) ? timeUnit : "millis";
+  const returnedTimeDifference = isDefined8(timeUnit) ? timeDurations(timeDifference)[timeUnit] : timeDifference;
   const timePerBlock = returnedTimeDifference / heightDifference;
   return {
     range: asXL1BlockRange([startingBlock.block, endingBlock.block], true),
     span: heightDifference,
-    rate: isDefined7(timeUnit) ? rate * rateMultipliers[timeUnit] : rate,
+    rate: isDefined8(timeUnit) ? rate * rateMultipliers[timeUnit] : rate,
     timeUnit: timeUnitValue,
     timeDifference: returnedTimeDifference,
     timePerBlock
@@ -1674,7 +1778,7 @@ var calculateStepSizeRate = async (viewer, start, stepIndex, count = 1, timeUnit
 // src/primitives/block/rate/timeRate.ts
 import {
   assertEx as assertEx10,
-  isDefined as isDefined8,
+  isDefined as isDefined9,
   isDefinedNotNull
 } from "@xylabs/sdk-js";
 import { asXL1BlockNumber as asXL1BlockNumber3, asXL1BlockRange as asXL1BlockRange3 } from "@xyo-network/xl1-protocol-lib";
@@ -1683,7 +1787,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);
@@ -1711,7 +1817,7 @@ var findEndBlockRecursive = async (viewer, startBlock, targetTimeMs, estimatedBl
   }
   const endBlock = await viewer.blockByNumber(estimatedEndBlockNumber);
   const resolvedEndBlock = assertEx10(
-    isDefined8(endBlock?.[0]) ? endBlock[0] : void 0,
+    isDefined9(endBlock?.[0]) ? endBlock[0] : void 0,
     () => `Could not retrieve block ${estimatedEndBlockNumber} for time rate calculation`
   );
   const endBlockEpoch = resolvedEndBlock.$epoch;
@@ -1748,7 +1854,7 @@ var findEndBlockRecursive = async (viewer, startBlock, targetTimeMs, estimatedBl
 // src/primitives/chain/getWindowedChain.ts
 import {
   assertEx as assertEx11,
-  isDefined as isDefined9,
+  isDefined as isDefined10,
   isNull,
   spanRootAsync
 } from "@xylabs/sdk-js";
@@ -1762,7 +1868,7 @@ async function getWindowedChain(context, blockViewer, maxWindowSize, previousCha
     while (currentBlock !== null && newChain.length < maxWindowSize) {
       const currentBlockNumber = currentBlock[0].block;
       const nextBlock = newChain[0];
-      if (isDefined9(nextBlock)) {
+      if (isDefined10(nextBlock)) {
         const nextBlockNumber = nextBlock[0].block;
         assertEx11(
           currentBlockNumber === nextBlockNumber - 1,
@@ -1847,7 +1953,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,
@@ -1857,7 +1965,7 @@ async function chainStepRewardAddress(context, blockViewer, { block, step }) {
 }
 
 // src/primitives/chain/step/stepRewardTotal.ts
-import { assertEx as assertEx15, isDefined as isDefined10 } from "@xylabs/sdk-js";
+import { assertEx as assertEx15, isDefined as isDefined11 } from "@xylabs/sdk-js";
 import {
   asAttoXL1,
   asXL1BlockRange as asXL1BlockRange5,
@@ -1950,7 +2058,7 @@ function stepInRange(step, range) {
   return stepRange[0] >= range[0] && stepRange[1] <= range[1];
 }
 async function stepRewardTotal(context, blockViewer, { block, step }, multipliers) {
-  const cacheKey = `${block}|${step}|${isDefined10(multipliers)}`;
+  const cacheKey = `${block}|${step}|${isDefined11(multipliers)}`;
   return await withContextCacheResponse(context, "stepRewardTotal", cacheKey, async () => {
     const [blockBw, payloads] = await stepRewardBlock(context, blockViewer, { block, step });
     assertEx15(blockBw.block === block, () => `Block Mismatch: expected ${block}, got ${blockBw.block}`);
@@ -1959,8 +2067,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);
@@ -2001,7 +2111,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,
@@ -2022,7 +2132,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);
@@ -2039,7 +2149,7 @@ async function externalBlockRangeFromStep(context, blockViewer, stepIdentity) {
 }
 
 // src/primitives/mapToMapType.ts
-import { isDefined as isDefined11 } from "@xylabs/sdk-js";
+import { isDefined as isDefined12 } from "@xylabs/sdk-js";
 function mapToMapType(map) {
   return {
     get: (key) => map.get(key),
@@ -2058,7 +2168,7 @@ function mapToMapType(map) {
       const result = [];
       for (const key of keys) {
         const value = map.get(key);
-        if (isDefined11(value)) {
+        if (isDefined12(value)) {
           result.push(value);
         }
       }
@@ -2073,18 +2183,20 @@ function mapToMapType(map) {
 }
 
 // src/primitives/readPayloadMapFromStore.ts
-import { isDefined as isDefined12 } from "@xylabs/sdk-js";
+import { isDefined as isDefined13 } from "@xylabs/sdk-js";
 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 isDefined13(results[0]);
       }
     };
   }
@@ -2094,13 +2206,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 isDefined13(results[0]);
       },
       clear: async () => {
         return await store.clear();
@@ -2146,7 +2260,7 @@ function rewardFromBlockNumber(blockNumber) {
 import { XYO_NETWORK_STAKING_ADDRESS } from "@xyo-network/xl1-protocol-lib";
 
 // src/primitives/stake/activeStakeAtTimeByAddress.ts
-import { isDefined as isDefined13 } from "@xylabs/sdk-js";
+import { isDefined as isDefined14 } from "@xylabs/sdk-js";
 
 // src/primitives/stake/mergedAddRemoveStakeEventsByStaker.ts
 async function mergedAddRemoveStakeEventsByStaker(chainEvents, range, staked, staker) {
@@ -2160,12 +2274,13 @@ 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;
     if (event.args.staked !== staked) continue;
-    if (isDefined13(staker) && event.args.staker !== staker) continue;
+    if (isDefined14(staker) && event.args.staker !== staker) continue;
     if (event.name === "StakeAdded") {
       result += event.args.amount;
     } else if (event.name === "StakeRemoved") {
@@ -2190,7 +2305,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;
@@ -2238,23 +2354,24 @@ async function allStakersForStep(context, blockViewer, stakeEventsViewer, stepCo
 }
 
 // src/primitives/stake/weightedStakeForRangeByPosition.ts
-import { isDefined as isDefined14 } from "@xylabs/sdk-js";
+import { isDefined as isDefined15 } from "@xylabs/sdk-js";
 import { asBlockNumber as asBlockNumber2 } from "@xyo-network/xl1-protocol-lib";
 async function weightedStakeForRangeByPosition(context, blockViewer, stakeEventsViewer, externalRange, staked, positionId) {
-  const cacheKey = isDefined14(positionId) ? `${externalRange[0]}-${externalRange[1]}-${positionId}` : `${externalRange[0]}-${externalRange[1]}-all`;
+  const cacheKey = isDefined15(positionId) ? `${externalRange[0]}-${externalRange[1]}-${positionId}` : `${externalRange[0]}-${externalRange[1]}-all`;
   return await withContextCacheResponse(context, "weightedStakeForRangeByPosition", cacheKey, async () => {
     let weightedStakeSum = 0n;
-    if (isDefined14(positionId)) {
-      const mergedEvents = (await mergedAddRemoveStakeEventsByPosition(
+    if (isDefined15(positionId)) {
+      const mergedEventsResult = await mergedAddRemoveStakeEventsByPosition(
         stakeEventsViewer,
         [0, externalRange[1]],
         positionId
-      )).toSorted((a, b) => a.time - b.time);
-      let currentTime = externalRange[0];
-      let currentStake = 0n;
-      if (isDefined14(staked) && mergedEvents.at(0)?.args.staked !== staked) {
+      );
+      const mergedEvents = mergedEventsResult.toSorted((a, b) => a.time - b.time);
+      if (isDefined15(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);
@@ -2299,7 +2416,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;
@@ -2315,9 +2432,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;
@@ -2330,7 +2446,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),
@@ -2343,7 +2459,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
@@ -2352,7 +2468,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) {
@@ -2387,6 +2503,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();
@@ -2394,17 +2523,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);
     }
@@ -2472,10 +2591,11 @@ var BaseConfigZod = z19.object({
   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")),
+  connections: z19._default(TransportsConfigZod, TransportsConfigZod.parse({})).check(z19.describe("Named connection profiles (rpc, rest, s3, lmdb, mongo, evm-rpc)")),
+  providerBindings: z19._default(ProviderBindingsConfigZod, ProviderBindingsConfigZod.parse({})).check(z19.describe("Per-moniker provider connection 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)")),
+  transports: z19._default(TransportsConfigZod, TransportsConfigZod.parse({})).check(z19.describe("Deprecated alias for connections (kept in sync during migration)")),
   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"))
@@ -2506,7 +2626,7 @@ var ActorsConfigZod = z21._default(
 );
 
 // src/config/adaptLegacyConfig.ts
-import { isDefined as isDefined15 } from "@xylabs/sdk-js";
+import { isDefined as isDefined16 } from "@xylabs/sdk-js";
 
 // src/config/Config.ts
 import { globalRegistry as globalRegistry15, z as z22 } from "zod/mini";
@@ -2531,6 +2651,44 @@ function resolveConfig(config) {
   return parsedConfig;
 }
 
+// src/config/normalizeConnectionsConfig.ts
+function mergeConnectionMaps(transports, connections) {
+  return { ...transports, ...connections };
+}
+function normalizeProviderBinding(binding) {
+  const connectionName = binding.connection ?? binding.transport;
+  if (connectionName === void 0 || connectionName === "") {
+    return binding;
+  }
+  return {
+    ...binding,
+    connection: connectionName,
+    transport: connectionName
+  };
+}
+function normalizeProviderBindings(bindings) {
+  const normalized = {};
+  for (const [moniker, binding] of Object.entries(bindings)) {
+    if (binding === void 0) continue;
+    normalized[moniker] = normalizeProviderBinding(binding);
+  }
+  return normalized;
+}
+function normalizeConnectionsConfig(config) {
+  const transports = config.transports ?? {};
+  const connections = config.connections ?? {};
+  const merged = mergeConnectionMaps(transports, connections);
+  return {
+    ...config,
+    connections: merged,
+    providerBindings: normalizeProviderBindings(config.providerBindings ?? {}),
+    transports: merged
+  };
+}
+function hasDeclaredConnectionProfiles(config) {
+  return Object.keys(config.transports ?? {}).length > 0 || Object.keys(config.connections ?? {}).length > 0;
+}
+
 // src/config/adaptLegacyConfig.ts
 var DEFAULT_LMDB_TRANSPORT = "local-store";
 var DEFAULT_RPC_TRANSPORT = "default-rpc";
@@ -2554,7 +2712,7 @@ function rpcTransportFromRemote(rpc) {
   };
 }
 function s3TransportFromBucket(shared, entry, fallbackBucket) {
-  if (!isDefined15(entry?.bucket) && !isDefined15(entry?.readUrl)) {
+  if (!isDefined16(entry?.bucket) && !isDefined16(entry?.readUrl)) {
     return void 0;
   }
   return {
@@ -2590,34 +2748,82 @@ function synthesizeS3Transports(s3) {
   }
   return transports;
 }
-function synthesizeProviderBindings(transports) {
+function hasTransport(transports, key) {
+  return Object.hasOwn(transports, key) && transports[key] !== void 0;
+}
+function bindMoniker2(bindings, moniker, connectionName) {
+  bindings[moniker] = { connection: connectionName, transport: connectionName };
+}
+var LMDB_MONIKERS = [
+  "AccountBalanceViewer",
+  "BlockRewardViewer",
+  "BlockRunner",
+  "BlockValidationViewer",
+  "BlockViewer",
+  "ChainContractViewer",
+  "DeadLetterQueueRunner",
+  "DeadLetterQueueViewer",
+  "FinalizationRunner",
+  "FinalizationViewer",
+  "MempoolRunner",
+  "MempoolViewer",
+  "StakeEventsViewer",
+  "StakeTotalsViewer",
+  "StakeViewer",
+  "TimeSyncViewer",
+  "TransactionValidationViewer",
+  "TransactionViewer",
+  "WindowedBlockViewer",
+  "XyoConnection",
+  "XyoGateway",
+  "XyoRunner",
+  "XyoViewer"
+];
+function synthesizeLmdbProviderBindings(transports) {
   const bindings = {};
-  if (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 (transports[S3_FINALIZED_TRANSPORT]) {
-    bindings.BlockPublishRunner = { transport: S3_FINALIZED_TRANSPORT };
+  if (!hasTransport(transports, DEFAULT_LMDB_TRANSPORT)) {
+    return bindings;
   }
-  if (transports[S3_CHAIN_STATE_TRANSPORT]) {
-    bindings.ChainStateViewer = { transport: S3_CHAIN_STATE_TRANSPORT };
-    bindings.ChainStatePublishRunner = { transport: S3_CHAIN_STATE_TRANSPORT };
+  for (const moniker of LMDB_MONIKERS) {
+    bindMoniker2(bindings, moniker, DEFAULT_LMDB_TRANSPORT);
   }
-  if (transports[S3_INDEX_TRANSPORT]) {
-    bindings.IndexPublishRunner = { transport: S3_INDEX_TRANSPORT };
+  return bindings;
+}
+function synthesizeProviderBindings(transports) {
+  const bindings = {};
+  if (hasTransport(transports, DEFAULT_RPC_TRANSPORT)) {
+    bindMoniker2(bindings, "BlockViewer", DEFAULT_RPC_TRANSPORT);
+    bindMoniker2(bindings, "MempoolViewer", DEFAULT_RPC_TRANSPORT);
+    bindMoniker2(bindings, "FinalizationViewer", DEFAULT_RPC_TRANSPORT);
+    bindMoniker2(bindings, "TransactionViewer", DEFAULT_RPC_TRANSPORT);
+    bindMoniker2(bindings, "AccountBalanceViewer", DEFAULT_RPC_TRANSPORT);
+  }
+  if (hasTransport(transports, S3_FINALIZED_TRANSPORT)) {
+    bindMoniker2(bindings, "BlockPublishRunner", S3_FINALIZED_TRANSPORT);
+  }
+  if (hasTransport(transports, S3_CHAIN_STATE_TRANSPORT)) {
+    bindMoniker2(bindings, "ChainStateViewer", S3_CHAIN_STATE_TRANSPORT);
+    bindMoniker2(bindings, "ChainStatePublishRunner", S3_CHAIN_STATE_TRANSPORT);
+  }
+  if (hasTransport(transports, S3_INDEX_TRANSPORT)) {
+    bindMoniker2(bindings, "IndexPublishRunner", S3_INDEX_TRANSPORT);
+  }
+  if (hasTransport(transports, DEFAULT_EVM_RPC_TRANSPORT)) {
+    bindMoniker2(bindings, "ChainContractViewer", DEFAULT_EVM_RPC_TRANSPORT);
+    bindMoniker2(bindings, "StakeEventsViewer", DEFAULT_EVM_RPC_TRANSPORT);
+    bindMoniker2(bindings, "StakeTotalsViewer", DEFAULT_EVM_RPC_TRANSPORT);
+    bindMoniker2(bindings, "StakeViewer", DEFAULT_EVM_RPC_TRANSPORT);
+    bindMoniker2(bindings, "TimeSyncViewer", DEFAULT_EVM_RPC_TRANSPORT);
   }
   return bindings;
 }
 function adaptLegacyConfig(config) {
   const parsed = ConfigZod.parse(config);
-  if (Object.keys(parsed.transports).length > 0) {
-    return parsed;
+  if (hasDeclaredConnectionProfiles(parsed)) {
+    return ConfigZod.parse(normalizeConnectionsConfig(parsed));
   }
-  const transports = { ...parsed.transports };
-  if (isDefined15(parsed.storage?.root) && parsed.storage.root !== "") {
+  const transports = { ...parsed.transports, ...parsed.connections };
+  if (isDefined16(parsed.storage?.root) && parsed.storage.root !== "") {
     transports[DEFAULT_LMDB_TRANSPORT] = { type: "lmdb", root: parsed.storage.root };
   }
   if (hasMongoConfig(parsed.storage?.mongo)) {
@@ -2630,24 +2836,26 @@ function adaptLegacyConfig(config) {
       username: parsed.storage.mongo.username
     };
   }
-  if (isDefined15(parsed.remote?.rpc)) {
+  if (isDefined16(parsed.remote?.rpc)) {
     transports[DEFAULT_RPC_TRANSPORT] = rpcTransportFromRemote(parsed.remote.rpc);
   }
-  if (isDefined15(parsed.evm?.jsonRpc?.url)) {
+  if (isDefined16(parsed.evm?.jsonRpc?.url)) {
     transports[DEFAULT_EVM_RPC_TRANSPORT] = { type: "evm-rpc", url: parsed.evm.jsonRpc.url };
   }
-  if (isDefined15(parsed.storage?.s3)) {
+  if (isDefined16(parsed.storage?.s3)) {
     Object.assign(transports, synthesizeS3Transports(parsed.storage.s3));
   }
   const providerBindings = {
+    ...synthesizeLmdbProviderBindings(transports),
     ...synthesizeProviderBindings(transports),
     ...parsed.providerBindings
   };
-  return ConfigZod.parse({
+  return ConfigZod.parse(normalizeConnectionsConfig({
     ...parsed,
+    connections: transports,
     providerBindings,
     transports
-  });
+  }));
 }
 
 // src/config/HostActor.ts
@@ -2722,8 +2930,8 @@ import {
 } from "@xylabs/sdk-js";
 import { CachingContextZod } from "@xyo-network/xl1-protocol-lib";
 import { z as z25 } from "zod/mini";
-var RuntimeStatusMonitorZod = z25.custom((val) => val && typeof val === "object");
-var ProviderFactoryLocatorZod = z25.lazy(() => z25.custom((val) => val && typeof val === "object" && "context" in val && "registry" in val));
+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)
@@ -2771,7 +2979,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
@@ -2802,10 +3012,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)
@@ -2813,7 +3020,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)))];
 }
 
@@ -2834,10 +3043,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
@@ -2845,14 +3051,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 isDefined16,
+  isDefined as isDefined17,
   isNumber
 } from "@xylabs/sdk-js";
 var DEFAULT_CONFIRMATION_ATTEMPTS = 20;
@@ -2874,22 +3082,20 @@ var confirmSubmittedTransaction = async (viewer, txHash, options) => {
   let attempts = 0;
   while (true) {
     const tx = await viewer.transaction.byHash(txHash) ?? void 0;
-    if (isDefined16(tx)) {
+    if (isDefined17(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);
   }
 };
 
@@ -2908,9 +3114,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");
       }
@@ -2922,9 +3126,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");
       }
@@ -3185,7 +3387,9 @@ 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
@@ -3231,7 +3435,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;
@@ -3246,8 +3450,7 @@ var ProviderFactory = class _ProviderFactory {
     let scopeObject;
     switch (this.scope) {
       case "global": {
-        globalThis.xyoServiceSingletons ??= {};
-        scopeObject = globalThis.xyoServiceSingletons;
+        scopeObject = getOrCreateGlobalSingletons();
         break;
       }
       case "context": {
@@ -3284,6 +3487,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 {
@@ -3469,7 +3681,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
@@ -3486,10 +3698,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);
@@ -3519,13 +3732,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}]`);
@@ -3586,20 +3799,21 @@ var asHostActorConfigContext = zodAsFactory7(HostActorConfigContext, "asHostActo
 var toHostActorConfigContext = zodToFactory6(HostActorConfigContext, "toHostActorConfigContext");
 
 // src/createDeclarationPayload.ts
-import { isDefined as isDefined17 } from "@xylabs/sdk-js";
+import { isDefined as isDefined18 } 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 = isDefined17(exp) ? exp : nbf + 1e4;
-  const redeclarationIntent = new PayloadBuilder13({ schema: ChainStakeIntentSchema }).fields({
+  const expiration = isDefined18(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
@@ -3607,12 +3821,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
@@ -3746,11 +3962,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) };
@@ -3773,7 +3989,7 @@ import {
   asHash as asHash4,
   assertEx as assertEx33,
   exists as exists3,
-  isDefined as isDefined18,
+  isDefined as isDefined19,
   ZERO_ADDRESS
 } from "@xylabs/sdk-js";
 import {
@@ -3867,39 +4083,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 });
@@ -4254,14 +4469,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);
@@ -4271,7 +4488,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 || isDefined18(t.transfers[address]));
+        }).filter(exists3).filter((t) => t.from === address || isDefined19(t.transfers[address]));
         if (transfers.length === 0) {
           continue;
         }
@@ -4390,10 +4607,11 @@ var SimpleAccountBalanceViewer = class extends AbstractCreatableProvider {
     return await this.spanAsync("qualifiedAccountBalanceHistory", async () => {
       const range = asRange(headOrRange);
       const headHash = asHash4(headOrRange);
-      const [head] = assertEx33(isDefined18(headHash) ? await this.blockViewer.blockByHash(headHash) : await this.blockViewer.currentBlock(), () => "Could not resolve head block");
+      const [head] = assertEx33(isDefined19(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);
@@ -4403,7 +4621,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 || isDefined18(t.transfers[address]));
+        }).filter(exists3).filter((t) => t.from === address || isDefined19(t.transfers[address]));
         if (transfers.length === 0) {
           continue;
         }
@@ -4585,7 +4803,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,
@@ -4609,7 +4827,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() {
@@ -4658,9 +4881,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() {
@@ -4707,10 +4931,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);
@@ -4791,13 +5016,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([
@@ -4820,13 +5050,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) => {
@@ -4884,7 +5117,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();
@@ -4967,14 +5200,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;
@@ -4992,7 +5227,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;
@@ -5019,9 +5254,8 @@ var RestDataLakeRunner = class extends AbstractRestDataLake {
     if (allowedItems.length > 0) {
       const result = await this.client.post(`${this.params.endpoint}/insert`, allowedItems);
       return z32.array(PayloadZodLoose).parse(result.data);
-    } else {
-      return [];
     }
+    return [];
   }
 };
 __publicField(RestDataLakeRunner, "defaultMoniker", DataLakeRunnerMoniker);
@@ -5077,7 +5311,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;
@@ -5091,10 +5325,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));
@@ -5137,7 +5373,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);
@@ -5191,7 +5428,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() {
@@ -5206,13 +5444,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 {
@@ -5221,9 +5462,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() {
@@ -5261,7 +5503,7 @@ var SimpleXyoGateway = class _SimpleXyoGateway extends AbstractCreatableProvider
 import {
   assertEx as assertEx39,
   BigIntToJsonZod,
-  isDefined as isDefined19
+  isDefined as isDefined20
 } from "@xylabs/sdk-js";
 import { PayloadBuilder as PayloadBuilder20 } from "@xyo-network/sdk-js";
 import {
@@ -5299,9 +5541,9 @@ var SimpleXyoGatewayRunner = class _SimpleXyoGatewayRunner extends AbstractCreat
       chain,
       fees
     } = options ?? {};
-    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 resolvedChainId = isDefined20(chain) ? chain : await viewer.chainId();
+    const resolvedNbf = asXL1BlockNumber10(isDefined20(nbf) ? nbf : await viewer.currentBlockNumber(), true);
+    const resolvedExp = asXL1BlockNumber10(isDefined20(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));
   }
@@ -5345,11 +5587,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;
   }
@@ -5470,10 +5714,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,
@@ -5492,7 +5737,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);
@@ -5532,10 +5777,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,
@@ -5555,7 +5801,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);
@@ -5789,7 +6035,7 @@ SimpleMempoolRunner = __decorateClass([
 // src/simple/mempool/SimpleMempoolViewer.ts
 import {
   exists as exists9,
-  isDefined as isDefined20,
+  isDefined as isDefined21,
   isHash as isHash2
 } from "@xylabs/sdk-js";
 import { isHashMeta as isHashMeta2, isPayloadBundle as isPayloadBundle2 } from "@xyo-network/sdk-js";
@@ -5850,7 +6096,7 @@ var SimpleMempoolViewer = class extends AbstractCreatableProvider {
     let cursor = void 0;
     if (isHash2(providedCursor)) {
       const [p] = await this.pendingBlocksArchivist.get([providedCursor]);
-      if (isDefined20(p)) {
+      if (isDefined21(p)) {
         cursor = p._sequence;
       }
     }
@@ -5860,7 +6106,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,
@@ -5869,7 +6116,7 @@ var SimpleMempoolViewer = class extends AbstractCreatableProvider {
     let cursor = void 0;
     if (isHash2(providedCursor)) {
       const [p] = await this.pendingTransactionsArchivist.get([providedCursor]);
-      if (isDefined20(p)) {
+      if (isDefined21(p)) {
         cursor = p._sequence;
       }
     }
@@ -5881,12 +6128,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 isDefined20(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(
@@ -5907,9 +6149,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));
@@ -5933,12 +6173,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 isDefined21(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
@@ -5996,7 +6251,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;
@@ -6062,13 +6317,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;
@@ -6235,7 +6489,7 @@ var SimpleXyoSigner = class _SimpleXyoSigner extends AbstractCreatableProvider {
 };
 
 // src/simple/StakeEventsViewer/SimpleStakeEventsViewer.ts
-import { isDefined as isDefined21 } from "@xylabs/sdk-js";
+import { isDefined as isDefined22 } from "@xylabs/sdk-js";
 import { StakeEventsViewerMoniker } from "@xyo-network/xl1-protocol-lib";
 var SimpleStakeEventsViewer = class extends AbstractCreatableProvider {
   moniker = SimpleStakeEventsViewer.defaultMoniker;
@@ -6248,7 +6502,7 @@ var SimpleStakeEventsViewer = class extends AbstractCreatableProvider {
   stakeEvents(range, { name } = {}) {
     const positions = this.positionsFromRange(range);
     const events = this.eventsFromPositions(positions);
-    if (isDefined21(name)) {
+    if (isDefined22(name)) {
       return events.filter((event) => event.name === name);
     }
     return events;
@@ -6596,7 +6850,7 @@ RestSyncViewer = __decorateClass([
 import {
   asHash as asHash5,
   assertEx as assertEx45,
-  isDefined as isDefined22
+  isDefined as isDefined23
 } from "@xylabs/sdk-js";
 import {
   asTimePayload as asTimePayload2,
@@ -6620,7 +6874,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(isDefined22(hash) ? payloads.find((p) => p._hash === hash) : void 0);
+        const timePayload = asTimePayload2(isDefined23(hash) ? payloads.find((p) => p._hash === hash) : void 0);
         if (timePayload === void 0) return 0;
         switch (toDomain) {
           case "xl1": {
@@ -6649,7 +6903,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()];
@@ -6693,7 +6948,7 @@ var SimpleTimeSyncViewer = class extends AbstractCreatableProvider {
       xl1Hash: assertEx45(xl1Hash, () => "No xl1 hash available from time sync service"),
       epoch: Date.now()
     };
-    if (isDefined22(this.ethProvider)) {
+    if (isDefined23(this.ethProvider)) {
       const [ethereum, ethHashOrNull] = await this.currentTimeAndHash("ethereum");
       const ethereumHash = asHash5(ethHashOrNull, () => "No ethereum hash available from time sync service");
       timePayload.ethereum = ethereum;
@@ -6761,13 +7016,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([
@@ -6790,10 +7050,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) => {
@@ -7091,8 +7353,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 });
   }
 };
@@ -7183,7 +7445,7 @@ import {
 } from "@xyo-network/xl1-protocol-lib";
 
 // src/test/buildBlock.ts
-import { assertEx as assertEx49, isDefined as isDefined23 } from "@xylabs/sdk-js";
+import { assertEx as assertEx49, isDefined as isDefined24 } from "@xylabs/sdk-js";
 import {
   asAnyPayload as asAnyPayload5,
   BoundWitnessBuilder as BoundWitnessBuilder3,
@@ -7253,6 +7515,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 (isDefined24(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);
@@ -7267,7 +7549,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}`);
@@ -7276,24 +7557,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 (isDefined23(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);
@@ -7303,13 +7573,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))];
 }
@@ -7365,7 +7637,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);
   }
@@ -7396,12 +7669,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
@@ -7445,13 +7720,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(
@@ -7583,6 +7865,7 @@ export {
   ActorConfigZod,
   ActorsConfigZod,
   AddressPairSchema,
+  AmbiguousProviderError,
   BalancesStepSummarySchema,
   BaseConfigContextZod,
   BaseConfigZod,
@@ -7592,6 +7875,8 @@ export {
   COIN_TYPES,
   ChainIndexingServiceStateSchema,
   ConfigZod,
+  TransportConfigZod as ConnectionConfigZod,
+  TransportsConfigZod as ConnectionsConfigZod,
   CreatableProviderContextZod,
   DEFAULT_BACKOFF_MS,
   DEFAULT_MAX_ATTEMPTS,
@@ -7605,6 +7890,7 @@ export {
   EIP712DataPayloadSchema,
   EIP712SignaturePayloadFieldsZod,
   EIP712SignaturePayloadSchema,
+  EvmRpcTransportConfigZod as EvmConnectionConfigZod,
   EvmRpcTransportConfigZod,
   GlobalMetaSchema,
   HostActorConfigContext,
@@ -7613,11 +7899,13 @@ export {
   HydratedBoundWitnessWithStorageMetaZod,
   HydratedCache,
   JSONSchemaMetaSchema,
+  LmdbTransportConfigZod as LmdbConnectionConfigZod,
   LmdbTransportConfigZod,
   LoggerStatusReporter,
   MemoryPermissionsStore,
   MissingCapabilityError,
   MnemonicStringZod,
+  MongoTransportConfigZod as MongoConnectionConfigZod,
   MongoTransportConfigZod,
   PRODUCER_DIVERSITY_BONUS,
   PayloadLocator,
@@ -7630,6 +7918,7 @@ export {
   ProviderFactoryLocatorZod,
   ProvidersConfigZod,
   RemoteConfigZod,
+  RestTransportConfigZod as RestConnectionConfigZod,
   RestDataLakeConfigZod,
   RestDataLakeRunner,
   RestDataLakeViewer,
@@ -7637,11 +7926,13 @@ export {
   RestTransportConfigZod,
   RewardMultipliers,
   RouterDataLakeConfigZod,
+  RpcTransportConfigZod as RpcConnectionConfigZod,
   RpcRemoteConfigBaseZod,
   RpcRemoteConfigZod,
   RpcTransportConfigZod,
   RuntimeStatusMonitor,
   RuntimeStatusMonitorZod,
+  S3TransportConfigZod as S3ConnectionConfigZod,
   S3TransportConfigZod,
   SchemasStepSummarySchema,
   ShiftedBigInt,
@@ -7680,6 +7971,8 @@ export {
   TypedDataFieldZod,
   TypedDataTypesZod,
   TypedDataValueZod,
+  UnboundProviderError,
+  UnknownConnectionError,
   UsageMetaSchema,
   VIEWER_BRANCH_KEYS,
   WALLET_COMPLIANCE,
@@ -7755,6 +8048,8 @@ export {
   createTransactionHydrator,
   createTransferPayload,
   deepCalculateFramesFromRange,
+  descriptorConnectionTypes,
+  descriptorMatchesConnectionType,
   externalBlockNumberFromXL1BlockNumber,
   externalBlockRangeFromStep,
   externalBlockRangeFromXL1BlockRange,
@@ -7776,6 +8071,7 @@ export {
   getTimeConfigInMilliseconds,
   getUrl,
   getWindowedChain,
+  hasDeclaredConnectionProfiles,
   hasLabels,
   hasMongoConfig,
   hasS3Config,
@@ -7822,6 +8118,7 @@ export {
   netTransfersForPayloads,
   networkBackedFactory,
   networkStakeStepRewardPositionWeight,
+  normalizeConnectionsConfig,
   parseSignedBigInt,
   payloadMapFromStore,
   prettifyZodError,