@xyo-network/chain-wrappers 1.19.5 → 1.19.7

package/dist/neutral/block/HydratedBlock.d.ts

@@ -8,7 +8,7 @@ export declare class HydratedBlockWrapper<T extends HydratedBlockWithHashMeta> i
     protected transactionsCache: HydratedTransactionInstance[];
     private _parseErrors;
     private _signatureCache;
-    protected constructor(context: BaseContext, data: [WithHashMeta<T[0]>, WithHashMeta<T[1][number]>[]]);
+    protected constructor(data: [WithHashMeta<T[0]>, WithHashMeta<T[1][number]>[]], context?: BaseContext);
     get block(): import("@xyo-network/xl1-sdk").XL1BlockNumber;
     get boundWitness(): WithHashMeta<T[0]>;
     get chain(): Hex;
@@ -21,7 +21,7 @@ export declare class HydratedBlockWrapper<T extends HydratedBlockWithHashMeta> i
     get stepHashes(): Hash[];
     get transactionCount(): number;
     get transactions(): HydratedTransactionInstance[];
-    static parse<T extends HydratedBlockWithHashMeta>(context: BaseContext, block: T, validate?: boolean): Promise<HydratedBlockInstance>;
+    static parse<T extends HydratedBlockWithHashMeta>(block: T, validate?: boolean): Promise<HydratedBlockInstance>;
     payload(index: number): WithHashMeta<T[1][number]> | undefined;
     signature(index: number): SignatureInstance | undefined;
     transaction(index: number): HydratedTransactionInstance | undefined;

package/dist/neutral/block/HydratedBlock.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"HydratedBlock.d.ts","sourceRoot":"","sources":["../../../src/block/HydratedBlock.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAA;AAI/C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAA;AAC9D,OAAO,KAAK,EACV,oBAAoB,EACpB,WAAW,EACX,qBAAqB,EAAE,yBAAyB,EAAE,2BAA2B,EAAE,iBAAiB,EAEjG,MAAM,sBAAsB,CAAA;AAe7B,qBAAa,oBAAoB,CAAC,CAAC,SAAS,yBAAyB,CAAE,YAAW,qBAAqB,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC;IACzJ,IAAI,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAA;IACxD,SAAS,CAAC,gBAAgB,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,CAAK;IAC7D,SAAS,CAAC,OAAO,EAAE,WAAW,CAAA;IAC9B,SAAS,CAAC,iBAAiB,EAAE,2BAA2B,EAAE,CAAK;IAC/D,OAAO,CAAC,YAAY,CAAc;IAClC,OAAO,CAAC,eAAe,CAA0B;IAEjD,SAAS,aAAa,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC;IAKpG,IAAI,KAAK,kDAER;IAED,IAAI,YAAY,uBAEf;IAED,IAAI,KAAK,IAAI,GAAG,CAEf;IAED,IAAI,WAAW,YAEd;IAED,IAAI,YAAY,IAAI,MAAM,CAEzB;IAED,IAAI,QAAQ,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,CAE7B;IAED,IAAI,MAAM,IAAI,MAAM,CAOnB;IAED,IAAI,cAAc,IAAI,MAAM,CAE3B;IAED,IAAI,UAAU,IAAI,iBAAiB,EAAE,CAEpC;IAED,IAAI,UAAU,IAAI,IAAI,EAAE,CAEvB;IAED,IAAI,gBAAgB,IAAI,MAAM,CAE7B;IAED,IAAI,YAAY,IAAI,2BAA2B,EAAE,CAEhD;WAEY,KAAK,CAAC,CAAC,SAAS,yBAAyB,EAAE,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,UAAQ,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAKzI,OAAO,CAAC,KAAK,EAAE,MAAM;IAIrB,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,iBAAiB,GAAG,SAAS;IAIvD,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,2BAA2B,GAAG,SAAS;IAI7D,QAAQ,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;IAI5B,aAAa,CAAC,QAAQ,EAAE;QAAE,cAAc,EAAE,oBAAoB,CAAA;KAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;cAIzE,KAAK,CAAC,QAAQ,UAAQ,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;CAkB5H"}
+{"version":3,"file":"HydratedBlock.d.ts","sourceRoot":"","sources":["../../../src/block/HydratedBlock.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAA;AAI/C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAA;AAC9D,OAAO,KAAK,EACV,oBAAoB,EACpB,WAAW,EACX,qBAAqB,EAAE,yBAAyB,EAAE,2BAA2B,EAAE,iBAAiB,EAEjG,MAAM,sBAAsB,CAAA;AAe7B,qBAAa,oBAAoB,CAAC,CAAC,SAAS,yBAAyB,CAAE,YAAW,qBAAqB,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC;IACzJ,IAAI,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAA;IACxD,SAAS,CAAC,gBAAgB,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,CAAK;IAC7D,SAAS,CAAC,OAAO,EAAE,WAAW,CAAA;IAC9B,SAAS,CAAC,iBAAiB,EAAE,2BAA2B,EAAE,CAAK;IAC/D,OAAO,CAAC,YAAY,CAAc;IAClC,OAAO,CAAC,eAAe,CAA0B;IAEjD,SAAS,aAAa,IAAI,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,EAAE,WAAW;IAKrG,IAAI,KAAK,kDAER;IAED,IAAI,YAAY,uBAEf;IAED,IAAI,KAAK,IAAI,GAAG,CAEf;IAED,IAAI,WAAW,YAEd;IAED,IAAI,YAAY,IAAI,MAAM,CAEzB;IAED,IAAI,QAAQ,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,CAE7B;IAED,IAAI,MAAM,IAAI,MAAM,CAOnB;IAED,IAAI,cAAc,IAAI,MAAM,CAE3B;IAED,IAAI,UAAU,IAAI,iBAAiB,EAAE,CAEpC;IAED,IAAI,UAAU,IAAI,IAAI,EAAE,CAEvB;IAED,IAAI,gBAAgB,IAAI,MAAM,CAE7B;IAED,IAAI,YAAY,IAAI,2BAA2B,EAAE,CAEhD;WAEY,KAAK,CAAC,CAAC,SAAS,yBAAyB,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,UAAQ,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAKnH,OAAO,CAAC,KAAK,EAAE,MAAM;IAIrB,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,iBAAiB,GAAG,SAAS;IAIvD,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,2BAA2B,GAAG,SAAS;IAI7D,QAAQ,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;IAI5B,aAAa,CAAC,QAAQ,EAAE;QAAE,cAAc,EAAE,oBAAoB,CAAA;KAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;cAMzE,KAAK,CAAC,QAAQ,UAAQ,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;CAkB5H"}

package/dist/neutral/block/index.d.ts

@@ -1,3 +1,2 @@
 export * from './HydratedBlock.ts';
-export * from './IndexedHydratedBlockRangeStore.ts';
 //# sourceMappingURL=index.d.ts.map

package/dist/neutral/block/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/block/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAA;AAClC,cAAc,qCAAqC,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/block/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAA"}

package/dist/neutral/index.mjs

@@ -23,9 +23,11 @@ var HydratedBlockWrapper = class _HydratedBlockWrapper {
   transactionsCache = [];
   _parseErrors = [];
   _signatureCache = [];
-  constructor(context, data) {
+  constructor(data, context) {
     this.data = data;
-    this.context = context;
+    this.context = context ?? {
+      singletons: {}
+    };
   }
   get block() {
     return this.data[0].block;
@@ -67,8 +69,8 @@ var HydratedBlockWrapper = class _HydratedBlockWrapper {
   get transactions() {
     return this.transactionsCache;
   }
-  static async parse(context, block, validate = false) {
-    const wrapper = new _HydratedBlockWrapper(context, block);
+  static async parse(block, validate = false) {
+    const wrapper = new _HydratedBlockWrapper(block);
     return await wrapper.parse(validate);
   }
   payload(index) {
@@ -84,7 +86,11 @@ var HydratedBlockWrapper = class _HydratedBlockWrapper {
     return await validateHydratedBlock(this.context, this.data);
   }
   async validateState(services) {
-    return await validateHydratedBlockState(this.context, this.data, () => this.chain, services);
+    return await validateHydratedBlockState({
+      ...this.context,
+      chainIdAtBlockNumber: /* @__PURE__ */ __name(() => this.chain, "chainIdAtBlockNumber"),
+      ...services
+    }, this.data);
   }
   async parse(validate = false) {
     const allPayloads = await PayloadBuilder.addStorageMeta(this.data[1]);
@@ -107,163 +113,9 @@ var HydratedBlockWrapper = class _HydratedBlockWrapper {
   }
 };
 
-// src/block/IndexedHydratedBlockRangeStore.ts
-import { assertEx, BaseEmitter, exists, isDefined } from "@xylabs/sdk-js";
-import { asBlockBoundWitness, asBlockBoundWitnessWithStorageMeta, hydrateBlock, readPayloadMapFromStore } from "@xyo-network/xl1-sdk";
-import { Semaphore } from "async-mutex";
-var BlockNumberIndexSemaphoreLocks = 10;
-var IndexedHydratedBlockRangeStore = class _IndexedHydratedBlockRangeStore extends BaseEmitter {
-  static {
-    __name(this, "IndexedHydratedBlockRangeStore");
-  }
-  _blockNumberIndex = /* @__PURE__ */ new Map();
-  _blockNumberIndexSemaphore = new Semaphore(BlockNumberIndexSemaphoreLocks);
-  _firstNumber;
-  _lastNumber;
-  constructor(params, firstNumber, lastNumber) {
-    super(params);
-    this._firstNumber = firstNumber;
-    this._lastNumber = lastNumber;
-  }
-  get count() {
-    return this._lastNumber - this._firstNumber + 1;
-  }
-  get numberRange() {
-    return [
-      this._firstNumber,
-      this._lastNumber
-    ];
-  }
-  get range() {
-    return [
-      this.params.first,
-      this.params.last
-    ];
-  }
-  static async create(params) {
-    const firstBlock = asBlockBoundWitness((await params.sourceArchivist.get([
-      params.first
-    ])).at(0) ?? (await params.snapshotArchivist.get([
-      params.first
-    ])).at(0));
-    const firstBlockExisting = assertEx(firstBlock, () => "First block not found");
-    const lastBlock = asBlockBoundWitness((await params.sourceArchivist.get([
-      params.last
-    ])).at(0) ?? (await params.snapshotArchivist.get([
-      params.last
-    ])).at(0));
-    const lastBlockExisting = assertEx(lastBlock, () => "Last block not found");
-    const result = new _IndexedHydratedBlockRangeStore(params, firstBlockExisting.block, lastBlockExisting.block);
-    result.createSubscriptions();
-    await result.index();
-    return result;
-  }
-  async first() {
-    return assertEx(await this.fromHash(this.params.first), () => "First block not found");
-  }
-  async fromHash(hash) {
-    const chainMap = readPayloadMapFromStore(this.params.sourceArchivist);
-    const snapshotMap = readPayloadMapFromStore(this.params.snapshotArchivist);
-    const block = await hydrateBlock({
-      chainMap
-    }, hash) ?? await hydrateBlock({
-      chainMap: snapshotMap
-    }, hash);
-    if (isDefined(block) && block[0].block <= this._lastNumber && block[0].block >= this._firstNumber) {
-      return block;
-    }
-  }
-  fromNumber(number) {
-    const hash = this._blockNumberIndex.get(number);
-    if (isDefined(hash)) {
-      return this.fromHash(hash);
-    }
-  }
-  async last() {
-    return assertEx(await this.fromHash(this.params.last), () => "Last block not found");
-  }
-  async next(from, count) {
-    const nextBlockNumber = from[0].block + 1;
-    if (nextBlockNumber > this._lastNumber) {
-      return isDefined(count) ? [] : void 0;
-    }
-    if (isDefined(count)) {
-      if (count === 0) {
-        return [];
-      }
-      const nextBlock = await this.fromNumber(nextBlockNumber);
-      if (isDefined(nextBlock)) {
-        return [
-          nextBlock,
-          ...await this.next(nextBlock, count - 1)
-        ].filter(exists);
-      } else {
-        if (from[0].block < this._lastNumber) {
-          throw new Error(`Next block [${nextBlockNumber}] not found, but should be in range`);
-        }
-        return [];
-      }
-    } else {
-      return await this.fromNumber(nextBlockNumber);
-    }
-  }
-  async prev(from, count) {
-    const prevBlockNumber = from[0].block - 1;
-    if (prevBlockNumber < this._firstNumber) {
-      return isDefined(count) ? [] : void 0;
-    }
-    if (isDefined(count)) {
-      if (count === 0) {
-        return [];
-      }
-      const prevBlock = await this.fromNumber(prevBlockNumber);
-      if (isDefined(prevBlock)) {
-        return [
-          ...await this.next(prevBlock, count - 1),
-          prevBlock
-        ].filter(exists);
-      } else {
-        if (from[0].block > this._firstNumber) {
-          throw new Error(`Prev block [${prevBlockNumber}] not found, but should be in range`);
-        }
-        return [];
-      }
-    } else {
-      return await this.fromNumber(prevBlockNumber);
-    }
-  }
-  createSubscriptions() {
-    this.params.sourceArchivist.on("deleted", async ({ payloads }) => {
-      await this.params.snapshotArchivist.insert(payloads);
-    });
-  }
-  async index() {
-    await this._blockNumberIndexSemaphore.acquire(BlockNumberIndexSemaphoreLocks);
-    try {
-      this._blockNumberIndex.clear();
-      let blockToIndex = this.params.last;
-      let firstFound = false;
-      while (!firstFound) {
-        const payload = assertEx((await this.params.sourceArchivist.get([
-          blockToIndex
-        ])).at(0), () => "Block payload not found");
-        const block = assertEx(asBlockBoundWitnessWithStorageMeta(payload), () => "Payload is not a Block");
-        if (block.block < this._firstNumber || block.block > this._lastNumber) {
-          throw new Error(`Block [${block.block}] is out of range`);
-        }
-        this._blockNumberIndex.set(block.block, block._hash);
-        firstFound = block.block === this._firstNumber;
-      }
-    } finally {
-      this._blockNumberIndexSemaphore.release(BlockNumberIndexSemaphoreLocks);
-    }
-  }
-};
-
 // src/index.ts
 export * from "@xyo-network/xl1-sdk";
 export {
-  HydratedBlockWrapper,
-  IndexedHydratedBlockRangeStore
+  HydratedBlockWrapper
 };
 //# sourceMappingURL=index.mjs.map

package/dist/neutral/index.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/block/HydratedBlock.ts","../../src/block/IndexedHydratedBlockRangeStore.ts","../../src/index.ts"],"sourcesContent":["import type { Hash, Hex } from '@xylabs/sdk-js'\nimport { hexToBigInt } from '@xylabs/sdk-js'\nimport { validateHydratedBlock, validateHydratedBlockState } from '@xyo-network/chain-validation'\nimport { PayloadBuilder } from '@xyo-network/payload-builder'\nimport type { WithHashMeta } from '@xyo-network/payload-model'\nimport type {\n  AccountBalanceViewer,\n  BaseContext,\n  HydratedBlockInstance, HydratedBlockWithHashMeta, HydratedTransactionInstance, SignatureInstance,\n  SignedHydratedTransactionWithStorageMeta, Transfer,\n} from '@xyo-network/xl1-sdk'\nimport {\n  createSignatureWrappers, HydratedTransactionWrapper,\n  isSignedTransactionBoundWitnessWithStorageMeta,\n  isTransfer, XYO_ZERO_ADDRESS,\n} from '@xyo-network/xl1-sdk'\n\nconst sumTransfers = (payload: Transfer) => {\n  let total = 0n\n  for (let i of Object.values(payload.transfers)) {\n    total += hexToBigInt(i ?? '00' as Hex)\n  }\n  return total\n}\n\nexport class HydratedBlockWrapper<T extends HydratedBlockWithHashMeta> implements HydratedBlockInstance<[WithHashMeta<T[0]>, WithHashMeta<T[1][number]>[]]> {\n  data: [WithHashMeta<T[0]>, WithHashMeta<T[1][number]>[]]\n  protected allPayloadsCache: WithHashMeta<T[1][number]>[] = []\n  protected context: BaseContext\n  protected transactionsCache: HydratedTransactionInstance[] = []\n  private _parseErrors: Error[] = []\n  private _signatureCache: SignatureInstance[] = []\n\n  protected constructor(context: BaseContext, data: [WithHashMeta<T[0]>, WithHashMeta<T[1][number]>[]]) {\n    this.data = data\n    this.context = context\n  }\n\n  get block() {\n    return this.data[0].block\n  }\n\n  get boundWitness() {\n    return this.data[0]\n  }\n\n  get chain(): Hex {\n    return this.data[0].chain\n  }\n\n  get parseErrors() {\n    return this._parseErrors\n  }\n\n  get payloadCount(): number {\n    return this.allPayloadsCache.length\n  }\n\n  get payloads(): T[1][number][] {\n    return [...this.allPayloadsCache]\n  }\n\n  get reward(): bigint {\n    return this.allPayloadsCache.reduce((acc: bigint, payload) => acc + (\n      isTransfer(payload)\n        ? payload.from === XYO_ZERO_ADDRESS\n          ? sumTransfers(payload)\n          : 0n\n        : 0n), 0n)\n  }\n\n  get signatureCount(): number {\n    return this._signatureCache.length\n  }\n\n  get signatures(): SignatureInstance[] {\n    return [...this._signatureCache]\n  }\n\n  get stepHashes(): Hash[] {\n    return this.data[0].step_hashes ?? []\n  }\n\n  get transactionCount(): number {\n    return this.transactionsCache.length\n  }\n\n  get transactions(): HydratedTransactionInstance[] {\n    return this.transactionsCache\n  }\n\n  static async parse<T extends HydratedBlockWithHashMeta>(context: BaseContext, block: T, validate = false): Promise<HydratedBlockInstance> {\n    const wrapper = new HydratedBlockWrapper(context, block)\n    return await wrapper.parse(validate)\n  }\n\n  payload(index: number) {\n    return this.data[1].at(index)\n  }\n\n  signature(index: number): SignatureInstance | undefined {\n    return this._signatureCache[index]\n  }\n\n  transaction(index: number): HydratedTransactionInstance | undefined {\n    return this.transactionsCache.at(index)\n  }\n\n  async validate(): Promise<Error[]> {\n    return await validateHydratedBlock(this.context, this.data)\n  }\n\n  async validateState(services: { accountBalance: AccountBalanceViewer }): Promise<Error[]> {\n    return await validateHydratedBlockState(this.context, this.data, () => this.chain, services)\n  }\n\n  protected async parse(validate = false): Promise<HydratedBlockInstance<[WithHashMeta<T[0]>, WithHashMeta<T[1][number]>[]]>> {\n    const allPayloads = await PayloadBuilder.addStorageMeta(this.data[1])\n    for (const payload of allPayloads) {\n      if (isSignedTransactionBoundWitnessWithStorageMeta(payload)) {\n        const hydratedTransaction: SignedHydratedTransactionWithStorageMeta = [payload, allPayloads.filter(\n          p => payload.payload_hashes.includes(p._hash) || payload.payload_hashes.includes(p._dataHash),\n        )]\n        this.transactionsCache.push(await HydratedTransactionWrapper.parse(hydratedTransaction))\n      } else {\n        this.allPayloadsCache.push(payload)\n      }\n    }\n    this._signatureCache = await createSignatureWrappers(this.data[0])\n    if (validate) {\n      this._parseErrors = await this.validate()\n    }\n    return this\n  }\n}\n","import type {\n  BaseParams, EmptyObject, Hash, Promisable,\n} from '@xylabs/sdk-js'\nimport {\n  assertEx, BaseEmitter, exists, isDefined,\n} from '@xylabs/sdk-js'\nimport type { ArchivistInstance } from '@xyo-network/archivist-model'\nimport type { Payload, WithStorageMeta } from '@xyo-network/payload-model'\nimport {\n  asBlockBoundWitness, asBlockBoundWitnessWithStorageMeta, type BlockWindowInstance, hydrateBlock, type HydratedBlock,\n  readPayloadMapFromStore,\n} from '@xyo-network/xl1-sdk'\nimport { Semaphore } from 'async-mutex'\n\nexport type HydratedBlockStoreParams<TAdditionalParams extends EmptyObject = EmptyObject> = BaseParams<{\n  sourceArchivist: ArchivistInstance\n} & TAdditionalParams>\n\nexport interface HydratedBlockStoreInstance {\n  fromHash(hash: Hash): Promisable<HydratedBlock | undefined>\n}\n\nexport interface IndexedHydratedBlockStoreInstance extends HydratedBlockStoreInstance {\n  fromNumber(number: number): Promisable<HydratedBlock | undefined>\n}\n\nexport interface HydratedBlockRangeStoreParams extends HydratedBlockStoreParams<{\n  first: Hash\n  last: Hash\n  snapshotArchivist: ArchivistInstance\n}> {}\n\nexport interface IndexedHydratedBlockRangeStoreInstance extends BlockWindowInstance, IndexedHydratedBlockStoreInstance {\n  first(): Promisable<HydratedBlock>\n  last(): Promisable<HydratedBlock>\n  next(from: HydratedBlock): Promisable<HydratedBlock | undefined>\n  next(from: HydratedBlock, count: number): Promisable<HydratedBlock[]>\n  prev(from: HydratedBlock): Promisable<HydratedBlock | undefined>\n  prev(from: HydratedBlock, count: number): Promisable<HydratedBlock[]>\n}\n\nconst BlockNumberIndexSemaphoreLocks = 10 as const\n\n// TODO: Allow/Require source/snapshot archivist to be BlockStores instead\nexport class IndexedHydratedBlockRangeStore extends BaseEmitter<HydratedBlockRangeStoreParams> implements IndexedHydratedBlockRangeStoreInstance {\n  private _blockNumberIndex: Map<number, Hash> = new Map()\n  private _blockNumberIndexSemaphore = new Semaphore(BlockNumberIndexSemaphoreLocks)\n  private _firstNumber: number\n  private _lastNumber: number\n\n  protected constructor(params: HydratedBlockRangeStoreParams, firstNumber: number, lastNumber: number) {\n    super(params)\n    this._firstNumber = firstNumber\n    this._lastNumber = lastNumber\n  }\n\n  get count(): number {\n    return this._lastNumber - this._firstNumber + 1\n  }\n\n  get numberRange(): [number, number] {\n    return [this._firstNumber, this._lastNumber]\n  }\n\n  get range(): [Hash, Hash] {\n    return [this.params.first, this.params.last]\n  }\n\n  static async create(params: HydratedBlockRangeStoreParams): Promise<IndexedHydratedBlockRangeStore> {\n    const firstBlock = asBlockBoundWitness((await params.sourceArchivist.get([params.first])).at(0)\n      ?? (await params.snapshotArchivist.get([params.first])).at(0))\n    const firstBlockExisting = assertEx(firstBlock, () => 'First block not found')\n\n    const lastBlock = asBlockBoundWitness((await params.sourceArchivist.get([params.last])).at(0)\n      ?? (await params.snapshotArchivist.get([params.last])).at(0))\n    const lastBlockExisting = assertEx(lastBlock, () => 'Last block not found')\n\n    // getting the block numbers here since can not get them in the constructor\n    const result = new IndexedHydratedBlockRangeStore(params, firstBlockExisting.block, lastBlockExisting.block)\n    result.createSubscriptions()\n    await result.index()\n    return result\n  }\n\n  async first(): Promise<HydratedBlock> {\n    return assertEx(await this.fromHash(this.params.first), () => 'First block not found')\n  }\n\n  async fromHash(hash: Hash): Promise<HydratedBlock | undefined> {\n    const chainMap = readPayloadMapFromStore<WithStorageMeta<Payload>>(this.params.sourceArchivist)\n    const snapshotMap = readPayloadMapFromStore<WithStorageMeta<Payload>>(this.params.snapshotArchivist)\n    const block = (await hydrateBlock({ chainMap }, hash))\n      ?? (await hydrateBlock({ chainMap: snapshotMap }, hash))\n    if (isDefined(block) && (block[0].block <= this._lastNumber && block[0].block >= this._firstNumber)) {\n      return block\n    }\n  }\n\n  fromNumber(number: number): Promisable<HydratedBlock | undefined> {\n    const hash = this._blockNumberIndex.get(number)\n    if (isDefined(hash)) {\n      return this.fromHash(hash)\n    }\n  }\n\n  async last(): Promise<HydratedBlock> {\n    return assertEx(await this.fromHash(this.params.last), () => 'Last block not found')\n  }\n\n  async next(from: HydratedBlock): Promise<HydratedBlock | undefined>\n  async next(from: HydratedBlock, count: number): Promise<HydratedBlock[]>\n  async next(from: HydratedBlock, count?: number): Promise<HydratedBlock | HydratedBlock[] | undefined> {\n    const nextBlockNumber = from[0].block + 1\n    if (nextBlockNumber > this._lastNumber) {\n      return isDefined(count) ? [] : undefined\n    }\n    if (isDefined(count)) {\n      if (count === 0) {\n        return []\n      }\n      const nextBlock = await this.fromNumber(nextBlockNumber)\n\n      if (isDefined(nextBlock)) {\n        return [nextBlock, ...await this.next(nextBlock, count - 1)].filter(exists)\n      } else {\n        if (from[0].block < this._lastNumber) {\n          throw new Error(`Next block [${nextBlockNumber}] not found, but should be in range`)\n        }\n        return []\n      }\n    } else {\n      return await this.fromNumber(nextBlockNumber)\n    }\n  }\n\n  async prev(from: HydratedBlock): Promise<HydratedBlock | undefined>\n  async prev(from: HydratedBlock, count: number): Promise<HydratedBlock[]>\n  async prev(from: HydratedBlock, count?: number): Promise<HydratedBlock | HydratedBlock[] | undefined> {\n    const prevBlockNumber = from[0].block - 1\n    if (prevBlockNumber < this._firstNumber) {\n      return isDefined(count) ? [] : undefined\n    }\n    if (isDefined(count)) {\n      if (count === 0) {\n        return []\n      }\n      const prevBlock = await this.fromNumber(prevBlockNumber)\n      if (isDefined(prevBlock)) {\n        return [...await this.next(prevBlock, count - 1), prevBlock].filter(exists)\n      } else {\n        if (from[0].block > this._firstNumber) {\n          throw new Error(`Prev block [${prevBlockNumber}] not found, but should be in range`)\n        }\n        return []\n      }\n    } else {\n      return await this.fromNumber(prevBlockNumber)\n    }\n  }\n\n  private createSubscriptions(): void {\n    // we monitor deletes so that we can keep them if we need them for the window\n    this.params.sourceArchivist.on('deleted', async ({ payloads }) => {\n      await this.params.snapshotArchivist.insert(payloads)\n    })\n  }\n\n  private async index() {\n    // get all the locks (make exclusive)\n    await this._blockNumberIndexSemaphore.acquire(BlockNumberIndexSemaphoreLocks)\n    try {\n      this._blockNumberIndex.clear()\n      let blockToIndex: Hash = this.params.last\n      let firstFound = false\n      while (!firstFound) {\n        const payload = assertEx((await this.params.sourceArchivist.get([blockToIndex])).at(0), () => 'Block payload not found')\n        const block = assertEx(asBlockBoundWitnessWithStorageMeta(payload), () => 'Payload is not a Block')\n        if (block.block < this._firstNumber || block.block > this._lastNumber) {\n          throw new Error(`Block [${block.block}] is out of range`)\n        }\n        this._blockNumberIndex.set(block.block, block._hash)\n        firstFound = block.block === this._firstNumber\n      }\n    } finally {\n      this._blockNumberIndexSemaphore.release(BlockNumberIndexSemaphoreLocks)\n    }\n  }\n}\n","export * from './block/index.ts'\nexport * from '@xyo-network/xl1-sdk'\n"],"mappings":"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","names":["hexToBigInt","validateHydratedBlock","validateHydratedBlockState","PayloadBuilder","createSignatureWrappers","HydratedTransactionWrapper","isSignedTransactionBoundWitnessWithStorageMeta","isTransfer","XYO_ZERO_ADDRESS","sumTransfers","payload","total","i","Object","values","transfers","hexToBigInt","HydratedBlockWrapper","data","allPayloadsCache","context","transactionsCache","_parseErrors","_signatureCache","block","boundWitness","chain","parseErrors","payloadCount","length","payloads","reward","reduce","acc","isTransfer","from","XYO_ZERO_ADDRESS","signatureCount","signatures","stepHashes","step_hashes","transactionCount","transactions","parse","validate","wrapper","index","at","signature","transaction","validateHydratedBlock","validateState","services","validateHydratedBlockState","allPayloads","PayloadBuilder","addStorageMeta","isSignedTransactionBoundWitnessWithStorageMeta","hydratedTransaction","filter","p","payload_hashes","includes","_hash","_dataHash","push","HydratedTransactionWrapper","createSignatureWrappers","assertEx","BaseEmitter","exists","isDefined","asBlockBoundWitness","asBlockBoundWitnessWithStorageMeta","hydrateBlock","readPayloadMapFromStore","Semaphore","BlockNumberIndexSemaphoreLocks","IndexedHydratedBlockRangeStore","BaseEmitter","_blockNumberIndex","Map","_blockNumberIndexSemaphore","Semaphore","_firstNumber","_lastNumber","params","firstNumber","lastNumber","count","numberRange","range","first","last","create","firstBlock","asBlockBoundWitness","sourceArchivist","get","at","snapshotArchivist","firstBlockExisting","assertEx","lastBlock","lastBlockExisting","result","block","createSubscriptions","index","fromHash","hash","chainMap","readPayloadMapFromStore","snapshotMap","hydrateBlock","isDefined","fromNumber","number","next","from","nextBlockNumber","undefined","nextBlock","filter","exists","Error","prev","prevBlockNumber","prevBlock","on","payloads","insert","acquire","clear","blockToIndex","firstFound","payload","asBlockBoundWitnessWithStorageMeta","set","_hash","release"]}
+{"version":3,"sources":["../../src/block/HydratedBlock.ts","../../src/index.ts"],"sourcesContent":["import type { Hash, Hex } from '@xylabs/sdk-js'\nimport { hexToBigInt } from '@xylabs/sdk-js'\nimport { validateHydratedBlock, validateHydratedBlockState } from '@xyo-network/chain-validation'\nimport { PayloadBuilder } from '@xyo-network/payload-builder'\nimport type { WithHashMeta } from '@xyo-network/payload-model'\nimport type {\n  AccountBalanceViewer,\n  BaseContext,\n  HydratedBlockInstance, HydratedBlockWithHashMeta, HydratedTransactionInstance, SignatureInstance,\n  SignedHydratedTransactionWithStorageMeta, Transfer,\n} from '@xyo-network/xl1-sdk'\nimport {\n  createSignatureWrappers, HydratedTransactionWrapper,\n  isSignedTransactionBoundWitnessWithStorageMeta,\n  isTransfer, XYO_ZERO_ADDRESS,\n} from '@xyo-network/xl1-sdk'\n\nconst sumTransfers = (payload: Transfer) => {\n  let total = 0n\n  for (let i of Object.values(payload.transfers)) {\n    total += hexToBigInt(i ?? '00' as Hex)\n  }\n  return total\n}\n\nexport class HydratedBlockWrapper<T extends HydratedBlockWithHashMeta> implements HydratedBlockInstance<[WithHashMeta<T[0]>, WithHashMeta<T[1][number]>[]]> {\n  data: [WithHashMeta<T[0]>, WithHashMeta<T[1][number]>[]]\n  protected allPayloadsCache: WithHashMeta<T[1][number]>[] = []\n  protected context: BaseContext\n  protected transactionsCache: HydratedTransactionInstance[] = []\n  private _parseErrors: Error[] = []\n  private _signatureCache: SignatureInstance[] = []\n\n  protected constructor(data: [WithHashMeta<T[0]>, WithHashMeta<T[1][number]>[]], context?: BaseContext) {\n    this.data = data\n    this.context = context ?? { singletons: {} }\n  }\n\n  get block() {\n    return this.data[0].block\n  }\n\n  get boundWitness() {\n    return this.data[0]\n  }\n\n  get chain(): Hex {\n    return this.data[0].chain\n  }\n\n  get parseErrors() {\n    return this._parseErrors\n  }\n\n  get payloadCount(): number {\n    return this.allPayloadsCache.length\n  }\n\n  get payloads(): T[1][number][] {\n    return [...this.allPayloadsCache]\n  }\n\n  get reward(): bigint {\n    return this.allPayloadsCache.reduce((acc: bigint, payload) => acc + (\n      isTransfer(payload)\n        ? payload.from === XYO_ZERO_ADDRESS\n          ? sumTransfers(payload)\n          : 0n\n        : 0n), 0n)\n  }\n\n  get signatureCount(): number {\n    return this._signatureCache.length\n  }\n\n  get signatures(): SignatureInstance[] {\n    return [...this._signatureCache]\n  }\n\n  get stepHashes(): Hash[] {\n    return this.data[0].step_hashes ?? []\n  }\n\n  get transactionCount(): number {\n    return this.transactionsCache.length\n  }\n\n  get transactions(): HydratedTransactionInstance[] {\n    return this.transactionsCache\n  }\n\n  static async parse<T extends HydratedBlockWithHashMeta>(block: T, validate = false): Promise<HydratedBlockInstance> {\n    const wrapper = new HydratedBlockWrapper(block)\n    return await wrapper.parse(validate)\n  }\n\n  payload(index: number) {\n    return this.data[1].at(index)\n  }\n\n  signature(index: number): SignatureInstance | undefined {\n    return this._signatureCache[index]\n  }\n\n  transaction(index: number): HydratedTransactionInstance | undefined {\n    return this.transactionsCache.at(index)\n  }\n\n  async validate(): Promise<Error[]> {\n    return await validateHydratedBlock(this.context, this.data)\n  }\n\n  async validateState(services: { accountBalance: AccountBalanceViewer }): Promise<Error[]> {\n    return await validateHydratedBlockState({\n      ...this.context, chainIdAtBlockNumber: () => this.chain, ...services,\n    }, this.data)\n  }\n\n  protected async parse(validate = false): Promise<HydratedBlockInstance<[WithHashMeta<T[0]>, WithHashMeta<T[1][number]>[]]>> {\n    const allPayloads = await PayloadBuilder.addStorageMeta(this.data[1])\n    for (const payload of allPayloads) {\n      if (isSignedTransactionBoundWitnessWithStorageMeta(payload)) {\n        const hydratedTransaction: SignedHydratedTransactionWithStorageMeta = [payload, allPayloads.filter(\n          p => payload.payload_hashes.includes(p._hash) || payload.payload_hashes.includes(p._dataHash),\n        )]\n        this.transactionsCache.push(await HydratedTransactionWrapper.parse(hydratedTransaction))\n      } else {\n        this.allPayloadsCache.push(payload)\n      }\n    }\n    this._signatureCache = await createSignatureWrappers(this.data[0])\n    if (validate) {\n      this._parseErrors = await this.validate()\n    }\n    return this\n  }\n}\n","export * from './block/index.ts'\nexport * from '@xyo-network/xl1-sdk'\n"],"mappings":"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","names":["hexToBigInt","validateHydratedBlock","validateHydratedBlockState","PayloadBuilder","createSignatureWrappers","HydratedTransactionWrapper","isSignedTransactionBoundWitnessWithStorageMeta","isTransfer","XYO_ZERO_ADDRESS","sumTransfers","payload","total","i","Object","values","transfers","hexToBigInt","HydratedBlockWrapper","data","allPayloadsCache","context","transactionsCache","_parseErrors","_signatureCache","singletons","block","boundWitness","chain","parseErrors","payloadCount","length","payloads","reward","reduce","acc","isTransfer","from","XYO_ZERO_ADDRESS","signatureCount","signatures","stepHashes","step_hashes","transactionCount","transactions","parse","validate","wrapper","index","at","signature","transaction","validateHydratedBlock","validateState","services","validateHydratedBlockState","chainIdAtBlockNumber","allPayloads","PayloadBuilder","addStorageMeta","isSignedTransactionBoundWitnessWithStorageMeta","hydratedTransaction","filter","p","payload_hashes","includes","_hash","_dataHash","push","HydratedTransactionWrapper","createSignatureWrappers"]}

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "http://json.schemastore.org/package.json",
   "name": "@xyo-network/chain-wrappers",
-  "version": "1.19.5",
+  "version": "1.19.7",
   "description": "XYO Layer One SDK Wrappers",
   "homepage": "https://xylabs.com",
   "bugs": {
@@ -39,16 +39,15 @@
     "!**/*.test.*"
   ],
   "dependencies": {
-    "@xylabs/sdk-js": "~5.0.64",
+    "@xylabs/sdk-js": "~5.0.65",
     "@xyo-network/archivist-model": "~5.3.2",
-    "@xyo-network/chain-validation": "~1.19.5",
+    "@xyo-network/chain-validation": "~1.19.7",
     "@xyo-network/payload-builder": "~5.3.2",
     "@xyo-network/payload-model": "~5.3.2",
-    "@xyo-network/xl1-sdk": "~1.21.10",
-    "async-mutex": "~0.5.0"
+    "@xyo-network/xl1-sdk": "~1.22.30"
   },
   "devDependencies": {
-    "@types/node": "~25.1.0",
+    "@types/node": "~25.2.1",
     "@xylabs/ts-scripts-yarn3": "~7.3.2",
     "@xylabs/tsconfig": "~7.3.2",
     "eslint": "^9.39.2",

package/src/block/HydratedBlock.ts

@@ -31,9 +31,9 @@ export class HydratedBlockWrapper<T extends HydratedBlockWithHashMeta> implement
   private _parseErrors: Error[] = []
   private _signatureCache: SignatureInstance[] = []
 
-  protected constructor(context: BaseContext, data: [WithHashMeta<T[0]>, WithHashMeta<T[1][number]>[]]) {
+  protected constructor(data: [WithHashMeta<T[0]>, WithHashMeta<T[1][number]>[]], context?: BaseContext) {
     this.data = data
-    this.context = context
+    this.context = context ?? { singletons: {} }
   }
 
   get block() {
@@ -89,8 +89,8 @@ export class HydratedBlockWrapper<T extends HydratedBlockWithHashMeta> implement
     return this.transactionsCache
   }
 
-  static async parse<T extends HydratedBlockWithHashMeta>(context: BaseContext, block: T, validate = false): Promise<HydratedBlockInstance> {
-    const wrapper = new HydratedBlockWrapper(context, block)
+  static async parse<T extends HydratedBlockWithHashMeta>(block: T, validate = false): Promise<HydratedBlockInstance> {
+    const wrapper = new HydratedBlockWrapper(block)
     return await wrapper.parse(validate)
   }
 
@@ -111,7 +111,9 @@ export class HydratedBlockWrapper<T extends HydratedBlockWithHashMeta> implement
   }
 
   async validateState(services: { accountBalance: AccountBalanceViewer }): Promise<Error[]> {
-    return await validateHydratedBlockState(this.context, this.data, () => this.chain, services)
+    return await validateHydratedBlockState({
+      ...this.context, chainIdAtBlockNumber: () => this.chain, ...services,
+    }, this.data)
   }
 
   protected async parse(validate = false): Promise<HydratedBlockInstance<[WithHashMeta<T[0]>, WithHashMeta<T[1][number]>[]]>> {

package/src/block/index.ts

@@ -1,2 +1 @@
 export * from './HydratedBlock.ts'
-export * from './IndexedHydratedBlockRangeStore.ts'

package/dist/neutral/block/IndexedHydratedBlockRangeStore.d.ts

@@ -1,49 +0,0 @@
-import type { BaseParams, EmptyObject, Hash, Promisable } from '@xylabs/sdk-js';
-import { BaseEmitter } from '@xylabs/sdk-js';
-import type { ArchivistInstance } from '@xyo-network/archivist-model';
-import { type BlockWindowInstance, type HydratedBlock } from '@xyo-network/xl1-sdk';
-export type HydratedBlockStoreParams<TAdditionalParams extends EmptyObject = EmptyObject> = BaseParams<{
-    sourceArchivist: ArchivistInstance;
-} & TAdditionalParams>;
-export interface HydratedBlockStoreInstance {
-    fromHash(hash: Hash): Promisable<HydratedBlock | undefined>;
-}
-export interface IndexedHydratedBlockStoreInstance extends HydratedBlockStoreInstance {
-    fromNumber(number: number): Promisable<HydratedBlock | undefined>;
-}
-export interface HydratedBlockRangeStoreParams extends HydratedBlockStoreParams<{
-    first: Hash;
-    last: Hash;
-    snapshotArchivist: ArchivistInstance;
-}> {
-}
-export interface IndexedHydratedBlockRangeStoreInstance extends BlockWindowInstance, IndexedHydratedBlockStoreInstance {
-    first(): Promisable<HydratedBlock>;
-    last(): Promisable<HydratedBlock>;
-    next(from: HydratedBlock): Promisable<HydratedBlock | undefined>;
-    next(from: HydratedBlock, count: number): Promisable<HydratedBlock[]>;
-    prev(from: HydratedBlock): Promisable<HydratedBlock | undefined>;
-    prev(from: HydratedBlock, count: number): Promisable<HydratedBlock[]>;
-}
-export declare class IndexedHydratedBlockRangeStore extends BaseEmitter<HydratedBlockRangeStoreParams> implements IndexedHydratedBlockRangeStoreInstance {
-    private _blockNumberIndex;
-    private _blockNumberIndexSemaphore;
-    private _firstNumber;
-    private _lastNumber;
-    protected constructor(params: HydratedBlockRangeStoreParams, firstNumber: number, lastNumber: number);
-    get count(): number;
-    get numberRange(): [number, number];
-    get range(): [Hash, Hash];
-    static create(params: HydratedBlockRangeStoreParams): Promise<IndexedHydratedBlockRangeStore>;
-    first(): Promise<HydratedBlock>;
-    fromHash(hash: Hash): Promise<HydratedBlock | undefined>;
-    fromNumber(number: number): Promisable<HydratedBlock | undefined>;
-    last(): Promise<HydratedBlock>;
-    next(from: HydratedBlock): Promise<HydratedBlock | undefined>;
-    next(from: HydratedBlock, count: number): Promise<HydratedBlock[]>;
-    prev(from: HydratedBlock): Promise<HydratedBlock | undefined>;
-    prev(from: HydratedBlock, count: number): Promise<HydratedBlock[]>;
-    private createSubscriptions;
-    private index;
-}
-//# sourceMappingURL=IndexedHydratedBlockRangeStore.d.ts.map

package/dist/neutral/block/IndexedHydratedBlockRangeStore.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"IndexedHydratedBlockRangeStore.d.ts","sourceRoot":"","sources":["../../../src/block/IndexedHydratedBlockRangeStore.ts"],"names":[],"mappings":"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"}

package/src/block/IndexedHydratedBlockRangeStore.ts

@@ -1,188 +0,0 @@
-import type {
-  BaseParams, EmptyObject, Hash, Promisable,
-} from '@xylabs/sdk-js'
-import {
-  assertEx, BaseEmitter, exists, isDefined,
-} from '@xylabs/sdk-js'
-import type { ArchivistInstance } from '@xyo-network/archivist-model'
-import type { Payload, WithStorageMeta } from '@xyo-network/payload-model'
-import {
-  asBlockBoundWitness, asBlockBoundWitnessWithStorageMeta, type BlockWindowInstance, hydrateBlock, type HydratedBlock,
-  readPayloadMapFromStore,
-} from '@xyo-network/xl1-sdk'
-import { Semaphore } from 'async-mutex'
-
-export type HydratedBlockStoreParams<TAdditionalParams extends EmptyObject = EmptyObject> = BaseParams<{
-  sourceArchivist: ArchivistInstance
-} & TAdditionalParams>
-
-export interface HydratedBlockStoreInstance {
-  fromHash(hash: Hash): Promisable<HydratedBlock | undefined>
-}
-
-export interface IndexedHydratedBlockStoreInstance extends HydratedBlockStoreInstance {
-  fromNumber(number: number): Promisable<HydratedBlock | undefined>
-}
-
-export interface HydratedBlockRangeStoreParams extends HydratedBlockStoreParams<{
-  first: Hash
-  last: Hash
-  snapshotArchivist: ArchivistInstance
-}> {}
-
-export interface IndexedHydratedBlockRangeStoreInstance extends BlockWindowInstance, IndexedHydratedBlockStoreInstance {
-  first(): Promisable<HydratedBlock>
-  last(): Promisable<HydratedBlock>
-  next(from: HydratedBlock): Promisable<HydratedBlock | undefined>
-  next(from: HydratedBlock, count: number): Promisable<HydratedBlock[]>
-  prev(from: HydratedBlock): Promisable<HydratedBlock | undefined>
-  prev(from: HydratedBlock, count: number): Promisable<HydratedBlock[]>
-}
-
-const BlockNumberIndexSemaphoreLocks = 10 as const
-
-// TODO: Allow/Require source/snapshot archivist to be BlockStores instead
-export class IndexedHydratedBlockRangeStore extends BaseEmitter<HydratedBlockRangeStoreParams> implements IndexedHydratedBlockRangeStoreInstance {
-  private _blockNumberIndex: Map<number, Hash> = new Map()
-  private _blockNumberIndexSemaphore = new Semaphore(BlockNumberIndexSemaphoreLocks)
-  private _firstNumber: number
-  private _lastNumber: number
-
-  protected constructor(params: HydratedBlockRangeStoreParams, firstNumber: number, lastNumber: number) {
-    super(params)
-    this._firstNumber = firstNumber
-    this._lastNumber = lastNumber
-  }
-
-  get count(): number {
-    return this._lastNumber - this._firstNumber + 1
-  }
-
-  get numberRange(): [number, number] {
-    return [this._firstNumber, this._lastNumber]
-  }
-
-  get range(): [Hash, Hash] {
-    return [this.params.first, this.params.last]
-  }
-
-  static async create(params: HydratedBlockRangeStoreParams): Promise<IndexedHydratedBlockRangeStore> {
-    const firstBlock = asBlockBoundWitness((await params.sourceArchivist.get([params.first])).at(0)
-      ?? (await params.snapshotArchivist.get([params.first])).at(0))
-    const firstBlockExisting = assertEx(firstBlock, () => 'First block not found')
-
-    const lastBlock = asBlockBoundWitness((await params.sourceArchivist.get([params.last])).at(0)
-      ?? (await params.snapshotArchivist.get([params.last])).at(0))
-    const lastBlockExisting = assertEx(lastBlock, () => 'Last block not found')
-
-    // getting the block numbers here since can not get them in the constructor
-    const result = new IndexedHydratedBlockRangeStore(params, firstBlockExisting.block, lastBlockExisting.block)
-    result.createSubscriptions()
-    await result.index()
-    return result
-  }
-
-  async first(): Promise<HydratedBlock> {
-    return assertEx(await this.fromHash(this.params.first), () => 'First block not found')
-  }
-
-  async fromHash(hash: Hash): Promise<HydratedBlock | undefined> {
-    const chainMap = readPayloadMapFromStore<WithStorageMeta<Payload>>(this.params.sourceArchivist)
-    const snapshotMap = readPayloadMapFromStore<WithStorageMeta<Payload>>(this.params.snapshotArchivist)
-    const block = (await hydrateBlock({ chainMap }, hash))
-      ?? (await hydrateBlock({ chainMap: snapshotMap }, hash))
-    if (isDefined(block) && (block[0].block <= this._lastNumber && block[0].block >= this._firstNumber)) {
-      return block
-    }
-  }
-
-  fromNumber(number: number): Promisable<HydratedBlock | undefined> {
-    const hash = this._blockNumberIndex.get(number)
-    if (isDefined(hash)) {
-      return this.fromHash(hash)
-    }
-  }
-
-  async last(): Promise<HydratedBlock> {
-    return assertEx(await this.fromHash(this.params.last), () => 'Last block not found')
-  }
-
-  async next(from: HydratedBlock): Promise<HydratedBlock | undefined>
-  async next(from: HydratedBlock, count: number): Promise<HydratedBlock[]>
-  async next(from: HydratedBlock, count?: number): Promise<HydratedBlock | HydratedBlock[] | undefined> {
-    const nextBlockNumber = from[0].block + 1
-    if (nextBlockNumber > this._lastNumber) {
-      return isDefined(count) ? [] : undefined
-    }
-    if (isDefined(count)) {
-      if (count === 0) {
-        return []
-      }
-      const nextBlock = await this.fromNumber(nextBlockNumber)
-
-      if (isDefined(nextBlock)) {
-        return [nextBlock, ...await this.next(nextBlock, count - 1)].filter(exists)
-      } else {
-        if (from[0].block < this._lastNumber) {
-          throw new Error(`Next block [${nextBlockNumber}] not found, but should be in range`)
-        }
-        return []
-      }
-    } else {
-      return await this.fromNumber(nextBlockNumber)
-    }
-  }
-
-  async prev(from: HydratedBlock): Promise<HydratedBlock | undefined>
-  async prev(from: HydratedBlock, count: number): Promise<HydratedBlock[]>
-  async prev(from: HydratedBlock, count?: number): Promise<HydratedBlock | HydratedBlock[] | undefined> {
-    const prevBlockNumber = from[0].block - 1
-    if (prevBlockNumber < this._firstNumber) {
-      return isDefined(count) ? [] : undefined
-    }
-    if (isDefined(count)) {
-      if (count === 0) {
-        return []
-      }
-      const prevBlock = await this.fromNumber(prevBlockNumber)
-      if (isDefined(prevBlock)) {
-        return [...await this.next(prevBlock, count - 1), prevBlock].filter(exists)
-      } else {
-        if (from[0].block > this._firstNumber) {
-          throw new Error(`Prev block [${prevBlockNumber}] not found, but should be in range`)
-        }
-        return []
-      }
-    } else {
-      return await this.fromNumber(prevBlockNumber)
-    }
-  }
-
-  private createSubscriptions(): void {
-    // we monitor deletes so that we can keep them if we need them for the window
-    this.params.sourceArchivist.on('deleted', async ({ payloads }) => {
-      await this.params.snapshotArchivist.insert(payloads)
-    })
-  }
-
-  private async index() {
-    // get all the locks (make exclusive)
-    await this._blockNumberIndexSemaphore.acquire(BlockNumberIndexSemaphoreLocks)
-    try {
-      this._blockNumberIndex.clear()
-      let blockToIndex: Hash = this.params.last
-      let firstFound = false
-      while (!firstFound) {
-        const payload = assertEx((await this.params.sourceArchivist.get([blockToIndex])).at(0), () => 'Block payload not found')
-        const block = assertEx(asBlockBoundWitnessWithStorageMeta(payload), () => 'Payload is not a Block')
-        if (block.block < this._firstNumber || block.block > this._lastNumber) {
-          throw new Error(`Block [${block.block}] is out of range`)
-        }
-        this._blockNumberIndex.set(block.block, block._hash)
-        firstFound = block.block === this._firstNumber
-      }
-    } finally {
-      this._blockNumberIndexSemaphore.release(BlockNumberIndexSemaphoreLocks)
-    }
-  }
-}