@xyo-network/chain-services 1.15.2 → 1.15.4

package/dist/neutral/index.mjs

@@ -2,10 +2,11 @@ var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 
 // src/AccountBalance/accountBalanceServiceFromArchivist.ts
-import { exists } from "@xylabs/exists";
-import { asHash, isHash } from "@xylabs/hex";
-import { PayloadBuilder } from "@xyo-network/payload-builder";
-import { LRUCache } from "lru-cache";
+import { ZERO_HASH } from "@xylabs/hex";
+import { LruCacheMap } from "@xyo-network/chain-protocol";
+import { StepSizes } from "@xyo-network/xl1-protocol";
+import { readPayloadMapFromStore } from "@xyo-network/xl1-protocol-sdk";
+import { Semaphore } from "async-mutex";
 
 // src/AccountBalance/BaseAccountBalanceService.ts
 import { creatable as creatable2 } from "@xylabs/creatable";
@@ -80,11 +81,7 @@ var BaseAccountBalanceService = class extends BaseService {
   }
   async balances(head, address) {
     return await spanRootAsync2("balances", async () => {
-      const summary = await balancesSummary({
-        chainArchivist: this.params.chainArchivist,
-        summaryRepository: this.params.summaryRepository,
-        head
-      });
+      const summary = await balancesSummary(this.params.context);
       const result = {};
       for (const addr of address) {
         const summaryBalance = summary[addr] ?? 0n;
@@ -99,46 +96,34 @@ BaseAccountBalanceService = _ts_decorate2([
 ], BaseAccountBalanceService);
 
 // src/AccountBalance/accountBalanceServiceFromArchivist.ts
-var accountBalanceServiceFromArchivist = /* @__PURE__ */ __name(async (archivist) => {
-  const summaryArchivistCache = new LRUCache({
+var accountBalancesServiceFromArchivist = /* @__PURE__ */ __name(async (chainId, archivist) => {
+  const summaryMap = new LruCacheMap({
     max: 1e5,
     allowStale: true,
     noDisposeOnSet: false,
     updateAgeOnGet: true
   });
-  const summaryRepository = {
-    get: /* @__PURE__ */ __name((hashes) => {
-      const results = hashes.map((hash) => {
-        return summaryArchivistCache.get(hash);
-      }).filter(exists);
-      return results;
-    }, "get"),
-    insert: /* @__PURE__ */ __name(async (payloads) => {
-      const results = (await PayloadBuilder.addStorageMeta(payloads)).map((payload) => {
-        const hash = asHash(payload.hash);
-        if (isHash(hash)) {
-          summaryArchivistCache.set(hash, payload);
-          return payload;
-        }
-      }).filter(exists);
-      return results;
-    }, "insert"),
-    next: /* @__PURE__ */ __name(() => {
-      throw new Error("Not implemented");
-    }, "next")
-  };
+  const chainMap = readPayloadMapFromStore(archivist);
   const service = await BaseAccountBalanceService.create({
-    chainArchivist: archivist,
-    summaryRepository
+    context: {
+      chainId,
+      store: {
+        chainMap
+      },
+      stepSemaphores: StepSizes.map(() => new Semaphore(20)),
+      summaryMap,
+      head: /* @__PURE__ */ __name(() => ZERO_HASH, "head")
+    }
   });
   return service;
-}, "accountBalanceServiceFromArchivist");
+}, "accountBalancesServiceFromArchivist");
 
 // src/AccountTransfers/accountTransfersServiceFromArchivist.ts
-import { exists as exists2 } from "@xylabs/exists";
-import { asHash as asHash2, isHash as isHash2 } from "@xylabs/hex";
-import { PayloadBuilder as PayloadBuilder2 } from "@xyo-network/payload-builder";
-import { LRUCache as LRUCache2 } from "lru-cache";
+import { ZERO_HASH as ZERO_HASH2 } from "@xylabs/hex";
+import { LruCacheMap as LruCacheMap2 } from "@xyo-network/chain-protocol";
+import { StepSizes as StepSizes2 } from "@xyo-network/xl1-protocol";
+import { readPayloadMapFromStore as readPayloadMapFromStore2 } from "@xyo-network/xl1-protocol-sdk";
+import { Semaphore as Semaphore2 } from "async-mutex";
 
 // src/AccountTransfers/BaseAccountTransfersService.ts
 import { creatable as creatable3 } from "@xylabs/creatable";
@@ -163,13 +148,7 @@ var BaseAccountTransfersService = class extends BaseService {
   }
   async transfers(head, addresses) {
     return await spanRootAsync3("transfers", async () => {
-      const { chainArchivist, summaryRepository, account } = this.params;
-      const summary = await transfersSummary({
-        chainArchivist,
-        summaryRepository,
-        head,
-        account
-      });
+      const summary = await transfersSummary(this.params.context);
       const result = {};
       for (const addr of addresses) {
         const summaryBalance = summary[addr] ?? 0n;
@@ -184,65 +163,51 @@ BaseAccountTransfersService = _ts_decorate3([
 ], BaseAccountTransfersService);
 
 // src/AccountTransfers/accountTransfersServiceFromArchivist.ts
-var accountTransferServiceFromArchivist = /* @__PURE__ */ __name(async (archivist, account) => {
-  const summaryArchivistCache = new LRUCache2({
+var accountTransfersServiceFromArchivist = /* @__PURE__ */ __name(async (chainId, archivist) => {
+  const summaryMap = new LruCacheMap2({
     max: 1e5,
     allowStale: true,
     noDisposeOnSet: false,
     updateAgeOnGet: true
   });
-  const summaryRepository = {
-    get: /* @__PURE__ */ __name((hashes) => {
-      const results = hashes.map((hash) => {
-        return summaryArchivistCache.get(hash);
-      }).filter(exists2);
-      return results;
-    }, "get"),
-    insert: /* @__PURE__ */ __name(async (payloads) => {
-      const results = (await PayloadBuilder2.addStorageMeta(payloads)).map((payload) => {
-        const hash = asHash2(payload.hash);
-        if (isHash2(hash)) {
-          summaryArchivistCache.set(hash, payload);
-          return payload;
-        }
-      }).filter(exists2);
-      return results;
-    }, "insert"),
-    next: /* @__PURE__ */ __name(() => {
-      throw new Error("Not implemented");
-    }, "next")
-  };
+  const chainMap = readPayloadMapFromStore2(archivist);
   const service = await BaseAccountTransfersService.create({
-    chainArchivist: archivist,
-    account,
-    summaryRepository
+    context: {
+      chainId,
+      store: {
+        chainMap
+      },
+      stepSemaphores: StepSizes2.map(() => new Semaphore2(20)),
+      summaryMap,
+      head: /* @__PURE__ */ __name(() => ZERO_HASH2, "head")
+    }
   });
   return service;
-}, "accountTransferServiceFromArchivist");
+}, "accountTransfersServiceFromArchivist");
 
 // src/BlockProducer/BaseBlockProducerService.ts
 import { assertEx as assertEx2 } from "@xylabs/assert";
 import { creatable as creatable4 } from "@xylabs/creatable";
-import { exists as exists3 } from "@xylabs/exists";
+import { exists } from "@xylabs/exists";
 import { hexToBigInt, toHex } from "@xylabs/hex";
 import { isDefined } from "@xylabs/typeof";
 import { FixedPercentageBlockRewardDiviner, FixedPercentageBlockRewardDivinerConfigSchema } from "@xyo-network/chain-modules";
 import { buildNextBlock, createDeclarationIntent } from "@xyo-network/chain-protocol";
-import { PayloadBuilder as PayloadBuilder4 } from "@xyo-network/payload-builder";
+import { PayloadBuilder as PayloadBuilder2 } from "@xyo-network/payload-builder";
 import { asBlockBoundWitness, AttoXL1 as AttoXL13, BlockNumberSchema, defaultRewardRatio, TimeSchema, XYO_STEP_REWARD_ADDRESS } from "@xyo-network/xl1-protocol";
 
 // src/BlockProducer/generateTransactionFeeTransfers.ts
 import { assertEx } from "@xylabs/assert";
 import { hexFromBigInt } from "@xylabs/hex";
-import { PayloadBuilder as PayloadBuilder3 } from "@xyo-network/payload-builder";
+import { PayloadBuilder } from "@xyo-network/payload-builder";
 import { TransferSchema, XYO_ZERO_ADDRESS } from "@xyo-network/xl1-protocol";
 import { transactionRequiredGas } from "@xyo-network/xl1-protocol-sdk";
 import { HydratedTransactionWrapper } from "@xyo-network/xl1-wrappers";
 async function generateTransactionFeeTransfers(address, transactions) {
   const txs = await Promise.all(transactions.map(async (tx) => {
     return HydratedTransactionWrapper.parse([
-      await PayloadBuilder3.addStorageMeta(tx[0]),
-      await PayloadBuilder3.addStorageMeta(tx[1])
+      await PayloadBuilder.addStorageMeta(tx[0]),
+      await PayloadBuilder.addStorageMeta(tx[1])
     ]);
   }));
   const txBaseFeeCosts = {};
@@ -369,7 +334,7 @@ var BaseBlockProducerService = class _BaseBlockProducerService extends BaseServi
       });
     }
     const blockHex = assertEx2(toHex(block), () => "Failed to convert block to hex");
-    const blockId = new PayloadBuilder4({
+    const blockId = new PayloadBuilder2({
       schema: BlockNumberSchema
     }).fields({
       block: blockHex
@@ -454,7 +419,7 @@ var BaseBlockProducerService = class _BaseBlockProducerService extends BaseServi
         fundedTransfers.push(transfer);
         return tx;
       }
-    }))).filter(exists3);
+    }))).filter(exists);
     this.logger?.info(`Filtered ${txs.length} transactions to ${fundedTransactions.length} funded transactions in ${Date.now() - start}ms`);
     return [
       fundedTransactions,
@@ -618,33 +583,31 @@ MemoryBlockRewardService = _ts_decorate7([
 // src/ChainBlockNumberIteration/ChainBlockNumberIterationService.ts
 import { assertEx as assertEx5 } from "@xylabs/assert";
 import { isDefined as isDefined2, isNull, isUndefined } from "@xylabs/typeof";
-import { PayloadBuilder as PayloadBuilder5 } from "@xyo-network/payload-builder";
+import { PayloadBuilder as PayloadBuilder3 } from "@xyo-network/payload-builder";
 import { asBlockBoundWitness as asBlockBoundWitness2, asBlockBoundWitnessWithStorageMeta, isBlockBoundWitnessWithHashStorageMeta } from "@xyo-network/xl1-protocol";
-import { LRUCache as LRUCache3 } from "lru-cache";
+import { LRUCache } from "lru-cache";
 var ChainBlockNumberIterationService = class extends BaseService {
   static {
     __name(this, "ChainBlockNumberIterationService");
   }
-  _blocksByBlockNumber = new LRUCache3({
+  _blocksByBlockNumber = new LRUCache({
     max: 1e4
   });
   _currentHead;
-  get chainArchivist() {
-    return assertEx5(this.params.chainArchivist);
-  }
   get chainId() {
     return assertEx5(this._currentHead?.chain ?? this.params?.head?.chain, () => "Current head is not set");
   }
+  get chainMap() {
+    return assertEx5(this.params.chainMap);
+  }
   async get(block) {
     const head = await this.head();
     assertEx5(head.block >= block, () => `Block requested is newer than the current head [${block}]`);
     const cached = this._blocksByBlockNumber.get(block);
     if (cached) return cached;
     const startingBlock = head;
-    const currentBlockHash = await PayloadBuilder5.hash(startingBlock);
-    let currentBlock = (await this.chainArchivist.get([
-      currentBlockHash
-    ])).at(0);
+    const currentBlockHash = await PayloadBuilder3.hash(startingBlock);
+    let currentBlock = await this.chainMap.get(currentBlockHash);
     while (isDefined2(currentBlock)) {
       assertEx5(asBlockBoundWitness2(currentBlock), () => `Expected hash to be a block bound witness [${currentBlock?._hash}]`);
       if (isBlockBoundWitnessWithHashStorageMeta(currentBlock)) {
@@ -654,9 +617,7 @@ var ChainBlockNumberIterationService = class extends BaseService {
         }
         const { previous } = currentBlock;
         if (isNull(previous)) break;
-        currentBlock = (await this.chainArchivist.get([
-          previous
-        ])).at(0);
+        currentBlock = await this.chainMap.get(previous);
       }
     }
     throw new Error(`Block not found: ${block}`);
@@ -680,17 +641,15 @@ var ChainBlockNumberIterationService = class extends BaseService {
   async previous(block = void 0, count = 1) {
     const results = [];
     let currentBlock = isDefined2(block) ? await this.get(block) : await this.head();
-    while (currentBlock && results.length < count) {
+    while (isDefined2(currentBlock) && results.length < count) {
       if (isBlockBoundWitnessWithHashStorageMeta(currentBlock)) {
         results.push(currentBlock);
         const { previous } = currentBlock;
         if (isNull(previous)) break;
-        const nextBlock = await this.chainArchivist.get([
-          previous
-        ]);
-        currentBlock = asBlockBoundWitnessWithStorageMeta(nextBlock[0]);
+        const nextBlock = await this.chainMap.get(previous);
+        currentBlock = asBlockBoundWitnessWithStorageMeta(nextBlock);
       } else {
-        const hash = PayloadBuilder5.hash(currentBlock);
+        const hash = PayloadBuilder3.hash(currentBlock);
         assertEx5(asBlockBoundWitnessWithStorageMeta(currentBlock), () => `Expected hash to be a block bound witness [${hash}]`);
       }
     }
@@ -706,10 +665,8 @@ var ChainBlockNumberIterationService = class extends BaseService {
     });
   }
   async getBoundWitnessAsBlockBoundWitnessWithStorageMeta(head) {
-    const hash = await PayloadBuilder5.hash(head);
-    const stored = (await this.chainArchivist.get([
-      hash
-    ])).at(-1);
+    const hash = await PayloadBuilder3.hash(head);
+    const stored = await this.chainMap.get(hash);
     const newHead = asBlockBoundWitnessWithStorageMeta(stored);
     if (isUndefined(newHead)) throw new Error(`Head block not found in archivist [${hash}]`);
     return newHead;
@@ -740,14 +697,14 @@ var EvmChainService = class extends BaseService {
   async active() {
     return await this.contract.active();
   }
-  async activeByAddressStaked(address) {
-    return await this.contract.activeByAddressStaked(getAddress(address));
+  async activeByStaked(staked) {
+    return await this.contract.activeByAddressStaked(getAddress(toEthAddress2(staked)));
   }
   async activeByStaker(address) {
-    return await this.contract.activeByStaker(getAddress(address));
+    return await this.contract.activeByStaker(getAddress(toEthAddress2(address)));
   }
   async addStake(staked, amount) {
-    const result = await this.contract.addStake(getAddress(staked), amount);
+    const result = await this.contract.addStake(getAddress(toEthAddress2(staked)), amount);
     await result.wait();
     return true;
   }
@@ -767,7 +724,7 @@ var EvmChainService = class extends BaseService {
     return await this.contract.pending();
   }
   async pendingByStaker(staker) {
-    return await this.contract.pendingByStaker(getAddress(staker));
+    return await this.contract.pendingByStaker(getAddress(toEthAddress2(staker)));
   }
   async removeStake(slot) {
     const result = await this.contract.removeStake(slot);
@@ -806,7 +763,7 @@ var MemoryChainService = class extends BaseService {
   async active() {
     return await Promise.resolve(this._simulatedStake);
   }
-  async activeByAddressStaked(_address) {
+  async activeByStaked(_staked) {
     return await Promise.resolve(this._simulatedStake);
   }
   async activeByStaker(_address) {
@@ -912,7 +869,7 @@ XyoValidator = _ts_decorate8([
 import { assertEx as assertEx8 } from "@xylabs/assert";
 import { creatable as creatable9 } from "@xylabs/creatable";
 import { hexToLast4BytesInt, shuffleWithSeed } from "@xyo-network/chain-utils";
-import { PayloadBuilder as PayloadBuilder6 } from "@xyo-network/payload-builder";
+import { PayloadBuilder as PayloadBuilder4 } from "@xyo-network/payload-builder";
 function _ts_decorate9(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);
@@ -937,7 +894,7 @@ var BaseElectionService = class extends BaseService {
     return await this.spanAsync("getCreatorCommitteeForNextBlock", async () => {
       const nextBlock = current.block + 1;
       const candidates = await this.stakeIntentService.getDeclaredCandidatesForBlock(nextBlock, "producer");
-      const previousBlockHash = await PayloadBuilder6.hash(current);
+      const previousBlockHash = await PayloadBuilder4.hash(current);
       return this.generateCreatorCommittee(candidates, previousBlockHash);
     });
   }
@@ -965,43 +922,49 @@ var BaseNetworkStakeStepRewardService = class extends BaseService {
   static {
     __name(this, "BaseNetworkStakeStepRewardService");
   }
-  claimedRewards(_address) {
+  networkStakeStepRewardAddressHistory(_address) {
     throw new Error("Method not implemented.");
   }
-  networkStakeStepAddressReward(_address, _step, _block) {
+  networkStakeStepRewardAddressReward(_context, _address) {
     throw new Error("Method not implemented.");
   }
-  networkStakeStepPoolRewardShares(_step, _block) {
+  networkStakeStepRewardAddressShare(_context, _address) {
     throw new Error("Method not implemented.");
   }
-  networkStakeStepPoolRewards(_step, _block) {
+  networkStakeStepRewardClaimedByAddress(_address) {
     throw new Error("Method not implemented.");
   }
-  networkStakeStepRewardAddressHistory(_address) {
+  networkStakeStepRewardForPosition(_position, _range) {
+    throw new Error("Method not implemented.");
+  }
+  networkStakeStepRewardForStep(_context) {
     throw new Error("Method not implemented.");
   }
-  networkStakeStepRewardAddressShare(_address, _step, _block) {
+  networkStakeStepRewardForStepForPosition(_context, _position) {
     throw new Error("Method not implemented.");
   }
-  networkStakeStepRewardForStep(_step) {
+  networkStakeStepRewardPoolRewards(_context) {
     throw new Error("Method not implemented.");
   }
-  networkStakeStepRewardPositionWeight(_position, _step) {
+  networkStakeStepRewardPoolShares(_context) {
     throw new Error("Method not implemented.");
   }
-  networkStakeStepRewardPotentialPositionLoss(_position, _step) {
+  networkStakeStepRewardPositionWeight(_context, _position) {
     throw new Error("Method not implemented.");
   }
-  networkStakeStepRewardRandomizer(_step, _block) {
+  networkStakeStepRewardPotentialPositionLoss(_context, _position) {
     throw new Error("Method not implemented.");
   }
-  networkStakeStepRewardStakerCount(_step, _block) {
+  networkStakeStepRewardRandomizer(_context) {
     throw new Error("Method not implemented.");
   }
-  networkStakeStepRewardWeightForAddress(_address, _step) {
+  networkStakeStepRewardStakerCount(_context) {
     throw new Error("Method not implemented.");
   }
-  unclaimedRewards(_address) {
+  networkStakeStepRewardUnclaimedByAddress(_address) {
+    throw new Error("Method not implemented.");
+  }
+  networkStakeStepRewardWeightForAddress(_context, _address) {
     throw new Error("Method not implemented.");
   }
 };
@@ -1014,7 +977,7 @@ import { ValueType } from "@opentelemetry/api";
 import { filterAs, filterAsync } from "@xylabs/array";
 import { assertEx as assertEx9 } from "@xylabs/assert";
 import { creatable as creatable11 } from "@xylabs/creatable";
-import { exists as exists4 } from "@xylabs/exists";
+import { exists as exists2 } from "@xylabs/exists";
 import { forget } from "@xylabs/forget";
 import { isDefined as isDefined3, isUndefined as isUndefined2 } from "@xylabs/typeof";
 import { MemoryArchivist } from "@xyo-network/archivist-memory";
@@ -1024,10 +987,10 @@ import { TransactionJsonSchemaValidator, validateTransaction } from "@xyo-networ
 import { Mutex as Mutex2 } from "async-mutex";
 
 // src/PendingTransactions/bundledPayloadToHydratedTransaction.ts
-import { PayloadBuilder as PayloadBuilder7 } from "@xyo-network/payload-builder";
+import { PayloadBuilder as PayloadBuilder5 } from "@xyo-network/payload-builder";
 import { asTransactionBoundWitnessWithStorageMeta } from "@xyo-network/xl1-protocol";
 var bundledPayloadToHydratedTransaction = /* @__PURE__ */ __name(async (payload) => {
-  const withStorageMeta = await PayloadBuilder7.addStorageMeta(payload.payloads);
+  const withStorageMeta = await PayloadBuilder5.addStorageMeta(payload.payloads);
   const tx = asTransactionBoundWitnessWithStorageMeta(withStorageMeta.find((p) => p._hash === payload.root));
   if (tx) {
     return [
@@ -1038,7 +1001,7 @@ var bundledPayloadToHydratedTransaction = /* @__PURE__ */ __name(async (payload)
 }, "bundledPayloadToHydratedTransaction");
 
 // src/PendingTransactions/hydratedTransactionToPayloadBundle.ts
-import { PayloadBuilder as PayloadBuilder8 } from "@xyo-network/payload-builder";
+import { PayloadBuilder as PayloadBuilder6 } from "@xyo-network/payload-builder";
 import { PayloadBundleSchema } from "@xyo-network/payload-model";
 import { flattenHydratedTransaction } from "@xyo-network/xl1-protocol-sdk";
 var hydratedTransactionToPayloadBundle = /* @__PURE__ */ __name((transaction) => {
@@ -1046,8 +1009,8 @@ var hydratedTransactionToPayloadBundle = /* @__PURE__ */ __name((transaction) =>
   return bundle(root, transaction);
 }, "hydratedTransactionToPayloadBundle");
 var bundle = /* @__PURE__ */ __name((root, transaction) => {
-  const payloads = flattenHydratedTransaction(transaction).flatMap((p) => PayloadBuilder8.omitStorageMeta(p));
-  return new PayloadBuilder8({
+  const payloads = flattenHydratedTransaction(transaction).flatMap((p) => PayloadBuilder6.omitStorageMeta(p));
+  return new PayloadBuilder6({
     schema: PayloadBundleSchema
   }).fields({
     payloads,
@@ -1169,7 +1132,7 @@ var BasePendingTransactionsService = class _BasePendingTransactionsService exten
           if (pendingBundledTransactions.length === 0) break;
           cursor = pendingBundledTransactions.at(-1)?._sequence;
           const undeletedTransactionBundles = pendingBundledTransactions.filter((tx) => !this._removablePendingTransactionHashes.has(tx.root));
-          const transactions = (await Promise.all(undeletedTransactionBundles.map((p) => bundledPayloadToHydratedTransaction(p)))).filter(exists4);
+          const transactions = (await Promise.all(undeletedTransactionBundles.map((p) => bundledPayloadToHydratedTransaction(p)))).filter(exists2);
           const activeTransactions = transactions.filter(isTransactionActive(lastHead.block + 1));
           foundPendingTransactions.push(...activeTransactions);
         }
@@ -1210,7 +1173,7 @@ var BasePendingTransactionsService = class _BasePendingTransactionsService exten
         const unprocessedTransactions = await this.filterAlreadyFinalizedTransactions(payloads);
         const hydratedUnprocessedTransactions = (await Promise.all(unprocessedTransactions.map(async (tx) => {
           return await bundledPayloadToHydratedTransaction(tx);
-        }))).filter(exists4);
+        }))).filter(exists2);
         const validTransactions = await filterAsync(hydratedUnprocessedTransactions, async (tx) => {
           const errors = await validateTransaction(tx, this.chainId, [
             TransactionJsonSchemaValidator
@@ -1257,14 +1220,14 @@ var BasePendingTransactionsService = class _BasePendingTransactionsService exten
         }
         cursor = pendingBundledTransactions.at(-1)?._sequence;
         const deletedTransactionBundles = pendingBundledTransactions.filter((tx) => this._removablePendingTransactionHashes.has(tx.root));
-        foundPendingTransactionsToDeleteHashes.push(...deletedTransactionBundles.map((tx) => tx._hash).filter(exists4));
+        foundPendingTransactionsToDeleteHashes.push(...deletedTransactionBundles.map((tx) => tx._hash).filter(exists2));
         const undeletedTransactionBundles = pendingBundledTransactions.filter((tx) => !this._removablePendingTransactionHashes.has(tx.root));
-        const transactions = (await Promise.all(undeletedTransactionBundles.map((p) => bundledPayloadToHydratedTransaction(p)))).filter(exists4);
+        const transactions = (await Promise.all(undeletedTransactionBundles.map((p) => bundledPayloadToHydratedTransaction(p)))).filter(exists2);
         const expiredTransactions = transactions.filter(isTransactionExpired(lastHead.block + 1));
         const expiredBundleHashes = expiredTransactions.map((expiredHydratedTx) => (
           // Find the corresponding payload bundle hash for the expired transaction
           pendingBundledTransactions.find((bundledTx) => bundledTx.root === expiredHydratedTx[0]._hash)?._hash
-        )).filter(exists4);
+        )).filter(exists2);
         foundPendingTransactionsToDeleteHashes.push(...expiredBundleHashes);
       }
       const deletedHashes = await this.pendingBundledTransactionsLocalArchivist.delete(foundPendingTransactionsToDeleteHashes);
@@ -1288,7 +1251,7 @@ var isTransactionActive = /* @__PURE__ */ __name((block) => ([txBw]) => txBw.nbf
 
 // src/StakeIntent/lib/getBlockSignedStakeDeclarations.ts
 import { filterAs as filterAs2 } from "@xylabs/array";
-import { exists as exists5 } from "@xylabs/exists";
+import { exists as exists3 } from "@xylabs/exists";
 import { asOptionalBoundWitness } from "@xyo-network/boundwitness-model";
 import { payloadSchemasContains } from "@xyo-network/boundwitness-validator";
 import { BoundWitnessWrapper } from "@xyo-network/boundwitness-wrapper";
@@ -1299,7 +1262,7 @@ var getBlockSignedStakeDeclarations = /* @__PURE__ */ __name(async (block, archi
   const bwsFromBlockWithDeclarations = bwsFromBlock.filter((bw) => payloadSchemasContains(bw, ChainStakeIntentSchema));
   const validBlockBwsWithDeclarations = await filterToValidSignedBoundWitnesses(bwsFromBlockWithDeclarations);
   return (await Promise.all(validBlockBwsWithDeclarations.map(async (bw) => {
-    const stakeIntentHashes = validBlockBwsWithDeclarations.flatMap(mapBoundWitnessToStakeIntentHashes).filter(exists5);
+    const stakeIntentHashes = validBlockBwsWithDeclarations.flatMap(mapBoundWitnessToStakeIntentHashes).filter(exists3);
     const payloads = await archivist.get(stakeIntentHashes);
     const stakeIntents = filterAs2(payloads, asChainStakeIntent).filter((p) => p.intent === intent).filter((p) => bw.addresses.includes(p.from));
     return stakeIntents;
@@ -1321,10 +1284,11 @@ import { asAddress } from "@xylabs/hex";
 import { isUndefined as isUndefined3 } from "@xylabs/typeof";
 import { analyzeChain, ChainStakeIntentAnalyzer, isChainSummaryStakeIntent } from "@xyo-network/chain-analyze";
 import { DEFAULT_FIND_FIRST_MATCHING_NEXT_OPTIONS, findFirstMatching, IntervalMap } from "@xyo-network/chain-utils";
-import { PayloadBuilder as PayloadBuilder9 } from "@xyo-network/payload-builder";
+import { PayloadBuilder as PayloadBuilder7 } from "@xyo-network/payload-builder";
 import { asBlockBoundWitness as asBlockBoundWitness3, asBlockBoundWitnessWithStorageMeta as asBlockBoundWitnessWithStorageMeta2, asChainIndexingServiceStateWithStorageMeta, asChainStakeIntent as asChainStakeIntent2, ChainIndexingServiceStateSchema, isChainIndexingServiceState } from "@xyo-network/xl1-protocol";
+import { readPayloadMapFromStore as readPayloadMapFromStore3 } from "@xyo-network/xl1-protocol-sdk";
 import { Mutex as Mutex3 } from "async-mutex";
-import { LRUCache as LRUCache4 } from "lru-cache";
+import { LRUCache as LRUCache2 } from "lru-cache";
 function _ts_decorate12(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);
@@ -1349,7 +1313,7 @@ var XyoStakeIntentService = class extends BaseService {
   // in performance for small sets, and (most importantly) easily
   // persisted so we can recover state on restart.
   _producers = new IntervalMap();
-  _stakeCache = new LRUCache4({
+  _stakeCache = new LRUCache2({
     max: STAKE_CACHE_MAX_ENTRIES
   });
   _updateMutex = new Mutex3();
@@ -1371,7 +1335,7 @@ var XyoStakeIntentService = class extends BaseService {
     });
     const head = await this.chainIterator.head();
     if (isUndefined3(head)) return;
-    const headHash = await PayloadBuilder9.hash(head);
+    const headHash = await PayloadBuilder7.hash(head);
     await this.recoverState(headHash);
   }
   async getDeclaredCandidateRanges(address, intent) {
@@ -1411,7 +1375,7 @@ var XyoStakeIntentService = class extends BaseService {
     const candidatesWithStake = await Promise.all(candidates.map(async (candidate) => {
       const stake = this._stakeCache.get(candidate);
       if (stake === void 0) {
-        const activeStake = await chainStakeViewer.activeByAddressStaked(`${candidate}`);
+        const activeStake = await chainStakeViewer.activeByStaked(candidate);
         if (activeStake > 0n) {
           this._stakeCache.set(candidate, activeStake, {
             ttl: ACTIVE_STAKE_TTL
@@ -1436,7 +1400,7 @@ var XyoStakeIntentService = class extends BaseService {
   }
   async persistState(current) {
     const state = this._producers.serialize();
-    const payload = new PayloadBuilder9({
+    const payload = new PayloadBuilder7({
       schema: ChainIndexingServiceStateSchema
     }).fields({
       endBlockHash: current,
@@ -1488,8 +1452,11 @@ var XyoStakeIntentService = class extends BaseService {
       return await this.spanAsync("updateIndex", async () => {
         const currentHead = await this.chainIterator.head();
         if (isUndefined3(currentHead)) return;
-        const currentHeadHash = await PayloadBuilder9.hash(currentHead);
-        const result = await analyzeChain(this.chainArchivist, [
+        const currentHeadHash = await PayloadBuilder7.hash(currentHead);
+        const chainMap = readPayloadMapFromStore3(this.chainArchivist);
+        const result = await analyzeChain({
+          chainMap
+        }, [
           new ChainStakeIntentAnalyzer("producer")
         ], currentHeadHash, this._lastIndexedBlockHash);
         const signedDeclarations = filterAs3(result.find(isChainSummaryStakeIntent)?.intents ?? [], asChainStakeIntent2);
@@ -1541,8 +1508,8 @@ BaseStepStakeService = _ts_decorate13([
 // src/Time/BaseTimeSyncService.ts
 import { assertEx as assertEx11 } from "@xylabs/assert";
 import { creatable as creatable14 } from "@xylabs/creatable";
-import { asHash as asHash3 } from "@xylabs/hex";
-import { PayloadBuilder as PayloadBuilder10 } from "@xyo-network/payload-builder";
+import { asHash } from "@xylabs/hex";
+import { PayloadBuilder as PayloadBuilder8 } from "@xyo-network/payload-builder";
 import { asTimePayload, TimeSchema as TimeSchema2 } from "@xyo-network/xl1-protocol";
 function _ts_decorate14(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
@@ -1626,7 +1593,7 @@ var BaseTimeSyncService = class extends BaseService {
         const head = await this.chainIterator.head();
         return [
           head.block,
-          await PayloadBuilder10.hash(head)
+          await PayloadBuilder8.hash(head)
         ];
       }
       case "epoch": {
@@ -1639,7 +1606,7 @@ var BaseTimeSyncService = class extends BaseService {
         const provider = assertEx11(this.ethProvider, () => "Ethereum provider not configured");
         const blockNumber = await provider.getBlockNumber() ?? 0;
         const block = await provider.getBlock(blockNumber);
-        const blockHash = asHash3(assertEx11(block?.hash, () => "Block hash not found"), true);
+        const blockHash = asHash(assertEx11(block?.hash, () => "Block hash not found"), true);
         return [
           blockNumber,
           blockHash
@@ -1679,8 +1646,8 @@ export {
   XYO_PRODUCER_REDECLARATION_WINDOW,
   XyoStakeIntentService,
   XyoValidator,
-  accountBalanceServiceFromArchivist,
-  accountTransferServiceFromArchivist,
+  accountBalancesServiceFromArchivist,
+  accountTransfersServiceFromArchivist,
   creatableService,
   getBlockSignedStakeDeclarations
 };