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

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;
     }
@@ -1024,7 +1047,7 @@ function resolveProviders(needs, candidates, ctx, options = {}) {
   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 selected = topoSort(selectedById.values().toArray(), ctx);
   return {
     bindings,
     rejected,
@@ -1083,15 +1106,20 @@ function filterByPreconditions(candidates, ctx) {
   }
   return { surviving, rejected };
 }
+function addDescriptorCapabilities(byCapability, descriptor, wanted) {
+  for (const moniker of descriptor.satisfies) {
+    if (!wanted.has(moniker)) {
+      continue;
+    }
+    const list = byCapability.get(moniker) ?? [];
+    list.push(descriptor);
+    byCapability.set(moniker, list);
+  }
+}
 function groupByCapability(surviving, wanted) {
   const byCapability = /* @__PURE__ */ new Map();
   for (const descriptor of surviving) {
-    for (const moniker of descriptor.satisfies) {
-      if (!wanted.has(moniker)) continue;
-      const list = byCapability.get(moniker) ?? [];
-      list.push(descriptor);
-      byCapability.set(moniker, list);
-    }
+    addDescriptorCapabilities(byCapability, descriptor, wanted);
   }
   return byCapability;
 }
@@ -1101,7 +1129,7 @@ function pickWinners(wanted, byCapability, rejected, allCandidates, options) {
   for (const moniker of wanted) {
     let group = byCapability.get(moniker);
     const pinned = options.implementations?.[moniker];
-    if (pinned) {
+    if (pinned !== void 0 && pinned !== "") {
       const pinnedGroup = group?.filter((descriptor) => descriptor.id === pinned);
       if (!pinnedGroup || pinnedGroup.length === 0) {
         throw new MissingCapabilityError(moniker, [`requested implementation '${pinned}' not available`]);
@@ -1683,7 +1711,9 @@ var DEFAULT_MAX_ATTEMPTS = 10;
 var calculateTimeRate = async (viewer, timeConfig, startBlockNumber, timeUnit, toleranceMs = DEFAULT_TOLERANCE_MS, maxAttempts = DEFAULT_MAX_ATTEMPTS) => {
   assertEx10(Object.keys(timeConfig ?? {}).length === 1, () => "Only one time unit should be specified in timeConfig");
   const startBlock = isDefinedNotNull(startBlockNumber) ? await viewer.blockByNumber(startBlockNumber) : null;
-  const resolvedStartBlock = isDefinedNotNull(startBlock) ? startBlock[0] : (await viewer.currentBlock())[0];
+  const currentBlockResult = await viewer.currentBlock();
+  const blockResult = isDefinedNotNull(startBlock) ? startBlock : currentBlockResult;
+  const resolvedStartBlock = blockResult[0];
   const timeInMilliseconds = getTimeConfigInMilliseconds(timeConfig);
   assertEx10(timeInMilliseconds > 0, () => "Time duration must be greater than zero");
   const blocksPerMillisecondRate = 1 / (12 * 1e3);
@@ -1847,7 +1877,9 @@ async function chainStepRewardAddress(context, blockViewer, { block, step }) {
   const [transferIndex, transferCount] = stepTransferIndex(block, step);
   const [blockBw, payloads] = hydratedBlock;
   const transfersFromPool = payloads.filter(isTransfer).map((p) => asTransfer(p)).filter(exists).filter((t) => t.from === XYO_STEP_REWARD_ADDRESS);
-  const fromEntries = Object.entries(mergeTransfers(transfersFromPool)[XYO_STEP_REWARD_ADDRESS]);
+  const mergedTransfers = mergeTransfers(transfersFromPool);
+  const rewardEntry = Object.entries(mergedTransfers).find(([address]) => address === XYO_STEP_REWARD_ADDRESS);
+  const fromEntries = Object.entries(rewardEntry?.[1] ?? {});
   const sortedTransferAmounts = fromEntries.toSorted(([, a], [, b]) => a > b ? -1 : a < b ? 1 : 0);
   assertEx14(
     sortedTransferAmounts.length === transferCount,
@@ -1959,8 +1991,10 @@ async function stepRewardTotal(context, blockViewer, { block, step }, multiplier
       payloads.find((p) => isTransfer5(p) && p.from === XYO_STEP_REWARD_ADDRESS2),
       () => `No step transfer found for step ${step} at block ${block} (${blockBw._hash})`
     );
+    const netTransfers = netTransfersForPayloads(context, [stepTransfer]);
+    const rewardEntry = Object.entries(netTransfers).find(([address]) => address === XYO_STEP_REWARD_ADDRESS2);
     const rewards = assertEx15(
-      netTransfersForPayloads(context, [stepTransfer])[XYO_STEP_REWARD_ADDRESS2],
+      rewardEntry?.[1],
       () => `No rewards found for step reward address ${XYO_STEP_REWARD_ADDRESS2} at block ${block} (${blockBw._hash})`
     );
     const sortedTransfers = Object.entries(rewards).toSorted(([, a], [, b]) => a > b ? -1 : a < b ? 1 : 0);
@@ -2001,7 +2035,7 @@ async function stepsRewardTotal(context, blockViewer, steps, multipliers) {
   return asAttoXL12(totalRewards);
 }
 
-// src/primitives/chain/time/externalBlockNumberFromXL1BlockNumber.ts
+// src/primitives/chain/time/externalBlockNumberFromXl1BlockNumber.ts
 import { assertEx as assertEx16, isArray } from "@xylabs/sdk-js";
 import {
   asBlockNumber,
@@ -2022,7 +2056,7 @@ async function externalBlockNumberFromXL1BlockNumber(context, blockViewer, xl1Bl
   });
 }
 
-// src/primitives/chain/time/externalBlockRangeFromXL1BlockRange.ts
+// src/primitives/chain/time/externalBlockRangeFromXl1BlockRange.ts
 async function externalBlockRangeFromXL1BlockRange(context, blockViewer, xl1BlockRange, externalTimeName = "ethereum") {
   const start = await externalBlockNumberFromXL1BlockNumber(context, blockViewer, xl1BlockRange[0], externalTimeName);
   const end = await externalBlockNumberFromXL1BlockNumber(context, blockViewer, xl1BlockRange[1], externalTimeName);
@@ -2078,13 +2112,15 @@ function readPayloadMapFromStore(store) {
   if (isReadArchivist(store)) {
     return {
       get: async (hash) => {
-        return (await store.get([hash]))[0];
+        const results = await store.get([hash]);
+        return results[0];
       },
       getMany: async (hashes) => {
         return await store.get(hashes);
       },
       has: async (hash) => {
-        return isDefined12((await store.get([hash]))[0]);
+        const results = await store.get([hash]);
+        return isDefined12(results[0]);
       }
     };
   }
@@ -2094,13 +2130,15 @@ function payloadMapFromStore(store) {
   if (isReadWriteArchivist(store)) {
     return {
       get: async (hash) => {
-        return (await store.get([hash]))[0];
+        const results = await store.get([hash]);
+        return results[0];
       },
       getMany: async (hashes) => {
         return await store.get(hashes);
       },
       has: async (hash) => {
-        return isDefined12((await store.get([hash]))[0]);
+        const results = await store.get([hash]);
+        return isDefined12(results[0]);
       },
       clear: async () => {
         return await store.clear();
@@ -2160,7 +2198,8 @@ async function mergedAddRemoveStakeEventsByStaker(chainEvents, range, staked, st
 
 // src/primitives/stake/activeStakeAtTimeByAddress.ts
 async function activeStakeAtTimeByAddress(chain, staked, time, staker) {
-  const stakeEvents = (await mergedAddRemoveStakeEventsByStaker(chain, [0, time], staked, staker)).toSorted((a, b) => a.time - b.time);
+  const mergedEvents = await mergedAddRemoveStakeEventsByStaker(chain, [0, time], staked, staker);
+  const stakeEvents = mergedEvents.toSorted((a, b) => a.time - b.time);
   let result = 0n;
   for (const event of stakeEvents) {
     if (event.time > time) break;
@@ -2190,7 +2229,8 @@ async function mergedAddRemoveStakeEventsByPosition(chainEvents, range, position
 
 // src/primitives/stake/activeStakeAtTimeByPosition.ts
 async function activeStakeAtTimeByPosition(chainStakeEvents, externalTime, position) {
-  const stakeEvents = (await mergedAddRemoveStakeEventsByPosition(chainStakeEvents, [0, externalTime], position)).toSorted((a, b) => a.time - b.time);
+  const mergedEvents = await mergedAddRemoveStakeEventsByPosition(chainStakeEvents, [0, externalTime], position);
+  const stakeEvents = mergedEvents.toSorted((a, b) => a.time - b.time);
   let result = 0n;
   for (const event of stakeEvents) {
     if (event.time > externalTime) break;
@@ -2245,16 +2285,17 @@ async function weightedStakeForRangeByPosition(context, blockViewer, stakeEvents
   return await withContextCacheResponse(context, "weightedStakeForRangeByPosition", cacheKey, async () => {
     let weightedStakeSum = 0n;
     if (isDefined14(positionId)) {
-      const mergedEvents = (await mergedAddRemoveStakeEventsByPosition(
+      const mergedEventsResult = await mergedAddRemoveStakeEventsByPosition(
         stakeEventsViewer,
         [0, externalRange[1]],
         positionId
-      )).toSorted((a, b) => a.time - b.time);
-      let currentTime = externalRange[0];
-      let currentStake = 0n;
+      );
+      const mergedEvents = mergedEventsResult.toSorted((a, b) => a.time - b.time);
       if (isDefined14(staked) && mergedEvents.at(0)?.args.staked !== staked) {
         return 0n;
       }
+      let currentTime = externalRange[0];
+      let currentStake = 0n;
       for (const event of mergedEvents) {
         if (event.time > currentTime) {
           weightedStakeSum += currentStake * BigInt(event.time - currentTime);
@@ -2299,7 +2340,7 @@ async function networkStakeStepRewardPositionWeight(context, blockViewer, stakeE
 // src/primitives/state/findMostRecentBlock.ts
 import { isSignedBlockBoundWitnessWithStorageMeta } from "@xyo-network/xl1-protocol-lib";
 var DEFAULT_NEXT_OPTIONS = { limit: 50 };
-var findMostRecentBlock = async (chainArchivist, nextOptions = DEFAULT_NEXT_OPTIONS, maxIterations = Number.POSITIVE_INFINITY) => {
+var findMostRecentBlock = async (chainArchivist, nextOptions = DEFAULT_NEXT_OPTIONS, maxIterations = Infinity) => {
   let mostRecentBlock;
   let cursor;
   let batch;
@@ -2315,9 +2356,8 @@ var findMostRecentBlock = async (chainArchivist, nextOptions = DEFAULT_NEXT_OPTI
     if (last) {
       mostRecentBlock = last;
       break;
-    } else {
-      cursor = batch.at(-1)?._sequence;
     }
+    cursor = batch.at(-1)?._sequence;
     iterations = iterations + 1;
   } while (batch.length > 0 && iterations < maxIterations);
   return mostRecentBlock;
@@ -2330,7 +2370,7 @@ async function hydratedBlockByNumber(context, blockNumber) {
     if (blockNumber < 0) throw new Error(`Block number ${blockNumber} is less than 0`);
     if (blockNumber > Number.MAX_SAFE_INTEGER) throw new Error(`Block number ${blockNumber} is greater than the maximum safe integer`);
     if (blockNumber % 1 !== 0) throw new Error(`Block number ${blockNumber} is not an integer`);
-    const cacheKey = `${blockNumber}`;
+    const cacheKey = String(blockNumber);
     return await withContextCacheResponse(context, "hydratedBlockByNumber", cacheKey, async () => {
       const block = assertEx17(
         await blockFromBlockNumber(context, blockNumber),
@@ -2343,7 +2383,7 @@ async function hydratedBlockByNumber(context, blockNumber) {
 
 // src/primitives/uncle/getProducerKey.ts
 function getProducerKey(block) {
-  return block[0].addresses.toSorted().join(",");
+  return block[0].addresses.toSorted((a, b) => a.localeCompare(b)).join(",");
 }
 
 // src/primitives/uncle/scoreUncle.ts
@@ -2352,7 +2392,7 @@ function scoreUncle(finalizedWindowedChain, blocks) {
   if (blocks.length === 0) return 0;
   let score = blocks.length;
   const head = finalizedWindowedChain.at(-1);
-  if (head && blocks[0]) {
+  if (head !== void 0 && blocks[0] !== void 0) {
     const headProducer = getProducerKey(head);
     const candidateProducer = getProducerKey(blocks[0]);
     if (headProducer !== candidateProducer) {
@@ -2387,6 +2427,19 @@ import {
   exists as exists2
 } from "@xylabs/sdk-js";
 import { isTransactionBoundWitness as isTransactionBoundWitness2 } from "@xyo-network/xl1-protocol-lib";
+function extendUncleChain(block, map) {
+  const uncle = [block];
+  let previous = block[0].previous ? map.get(block[0].previous) : void 0;
+  while (previous) {
+    if (previous[0].block === uncle[0][0].block - 1) {
+      uncle.unshift(previous);
+      previous = previous[0].previous ? map.get(previous[0].previous) : void 0;
+    } else {
+      return [];
+    }
+  }
+  return uncle;
+}
 function blocksToChains(blocks) {
   const chains = [];
   const map = /* @__PURE__ */ new Map();
@@ -2394,17 +2447,7 @@ function blocksToChains(blocks) {
     map.set(block[0]._hash, block);
   }
   for (const block of blocks) {
-    let uncle = [block];
-    let previous = block[0].previous ? map.get(block[0].previous) : void 0;
-    while (previous) {
-      if (previous[0].block === uncle[0][0].block - 1) {
-        uncle.unshift(previous);
-        previous = previous[0].previous ? map.get(previous[0].previous) : void 0;
-      } else {
-        uncle = [];
-        break;
-      }
-    }
+    const uncle = extendUncleChain(block, map);
     if (uncle.length > 0) {
       chains.push(uncle);
     }
@@ -2590,23 +2633,26 @@ function synthesizeS3Transports(s3) {
   }
   return transports;
 }
+function hasTransport(transports, key) {
+  return Object.hasOwn(transports, key) && transports[key] !== void 0;
+}
 function synthesizeProviderBindings(transports) {
   const bindings = {};
-  if (transports[DEFAULT_RPC_TRANSPORT]) {
+  if (hasTransport(transports, DEFAULT_RPC_TRANSPORT)) {
     bindings.BlockViewer = { transport: DEFAULT_RPC_TRANSPORT };
     bindings.MempoolViewer = { transport: DEFAULT_RPC_TRANSPORT };
     bindings.FinalizationViewer = { transport: DEFAULT_RPC_TRANSPORT };
     bindings.TransactionViewer = { transport: DEFAULT_RPC_TRANSPORT };
     bindings.AccountBalanceViewer = { transport: DEFAULT_RPC_TRANSPORT };
   }
-  if (transports[S3_FINALIZED_TRANSPORT]) {
+  if (hasTransport(transports, S3_FINALIZED_TRANSPORT)) {
     bindings.BlockPublishRunner = { transport: S3_FINALIZED_TRANSPORT };
   }
-  if (transports[S3_CHAIN_STATE_TRANSPORT]) {
+  if (hasTransport(transports, S3_CHAIN_STATE_TRANSPORT)) {
     bindings.ChainStateViewer = { transport: S3_CHAIN_STATE_TRANSPORT };
     bindings.ChainStatePublishRunner = { transport: S3_CHAIN_STATE_TRANSPORT };
   }
-  if (transports[S3_INDEX_TRANSPORT]) {
+  if (hasTransport(transports, S3_INDEX_TRANSPORT)) {
     bindings.IndexPublishRunner = { transport: S3_INDEX_TRANSPORT };
   }
   return bindings;
@@ -2722,8 +2768,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 +2817,9 @@ var hydratedBlockToPayloadBundle = (transaction) => {
 };
 var bundle = (root, transaction) => {
   const payloads = flattenHydratedBlock(transaction).flatMap((p) => PayloadBuilder6.omitStorageMeta(p));
-  return new PayloadBuilder6({ schema: PayloadBundleSchema }).fields({ payloads, root }).build();
+  const payloadBuilder = new PayloadBuilder6({ schema: PayloadBundleSchema });
+  const builder = payloadBuilder.fields({ payloads, root });
+  return builder.build();
 };
 
 // src/model/PayloadBundle/hydratedTransactionToPayloadBundle.ts
@@ -2802,10 +2850,7 @@ async function buildTransaction(chain, onChainPayloads, offChainPayloads, signer
     exp
   };
   const elevatedHashes = await PayloadBuilder7.hashes(onChainPayloads);
-  const script = [];
-  for (const elevatedHash of elevatedHashes) {
-    script.push(`elevate|${elevatedHash}`);
-  }
+  const script = Array.from(elevatedHashes, (elevatedHash) => `elevate|${elevatedHash}`);
   const fields = {
     ...txBoundWitnessFields,
     from: from ?? (Array.isArray(signer) ? assertEx19(signer.at(0)?.address) : signer.address)
@@ -2813,7 +2858,9 @@ async function buildTransaction(chain, onChainPayloads, offChainPayloads, signer
   if (script.length > 0) {
     fields.script = script;
   }
-  const [tx, txPayloads] = await new BoundWitnessBuilder().fields(fields).meta({ $signatures: [] }).payloads([...onChainPayloads, ...offChainPayloads]).signers(Array.isArray(signer) ? signer : [signer]).build();
+  const boundWitnessBuilder = new BoundWitnessBuilder();
+  const builder = boundWitnessBuilder.fields(fields).meta({ $signatures: [] }).payloads([...onChainPayloads, ...offChainPayloads]).signers(Array.isArray(signer) ? signer : [signer]);
+  const [tx, txPayloads] = await builder.build();
   return [await PayloadBuilder7.addHashMeta(tx), await PayloadBuilder7.addHashMeta(txPayloads.map((p) => asAnyPayload2(p, true)))];
 }
 
@@ -2834,10 +2881,7 @@ async function buildUnsignedTransaction(chain, onChainPayloads, offChainPayloads
     exp
   };
   const elevatedHashes = await PayloadBuilder8.hashes(onChainPayloads);
-  const script = [];
-  for (const elevatedHash of elevatedHashes) {
-    script.push(`elevate|${elevatedHash}`);
-  }
+  const script = Array.from(elevatedHashes, (elevatedHash) => `elevate|${elevatedHash}`);
   const fields = {
     ...txBoundWitnessFields,
     from
@@ -2845,7 +2889,9 @@ 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];
 }
 
@@ -2877,19 +2923,17 @@ var confirmSubmittedTransaction = async (viewer, txHash, options) => {
     if (isDefined16(tx)) {
       options?.logger?.debug("Transaction confirmed", txHash);
       return tx;
-    } else {
-      if (isNumber(exp)) {
-        await assertNotExpired(viewer, txHash, exp, options);
-      }
-      attempts++;
-      if (attempts > maxAttempts) {
-        options?.logger?.error(`\u26A0\uFE0F Transaction not confirmed after ${maxAttempts} attempts`);
-        throw new Error(`Transaction ${txHash} not confirmed after ${maxAttempts} attempts`);
-      } else {
-        options?.logger?.debug(`Transaction not confirmed yet, attempt ${attempts}. Retrying...`, txHash);
-        await delay(attemptDelay);
-      }
     }
+    if (isNumber(exp)) {
+      await assertNotExpired(viewer, txHash, exp, options);
+    }
+    attempts++;
+    if (attempts > maxAttempts) {
+      options?.logger?.error(`\u26A0\uFE0F Transaction not confirmed after ${maxAttempts} attempts`);
+      throw new Error(`Transaction ${txHash} not confirmed after ${maxAttempts} attempts`);
+    }
+    options?.logger?.debug(`Transaction not confirmed yet, attempt ${attempts}. Retrying...`, txHash);
+    await delay(attemptDelay);
   }
 };
 
@@ -2908,9 +2952,7 @@ import {
 var tryHydrateTransaction = async ({ chainMap }, hash) => {
   return await tryHydrateTypedBoundWitness(
     {
-      get(hashes) {
-        return chainMap.get(hashes);
-      },
+      get: (hashes) => chainMap.get(hashes),
       next() {
         throw new Error("Not implemented");
       }
@@ -2922,9 +2964,7 @@ var tryHydrateTransaction = async ({ chainMap }, hash) => {
 var hydrateTransaction = async ({ chainMap }, hash) => {
   return await hydrateTypedBoundWitness(
     {
-      get(hashes) {
-        return chainMap.get(hashes);
-      },
+      get: (hashes) => chainMap.get(hashes),
       next() {
         throw new Error("Not implemented");
       }
@@ -3185,7 +3225,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 +3273,7 @@ var ProviderFactory = class _ProviderFactory {
   get resolvedMoniker() {
     const labels = this.labels ?? {};
     const labelString = Object.entries(labels).map(([key, value]) => `${key}=${value}`).join(",");
-    return labelString.length === 0 ? `${this.defaultMoniker}` : `${this.defaultMoniker}|${labelString}`;
+    return labelString.length === 0 ? this.defaultMoniker : `${this.defaultMoniker}|${labelString}`;
   }
   get uniqueId() {
     return this._uniqueId;
@@ -3246,8 +3288,7 @@ var ProviderFactory = class _ProviderFactory {
     let scopeObject;
     switch (this.scope) {
       case "global": {
-        globalThis.xyoServiceSingletons ??= {};
-        scopeObject = globalThis.xyoServiceSingletons;
+        scopeObject = getOrCreateGlobalSingletons();
         break;
       }
       case "context": {
@@ -3284,6 +3325,15 @@ var ProviderFactory = class _ProviderFactory {
     }
   }
 };
+function getOrCreateGlobalSingletons() {
+  const existing = globalThis.xyoServiceSingletons;
+  if (existing !== void 0) {
+    return existing;
+  }
+  const singletons = {};
+  Reflect.set(globalThis, "xyoServiceSingletons", singletons);
+  return singletons;
+}
 
 // src/CreatableProvider/AbstractCreatableProvider.ts
 var AbstractCreatableProvider = class extends AbstractCreatable {
@@ -3469,7 +3519,7 @@ var ProviderFactoryLocator = class _ProviderFactoryLocator {
     );
   }
   has(moniker) {
-    return !!this._registry[moniker];
+    return Object.hasOwn(this._registry, moniker);
   }
   /**
    * Locates a provider factory that matches the supplied moniker and labels
@@ -3486,10 +3536,11 @@ var ProviderFactoryLocator = class _ProviderFactoryLocator {
   merge(locator) {
     const registry = { ...this.registry };
     for (const moniker in locator.registry) {
-      if (registry[moniker]) {
-        registry[moniker].push(...locator.registry[moniker] ?? []);
-      } else {
+      const existing = registry[moniker];
+      if (existing === void 0) {
         registry[moniker] = locator.registry[moniker];
+      } else {
+        existing.push(...locator.registry[moniker] ?? []);
       }
     }
     return new _ProviderFactoryLocator(this.context, registry);
@@ -3519,13 +3570,13 @@ var ProviderFactoryLocator = class _ProviderFactoryLocator {
     return this;
   }
   registered(moniker) {
-    return !!this.registry[moniker] || (this._parent?.registered(moniker) ?? false);
+    return Object.hasOwn(this.registry, moniker) || (this._parent?.registered(moniker) ?? false);
   }
   async tryGetInstance(moniker, { start = true, labels } = {}) {
     const resolvedParams = { context: this.context };
     const factory = this.tryLocate(moniker, labels);
-    if (factory) {
-      if (this.context.singletons[factory.uniqueId]) {
+    if (factory !== void 0) {
+      if (Object.hasOwn(this.context.singletons, factory.uniqueId)) {
         return this.context.singletons[factory.uniqueId];
       }
       this.logger?.debug(`Creating provider instance for moniker [${moniker}]${labels ? ` with labels [${JSON.stringify(labels)}]` : ""} using factory [${factory.uniqueId.description}]`);
@@ -3593,13 +3644,14 @@ import {
 } 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 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 +3659,14 @@ import { toHex as toHex3 } from "@xylabs/sdk-js";
 import { PayloadBuilder as PayloadBuilder14 } from "@xyo-network/sdk-js";
 import { TransferSchema } from "@xyo-network/xl1-protocol-lib";
 function createTransferPayload(from, transfers, context) {
-  return new PayloadBuilder14({ schema: TransferSchema }).fields({
+  const payloadBuilder = new PayloadBuilder14({ schema: TransferSchema });
+  const builder = payloadBuilder.fields({
     epoch: Date.now(),
     from,
     transfers: Object.fromEntries(Object.entries(transfers).map(([k, v]) => [k, toHex3(v)])),
     context
-  }).build();
+  });
+  return builder.build();
 }
 
 // src/eip-712/Payloads/EIP712Data.ts
@@ -3746,11 +3800,11 @@ var isPositiveBigInt = (value) => {
 var parseSignedBigInt = (value) => {
   if (isNegativeBigInt(value)) {
     return -hexToBigInt5(value.negative);
-  } else if (isPositiveBigInt(value)) {
+  }
+  if (isPositiveBigInt(value)) {
     return hexToBigInt5(value.positive);
-  } else {
-    throw new Error("Invalid balance type");
   }
+  throw new Error("Invalid balance type");
 };
 var toSignedBigInt = (value) => {
   return value < 0n ? { negative: toHex4(-value) } : { positive: toHex4(value) };
@@ -3867,39 +3921,38 @@ async function balancesStepSummaryFromRange(context, semaphores, blockViewer, su
         const summaryResult = await summaryMap.get(`${frameHead._hash}|${frameSize}`);
         if (isAnyPayload3(summaryResult)) {
           return summaryResult;
-        } else {
-          await semaphores[step].acquire();
-          try {
-            const subRanges = deepCalculateFramesFromRange(range, step - 1);
-            const promises = subRanges.map((subRange) => balancesStepSummaryFromRange(
-              context,
-              semaphores,
-              blockViewer,
-              summaryMap,
-              subRange
-            ));
-            const subResults = await Promise.all(promises);
-            const bigIntBalances = {};
-            for (const subResult of subResults) {
-              for (const [address, balance] of Object.entries(subResult.balances)) {
-                bigIntBalances[address] = (bigIntBalances[address] ?? 0n) + parseSignedBigInt(balance);
-              }
-            }
-            const balances = {};
-            for (const [address, balance] of Object.entries(bigIntBalances)) {
-              balances[address] = toSignedBigInt(balance);
+        }
+        await semaphores[step].acquire();
+        try {
+          const subRanges = deepCalculateFramesFromRange(range, step - 1);
+          const promises = subRanges.map((subRange) => balancesStepSummaryFromRange(
+            context,
+            semaphores,
+            blockViewer,
+            summaryMap,
+            subRange
+          ));
+          const subResults = await Promise.all(promises);
+          const bigIntBalances = {};
+          for (const subResult of subResults) {
+            for (const [address, balance] of Object.entries(subResult.balances)) {
+              bigIntBalances[address] = (bigIntBalances[address] ?? 0n) + parseSignedBigInt(balance);
             }
-            const result = {
-              schema: BalancesStepSummarySchema,
-              hash: frameHead._hash,
-              stepSize: frameSize,
-              balances
-            };
-            await summaryMap.set(key, result);
-            return result;
-          } finally {
-            semaphores[step].release();
           }
+          const balances = {};
+          for (const [address, balance] of Object.entries(bigIntBalances)) {
+            balances[address] = toSignedBigInt(balance);
+          }
+          const result = {
+            schema: BalancesStepSummarySchema,
+            hash: frameHead._hash,
+            stepSize: frameSize,
+            balances
+          };
+          await summaryMap.set(key, result);
+          return result;
+        } finally {
+          semaphores[step].release();
         }
       }, { ...context, timeBudgetLimit: 500 });
     }, { ...context, timeBudgetLimit: 500 });
@@ -4254,14 +4307,16 @@ var SimpleAccountBalanceViewer = class extends AbstractCreatableProvider {
     return balances[address] ?? AttoXL13(0n);
   }
   async accountBalanceHistories(addresses, config = {}) {
-    return (await this.qualifiedAccountBalanceHistories(addresses, config))[0];
+    const [histories] = await this.qualifiedAccountBalanceHistories(addresses, config);
+    return histories;
   }
   async accountBalanceHistory(address, config) {
     return await this.spanAsync("accountBalanceHistory", async () => {
       const range = isChainQualifiedRangeConfig4(config) ? config.range : void 0;
       const startingRange = asXL1BlockRange10(range ?? [0, await this.blockViewer.currentBlockNumber()], true);
       const blockNumbers = await this.distillTransferHistory(address, startingRange);
-      const blocks = (await Promise.all(blockNumbers.map(async (bn) => await this.blockViewer.blockByNumber(bn)))).filter(exists3);
+      const blockResults = await Promise.all(blockNumbers.map(async (bn) => await this.blockViewer.blockByNumber(bn)));
+      const blocks = blockResults.filter(exists3);
       const result = [];
       for (const block of blocks) {
         const transferIndexes = block[0].payload_schemas.map((schema, index) => schema === TransferSchema2 ? index : void 0).filter(exists3);
@@ -4393,7 +4448,8 @@ var SimpleAccountBalanceViewer = class extends AbstractCreatableProvider {
       const [head] = assertEx33(isDefined18(headHash) ? await this.blockViewer.blockByHash(headHash) : await this.blockViewer.currentBlock(), () => "Could not resolve head block");
       const startingRange = asXL1BlockRange10(range ?? [0, head.block], true);
       const blockNumbers = await this.distillTransferHistory(address, startingRange);
-      const blocks = (await Promise.all(blockNumbers.map(async (bn) => await this.blockViewer.blockByNumber(bn)))).filter(exists3);
+      const blockResults = await Promise.all(blockNumbers.map(async (bn) => await this.blockViewer.blockByNumber(bn)));
+      const blocks = blockResults.filter(exists3);
       const result = [];
       for (const block of blocks) {
         const transferIndexes = block[0].payload_schemas.map((schema, index) => schema === TransferSchema2 ? index : void 0).filter(exists3);
@@ -4585,7 +4641,7 @@ var SimpleBlockViewer = class extends AbstractCreatableProvider {
   }
   async blocksByStep(stepLevel, stepIndex) {
     return await this.spanAsync("blocksByStep", async () => {
-      assertEx34(Number.isInteger(stepIndex) && stepIndex >= 0, () => "stepIndex must be a non-negative integer");
+      assertEx34(Number.isSafeInteger(stepIndex) && stepIndex >= 0, () => "stepIndex must be a non-negative integer");
       const size = stepSize2(stepLevel);
       assertEx34(
         stepLevel <= blocksMaxStep,
@@ -4609,7 +4665,12 @@ var SimpleBlockViewer = class extends AbstractCreatableProvider {
   }
   async chainId(blockNumber = "latest") {
     return await this.spanAsync("chainId", async () => {
-      return blockNumber === "latest" ? (await this.finalizationViewer.headBlock()).chain : assertEx34(await this.blockByNumber(blockNumber), () => `Block not found [${blockNumber}]`)[0].chain;
+      if (blockNumber === "latest") {
+        const headBlock = await this.finalizationViewer.headBlock();
+        return headBlock.chain;
+      }
+      const block = assertEx34(await this.blockByNumber(blockNumber), () => `Block not found [${blockNumber}]`);
+      return block[0].chain;
     }, this.context);
   }
   async createHandler() {
@@ -4658,9 +4719,10 @@ var SimpleBlockViewer = class extends AbstractCreatableProvider {
     };
   }
   async getChainContextRead() {
+    const headBlock = await this.finalizationViewer.head();
     return {
       ...this.getBlockContextRead(),
-      head: (await this.finalizationViewer.head())[0]
+      head: headBlock[0]
     };
   }
   async startHandler() {
@@ -4707,10 +4769,11 @@ var SimpleBlockViewer = class extends AbstractCreatableProvider {
     }, this.headPollIntervalMs);
   }
   stopHeadPolling() {
-    if (this._headPollTimer) {
-      clearInterval(this._headPollTimer);
-      this._headPollTimer = null;
+    if (!this._headPollTimer) {
+      return;
     }
+    clearInterval(this._headPollTimer);
+    this._headPollTimer = null;
   }
 };
 __publicField(SimpleBlockViewer, "defaultMoniker", BlockViewerMoniker2);
@@ -4791,13 +4854,18 @@ var SimpleBlockValidationViewer = class extends AbstractCreatableProvider {
       head: void 0
     };
     const blocksWithMeta = await Promise.all(blocks.map((b) => Promise.all([PayloadBuilder18.addHashMeta(b[0]), PayloadBuilder18.addHashMeta(b[1])])));
-    const head = isChainQualifiedHeadConfig5(config) ? assertEx35(
-      (await this.blockViewer.blockByHash(config.head))?.[0],
-      () => `Specified a head that is not in the chain [${config.head}]`
-    ) : void 0;
-    const headBlock = head ?? (await this.blockViewer.currentBlock())[0];
-    const validateProtocol = value ? this.doValidateProtocol.bind(this) : void 0;
-    const validateState = state ? this.doValidateState.bind(this) : void 0;
+    let head;
+    if (isChainQualifiedHeadConfig5(config)) {
+      const headBlockResult = await this.blockViewer.blockByHash(config.head);
+      head = headBlockResult == null ? assertEx35(
+        void 0,
+        () => `Specified a head that is not in the chain [${config.head}]`
+      ) : headBlockResult[0];
+    }
+    const currentBlock = await this.blockViewer.currentBlock();
+    const headBlock = head ?? currentBlock[0];
+    const validateProtocol = value === true ? this.doValidateProtocol.bind(this) : void 0;
+    const validateState = state === true ? this.doValidateState.bind(this) : void 0;
     const chainIdAtBlockNumber = (blockNumber) => this.chainContractViewer.chainIdAtBlockNumber(blockNumber);
     const qualification = { head: headBlock._hash, range: asXL1BlockRange12([0, headBlock.block], true) };
     const [protocolResults, stateResults] = await Promise.all([
@@ -4820,13 +4888,16 @@ var SimpleBlockValidationViewer = class extends AbstractCreatableProvider {
     throw new Error("Method not implemented.");
   }
   async validateBlock(block, config) {
-    return (await this.validateBlocks([block], config))[0];
+    const results = await this.validateBlocks([block], config);
+    return results[0];
   }
   async validateBlocks(blocks, config) {
-    return (await this.qualifiedValidateBlocks(blocks, config))[0];
+    const results = await this.qualifiedValidateBlocks(blocks, config);
+    return results[0];
   }
   async validateUncle(blocks, config) {
-    return (await this.qualifiedValidateUncle(blocks, config))[0];
+    const results = await this.qualifiedValidateUncle(blocks, config);
+    return results[0];
   }
   async doValidateProtocol(blocks, chainIdAtBlockNumber) {
     return await Promise.all(blocks.map(async (block) => {
@@ -4884,7 +4955,7 @@ var SimpleChainContractViewer = class extends AbstractCreatableProvider {
     return this.finalizationViewer.chainId();
   }
   async chainIdAtBlockNumber(blockNumber) {
-    return await withContextCacheResponse(this.context, "chainIdAtBlockNumber", `${blockNumber}`, async () => {
+    return await withContextCacheResponse(this.context, "chainIdAtBlockNumber", String(blockNumber), async () => {
       let chainId = this.chainId();
       let contractViewer = this;
       let forkedAtBlockNumber = await contractViewer.forkedAtBlockNumber();
@@ -4967,14 +5038,16 @@ var AbstractRestDataLake = class extends AbstractCreatableProvider {
     return this.params.endpoint;
   }
   async get(hashes) {
-    return (await Promise.all(hashes.map((hash) => this.getOne(hash)))).filter(exists5);
+    const results = await Promise.all(hashes.map((hash) => this.getOne(hash)));
+    return results.filter(exists5);
   }
   next(_options) {
     throw new Error("Method not implemented.");
   }
   async getOne(hash) {
     try {
-      return asAnyPayload4((await this.client.get(`${this.params.endpoint}/get/${hash}`)).data);
+      const response = await this.client.get(`${this.params.endpoint}/get/${hash}`);
+      return asAnyPayload4(response.data);
     } catch (ex) {
       if (ex instanceof FetchClientError && (ex.response.status === 400 || ex.response.status === 404)) {
         return void 0;
@@ -4992,7 +5065,7 @@ var AbstractRestDataLake = class extends AbstractCreatableProvider {
     if (this.allowedSchemas && !this.allowedSchemas.includes(schema)) {
       return false;
     }
-    if (this.disallowedSchemas?.includes(schema)) {
+    if (this.disallowedSchemas?.includes(schema) === true) {
       return false;
     }
     return true;
@@ -5019,9 +5092,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 +5149,7 @@ var AbstractSimpleDataLake = class extends AbstractCreatableProvider {
     if (this.allowedSchemas && !this.allowedSchemas.includes(schema)) {
       return false;
     }
-    if (this.disallowedSchemas?.includes(schema)) {
+    if (this.disallowedSchemas?.includes(schema) === true) {
       return false;
     }
     return true;
@@ -5091,10 +5163,12 @@ var SimpleDataLakeRunner = class extends AbstractSimpleDataLake {
     await this.map.clear();
   }
   async delete(hashes) {
-    return (await Promise.all(hashes.map(async (hash) => {
+    const deleteResults = await Promise.all(hashes.map(async (hash) => {
       const payload = await this.map.get(hash);
-      return await this.map.delete(hash) ? payload : void 0;
-    }))).filter(exists7);
+      const deleted = await this.map.delete(hash);
+      return deleted ? payload : void 0;
+    }));
+    return deleteResults.filter(exists7);
   }
   async insert(items) {
     const payloads = items.filter(isAnyPayload10).filter((i) => this.isAllowed(i));
@@ -5137,7 +5211,8 @@ var SimpleFinalizationRunner = class extends AbstractCreatableProvider {
     this._store = { chainMap: this.params.finalizedArchivist };
   }
   async finalizeBlock(block) {
-    return (await this.finalizeBlocks([block]))[0];
+    const results = await this.finalizeBlocks([block]);
+    return results[0];
   }
   async finalizeBlocks(blocks) {
     const sortedBlocks = blocks.toSorted((a, b) => a[0].block - b[0].block);
@@ -5191,7 +5266,8 @@ var SimpleFinalizationViewer = class extends AbstractCreatableProvider {
   }
   async createHandler() {
     await super.createHandler();
-    this._chainId = assertEx38(this.config.chain.id ?? (await findMostRecentBlock(this.params.finalizedArchivist))?.chain, () => "chain.id is required if empty archivist");
+    const mostRecentBlock = await findMostRecentBlock(this.params.finalizedArchivist);
+    this._chainId = assertEx38(this.config.chain.id ?? mostRecentBlock?.chain, () => "chain.id is required if empty archivist");
     this._store = { chainMap: this.params.finalizedArchivist };
   }
   async head() {
@@ -5206,13 +5282,16 @@ var SimpleFinalizationViewer = class extends AbstractCreatableProvider {
     }, this.context);
   }
   async headBlock() {
-    return (await this.head())[0];
+    const headBlock = await this.head();
+    return headBlock[0];
   }
   async headHash() {
-    return (await this.headBlock())._hash;
+    const headBlock = await this.headBlock();
+    return headBlock._hash;
   }
   async headNumber() {
-    return (await this.headBlock()).block;
+    const headBlock = await this.headBlock();
+    return headBlock.block;
   }
   getBlockContextRead() {
     return {
@@ -5221,9 +5300,10 @@ var SimpleFinalizationViewer = class extends AbstractCreatableProvider {
     };
   }
   async getChainContextRead() {
+    const headBlock = await this.head();
     return {
       ...this.getBlockContextRead(),
-      head: (await this.head())[0]
+      head: headBlock[0]
     };
   }
   async getCurrentHead() {
@@ -5345,11 +5425,13 @@ var SimpleXyoGatewayRunner = class _SimpleXyoGatewayRunner extends AbstractCreat
         BigIntToJsonZod.parse(amount)
       ])
     );
-    const transfer = new PayloadBuilder20({ schema: TransferSchema3 }).fields({
+    const payloadBuilder = new PayloadBuilder20({ schema: TransferSchema3 });
+    const transferBuilder = payloadBuilder.fields({
       from,
       transfers: hexTransfers,
       epoch: Date.now()
-    }).build();
+    });
+    const transfer = transferBuilder.build();
     const [hash] = await this.addPayloadsToChain([transfer], [], options);
     return hash;
   }
@@ -5470,10 +5552,11 @@ var SimpleMempoolRunner = class extends AbstractCreatableProvider {
       const valid = blocks.map((b) => !!b);
       const remainingBlockMap = [];
       const remainingBlocks = blocks.map((b, i) => {
-        if (b) {
-          remainingBlockMap.push(i);
-          return b;
+        if (!b) {
+          return;
         }
+        remainingBlockMap.push(i);
+        return b;
       }).filter(exists8);
       assertEx40(
         remainingBlockMap.length === remainingBlocks.length,
@@ -5492,7 +5575,7 @@ var SimpleMempoolRunner = class extends AbstractCreatableProvider {
         valid[remainingBlockMap[i]] = validated;
       }
       const pruneHashes = bundles.map((p, i) => {
-        if (!valid[i]) {
+        if (valid.at(i) !== true) {
           return p._hash;
         }
       }).filter(exists8);
@@ -5532,10 +5615,11 @@ var SimpleMempoolRunner = class extends AbstractCreatableProvider {
       const valid = transactions.map((t) => !!t);
       const remainingTransactionMap = [];
       const remainingTransactions = transactions.map((t, i) => {
-        if (t) {
-          remainingTransactionMap.push(i);
-          return t;
+        if (!t) {
+          return;
         }
+        remainingTransactionMap.push(i);
+        return t;
       }).filter(exists8);
       assertEx40(
         remainingTransactionMap.length === remainingTransactions.length,
@@ -5555,7 +5639,7 @@ var SimpleMempoolRunner = class extends AbstractCreatableProvider {
         valid[remainingTransactionMap[i]] = validated;
       }
       const pruneHashes = bundles.map((p, i) => {
-        if (!valid[i]) {
+        if (valid.at(i) !== true) {
           return p._hash;
         }
       }).filter(exists8);
@@ -5860,7 +5944,8 @@ var SimpleMempoolViewer = class extends AbstractCreatableProvider {
       cursor
     });
     const filteredBundles = bundles.filter(isPayloadBundle2).filter(isHashMeta2);
-    return (await Promise.all(filteredBundles.map(async (bundle3) => await bundledPayloadToHydratedBlock(bundle3)))).filter(exists9);
+    const hydratedBlocks = await Promise.all(filteredBundles.map(async (bundle3) => await bundledPayloadToHydratedBlock(bundle3)));
+    return hydratedBlocks.filter(exists9);
   }
   async pendingTransactions({
     cursor: providedCursor,
@@ -5881,12 +5966,7 @@ var SimpleMempoolViewer = class extends AbstractCreatableProvider {
     });
     this.logger?.debug(`Fetched pending transactions: ${bundles.length} bundles`);
     const filteredBundles = bundles.filter(isPayloadBundle2).filter(isHashMeta2);
-    const hydratedWithBundle = (await Promise.all(
-      filteredBundles.map(async (bundle3) => {
-        const tx = await bundledPayloadToHydratedTransaction(bundle3);
-        return 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 +5987,7 @@ var SimpleMempoolViewer = class extends AbstractCreatableProvider {
       })
     );
     this.gcHandoutStats(currentBlockNumber);
-    const inclusionCandidates = (await Promise.all(validTransactions.map(async ({ bundle: bundle3, tx }) => {
-      if (await this.isInclusionCandidate(tx, currentBlock, false)) return { bundle: bundle3, tx };
-    }))).filter(exists9);
+    const inclusionCandidates = await this.filterInclusionCandidates(validTransactions, currentBlock);
     const selectionRatio = this.params.mempoolSelectionRatio ?? DEFAULT_MEMPOOL_SELECTION_RATIO;
     const nonDemoted = inclusionCandidates.filter(({ bundle: bundle3 }) => !this.isDemoted(bundle3._hash));
     const demoted = inclusionCandidates.filter(({ bundle: bundle3 }) => this.isDemoted(bundle3._hash));
@@ -5933,12 +6011,27 @@ var SimpleMempoolViewer = class extends AbstractCreatableProvider {
   async deleteBundledTransaction(bundle3) {
     await this.pendingTransactionsArchivist.delete([bundle3._hash]);
   }
+  async filterInclusionCandidates(validTransactions, currentBlock) {
+    const inclusionResults = await Promise.all(validTransactions.map(async ({ bundle: bundle3, tx }) => {
+      if (await this.isInclusionCandidate(tx, currentBlock, false)) return { bundle: bundle3, tx };
+    }));
+    return inclusionResults.filter(exists9);
+  }
   gcHandoutStats(currentBlockNumber) {
     const ttl = this.handoutStatsTtlBlocks;
     for (const [hash, stats] of this._handoutStats) {
       if (currentBlockNumber - stats.firstHandoutAt > ttl) this._handoutStats.delete(hash);
     }
   }
+  async hydratePendingBundles(filteredBundles) {
+    const hydratedResults = await Promise.all(
+      filteredBundles.map(async (bundle3) => {
+        const tx = await bundledPayloadToHydratedTransaction(bundle3);
+        return isDefined20(tx) ? { bundle: bundle3, tx } : void 0;
+      })
+    );
+    return hydratedResults.filter(exists9);
+  }
   /**
    * Evaluates a transaction to determine if it should be purged from the mempool.
    * @param tx The transaction to evaluate
@@ -5996,7 +6089,7 @@ SimpleMempoolViewer = __decorateClass([
 function deduplicateWithBundleBySigner(items) {
   const seen = /* @__PURE__ */ new Set();
   return items.filter(({ tx }) => {
-    const key = tx[0].addresses.toSorted().join(",");
+    const key = tx[0].addresses.toSorted((a, b) => a.localeCompare(b)).join(",");
     if (seen.has(key)) return false;
     seen.add(key);
     return true;
@@ -6062,13 +6155,12 @@ var SimpleXyoNetwork = class {
       const response = await fetchJsonGet(url);
       if (isNetworkStatus(response.data)) {
         return response.data;
-      } else {
-        if (response.status === 200) {
-          this.logger?.error("Unknown network status response", response.data);
-          return unknownStatus;
-        }
-        return errorStatus;
       }
+      if (response.status === 200) {
+        this.logger?.error("Unknown network status response", response.data);
+        return unknownStatus;
+      }
+      return errorStatus;
     } catch (error) {
       this.logger?.error("Error fetching network status", error);
       return errorStatus;
@@ -6649,7 +6741,8 @@ var SimpleTimeSyncViewer = class extends AbstractCreatableProvider {
   async currentTime(domain) {
     switch (domain) {
       case "xl1": {
-        return ["xl1", (await this.blockViewer.currentBlock())?.[0].block ?? -1];
+        const currentBlock = await this.blockViewer.currentBlock();
+        return ["xl1", currentBlock?.[0].block ?? -1];
       }
       case "epoch": {
         return ["epoch", Date.now()];
@@ -6761,13 +6854,18 @@ var SimpleTransactionValidationViewer = class extends AbstractCreatableProvider
       head: void 0
     };
     const transactionsWithMeta = await Promise.all(transactions.map((b) => Promise.all([PayloadBuilder24.addHashMeta(b[0]), PayloadBuilder24.addHashMeta(b[1])])));
-    const head = isChainQualifiedHeadConfig6(config) ? assertEx46(
-      (await this.blockViewer.blockByHash(config.head))?.[0],
-      () => `Specified a head that is not in the chain [${config.head}]`
-    ) : void 0;
-    const headBlock = head ?? (await this.blockViewer.currentBlock())[0];
-    const validateProtocol = value ? this.doValidateProtocol.bind(this) : void 0;
-    const validateState = state ? this.doValidateState.bind(this) : void 0;
+    let head;
+    if (isChainQualifiedHeadConfig6(config)) {
+      const headBlockResult = await this.blockViewer.blockByHash(config.head);
+      head = headBlockResult == null ? assertEx46(
+        void 0,
+        () => `Specified a head that is not in the chain [${config.head}]`
+      ) : headBlockResult[0];
+    }
+    const currentBlock = await this.blockViewer.currentBlock();
+    const headBlock = head ?? currentBlock[0];
+    const validateProtocol = value === true ? this.doValidateProtocol.bind(this) : void 0;
+    const validateState = state === true ? this.doValidateState.bind(this) : void 0;
     const chainId = headBlock.chain;
     const qualification = { head: headBlock._hash, range: asXL1BlockRange13([0, headBlock.block], true) };
     const [protocolResults, stateResults] = await Promise.all([
@@ -6790,10 +6888,12 @@ var SimpleTransactionValidationViewer = class extends AbstractCreatableProvider
     throw new Error("Method not implemented.");
   }
   async validateTransaction(block, config) {
-    return (await this.validateTransactions([block], config))[0];
+    const results = await this.validateTransactions([block], config);
+    return results[0];
   }
   async validateTransactions(transactions, config) {
-    return (await this.qualifiedValidateTransactions(transactions, config))[0];
+    const results = await this.qualifiedValidateTransactions(transactions, config);
+    return results[0];
   }
   async doValidateProtocol(transactions, chainId) {
     return await Promise.all(transactions.map(async (tx) => {
@@ -7091,8 +7191,8 @@ var LoggerStatusReporter = class {
   }
   report(name, status, progress) {
     this.statusMap[name] = status;
-    const starting = Object.entries(this.statusMap).map(([, value]) => value === "starting" ? 1 : 0).reduce((a, b) => a + b, 0);
-    const started = Object.entries(this.statusMap).map(([, value]) => value === "started" ? 1 : 0).reduce((a, b) => a + b, 0);
+    const starting = Object.values(this.statusMap).map((value) => value === "starting" ? 1 : 0).reduce((a, b) => a + b, 0);
+    const started = Object.values(this.statusMap).map((value) => value === "started" ? 1 : 0).reduce((a, b) => a + b, 0);
     this.logger.info(`${started}/${starting + started} ${name} status: ${status}`, { progress });
   }
 };
@@ -7253,6 +7353,26 @@ var isBuildNextBlockOptions = (value) => {
 function calculateCompletedStepReward(step, balance) {
   return AttoXL14(StepRewardFractions[step][0] * balance / StepRewardFractions[step][1]);
 }
+function buildStepHashes(blockNumber, inStepHashes, previousBlockHash, chainStepRewardAddress2, stepRewardPoolBalance) {
+  const completedStepRewardTransfers = [];
+  const step_hashes = [];
+  for (const [i, step] of StepSizes14.entries()) {
+    if (blockNumber < step) {
+      break;
+    }
+    if (blockNumber % step === 0) {
+      if (StepRewardFractions[i][0] > 0 && chainStepRewardAddress2 !== XYO_ZERO_ADDRESS2) {
+        const completedStepRewardHolderAddress = rewardAddressFromStepIdentity({ block: blockNumber, step });
+        const completedStepReward = calculateCompletedStepReward(i, stepRewardPoolBalance);
+        completedStepRewardTransfers.push(createTransferPayload(chainStepRewardAddress2, { [completedStepRewardHolderAddress]: completedStepReward }));
+      }
+      step_hashes.push(assertEx49(previousBlockHash, () => `Previous block hash is required for step ${step} at block ${blockNumber}`));
+    } else if (isDefined23(inStepHashes.at(i))) {
+      step_hashes.push(inStepHashes[i]);
+    }
+  }
+  return { completedStepRewardTransfers, step_hashes };
+}
 async function buildBlock(options) {
   const previousBlockNumber = isBuildGenesisBlockOptions(options) ? -1 : options.previousBlockNumber;
   const blockNumber = asXL1BlockNumber13(previousBlockNumber + 1, true);
@@ -7267,7 +7387,6 @@ async function buildBlock(options) {
     protocol = XL1_PROTOCOL_VERSION,
     signers
   } = options;
-  const step_hashes = [];
   for (const [tx] of txs) {
     if (tx.nbf > blockNumber) {
       throw new Error(`Transaction ${await PayloadBuilder25.hash(tx)} not valid for block ${blockNumber} - NBF is ${tx.nbf}`);
@@ -7276,24 +7395,13 @@ async function buildBlock(options) {
       throw new Error(`Transaction ${await PayloadBuilder25.hash(tx)} not valid for block ${blockNumber} - EXP is ${tx.exp}`);
     }
   }
-  const completedStepRewardTransfers = [];
-  for (const [i, step] of StepSizes14.entries()) {
-    if (blockNumber < step) {
-      break;
-    }
-    if (blockNumber % step === 0) {
-      if (StepRewardFractions[i][0] > 0 && chainStepRewardAddress2 !== XYO_ZERO_ADDRESS2) {
-        const completedStepRewardHolderAddress = rewardAddressFromStepIdentity({ block: blockNumber, step });
-        const completedStepReward = calculateCompletedStepReward(i, stepRewardPoolBalance);
-        completedStepRewardTransfers.push(createTransferPayload(chainStepRewardAddress2, { [completedStepRewardHolderAddress]: completedStepReward }));
-      }
-      step_hashes.push(assertEx49(previousBlockHash, () => `Previous block hash is required for step ${step} at block ${blockNumber}`));
-    } else {
-      if (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 +7411,15 @@ async function buildBlock(options) {
     ...txElevatedPayloads,
     ...completedStepRewardTransfers
   ];
-  const [bw, txPayloads] = await new BoundWitnessBuilder3().fields({
+  const boundWitnessBuilder = new BoundWitnessBuilder3();
+  const builder = boundWitnessBuilder.fields({
     block,
     chain: chainId,
     previous,
     step_hashes,
     protocol
-  }).meta({ $epoch: Date.now(), $signatures: [] }).signers(signers).payloads(await PayloadBuilder25.addStorageMeta(payloads)).build();
+  }).meta({ $epoch: Date.now(), $signatures: [] }).signers(signers).payloads(await PayloadBuilder25.addStorageMeta(payloads));
+  const [bw, txPayloads] = await builder.build();
   assertEx49(isBlockBoundWitness(bw), () => "Build of BlockBoundWitness failed");
   return [await PayloadBuilder25.addStorageMeta(bw), txPayloads.map((p) => asAnyPayload5(p, true))];
 }
@@ -7365,7 +7475,8 @@ var buildRandomTransaction = async (chain, payloads, account, nbf = asXL1BlockNu
   const additionalPayloads = (payloads ?? []).filter((payload) => !isAllowedBlockPayload3(payload));
   const sender = account ?? await Account2.random();
   if (elevatedPayloads.length === 0) {
-    const receiver = receiverAddress ?? (await Account2.random()).address;
+    const defaultReceiver = await Account2.random();
+    const receiver = receiverAddress ?? defaultReceiver.address;
     const transferPayload = createTransferPayload(sender.address, { [receiver]: 1n });
     elevatedPayloads.push(transferPayload);
   }
@@ -7396,12 +7507,14 @@ import {
   defaultTransactionFees as defaultTransactionFees4
 } from "@xyo-network/xl1-protocol-lib";
 async function createProducerChainStakeIntent(from, exp, nbf = 0) {
-  return await PayloadBuilder27.addHashMeta(new PayloadBuilder27({ schema: ChainStakeIntentSchema2 }).fields({
+  const payloadBuilder = new PayloadBuilder27({ schema: ChainStakeIntentSchema2 });
+  const builder = payloadBuilder.fields({
     from,
     exp,
     nbf,
     intent: "producer"
-  }).build());
+  });
+  return await PayloadBuilder27.addHashMeta(builder.build());
 }
 
 // src/test/createGenesisBlock.ts
@@ -7445,13 +7558,20 @@ var buildRandomChain = async (blockProducer, count = 10, previousBlock, chainId,
     remaining = remaining - 1;
     lastBlock = block;
   }
-  const resolvedReceiverAddresses = receiverAddresses ?? [(await Account4.random()).address];
+  const defaultReceiver = await Account4.random();
+  const resolvedReceiverAddresses = receiverAddresses ?? [defaultReceiver.address];
   let saltCounter = 0;
   while (remaining > 0) {
     saltCounter += 1;
-    const payloads = [new PayloadBuilder29({ schema: IdSchema2 }).fields({ salt: `${Date.now()}-${saltCounter}` }).build()];
+    const idPayloadBuilder = new PayloadBuilder29({ schema: IdSchema2 });
+    const idBuilder = idPayloadBuilder.fields({ salt: `${Date.now()}-${saltCounter}` });
+    const payloads = [idBuilder.build()];
     saltCounter += 1;
-    const additionalPrivatePayloads = remaining % 2 === 0 ? [new PayloadBuilder29({ schema: asSchema9("network.xyo.private", true) }).fields({ salt: `${Date.now()}-${saltCounter}` }).build()] : [];
+    const additionalPrivatePayloads = remaining % 2 === 0 ? (() => {
+      const privatePayloadBuilder = new PayloadBuilder29({ schema: asSchema9("network.xyo.private", true) });
+      const privateBuilder = privatePayloadBuilder.fields({ salt: `${Date.now()}-${saltCounter}` });
+      return [privateBuilder.build()];
+    })() : [];
     const txs = [];
     for (const receiverAddress of resolvedReceiverAddresses) {
       txs.push(await buildRandomTransaction(