@xyo-network/xl1-protocol-sdk 1.16.26 → 1.17.0

package/dist/neutral/ChainServiceCollectionV2.d.ts

@@ -1,7 +1,7 @@
 import type { ArchivistInstance, WriteArchivist } from '@xyo-network/archivist-model';
 import type { WalletInstance } from '@xyo-network/wallet-model';
-import type { BlockProducerService, BlockRewardService, ChainStaker, ChainStakeViewer, ElectionService, EventingChainBlockNumberIteratorService, PendingTransactionsService, StakeIntentService } from './services/index.ts';
-import type { AccountBalanceViewer, ChainContractViewer } from './viewers/index.ts';
+import type { BlockProducerService, BlockRewardService, ChainStaker, ChainStakeViewer, ElectionService, StakeIntentService } from './services/index.ts';
+import type { AccountBalanceViewer, BlockViewer, ChainContractViewer, MempoolViewer } from './viewers/index.ts';
 export interface ChainServiceCollectionV2 {
     /**
      * The account which is used to sign transactions
@@ -12,18 +12,14 @@ export interface ChainServiceCollectionV2 {
      */
     balance: AccountBalanceViewer;
     /**
-     * The archivist which the chain data is stored in
+     * The chain iterator
      */
-    chainArchivist: ArchivistInstance;
+    blockViewer?: BlockViewer;
     /**
      * Service for viewing codified chain information
      * from a contract
      */
     chainContractViewer: ChainContractViewer;
-    /**
-     * The chain iterator
-     */
-    chainIterator?: EventingChainBlockNumberIteratorService;
     /**
      * Service for viewing stake information
      */
@@ -48,7 +44,7 @@ export interface ChainServiceCollectionV2 {
     /**
      * Service for managing pending transactions
      */
-    pendingTransactions: PendingTransactionsService;
+    pendingTransactions: MempoolViewer;
     /**
      * The block producer service
      */

package/dist/neutral/ChainServiceCollectionV2.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ChainServiceCollectionV2.d.ts","sourceRoot":"","sources":["../../src/ChainServiceCollectionV2.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AACrF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAE/D,OAAO,KAAK,EACV,oBAAoB,EAAE,kBAAkB,EACxC,WAAW,EAAE,gBAAgB,EAAE,eAAe,EAAE,uCAAuC,EACvF,0BAA0B,EAC1B,kBAAkB,EACnB,MAAM,qBAAqB,CAAA;AAC5B,OAAO,KAAK,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAA;AAEnF,MAAM,WAAW,wBAAwB;IAEvC;;OAEG;IACH,OAAO,EAAE,cAAc,CAAA;IACvB;;OAEG;IACH,OAAO,EAAE,oBAAoB,CAAA;IAC7B;;OAEG;IACH,cAAc,EAAE,iBAAiB,CAAA;IACjC;;;OAGG;IACH,mBAAmB,EAAE,mBAAmB,CAAA;IACxC;;OAEG;IACH,aAAa,CAAC,EAAE,uCAAuC,CAAA;IACvD;;OAEG;IACH,gBAAgB,EAAE,gBAAgB,CAAA;IAClC;;OAEG;IACH,WAAW,EAAE,WAAW,CAAA;IACxB;;OAEG;IACH,8BAA8B,EAAE,cAAc,CAAA;IAC9C;;OAEG;IACH,QAAQ,EAAE,eAAe,CAAA;IACzB;;;OAGG;IACH,wCAAwC,EAAE,iBAAiB,CAAA;IAC3D;;OAEG;IACH,mBAAmB,EAAE,0BAA0B,CAAA;IAC/C;;OAEG;IACH,QAAQ,EAAE,oBAAoB,CAAA;IAC9B;;OAEG;IACH,MAAM,EAAE,kBAAkB,CAAA;IAC1B;;OAEG;IACH,WAAW,EAAE,kBAAkB,CAAA;CAChC"}
+{"version":3,"file":"ChainServiceCollectionV2.d.ts","sourceRoot":"","sources":["../../src/ChainServiceCollectionV2.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AACrF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAE/D,OAAO,KAAK,EACV,oBAAoB,EAAE,kBAAkB,EACxC,WAAW,EAAE,gBAAgB,EAAE,eAAe,EAC9C,kBAAkB,EACnB,MAAM,qBAAqB,CAAA;AAC5B,OAAO,KAAK,EACV,oBAAoB,EAAE,WAAW,EAAE,mBAAmB,EAAE,aAAa,EACtE,MAAM,oBAAoB,CAAA;AAE3B,MAAM,WAAW,wBAAwB;IAEvC;;OAEG;IACH,OAAO,EAAE,cAAc,CAAA;IACvB;;OAEG;IACH,OAAO,EAAE,oBAAoB,CAAA;IAC7B;;OAEG;IACH,WAAW,CAAC,EAAE,WAAW,CAAA;IACzB;;;OAGG;IACH,mBAAmB,EAAE,mBAAmB,CAAA;IACxC;;OAEG;IACH,gBAAgB,EAAE,gBAAgB,CAAA;IAClC;;OAEG;IACH,WAAW,EAAE,WAAW,CAAA;IACxB;;OAEG;IACH,8BAA8B,EAAE,cAAc,CAAA;IAC9C;;OAEG;IACH,QAAQ,EAAE,eAAe,CAAA;IACzB;;;OAGG;IACH,wCAAwC,EAAE,iBAAiB,CAAA;IAC3D;;OAEG;IACH,mBAAmB,EAAE,aAAa,CAAA;IAClC;;OAEG;IACH,QAAQ,EAAE,oBAAoB,CAAA;IAC9B;;OAEG;IACH,MAAM,EAAE,kBAAkB,CAAA;IAC1B;;OAEG;IACH,WAAW,EAAE,kBAAkB,CAAA;CAChC"}

package/dist/neutral/index.mjs

@@ -225,6 +225,49 @@ function readPayloadMapFromStore(store) {
 }
 __name(readPayloadMapFromStore, "readPayloadMapFromStore");
 
+// src/primitives/state/findMostRecentBlock.ts
+import { isSignedBlockBoundWitnessWithStorageMeta } from "@xyo-network/xl1-protocol";
+var DEFAULT_NEXT_OPTIONS = {
+  limit: 50
+};
+var findMostRecentBlock = /* @__PURE__ */ __name(async (chainArchivist, nextOptions = DEFAULT_NEXT_OPTIONS, maxIterations = Number.POSITIVE_INFINITY) => {
+  let mostRecentBlock;
+  let cursor;
+  let batch;
+  let iterations = 0;
+  do {
+    batch = await chainArchivist.next({
+      ...nextOptions,
+      order: "desc",
+      cursor
+    });
+    const blocks = batch.filter(isSignedBlockBoundWitnessWithStorageMeta);
+    const last = blocks?.at(0);
+    if (last) {
+      mostRecentBlock = last;
+      break;
+    } else {
+      cursor = batch.at(-1)?._sequence;
+    }
+    iterations = iterations + 1;
+  } while (batch.length > 0 && iterations < maxIterations);
+  return mostRecentBlock;
+}, "findMostRecentBlock");
+
+// src/primitives/state/hydratedBlockByNumber.ts
+import { assertEx as assertEx4 } from "@xylabs/sdk-js";
+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}`;
+  return await withContextCacheResponse(context, "hydratedBlockByNumber", cacheKey, async () => {
+    const block = assertEx4(await blockFromBlockNumber(context, blockNumber), () => `Could not find block for block number ${blockNumber}`);
+    return await hydrateBlock(context.store, block._hash);
+  });
+}
+__name(hydratedBlockByNumber, "hydratedBlockByNumber");
+
 // src/primitives/step/completedStepRewardAddress.ts
 import { toAddress } from "@xylabs/sdk-js";
 import { StepSizes } from "@xyo-network/xl1-protocol";
@@ -265,7 +308,7 @@ function stepBlockRange({ block, step }) {
 __name(stepBlockRange, "stepBlockRange");
 
 // src/primitives/step/stepTransferIndex.ts
-import { assertEx as assertEx4 } from "@xylabs/sdk-js";
+import { assertEx as assertEx5 } from "@xylabs/sdk-js";
 import { StepSizes as StepSizes3 } from "@xyo-network/xl1-protocol";
 function stepTransferIndex(block, step) {
   let rewardTransferCount = 0;
@@ -279,7 +322,7 @@ function stepTransferIndex(block, step) {
       rewardTransferCount++;
     }
   }
-  assertEx4(rewardTransferIndex >= 0, () => `Could not find step size for step ${step} at block ${block}`);
+  assertEx5(rewardTransferIndex >= 0, () => `Could not find step size for step ${step} at block ${block}`);
   return [
     rewardTransferIndex,
     rewardTransferCount
@@ -288,7 +331,7 @@ function stepTransferIndex(block, step) {
 __name(stepTransferIndex, "stepTransferIndex");
 
 // src/primitives/summary/balances/balancesStepSummaryFromRange.ts
-import { assertEx as assertEx5 } from "@xylabs/sdk-js";
+import { assertEx as assertEx6 } from "@xylabs/sdk-js";
 import { PayloadBuilder } from "@xyo-network/payload-builder";
 import { isAnyPayload } from "@xyo-network/payload-model";
 import { StepSizes as StepSizes4 } from "@xyo-network/xl1-protocol";
@@ -465,7 +508,7 @@ async function balancesStepSummaryFromRange(context, range) {
     };
   } else {
     const step = StepSizes4.indexOf(frameSize);
-    assertEx5(step !== -1, () => `Invalid step size: ${frameSize}. Must be one of ${StepSizes4.join(", ")}`);
+    assertEx6(step !== -1, () => `Invalid step size: ${frameSize}. Must be one of ${StepSizes4.join(", ")}`);
     const summaryResult = await context.summaryMap.get(`${frameHeadHash}|${frameSize}`);
     if (isAnyPayload(summaryResult)) {
       result = summaryResult;
@@ -532,7 +575,7 @@ async function balancesSummary(context) {
 __name(balancesSummary, "balancesSummary");
 
 // src/primitives/summary/schemas/schemasStepSummaryFromRange.ts
-import { assertEx as assertEx6 } from "@xylabs/sdk-js";
+import { assertEx as assertEx7 } from "@xylabs/sdk-js";
 import { isBoundWitness } from "@xyo-network/boundwitness-model";
 import { PayloadBuilder as PayloadBuilder2 } from "@xyo-network/payload-builder";
 import { isAnyPayload as isAnyPayload2, isHashMeta } from "@xyo-network/payload-model";
@@ -564,7 +607,7 @@ async function schemasStepSummaryFromRange(context, range) {
     };
   } else {
     const step = StepSizes5.indexOf(frameSize);
-    assertEx6(step !== -1, () => `Invalid step size: ${frameSize}. Must be one of ${StepSizes5.join(", ")}`);
+    assertEx7(step !== -1, () => `Invalid step size: ${frameSize}. Must be one of ${StepSizes5.join(", ")}`);
     const summaryResult = await context.summaryMap.get(`${frameHeadHash}|${frameSize}`);
     if (isAnyPayload2(summaryResult)) {
       result = summaryResult;
@@ -625,7 +668,7 @@ async function schemasSummary(context) {
 __name(schemasSummary, "schemasSummary");
 
 // src/primitives/summary/transfers/transfersStepSummaryFromRange.ts
-import { assertEx as assertEx7 } from "@xylabs/sdk-js";
+import { assertEx as assertEx8 } from "@xylabs/sdk-js";
 import { PayloadBuilder as PayloadBuilder3 } from "@xyo-network/payload-builder";
 import { isAnyPayload as isAnyPayload3 } from "@xyo-network/payload-model";
 import { StepSizes as StepSizes6 } from "@xyo-network/xl1-protocol";
@@ -691,7 +734,7 @@ async function transfersStepSummaryFromRange(context, range) {
     };
   } else {
     const step = StepSizes6.indexOf(frameSize);
-    assertEx7(step !== -1, () => `Invalid step size: ${frameSize}. Must be one of ${StepSizes6.join(", ")}`);
+    assertEx8(step !== -1, () => `Invalid step size: ${frameSize}. Must be one of ${StepSizes6.join(", ")}`);
     const key = transfersSummaryKey(frameHeadHash, frameSize);
     const summaryResult = await context.summaryMap.get(key);
     if (isAnyPayload3(summaryResult)) {
@@ -822,7 +865,7 @@ import { PayloadBuilder as PayloadBuilder9 } from "@xyo-network/payload-builder"
 import { PayloadBundleSchema } from "@xyo-network/payload-model";
 
 // src/transaction/buildTransaction.ts
-import { assertEx as assertEx8, toHex as toHex2 } from "@xylabs/sdk-js";
+import { assertEx as assertEx9, toHex as toHex2 } from "@xylabs/sdk-js";
 import { BoundWitnessBuilder } from "@xyo-network/boundwitness-builder";
 import { PayloadBuilder as PayloadBuilder5 } from "@xyo-network/payload-builder";
 import { defaultTransactionFees } from "@xyo-network/xl1-protocol";
@@ -848,7 +891,7 @@ async function buildTransaction(chain, onChainPayloads, offChainPayloads, signer
   }
   const fields = {
     ...txBoundWitnessFields,
-    from: from ?? (Array.isArray(signer) ? assertEx8(signer.at(0)?.address) : signer.address)
+    from: from ?? (Array.isArray(signer) ? assertEx9(signer.at(0)?.address) : signer.address)
   };
   if (script.length > 0) {
     fields.script = script;
@@ -937,7 +980,7 @@ var confirmSubmittedTransaction = /* @__PURE__ */ __name(async (viewer, txHash,
 }, "confirmSubmittedTransaction");
 
 // src/transaction/hydrateTransaction.ts
-import { assertEx as assertEx9 } from "@xylabs/sdk-js";
+import { assertEx as assertEx10 } from "@xylabs/sdk-js";
 import { hydrateTypedBoundWitness, tryHydrateTypedBoundWitness } from "@xyo-network/archivist-model";
 import { isAllowedBlockPayload as isAllowedBlockPayload2, isSignedTransactionBoundWitnessWithStorageMeta } from "@xyo-network/xl1-protocol";
 var tryHydrateTransaction = /* @__PURE__ */ __name(async ({ chainMap }, hash) => {
@@ -996,7 +1039,7 @@ var tryHydrateElevatedTransaction = /* @__PURE__ */ __name(async ({ chainMap },
   return void 0;
 }, "tryHydrateElevatedTransaction");
 var hydrateElevatedTransaction = /* @__PURE__ */ __name(async (context, hash) => {
-  return assertEx9(await tryHydrateElevatedTransaction(context, hash), () => "Hydration failed");
+  return assertEx10(await tryHydrateElevatedTransaction(context, hash), () => "Hydration failed");
 }, "hydrateElevatedTransaction");
 
 // src/transaction/primitives/transactionBlockByteCount.ts
@@ -1062,7 +1105,7 @@ __name(transactionRequiredGas, "transactionRequiredGas");
 
 // src/transaction/script.ts
 import { asHash as asHash2 } from "@xylabs/sdk-js";
-import { assertEx as assertEx10, filterAs } from "@xylabs/sdk-js";
+import { assertEx as assertEx11, filterAs } from "@xylabs/sdk-js";
 import { isAllowedBlockPayloadWithHashMeta } from "@xyo-network/xl1-protocol";
 var tryExtractElevatedHashesFromScript = /* @__PURE__ */ __name((strings) => {
   const hashes = strings.filter((str) => str.startsWith("elevate|")).map((str) => str.split("|")[1]);
@@ -1071,7 +1114,7 @@ var tryExtractElevatedHashesFromScript = /* @__PURE__ */ __name((strings) => {
 var extractElevatedHashesFromScript = /* @__PURE__ */ __name((strings) => {
   const hashes = strings.filter((str) => str.startsWith("elevate|")).map((str) => str.split("|")[1]);
   const filtered = filterAs(hashes, (h) => asHash2(h));
-  assertEx10(filtered.length === hashes.length, () => "Invalid elevated hashes");
+  assertEx11(filtered.length === hashes.length, () => "Invalid elevated hashes");
   return filtered;
 }, "extractElevatedHashesFromScript");
 var tryExtractElevatedHashes = /* @__PURE__ */ __name((tx) => {
@@ -1085,15 +1128,15 @@ var extractElevatedHashes = /* @__PURE__ */ __name((tx) => {
   const { script } = bw;
   const hashes = script ? tryExtractElevatedHashesFromScript(script) : [];
   const filtered = payloads.filter((p) => hashes.includes(p._hash)).filter(isAllowedBlockPayloadWithHashMeta);
-  assertEx10(filtered.length === hashes.length, () => "Invalid elevated hashes");
+  assertEx11(filtered.length === hashes.length, () => "Invalid elevated hashes");
   return filtered;
 }, "extractElevatedHashes");
 
 // src/transaction/signTransaction.ts
-import { assertEx as assertEx11, hexFromArrayBuffer, toArrayBuffer } from "@xylabs/sdk-js";
+import { assertEx as assertEx12, hexFromArrayBuffer, toArrayBuffer } from "@xylabs/sdk-js";
 import { PayloadBuilder as PayloadBuilder8 } from "@xyo-network/payload-builder";
 async function signTransaction(tx, account) {
-  assertEx11(tx.from === account.address, () => "Signer address does not match transaction from address");
+  assertEx12(tx.from === account.address, () => "Signer address does not match transaction from address");
   const unsignedTx = structuredClone(tx);
   unsignedTx.addresses = [
     account.address
@@ -1882,7 +1925,7 @@ var isChainIndexingServiceStateWithStorageMeta = /* @__PURE__ */ __name((value)
 var asChainIndexingServiceStateWithStorageMeta = AsObjectFactory7.create(isChainIndexingServiceStateWithStorageMeta);
 
 // src/simple/accountBalance/SimpleAccountBalanceViewer.ts
-import { AbstractCreatable, assertEx as assertEx12, exists, isDefined as isDefined11 } from "@xylabs/sdk-js";
+import { AbstractCreatable, assertEx as assertEx13, exists, isDefined as isDefined11 } from "@xylabs/sdk-js";
 import { spanRootAsync as spanRootAsync4 } from "@xylabs/telemetry";
 import { asRange, asXL1BlockNumber as asXL1BlockNumber5, asXL1BlockRange as asXL1BlockRange5, AttoXL1 as AttoXL12, StepSizes as StepSizes9, TransferSchema } from "@xyo-network/xl1-protocol";
 var SimpleAccountBalanceViewer = class extends AbstractCreatable {
@@ -1895,13 +1938,13 @@ var SimpleAccountBalanceViewer = class extends AbstractCreatable {
   get context() {
     return this.params.context;
   }
-  get transferContext() {
-    return this.params.transferContext;
+  get transfersSummaryContext() {
+    return this.params.transfersSummaryContext;
   }
   static async paramsHandler(params) {
-    assertEx12(params.blockViewer, () => "blockViewer is required");
-    assertEx12(params.context, () => "context is required");
-    assertEx12(params.transferContext, () => "transferContext is required");
+    assertEx13(params.blockViewer, () => "blockViewer is required");
+    assertEx13(params.context, () => "context is required");
+    assertEx13(params.transfersSummaryContext, () => "transfersSummaryContext is required");
     return {
       ...await super.paramsHandler(params)
     };
@@ -1925,7 +1968,7 @@ var SimpleAccountBalanceViewer = class extends AbstractCreatable {
       const transferIndexes = block[0].payload_schemas.map((schema, index) => schema === TransferSchema ? index : void 0).filter(exists);
       const transfers = transferIndexes.map((index) => {
         const hash = block[0].payload_hashes[index];
-        return assertEx12(block[1].find((p) => p._hash === hash), () => `Error: Could not find Transfer with hash ${hash} in block ${block[0]._hash}`);
+        return assertEx13(block[1].find((p) => p._hash === hash), () => `Error: Could not find Transfer with hash ${hash} in block ${block[0]._hash}`);
       }).filter(exists).filter((t) => t.from === address || isDefined11(t.transfers[address]));
       if (transfers.length === 0) {
         continue;
@@ -1968,7 +2011,7 @@ var SimpleAccountBalanceViewer = class extends AbstractCreatable {
     const transferSummaryPairs = await Promise.all(frames.map(async (frame) => {
       return [
         frame,
-        await transfersStepSummaryFromRange(this.transferContext, frame)
+        await transfersStepSummaryFromRange(this.transfersSummaryContext, frame)
       ];
     }));
     const filteredTransferSummaryPairs = transferSummaryPairs.filter(([_, summary]) => Object.keys(summary.transfers).includes(address));
@@ -2001,13 +2044,158 @@ var SimpleAccountBalanceViewer = class extends AbstractCreatable {
   }
 };
 
+// src/simple/block/SimpleBlockViewer.ts
+import { AbstractCreatable as AbstractCreatable2, assertEx as assertEx14, spanRootAsync as spanRootAsync5 } from "@xylabs/sdk-js";
+import { asSignedHydratedBlockWithHashMeta, asXL1BlockNumber as asXL1BlockNumber6 } from "@xyo-network/xl1-protocol";
+
+// src/utils/HydratedCache.ts
+import { LRUCache as LRUCache2 } from "lru-cache";
+var HydratedCache = class {
+  static {
+    __name(this, "HydratedCache");
+  }
+  cache;
+  chainMap;
+  hydrateFunction;
+  constructor(chainMap, hydrateFunction, maxSize = 200) {
+    this.chainMap = chainMap;
+    this.hydrateFunction = hydrateFunction;
+    this.cache = new LRUCache2({
+      max: maxSize
+    });
+  }
+  async get(hash) {
+    const existing = this.cache.get(hash);
+    if (existing !== void 0) return existing;
+    const block = await this.hydrateFunction({
+      chainMap: this.chainMap
+    }, hash) ?? null;
+    if (block !== null) this.cache.set(hash, block);
+    return block;
+  }
+  has(hash) {
+    return this.cache.has(hash);
+  }
+};
+
+// src/utils/isZodError.ts
+import * as z20 from "zod";
+var isZodError = /* @__PURE__ */ __name((error) => {
+  return error instanceof z20.ZodError;
+}, "isZodError");
+var prettifyZodError = /* @__PURE__ */ __name((error) => {
+  return z20.prettifyError(error);
+}, "prettifyZodError");
+
+// src/simple/block/SimpleBlockViewer.ts
+var SimpleBlockViewer = class extends AbstractCreatable2 {
+  static {
+    __name(this, "SimpleBlockViewer");
+  }
+  _signedHydratedBlockCache;
+  get context() {
+    return this.params.context;
+  }
+  get finalizedArchivist() {
+    return this.params.finalizedArchivist;
+  }
+  static async paramsHandler(params) {
+    assertEx14(params.context, () => "context is required");
+    assertEx14(params.finalizedArchivist, () => "finalizedArchivist is required");
+    return {
+      ...await super.paramsHandler(params)
+    };
+  }
+  async blockByHash(hash) {
+    return await spanRootAsync5("blockByHash", async () => {
+      const cache = this.getHydratedBlockCache();
+      return await cache.get(hash);
+    }, this.tracer);
+  }
+  async blockByNumber(blockNumber) {
+    return await spanRootAsync5("blockByNumber", async () => {
+      return asSignedHydratedBlockWithHashMeta(await hydratedBlockByNumber(this.context, blockNumber)) ?? null;
+    }, this.tracer);
+  }
+  async blocksByHash(hash, limit = 50) {
+    return await spanRootAsync5("blocksByHash", async () => {
+      assertEx14(limit > 0, () => "limit must be greater than 0");
+      assertEx14(limit <= 100, () => "limit must be less than 100");
+      const blocks = [];
+      let current = await this.blockByHash(hash);
+      while (current && blocks.length < limit) {
+        blocks.push(current);
+        const previousHash = current[0].previous;
+        if (previousHash === null) break;
+        current = await this.blockByHash(previousHash);
+      }
+      return blocks.map((b) => asSignedHydratedBlockWithHashMeta(b, true));
+    }, this.tracer);
+  }
+  async blocksByNumber(blockNumber, limit = 50) {
+    return await spanRootAsync5("blocksByHash", async () => {
+      assertEx14(limit > 0, () => "limit must be greater than 0");
+      assertEx14(limit <= 100, () => "limit must be less than 100");
+      const blocks = [];
+      let current = await this.blockByNumber(blockNumber);
+      while (current && blocks.length < limit) {
+        blocks.push(current);
+        if (current[0].block === 0) break;
+        const previousNumber = asXL1BlockNumber6(current[0].block - 1, true);
+        current = await this.blockByNumber(previousNumber);
+      }
+      return blocks.map((b) => asSignedHydratedBlockWithHashMeta(b, true));
+    }, this.tracer);
+  }
+  async currentBlock() {
+    return await spanRootAsync5("currentBlock", async () => {
+      const currentHead = assertEx14(await this.getCurrentHead(), () => "Could not find most recent block");
+      const cache = this.getHydratedBlockCache();
+      const block = await cache.get(currentHead._hash);
+      if (!block) {
+        console.log(`Could not find current block with hash ${currentHead._hash}`);
+      }
+      return assertEx14(block, () => "Could not find current block");
+    }, this.tracer);
+  }
+  async currentBlockHash() {
+    return await spanRootAsync5("currentBlockHash", async () => {
+      const currentHead = assertEx14(await this.getCurrentHead(), () => "Could not find most recent block");
+      return currentHead._hash;
+    }, this.tracer);
+  }
+  async currentBlockNumber() {
+    return await spanRootAsync5("currentBlockNumber", async () => {
+      const currentHead = assertEx14(await this.getCurrentHead(), () => "Could not find most recent block");
+      return asXL1BlockNumber6(currentHead.block, {
+        name: "currentBlockNumber"
+      });
+    }, this.tracer);
+  }
+  async getCurrentHead() {
+    const chainArchivist = this.finalizedArchivist;
+    return await findMostRecentBlock(chainArchivist);
+  }
+  getHydratedBlockCache() {
+    if (this._signedHydratedBlockCache) return this._signedHydratedBlockCache;
+    const chainMap = this.context.store.chainMap;
+    this._signedHydratedBlockCache = new HydratedCache(chainMap, async ({ chainMap: chainMap2 }, hash, maxDepth, minDepth) => {
+      const result = await hydrateBlock({
+        chainMap: chainMap2
+      }, hash, maxDepth, minDepth);
+      return asSignedHydratedBlockWithHashMeta(result, true);
+    }, 200);
+    return this._signedHydratedBlockCache;
+  }
+};
+
 // src/simple/chainStake/SimpleChainStakeViewer.ts
 import { asAddress as asAddress5, toAddress as toAddress5 } from "@xylabs/sdk-js";
-import { AbstractCreatable as AbstractCreatable3, assertEx as assertEx13, creatable as creatable2 } from "@xylabs/sdk-js";
+import { AbstractCreatable as AbstractCreatable4, assertEx as assertEx15, creatable as creatable2 } from "@xylabs/sdk-js";
 import { Account } from "@xyo-network/account";
 
 // src/simple/chainStakeEvents/SimpleChainStakeEventsViewer.ts
-import { AbstractCreatable as AbstractCreatable2, creatable, isDefined as isDefined12 } from "@xylabs/sdk-js";
+import { AbstractCreatable as AbstractCreatable3, creatable, isDefined as isDefined12 } from "@xylabs/sdk-js";
 function _ts_decorate(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -2015,7 +2203,7 @@ function _ts_decorate(decorators, target, key, desc) {
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
 __name(_ts_decorate, "_ts_decorate");
-var SimpleChainStakeEventsViewer = class extends AbstractCreatable2 {
+var SimpleChainStakeEventsViewer = class extends AbstractCreatable3 {
   static {
     __name(this, "SimpleChainStakeEventsViewer");
   }
@@ -2099,14 +2287,14 @@ function _ts_decorate2(decorators, target, key, desc) {
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
 __name(_ts_decorate2, "_ts_decorate");
-var SimpleChainStakeViewer = class extends AbstractCreatable3 {
+var SimpleChainStakeViewer = class extends AbstractCreatable4 {
   static {
     __name(this, "SimpleChainStakeViewer");
   }
   _chainId;
   _chainStakeEventsViewer;
   get chainId() {
-    return assertEx13(this._chainId, () => "Chain ID not set");
+    return assertEx15(this._chainId, () => "Chain ID not set");
   }
   get chainMap() {
     return this.params.chainMap;
@@ -2118,7 +2306,7 @@ var SimpleChainStakeViewer = class extends AbstractCreatable3 {
     return toAddress5(toAddress5(1n));
   }
   get stakeEvents() {
-    return assertEx13(this._chainStakeEventsViewer, () => "Stake events viewer not set");
+    return assertEx15(this._chainStakeEventsViewer, () => "Stake events viewer not set");
   }
   get stakingTokenAddress() {
     return toAddress5("0x000000000000000000000000000011");
@@ -2172,7 +2360,7 @@ var SimpleChainStakeViewer = class extends AbstractCreatable3 {
     return pending;
   }
   stakeById(id) {
-    return assertEx13(this.positions[id], () => new Error(`Stake with id ${id} not found`));
+    return assertEx15(this.positions[id], () => new Error(`Stake with id ${id} not found`));
   }
   stakeByStaker(staker, slot) {
     return this.positions.filter((s) => asAddress5(s.staker) === asAddress5(staker))[slot];
@@ -2339,9 +2527,9 @@ var SimpleXyoGateway = class {
 };
 
 // src/simple/gateway/SimpleXyoGatewayRunner.ts
-import { assertEx as assertEx14, BigIntToJsonZod, isDefined as isDefined13 } from "@xylabs/sdk-js";
+import { assertEx as assertEx16, BigIntToJsonZod, isDefined as isDefined13 } from "@xylabs/sdk-js";
 import { PayloadBuilder as PayloadBuilder12 } from "@xyo-network/payload-builder";
-import { asXL1BlockNumber as asXL1BlockNumber6, TransferSchema as TransferSchema2 } from "@xyo-network/xl1-protocol";
+import { asXL1BlockNumber as asXL1BlockNumber7, TransferSchema as TransferSchema2 } from "@xyo-network/xl1-protocol";
 var SimpleXyoGatewayRunner = class {
   static {
     __name(this, "SimpleXyoGatewayRunner");
@@ -2370,18 +2558,18 @@ var SimpleXyoGatewayRunner = class {
     return this._dataLakes.length - 1;
   }
   async addPayloadsToChain(onChain, offChain, options) {
-    const viewer = assertEx14(this.connectionInstance.viewer, () => "No viewer available on connection");
+    const viewer = assertEx16(this.connectionInstance.viewer, () => "No viewer available on connection");
     const { nbf, exp, chain, fees } = options ?? {};
     const resolvedChainId = isDefined13(chain) ? chain : await viewer.chainId();
-    const resolvedNbf = asXL1BlockNumber6(isDefined13(nbf) ? nbf : await viewer.currentBlockNumber(), true);
-    const resolvedExp = asXL1BlockNumber6(isDefined13(exp) ? exp : resolvedNbf + 10, true);
+    const resolvedNbf = asXL1BlockNumber7(isDefined13(nbf) ? nbf : await viewer.currentBlockNumber(), true);
+    const resolvedExp = asXL1BlockNumber7(isDefined13(exp) ? exp : resolvedNbf + 10, true);
     const tx = await buildUnsignedTransaction(resolvedChainId, onChain, offChain, resolvedNbf, resolvedExp, await (await this.signer()).address(), fees);
     return await this.addTransactionToChain(tx);
   }
   async addTransactionToChain(tx) {
     const connection = this.connectionInstance;
     const signer = this.signerInstance;
-    const runner = assertEx14(connection.runner, () => "No runner available on connection");
+    const runner = assertEx16(connection.runner, () => "No runner available on connection");
     const signedTx = await signer.signTransaction(tx);
     await this.addPayloadsToDataLakes(signedTx[1]);
     return [
@@ -2393,7 +2581,7 @@ var SimpleXyoGatewayRunner = class {
     ];
   }
   async confirmSubmittedTransaction(txHash, options) {
-    return await confirmSubmittedTransaction(assertEx14(this.connectionInstance.viewer, () => "Connection viewer is undefined"), txHash, options);
+    return await confirmSubmittedTransaction(assertEx16(this.connectionInstance.viewer, () => "Connection viewer is undefined"), txHash, options);
   }
   /** @deprecated use connectionInstance instead */
   connection() {
@@ -2511,7 +2699,7 @@ var SimpleXyoNetwork = class {
 };
 
 // src/simple/permissions/SimpleXyoPermissions.ts
-import { assertEx as assertEx15 } from "@xylabs/sdk-js";
+import { assertEx as assertEx17 } from "@xylabs/sdk-js";
 var SimpleXyoPermissions = class {
   static {
     __name(this, "SimpleXyoPermissions");
@@ -2523,7 +2711,7 @@ var SimpleXyoPermissions = class {
     this.invoker = store.invoker;
   }
   get store() {
-    return assertEx15(this._store, () => "Store must be defined to get permissions");
+    return assertEx17(this._store, () => "Store must be defined to get permissions");
   }
   async getPermissions() {
     return await this.store.getPermissions();
@@ -2581,7 +2769,7 @@ var SimpleXyoPermissions = class {
 };
 
 // src/simple/permissions/store/MemoryPermissions.ts
-import { assertEx as assertEx16 } from "@xylabs/sdk-js";
+import { assertEx as assertEx18 } from "@xylabs/sdk-js";
 var MemoryPermissionsStore = class {
   static {
     __name(this, "MemoryPermissionsStore");
@@ -2592,7 +2780,7 @@ var MemoryPermissionsStore = class {
     this._invoker = invoker;
   }
   get invoker() {
-    return assertEx16(this._invoker, () => "Invoker must be defined to get permissions");
+    return assertEx18(this._invoker, () => "Invoker must be defined to get permissions");
   }
   async getPermissions() {
     await Promise.resolve();
@@ -2659,8 +2847,8 @@ var SimpleXyoSigner = class {
 };
 
 // src/simple/timesync/SimpleTimeSyncViewer.ts
-import { asHash as asHash5, assertEx as assertEx17, isDefined as isDefined14 } from "@xylabs/sdk-js";
-import { asTimePayload, asXL1BlockNumber as asXL1BlockNumber7, TimeSchema } from "@xyo-network/xl1-protocol";
+import { asHash as asHash5, assertEx as assertEx19, isDefined as isDefined14 } from "@xylabs/sdk-js";
+import { asTimePayload, asXL1BlockNumber as asXL1BlockNumber8, TimeSchema } from "@xyo-network/xl1-protocol";
 var SimpleTimeSyncViewer = class {
   static {
     __name(this, "SimpleTimeSyncViewer");
@@ -2674,7 +2862,7 @@ var SimpleTimeSyncViewer = class {
   async convertTime(fromDomain, toDomain, from) {
     switch (fromDomain) {
       case "xl1": {
-        const [block, payloads] = assertEx17(await this.blockViewer.blockByNumber(asXL1BlockNumber7(from, true)), () => "Block not found");
+        const [block, payloads] = assertEx19(await this.blockViewer.blockByNumber(asXL1BlockNumber8(from, true)), () => "Block not found");
         const timeSchemaIndex = block.payload_schemas.indexOf(TimeSchema);
         const hash = timeSchemaIndex === -1 ? void 0 : block.payload_hashes[timeSchemaIndex];
         const timePayload = asTimePayload(isDefined14(hash) ? payloads.find((p) => p._hash === hash) : void 0);
@@ -2740,10 +2928,10 @@ var SimpleTimeSyncViewer = class {
         ];
       }
       case "ethereum": {
-        const provider = assertEx17(this.ethProvider, () => "Ethereum provider not configured");
+        const provider = assertEx19(this.ethProvider, () => "Ethereum provider not configured");
         const blockNumber = await provider.getBlockNumber() ?? 0;
         const block = await provider.getBlock(blockNumber);
-        const blockHash = asHash5(assertEx17(block?.hash, () => "Block hash not found"), true);
+        const blockHash = asHash5(assertEx19(block?.hash, () => "Block hash not found"), true);
         return [
           blockNumber,
           blockHash
@@ -2760,7 +2948,7 @@ var SimpleTimeSyncViewer = class {
 };
 
 // src/time/primitives/xl1BlockNumberToEthBlockNumber.ts
-import { assertEx as assertEx18 } from "@xylabs/sdk-js";
+import { assertEx as assertEx20 } from "@xylabs/sdk-js";
 import { asTimePayload as asTimePayload2, TimeSchema as TimeSchema2 } from "@xyo-network/xl1-protocol";
 async function xl1BlockNumberToEthBlockNumber(context, xl1BlockNumber) {
   const blockHash = await hashFromBlockNumber(context, xl1BlockNumber);
@@ -2768,19 +2956,10 @@ async function xl1BlockNumberToEthBlockNumber(context, xl1BlockNumber) {
   const timePayload = asTimePayload2(hydratedBlock[1].find((p) => p.schema === TimeSchema2), {
     required: true
   });
-  return assertEx18(timePayload.ethereum, () => "No ethereum timestamp found on block");
+  return assertEx20(timePayload.ethereum, () => "No ethereum timestamp found on block");
 }
 __name(xl1BlockNumberToEthBlockNumber, "xl1BlockNumberToEthBlockNumber");
 
-// src/utils/isZodError.ts
-import * as z20 from "zod";
-var isZodError = /* @__PURE__ */ __name((error) => {
-  return error instanceof z20.ZodError;
-}, "isZodError");
-var prettifyZodError = /* @__PURE__ */ __name((error) => {
-  return z20.prettifyError(error);
-}, "prettifyZodError");
-
 // src/viewers/AccountBalance.ts
 import { WithHashMetaZod } from "@xyo-network/payload-model";
 import { TransferZod } from "@xyo-network/xl1-protocol";
@@ -2855,6 +3034,7 @@ export {
   GlobalMetaSchema,
   HydratedBlockStateValidationError,
   HydratedBlockValidationError,
+  HydratedCache,
   JSONSchemaMetaSchema,
   LruCacheMap,
   MemoryMap,
@@ -2864,6 +3044,7 @@ export {
   RewardMultipliers,
   SchemasStepSummarySchema,
   SimpleAccountBalanceViewer,
+  SimpleBlockViewer,
   SimpleChainStakeViewer,
   SimpleDataLakeRunner,
   SimpleDataLakeViewer,
@@ -2922,6 +3103,7 @@ export {
   elevatedPayloads,
   extractElevatedHashes,
   extractElevatedHashesFromScript,
+  findMostRecentBlock,
   flattenHydratedBlock,
   flattenHydratedBlocks,
   flattenHydratedTransaction,
@@ -2934,6 +3116,7 @@ export {
   hydrateBlock,
   hydrateElevatedTransaction,
   hydrateTransaction,
+  hydratedBlockByNumber,
   hydratedTransactionToPayloadBundle,
   isAddressPairPayload,
   isBalancesStepSummary,