@xyo-network/chain-services 1.18.0 → 1.18.2

package/dist/neutral/index.mjs

@@ -3,8 +3,7 @@ var __name = (target, value) => __defProp(target, "name", { value, configurable:
 
 // src/AccountBalance/accountBalanceServiceFromArchivist.ts
 import { assertEx } from "@xylabs/sdk-js";
-import { StepSizes } from "@xyo-network/xl1-protocol";
-import { findMostRecentBlock, LruCacheMap, payloadMapFromStore, SimpleAccountBalanceViewer } from "@xyo-network/xl1-protocol-sdk";
+import { findMostRecentBlock, LruCacheMap, payloadMapFromStore, SimpleAccountBalanceViewer, StepSizes } from "@xyo-network/xl1-sdk";
 import { Semaphore } from "async-mutex";
 var accountBalancesViewerFromArchivist = /* @__PURE__ */ __name(async (context, chainId, archivist) => {
   const summaryMap = new LruCacheMap({
@@ -37,7 +36,8 @@ var accountBalancesViewerFromArchivist = /* @__PURE__ */ __name(async (context,
       stepSemaphores: StepSizes.map(() => new Semaphore(20)),
       summaryMap,
       head: headFunc,
-      singletons: context.singletons
+      singletons: context.singletons,
+      caches: context.caches
     },
     transfersSummaryContext: {
       chainId,
@@ -47,16 +47,17 @@ var accountBalancesViewerFromArchivist = /* @__PURE__ */ __name(async (context,
       stepSemaphores: StepSizes.map(() => new Semaphore(20)),
       summaryMap: transferSummaryMap,
       head: headFunc,
-      singletons: context.singletons
+      singletons: context.singletons,
+      caches: context.caches
     }
   });
   return service;
 }, "accountBalancesViewerFromArchivist");
 
-// src/BaseService.ts
-import { creatable } from "@xylabs/sdk-js";
-import { AbstractCreatableProvider } from "@xyo-network/xl1-protocol-sdk";
-import { Mutex } from "async-mutex";
+// src/BlockReward/EvmBlockRewardViewer.ts
+import { AbstractCreatable, assertEx as assertEx2, creatable, toEthAddress } from "@xylabs/sdk-js";
+import { IXyoChainRewards__factory } from "@xyo-network/typechain";
+import { asAttoXL1, BlockRewardViewerMoniker } from "@xyo-network/xl1-sdk";
 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);
@@ -64,48 +65,6 @@ function _ts_decorate(decorators, target, key, desc) {
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
 __name(_ts_decorate, "_ts_decorate");
-var BaseService = class extends AbstractCreatableProvider {
-  static {
-    __name(this, "BaseService");
-  }
-  static singletonInitMutex = new Mutex();
-  static get singletons() {
-    return globalThis["xyoServiceSingletons"] ?? (globalThis["xyoServiceSingletons"] = {});
-  }
-  static initSingleton(params) {
-    if (this.singletons[this.name]) throw new Error(`Singleton already initialized for ${this.name}`);
-    return this.singletonInitMutex.runExclusive(async () => {
-      return await this.create(params);
-    });
-  }
-};
-BaseService = _ts_decorate([
-  creatable()
-], BaseService);
-var BaseAccountableService = class extends BaseService {
-  static {
-    __name(this, "BaseAccountableService");
-  }
-};
-function creatableService() {
-  return (constructor) => {
-    constructor;
-  };
-}
-__name(creatableService, "creatableService");
-
-// src/BlockReward/EvmBlockRewardViewer.ts
-import { AbstractCreatable, assertEx as assertEx2, creatable as creatable2, toEthAddress } from "@xylabs/sdk-js";
-import { XyoChainRewards__factory as XyoChainRewardsFactory } from "@xyo-network/typechain";
-import { asAttoXL1 } from "@xyo-network/xl1-protocol";
-import { BlockRewardViewerMoniker } from "@xyo-network/xl1-protocol-sdk";
-function _ts_decorate2(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);
-  else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-  return c > 3 && r && Object.defineProperty(target, key, r), r;
-}
-__name(_ts_decorate2, "_ts_decorate");
 var EvmBlockRewardViewer = class _EvmBlockRewardViewer extends AbstractCreatable {
   static {
     __name(this, "EvmBlockRewardViewer");
@@ -126,7 +85,7 @@ var EvmBlockRewardViewer = class _EvmBlockRewardViewer extends AbstractCreatable
     return assertEx2(this.params.provider, () => "provider is required");
   }
   async allowedRewardForBlock(blockNumber) {
-    const contract = XyoChainRewardsFactory.connect(toEthAddress(this.contractAddress), this.provider);
+    const contract = IXyoChainRewards__factory.connect(toEthAddress(this.contractAddress), this.provider);
     return asAttoXL1(await contract.calcBlockReward(blockNumber));
   }
   async createHandler() {
@@ -139,15 +98,14 @@ var EvmBlockRewardViewer = class _EvmBlockRewardViewer extends AbstractCreatable
     }
   }
 };
-EvmBlockRewardViewer = _ts_decorate2([
-  creatable2()
+EvmBlockRewardViewer = _ts_decorate([
+  creatable()
 ], EvmBlockRewardViewer);
 
 // src/blockViewerFromChainIteratorAndArchivist.ts
 import { isDefined } from "@xylabs/sdk-js";
 import { PayloadBuilder } from "@xyo-network/payload-builder";
-import { asSignedBlockBoundWitness, asSignedBlockBoundWitnessWithStorageMeta } from "@xyo-network/xl1-protocol";
-import { BlockViewerMoniker } from "@xyo-network/xl1-protocol-sdk";
+import { asSignedBlockBoundWitness, asSignedBlockBoundWitnessWithStorageMeta, BlockViewerMoniker } from "@xyo-network/xl1-sdk";
 function blockViewerFromChainIteratorAndArchivist(chainIterator, chainArchivist) {
   const result = {
     blockByHash: /* @__PURE__ */ __name(async function(hash) {
@@ -225,176 +183,28 @@ function blockViewerFromChainIteratorAndArchivist(chainIterator, chainArchivist)
     }, "payloadByHash"),
     payloadsByHash: /* @__PURE__ */ __name(function(_hashes) {
       throw new Error("Function not implemented.");
-    }, "payloadsByHash")
+    }, "payloadsByHash"),
+    rate(..._args) {
+      throw new Error("Function not implemented.");
+    },
+    stepSizeRate(..._args) {
+      throw new Error("Function not implemented.");
+    },
+    timeDurationRate(..._args) {
+      throw new Error("Function not implemented.");
+    }
   };
   return result;
 }
 __name(blockViewerFromChainIteratorAndArchivist, "blockViewerFromChainIteratorAndArchivist");
 
-// src/ChainService/Evm/Evm.ts
-import { toAddress, toEthAddress as toEthAddress2 } from "@xylabs/sdk-js";
-import { ChainContractViewerMoniker } from "@xyo-network/xl1-protocol-sdk";
-import { getAddress } from "ethers/address";
-var EvmChainViewer = class _EvmChainViewer extends BaseService {
-  static {
-    __name(this, "EvmChainViewer");
-  }
-  static defaultMoniker = ChainContractViewerMoniker;
-  static monikers = [
-    ChainContractViewerMoniker
-  ];
-  moniker = _EvmChainViewer.defaultMoniker;
-  get contract() {
-    return this.params.contract;
-  }
-  async active() {
-    return await this.contract.active();
-  }
-  async activeByStaked(staked) {
-    return await this.contract.activeByAddressStaked(getAddress(toEthAddress2(staked)));
-  }
-  async activeByStaker(address) {
-    return await this.contract.activeByStaker(getAddress(toEthAddress2(address)));
-  }
-  async addStake(staked, amount) {
-    const result = await this.contract.addStake(getAddress(toEthAddress2(staked)), amount);
-    await result.wait();
-    return true;
-  }
-  async forkedAtBlockNumber() {
-    return await this.contract.forkedAtBlockNumber();
-  }
-  async forkedAtHash() {
-    return await this.contract.forkedAtHash();
-  }
-  async forkedChainId() {
-    return toAddress(await this.contract.forkedChainId());
-  }
-  async minWithdrawalBlocks() {
-    return await this.contract.minWithdrawalBlocks();
-  }
-  async pending() {
-    return await this.contract.pending();
-  }
-  async pendingByStaker(staker) {
-    return await this.contract.pendingByStaker(getAddress(toEthAddress2(staker)));
-  }
-  async removeStake(slot) {
-    const result = await this.contract.removeStake(slot);
-    await result.wait();
-    return true;
-  }
-  rewardForBlock(_block) {
-    throw new Error("Method not implemented.");
-  }
-  async rewardsContract() {
-    return await this.contract.rewardsContract();
-  }
-  async stakingTokenAddress() {
-    return await this.contract.stakingTokenAddress();
-  }
-  async withdrawStake(slot) {
-    const result = await this.contract.withdrawStake(slot);
-    await result.wait();
-    return true;
-  }
-  async withdrawn() {
-    return await this.contract.withdrawn();
-  }
-  async withdrawnByStaker(staker) {
-    return await this.contract.withdrawnByStaker(getAddress(staker));
-  }
-};
-
-// src/ChainService/Memory/Memory.ts
-import { toAddress as toAddress2, ZERO_ADDRESS } from "@xylabs/sdk-js";
-import { ChainContractViewerMoniker as ChainContractViewerMoniker2 } from "@xyo-network/xl1-protocol-sdk";
-var MemoryChainViewer = class _MemoryChainViewer extends BaseService {
-  static {
-    __name(this, "MemoryChainViewer");
-  }
-  static defaultMoniker = ChainContractViewerMoniker2;
-  static monikers = [
-    ChainContractViewerMoniker2
-  ];
-  moniker = _MemoryChainViewer.defaultMoniker;
-  _chainId;
-  _simulatedStake = 1n;
-  async active() {
-    return await Promise.resolve(this._simulatedStake);
-  }
-  async activeByStaked(_staked) {
-    return await Promise.resolve(this._simulatedStake);
-  }
-  async activeByStaker(_address) {
-    return await Promise.resolve(this._simulatedStake);
-  }
-  async addStake(_staked, _amount) {
-    return await Promise.resolve(true);
-  }
-  createHandler() {
-    const { minStake = 1 } = this.params.context.config.producer ?? {};
-    this._simulatedStake = BigInt(minStake);
-  }
-  async forkedAtBlockNumber() {
-    return await Promise.resolve(0n);
-  }
-  async forkedAtHash() {
-    return await Promise.resolve(0n);
-  }
-  async forkedChainId() {
-    return await Promise.resolve(ZERO_ADDRESS);
-  }
-  async minWithdrawalBlocks() {
-    return await Promise.resolve(1n);
-  }
-  async pending() {
-    return await Promise.resolve(0n);
-  }
-  async pendingByStaker(_staker) {
-    return await Promise.resolve(0n);
-  }
-  async removeStake(_slot) {
-    return await Promise.resolve(true);
-  }
-  rewardForBlock(_block) {
-    throw new Error("Method not implemented.");
-  }
-  async rewardsContract() {
-    return await Promise.resolve("");
-  }
-  async stakingTokenAddress() {
-    return await Promise.resolve("");
-  }
-  async withdrawStake(_slot) {
-    return await Promise.resolve(true);
-  }
-  async withdrawn() {
-    return await Promise.resolve(0n);
-  }
-  async withdrawnByStaker(_staker) {
-    return await Promise.resolve(0n);
-  }
-  async startHandler() {
-    await super.startHandler();
-    this._chainId = this.params.chainId ?? toAddress2(1n);
-  }
-};
-
 // src/ChainValidator/XyoValidator.ts
-import { creatable as creatable3 } from "@xylabs/sdk-js";
-import { BlockViewerMoniker as BlockViewerMoniker2 } from "@xyo-network/xl1-protocol-sdk";
-function _ts_decorate3(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);
-  else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-  return c > 3 && r && Object.defineProperty(target, key, r), r;
-}
-__name(_ts_decorate3, "_ts_decorate");
-var XyoValidator = class extends BaseService {
+import { AbstractCreatableProvider, BlockViewerMoniker as BlockViewerMoniker2 } from "@xyo-network/xl1-sdk";
+var XyoValidator = class extends AbstractCreatableProvider {
   static {
     __name(this, "XyoValidator");
   }
+  moniker = "Validator";
   _blockViewer;
   // get address() {
   //   return this.account.address
@@ -430,24 +240,28 @@ var XyoValidator = class extends BaseService {
     return await Promise.resolve(true);
   }
 };
-XyoValidator = _ts_decorate3([
-  creatable3()
-], XyoValidator);
 
 // src/Election/BaseElectionService.ts
-import { assertEx as assertEx3, creatable as creatable4 } from "@xylabs/sdk-js";
+import { assertEx as assertEx3 } from "@xylabs/sdk-js";
 import { hexToLast4BytesInt, shuffleWithSeed } from "@xyo-network/chain-utils";
-function _ts_decorate4(decorators, target, key, desc) {
+import { AbstractCreatableProvider as AbstractCreatableProvider2, creatableProvider } from "@xyo-network/xl1-sdk";
+function _ts_decorate2(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);
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-__name(_ts_decorate4, "_ts_decorate");
-var BaseElectionService = class extends BaseService {
+__name(_ts_decorate2, "_ts_decorate");
+var BaseElectionService = class _BaseElectionService extends AbstractCreatableProvider2 {
   static {
     __name(this, "BaseElectionService");
   }
+  static defaultMoniker = "Election";
+  static dependencies = [];
+  static monikers = [
+    "Election"
+  ];
+  moniker = _BaseElectionService.defaultMoniker;
   get blockViewer() {
     return assertEx3(this.params.blockViewer, () => "No block viewer");
   }
@@ -463,6 +277,8 @@ var BaseElectionService = class extends BaseService {
       const candidates = await this.stakeIntentService.getDeclaredCandidatesForBlock(nextBlock, "producer");
       const previousBlockHash = current._hash;
       return this.generateCreatorCommittee(candidates, previousBlockHash);
+    }, {
+      timeBudgetLimit: 200
     });
   }
   generateCreatorCommittee(candidates, previousBlockHash, maxSize = 3) {
@@ -472,17 +288,10 @@ var BaseElectionService = class extends BaseService {
     return creatorArray.slice(0, maxSize);
   }
 };
-BaseElectionService = _ts_decorate4([
-  creatable4()
+BaseElectionService = _ts_decorate2([
+  creatableProvider()
 ], BaseElectionService);
 
-// src/implementation/chain/index.ts
-import { assertEx as assertEx9 } from "@xylabs/sdk-js";
-
-// src/implementation/chain/evm.ts
-import { asAddress, assertEx as assertEx8, isDefined as isDefined5, ZERO_ADDRESS as ZERO_ADDRESS2 } from "@xylabs/sdk-js";
-import { Wallet } from "ethers/wallet";
-
 // src/implementation/evm/initEvmProvider.ts
 import { assertEx as assertEx7 } from "@xylabs/sdk-js";
 
@@ -563,69 +372,9 @@ var canUseEvmProvider = /* @__PURE__ */ __name(({ config }) => {
   return canUseInfuraProvider(config) || canUseJsonRpcProvider(config);
 }, "canUseEvmProvider");
 
-// src/implementation/chain/evm.ts
-var chainStakeServiceSingleton;
-var canUseEvmContractChainService = /* @__PURE__ */ __name((config) => {
-  const { id } = config.chain;
-  return isDefined5(id) && id !== ZERO_ADDRESS2 && canUseEvmProvider({
-    config
-  });
-}, "canUseEvmContractChainService");
-var initEvmContractChainService = /* @__PURE__ */ __name(async ({ account, context: { config }, traceProvider, meterProvider, logger }) => {
-  if (chainStakeServiceSingleton) return chainStakeServiceSingleton;
-  const emvStakingContractAddress = assertEx8(config.chain.id, () => "config.chain.id is required");
-  const id = assertEx8(asAddress(emvStakingContractAddress), () => "config.chain.id is not a valid address");
-  const provider2 = assertEx8(await initEvmProvider({
-    config
-  }));
-  const privateKey = assertEx8(account.private?.hex, () => "Account does not have a private key");
-  const runner = new Wallet(privateKey, provider2);
-  chainStakeServiceSingleton = EvmChainViewer.create({
-    id,
-    runner,
-    traceProvider,
-    meterProvider,
-    logger
-  });
-  const result = await chainStakeServiceSingleton;
-  await result.start();
-  return result;
-}, "initEvmContractChainService");
-
-// src/implementation/chain/index.ts
-var chainStakeServiceSingleton2;
-var initChainService = /* @__PURE__ */ __name(({ account, context }) => {
-  const { logger } = context;
-  logger?.log("ChainService: Initializing...");
-  const result = init({
-    context,
-    name: "ChainService",
-    account
-  });
-  logger?.log("ChainService: Initialized");
-  return result;
-}, "initChainService");
-var initMemoryChainService = /* @__PURE__ */ __name(async ({ context }) => {
-  const result = await MemoryChainViewer.create({
-    context,
-    name: "MemoryChainService"
-  });
-  assertEx9(await result.start(), () => "Failed to start MemoryChainService");
-  return result;
-}, "initMemoryChainService");
-var init = /* @__PURE__ */ __name(async (params) => {
-  if (chainStakeServiceSingleton2) return chainStakeServiceSingleton2;
-  const { config } = params.context;
-  chainStakeServiceSingleton2 = canUseEvmContractChainService(config) ? await initEvmContractChainService({
-    ...params,
-    name: "ChainStakeService"
-  }) : await initMemoryChainService(params);
-  return chainStakeServiceSingleton2;
-}, "init");
-
 // src/implementation/head/createBootstrapHead.ts
 import { buildNextBlock, createGenesisBlock } from "@xyo-network/chain-protocol";
-import { createDeclarationIntent } from "@xyo-network/xl1-protocol-sdk";
+import { createDeclarationIntent } from "@xyo-network/xl1-sdk";
 var createBootstrapHead = /* @__PURE__ */ __name(async (account, chainId, genesisBlockRewardAmount, genesisBlockRewardAddress) => {
   const chain = [];
   const genesisBlock = await createGenesisBlock(account, chainId, genesisBlockRewardAmount, genesisBlockRewardAddress);
@@ -641,20 +390,20 @@ var createBootstrapHead = /* @__PURE__ */ __name(async (account, chainId, genesi
 }, "createBootstrapHead");
 
 // src/NetworkStakeStepReward/BaseNetworkStakeStepRewardService.ts
-import { creatable as creatable5 } from "@xylabs/sdk-js";
-import { NetworkStakeStepRewardViewerMoniker } from "@xyo-network/xl1-protocol-sdk";
-function _ts_decorate5(decorators, target, key, desc) {
+import { AbstractCreatableProvider as AbstractCreatableProvider3, creatableProvider as creatableProvider2, NetworkStakeStepRewardViewerMoniker } from "@xyo-network/xl1-sdk";
+function _ts_decorate3(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);
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-__name(_ts_decorate5, "_ts_decorate");
-var BaseNetworkStakeStepRewardService = class _BaseNetworkStakeStepRewardService extends BaseService {
+__name(_ts_decorate3, "_ts_decorate");
+var BaseNetworkStakeStepRewardService = class _BaseNetworkStakeStepRewardService extends AbstractCreatableProvider3 {
   static {
     __name(this, "BaseNetworkStakeStepRewardService");
   }
   static defaultMoniker = NetworkStakeStepRewardViewerMoniker;
+  static dependencies = [];
   static monikers = [
     NetworkStakeStepRewardViewerMoniker
   ];
@@ -714,22 +463,20 @@ var BaseNetworkStakeStepRewardService = class _BaseNetworkStakeStepRewardService
     throw new Error("Method [networkStakeStepRewardsForStepLevel] not implemented.");
   }
 };
-BaseNetworkStakeStepRewardService = _ts_decorate5([
-  creatable5()
+BaseNetworkStakeStepRewardService = _ts_decorate3([
+  creatableProvider2()
 ], BaseNetworkStakeStepRewardService);
 
 // src/PendingTransactions/BasePendingTransactions.ts
 import { ValueType } from "@opentelemetry/api";
-import { assertEx as assertEx10, creatable as creatable6, exists, filterAs, filterAsync, forget, isDefined as isDefined6, isUndefined } from "@xylabs/sdk-js";
+import { assertEx as assertEx8, exists, filterAs, filterAsync, forget, isDefined as isDefined5, isUndefined } from "@xylabs/sdk-js";
 import { MemoryArchivist } from "@xyo-network/archivist-memory";
-import { asBlockBoundWitnessWithHashMeta, asXL1BlockNumber, isTransactionBoundWitnessWithStorageMeta } from "@xyo-network/xl1-protocol";
-import { findMostRecentBlock as findMostRecentBlock2, MempoolViewerMoniker } from "@xyo-network/xl1-protocol-sdk";
-import { TransactionJsonSchemaValidator, validateTransaction } from "@xyo-network/xl1-validation";
-import { Mutex as Mutex2 } from "async-mutex";
+import { AbstractCreatableProvider as AbstractCreatableProvider4, asBlockBoundWitnessWithHashMeta, asXL1BlockNumber, creatableProvider as creatableProvider3, findMostRecentBlock as findMostRecentBlock2, isTransactionBoundWitnessWithStorageMeta, MempoolViewerMoniker, TransactionJsonSchemaValidator, validateTransaction } from "@xyo-network/xl1-sdk";
+import { Mutex } from "async-mutex";
 
 // src/PendingTransactions/bundledPayloadToHydratedTransaction.ts
 import { PayloadBuilder as PayloadBuilder2 } from "@xyo-network/payload-builder";
-import { asSignedTransactionBoundWitnessWithHashMeta } from "@xyo-network/xl1-protocol";
+import { asSignedTransactionBoundWitnessWithHashMeta } from "@xyo-network/xl1-sdk";
 var bundledPayloadToHydratedTransaction = /* @__PURE__ */ __name(async (payload) => {
   const withHashMeta = await PayloadBuilder2.addHashMeta(payload.payloads);
   const tx = asSignedTransactionBoundWitnessWithHashMeta(withHashMeta.find((p) => p._hash === payload.root));
@@ -744,7 +491,7 @@ var bundledPayloadToHydratedTransaction = /* @__PURE__ */ __name(async (payload)
 // src/PendingTransactions/hydratedTransactionToPayloadBundle.ts
 import { PayloadBuilder as PayloadBuilder3 } from "@xyo-network/payload-builder";
 import { PayloadBundleSchema } from "@xyo-network/payload-model";
-import { flattenHydratedTransaction } from "@xyo-network/xl1-protocol-sdk";
+import { flattenHydratedTransaction } from "@xyo-network/xl1-sdk";
 var hydratedTransactionToPayloadBundle = /* @__PURE__ */ __name((transaction) => {
   const root = transaction[0]._hash;
   return bundle(root, transaction);
@@ -760,18 +507,19 @@ var bundle = /* @__PURE__ */ __name((root, transaction) => {
 }, "bundle");
 
 // src/PendingTransactions/BasePendingTransactions.ts
-function _ts_decorate6(decorators, target, key, desc) {
+function _ts_decorate4(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);
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-__name(_ts_decorate6, "_ts_decorate");
-var BasePendingTransactionsService = class _BasePendingTransactionsService extends BaseService {
+__name(_ts_decorate4, "_ts_decorate");
+var BasePendingTransactionsService = class _BasePendingTransactionsService extends AbstractCreatableProvider4 {
   static {
     __name(this, "BasePendingTransactionsService");
   }
   static defaultMoniker = MempoolViewerMoniker;
+  static dependencies = [];
   static monikers = [
     MempoolViewerMoniker
   ];
@@ -794,7 +542,7 @@ var BasePendingTransactionsService = class _BasePendingTransactionsService exten
   * A mutex to ensure that the counting the number of pending transactions is
   * not called concurrently
   */
-  _countPendingTransactionsMutex = new Mutex2();
+  _countPendingTransactionsMutex = new Mutex();
   /**
   * A local Archivist optimized for fast retrieval that stores only validated
   * pending transactions
@@ -814,25 +562,25 @@ var BasePendingTransactionsService = class _BasePendingTransactionsService exten
   * A mutex to ensure that the curated pending transactions archivist is
   * updated in a thread-safe manner
   */
-  _updateCuratedPendingTransactionsArchivistMutex = new Mutex2();
+  _updateCuratedPendingTransactionsArchivistMutex = new Mutex();
   get additionalPendingTransactionValidators() {
     return this.params.additionalPendingTransactionValidators ?? [];
   }
   get chainArchivist() {
-    return assertEx10(this.params.chainArchivist, () => "No completed blocks with data archivist");
+    return assertEx8(this.params.chainArchivist, () => "No completed blocks with data archivist");
   }
   get pendingBundledTransactionsArchivist() {
-    return assertEx10(this.params.pendingBundledTransactionsArchivist, () => "No pending bundled transactions archivist");
+    return assertEx8(this.params.pendingBundledTransactionsArchivist, () => "No pending bundled transactions archivist");
   }
   get pendingBundledTransactionsLocalArchivist() {
-    return assertEx10(this._curatedPendingBundledTransactionsArchivist, () => "No pending bundled transactions curated archivist");
+    return assertEx8(this._curatedPendingBundledTransactionsArchivist, () => "No pending bundled transactions curated archivist");
   }
   get pendingTransactionsCount() {
     forget(this.countPendingTransactions());
     return this._pendingTransactionsCount;
   }
   get rejectedTransactionsArchivist() {
-    return assertEx10(this.params.rejectedTransactionsArchivist, () => "No rejected transactions archivist");
+    return assertEx8(this.params.rejectedTransactionsArchivist, () => "No rejected transactions archivist");
   }
   async createHandler() {
     await super.createHandler();
@@ -907,12 +655,14 @@ var BasePendingTransactionsService = class _BasePendingTransactionsService exten
         }
         return foundPendingTransactions;
       }, _BasePendingTransactionsService.MutexPriority.ReadTransactions);
+    }, {
+      timeBudgetLimit: 100
     });
   }
   async cleanupWorker() {
     return await this._updateCuratedPendingTransactionsArchivistMutex.runExclusive(async () => {
       const lastHead = await findMostRecentBlock2(this.chainArchivist);
-      if (isDefined6(lastHead)) await this.pruneCuratedPendingTransactionsArchivist(lastHead._hash);
+      if (isDefined5(lastHead)) await this.pruneCuratedPendingTransactionsArchivist(lastHead._hash);
     }, _BasePendingTransactionsService.MutexPriority.PurgeTransactions);
   }
   async countPendingTransactions() {
@@ -953,6 +703,8 @@ var BasePendingTransactionsService = class _BasePendingTransactionsService exten
           await this.pendingBundledTransactionsLocalArchivist.insert(bundledTransactions);
         }
       }, _BasePendingTransactionsService.MutexPriority.InsertNewTransactions);
+    }, {
+      timeBudgetLimit: 200
     });
   }
   /**
@@ -974,7 +726,7 @@ var BasePendingTransactionsService = class _BasePendingTransactionsService exten
       let [lastHead] = filterAs(await this.chainArchivist.get([
         head
       ]), (x) => asBlockBoundWitnessWithHashMeta(x));
-      while (isDefined6(lastHead)) {
+      while (isDefined5(lastHead)) {
         const pendingBundledTransactions = await this.pendingBundledTransactionsLocalArchivist.next({
           limit: 100,
           order: "asc",
@@ -1005,36 +757,43 @@ var BasePendingTransactionsService = class _BasePendingTransactionsService exten
           this.logger?.log(payload._hash);
         }
       }
+    }, {
+      timeBudgetLimit: 200
     });
   }
 };
-BasePendingTransactionsService = _ts_decorate6([
-  creatable6()
+BasePendingTransactionsService = _ts_decorate4([
+  creatableProvider3()
 ], BasePendingTransactionsService);
 var isTransactionExpired = /* @__PURE__ */ __name((block) => ([txBw]) => txBw.exp < block, "isTransactionExpired");
 var isTransactionActive = /* @__PURE__ */ __name((block) => ([txBw]) => txBw.nbf <= block && txBw.exp >= block, "isTransactionActive");
 
 // src/Schemas/BaseSchemasService.ts
-import { creatable as creatable7, spanRootAsync } from "@xylabs/sdk-js";
-import { schemasSummary } from "@xyo-network/xl1-protocol-sdk";
-function _ts_decorate7(decorators, target, key, desc) {
+import { AbstractCreatableProvider as AbstractCreatableProvider5, creatableProvider as creatableProvider4, schemasSummary } from "@xyo-network/xl1-sdk";
+function _ts_decorate5(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);
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-__name(_ts_decorate7, "_ts_decorate");
-var BaseSchemasService = class extends BaseService {
+__name(_ts_decorate5, "_ts_decorate");
+var BaseSchemasService = class _BaseSchemasService extends AbstractCreatableProvider5 {
   static {
     __name(this, "BaseSchemasService");
   }
+  static defaultMoniker = "SchemasService";
+  static dependencies = [];
+  static monikers = [
+    _BaseSchemasService.defaultMoniker
+  ];
+  moniker = _BaseSchemasService.defaultMoniker;
   async schema(head, schema) {
     return (await this.schemas(head, [
       schema
     ]))[schema] ?? 0;
   }
   async schemas(head, schemas) {
-    return await spanRootAsync("transfers", async () => {
+    return await this.spanAsync("schemas", async () => {
       const [summary] = await schemasSummary(this.params.schemasStepSummaryContext);
       const result = {};
       for (const schema of schemas) {
@@ -1042,29 +801,28 @@ var BaseSchemasService = class extends BaseService {
         result[schema] = count;
       }
       return result;
+    }, {
+      timeBudgetLimit: 100
     });
   }
 };
-BaseSchemasService = _ts_decorate7([
-  creatable7()
+BaseSchemasService = _ts_decorate5([
+  creatableProvider4()
 ], BaseSchemasService);
 
 // src/simple/block/runner/SimpleBlockRunner.ts
-import { assertEx as assertEx12, exists as exists2, hexToBigInt, isDefined as isDefined7 } from "@xylabs/sdk-js";
+import { assertEx as assertEx10, exists as exists2, hexToBigInt, isDefined as isDefined6 } from "@xylabs/sdk-js";
 import { MemoryArchivist as MemoryArchivist2 } from "@xyo-network/archivist-memory";
 import { FixedPercentageBlockRewardDiviner, FixedPercentageBlockRewardDivinerConfigSchema } from "@xyo-network/chain-modules";
 import { buildNextBlock as buildNextBlock2 } from "@xyo-network/chain-protocol";
 import { PayloadBuilder as PayloadBuilder5 } from "@xyo-network/payload-builder";
-import { asBlockBoundWitness, AttoXL1, BlockNumberSchema, defaultRewardRatio, XYO_STEP_REWARD_ADDRESS } from "@xyo-network/xl1-protocol";
-import { AbstractCreatableProvider as AbstractCreatableProvider2, AccountBalanceViewerMoniker, BlockRewardViewerMoniker as BlockRewardViewerMoniker2, BlockRunnerMoniker, BlockValidationViewerMoniker, creatableProvider, createDeclarationIntent as createDeclarationIntent2, MempoolRunnerMoniker, MempoolViewerMoniker as MempoolViewerMoniker2, TimeSyncViewerMoniker } from "@xyo-network/xl1-protocol-sdk";
+import { AbstractCreatableProvider as AbstractCreatableProvider6, AccountBalanceViewerMoniker, asBlockBoundWitness, AttoXL1, BlockNumberSchema, BlockRewardViewerMoniker as BlockRewardViewerMoniker2, BlockRunnerMoniker, BlockValidationViewerMoniker, creatableProvider as creatableProvider5, createDeclarationIntent as createDeclarationIntent2, defaultRewardRatio, MempoolRunnerMoniker, MempoolViewerMoniker as MempoolViewerMoniker2, TimeSyncViewerMoniker, XYO_STEP_REWARD_ADDRESS } from "@xyo-network/xl1-sdk";
 
 // src/simple/block/runner/generateTransactionFeeTransfers.ts
 import { hexFromBigInt } from "@xylabs/sdk-js";
-import { assertEx as assertEx11 } from "@xylabs/sdk-js";
+import { assertEx as assertEx9 } from "@xylabs/sdk-js";
 import { PayloadBuilder as PayloadBuilder4 } 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";
+import { HydratedTransactionWrapper, transactionRequiredGas, TransferSchema, XYO_ZERO_ADDRESS } from "@xyo-network/xl1-sdk";
 async function generateTransactionFeeTransfers(address, transactions) {
   const txs = await Promise.all(transactions.map(async (tx) => {
     return HydratedTransactionWrapper.parse([
@@ -1095,7 +853,7 @@ async function generateTransactionFeeTransfers(address, transactions) {
     return payload;
   });
   for (const [from, amount] of Object.entries(txGasCosts)) {
-    const fromPayload = assertEx11(payloads.find((p) => p.from === from), () => "from payload not found");
+    const fromPayload = assertEx9(payloads.find((p) => p.from === from), () => "from payload not found");
     fromPayload.transfers[address] = hexFromBigInt(amount);
   }
   return payloads;
@@ -1103,21 +861,29 @@ async function generateTransactionFeeTransfers(address, transactions) {
 __name(generateTransactionFeeTransfers, "generateTransactionFeeTransfers");
 
 // src/simple/block/runner/SimpleBlockRunner.ts
-function _ts_decorate8(decorators, target, key, desc) {
+function _ts_decorate6(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);
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-__name(_ts_decorate8, "_ts_decorate");
+__name(_ts_decorate6, "_ts_decorate");
 var DEFAULT_BLOCK_SIZE = 10;
 var XYO_PRODUCER_REDECLARATION_DURATION = 1e4;
 var XYO_PRODUCER_REDECLARATION_WINDOW = 500;
-var SimpleBlockRunner = class _SimpleBlockRunner extends AbstractCreatableProvider2 {
+var SimpleBlockRunner = class _SimpleBlockRunner extends AbstractCreatableProvider6 {
   static {
     __name(this, "SimpleBlockRunner");
   }
   static defaultMoniker = BlockRunnerMoniker;
+  static dependencies = [
+    AccountBalanceViewerMoniker,
+    BlockRewardViewerMoniker2,
+    BlockValidationViewerMoniker,
+    MempoolRunnerMoniker,
+    MempoolViewerMoniker2,
+    TimeSyncViewerMoniker
+  ];
   static monikers = [
     BlockRunnerMoniker
   ];
@@ -1130,6 +896,7 @@ var SimpleBlockRunner = class _SimpleBlockRunner extends AbstractCreatableProvid
   _address;
   _blockRewardViewer;
   _blockValidationViewer;
+  _chainId;
   _mempoolRunner;
   _mempoolViewer;
   _rewardAddress;
@@ -1169,6 +936,9 @@ var SimpleBlockRunner = class _SimpleBlockRunner extends AbstractCreatableProvid
   get blockValidationViewer() {
     return this._blockValidationViewer;
   }
+  get chainId() {
+    return this._chainId;
+  }
   // protected get electionService() {
   //   return assertEx(this.params.electionService, () => 'electionService is required')
   // }
@@ -1185,7 +955,7 @@ var SimpleBlockRunner = class _SimpleBlockRunner extends AbstractCreatableProvid
     return this._rejectedTransactionsArchivist;
   }
   get rewardAddress() {
-    return assertEx12(this.params.rewardAddress, () => "No reward address provided");
+    return this._rewardAddress;
   }
   // protected get stakeIntentService(): StakeIntentService {
   //   return assertEx(this.params.stakeIntentService, () => 'No StakeIntentService provided')
@@ -1198,14 +968,15 @@ var SimpleBlockRunner = class _SimpleBlockRunner extends AbstractCreatableProvid
   // }
   async createHandler() {
     this._rejectedTransactionsArchivist = this.params.rejectedTransactionsArchivist ?? await MemoryArchivist2.create();
-    this._account = assertEx12(this.params.account, () => "Account is required");
-    this._rewardAddress = assertEx12(this.params.rewardAddress, () => "No reward address provided");
+    this._account = assertEx10(this.params.account, () => "Account is required");
     this._address = this.account.address;
     this._accountBalanceViewer = await this.locateAndCreate(AccountBalanceViewerMoniker);
     this._blockRewardViewer = await this.locateAndCreate(BlockRewardViewerMoniker2);
     this._blockValidationViewer = await this.locator.getInstance(BlockValidationViewerMoniker);
+    this._chainId = this.context.config.chain.id;
     this._mempoolRunner = await this.locateAndCreate(MempoolRunnerMoniker);
     this._mempoolViewer = await this.locateAndCreate(MempoolViewerMoniker2);
+    this._rewardAddress = this.params.rewardAddress ?? this.context.config.producer.rewardAddress;
     this._timeSyncViewer = await this.locateAndCreate(TimeSyncViewerMoniker);
   }
   async next(head) {
@@ -1213,7 +984,7 @@ var SimpleBlockRunner = class _SimpleBlockRunner extends AbstractCreatableProvid
   }
   async produceNextBlock(head, force) {
     const result = await this.proposeNextValidBlock(head);
-    return force ? assertEx12(result, () => "Failed to produce next block") : result;
+    return force ? assertEx10(result, () => "Failed to produce next block") : result;
   }
   async getBlockRewardTransfers(block) {
     if (!this._blockRewardDiviner) {
@@ -1250,7 +1021,7 @@ var SimpleBlockRunner = class _SimpleBlockRunner extends AbstractCreatableProvid
   async proposeNextValidBlock(head, validateBalances = false, force = false) {
     return await this.spanAsync("proposeNextValidBlock", async () => {
       try {
-        const { block: previousBlock } = assertEx12(asBlockBoundWitness(head), () => "Invalid head block");
+        const { block: previousBlock } = assertEx10(asBlockBoundWitness(head), () => "Invalid head block");
         const nextBlock = previousBlock + 1;
         const nextBlockTransactions = await this.mempoolViewer.pendingTransactions({
           limit: _SimpleBlockRunner.DefaultBlockSize
@@ -1264,7 +1035,7 @@ var SimpleBlockRunner = class _SimpleBlockRunner extends AbstractCreatableProvid
         blockPayloads.push(...rewardTransferPayloads);
         const transactionTransfers = await generateTransactionFeeTransfers(this.address, nextBlockTransactions);
         const timeStart = Date.now();
-        const timePayload = await this.generateTimePayload(head);
+        const timePayload = await this.generateTimePayload();
         const timeDuration = Date.now() - timeStart;
         if (timeDuration > 100) {
           this.logger?.warn(`[Slow] Generated time payload in ${timeDuration}ms`);
@@ -1278,11 +1049,13 @@ var SimpleBlockRunner = class _SimpleBlockRunner extends AbstractCreatableProvid
         ]))[XYO_STEP_REWARD_ADDRESS];
         const block = await buildNextBlock2(head, fundedNextBlockTransactions, blockPayloads, [
           this.account
-        ], XYO_STEP_REWARD_ADDRESS, stepRewardPoolBalance);
+        ], XYO_STEP_REWARD_ADDRESS, stepRewardPoolBalance, void 0, this.chainId);
         this.logger?.info(`Built block ${block[0].block} in ${Date.now() - startBuild}ms with ${block[1].length} payloads`);
         this.logger?.info(`Validating block ${block[0].block} with ${block[1].length} payloads`);
         const startValidate = Date.now();
-        const errors = await this.blockValidationViewer.validateBlock(block);
+        const errors = await this.blockValidationViewer.validateBlock(block, {
+          head: head._hash
+        });
         this.logger?.info(`Validated block ${block[0].block} in ${Date.now() - startValidate}ms with ${block[1].length} payloads`);
         if (errors.length > 0) {
           this.logger?.warn(`Validation of produced block failed: ${errors.at(0)?.message}`);
@@ -1298,6 +1071,8 @@ var SimpleBlockRunner = class _SimpleBlockRunner extends AbstractCreatableProvid
         this.logger?.error(`Error proposing next valid block: ${error.message}`);
         throw error;
       }
+    }, {
+      timeBudgetLimit: 200
     });
   }
   // remove unfunded transactions and block transfers
@@ -1325,7 +1100,7 @@ var SimpleBlockRunner = class _SimpleBlockRunner extends AbstractCreatableProvid
       fundedTransfers
     ];
   }
-  async generateTimePayload(head) {
+  async generateTimePayload() {
     return await this.timeSyncViewer.currentTimePayload();
   }
   /**
@@ -1335,7 +1110,7 @@ var SimpleBlockRunner = class _SimpleBlockRunner extends AbstractCreatableProvid
   */
   heartbeatRequired(head) {
     const epoch = head.$epoch;
-    if (isDefined7(epoch)) {
+    if (isDefined6(epoch)) {
       const { heartbeatInterval } = this.params.context.config.producer;
       if (Date.now() - epoch > heartbeatInterval) {
         return true;
@@ -1344,8 +1119,8 @@ var SimpleBlockRunner = class _SimpleBlockRunner extends AbstractCreatableProvid
     return false;
   }
 };
-SimpleBlockRunner = _ts_decorate8([
-  creatableProvider()
+SimpleBlockRunner = _ts_decorate6([
+  creatableProvider5()
 ], SimpleBlockRunner);
 
 // src/StakeIntent/lib/getBlockSignedStakeDeclarations.ts
@@ -1353,7 +1128,7 @@ import { exists as exists3, filterAs as filterAs2 } from "@xylabs/sdk-js";
 import { isBoundWitness } from "@xyo-network/boundwitness-model";
 import { payloadSchemasContains } from "@xyo-network/boundwitness-validator";
 import { BoundWitnessWrapper } from "@xyo-network/boundwitness-wrapper";
-import { asChainStakeIntent, ChainStakeIntentSchema } from "@xyo-network/xl1-protocol";
+import { asChainStakeIntent, ChainStakeIntentSchema } from "@xyo-network/xl1-sdk";
 var getBlockSignedStakeDeclarations = /* @__PURE__ */ __name(async (block, archivist, intent) => {
   const blockData = await archivist.get(block.payload_hashes);
   const bwsFromBlock = blockData.filter((x) => isBoundWitness(x));
@@ -1375,28 +1150,34 @@ var mapBoundWitnessToStakeIntentHashes = /* @__PURE__ */ __name((bw) => {
 }, "mapBoundWitnessToStakeIntentHashes");
 
 // src/StakeIntent/XyoStakeIntentService.ts
-import { asAddress as asAddress2, assertEx as assertEx13, creatable as creatable8, filterAs as filterAs3, isUndefined as isUndefined2 } from "@xylabs/sdk-js";
+import { asAddress, assertEx as assertEx11, filterAs as filterAs3, isUndefined as isUndefined2 } from "@xylabs/sdk-js";
 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 PayloadBuilder6 } from "@xyo-network/payload-builder";
-import { asBlockBoundWitness as asBlockBoundWitness2, asBlockBoundWitnessWithStorageMeta, asChainStakeIntent as asChainStakeIntent2 } from "@xyo-network/xl1-protocol";
-import { asChainIndexingServiceStateWithStorageMeta, BlockViewerMoniker as BlockViewerMoniker3, ChainIndexingServiceStateSchema, ChainStakeViewerMoniker, isChainIndexingServiceState, readPayloadMapFromStore, timeBudget } from "@xyo-network/xl1-protocol-sdk";
-import { Mutex as Mutex3 } from "async-mutex";
+import { AbstractCreatableProvider as AbstractCreatableProvider7, asChainIndexingServiceStateWithStorageMeta, BlockViewerMoniker as BlockViewerMoniker3, ChainIndexingServiceStateSchema, ChainStakeViewerMoniker, creatableProvider as creatableProvider6, isChainIndexingServiceState, readPayloadMapFromStore, timeBudget } from "@xyo-network/xl1-sdk";
+import { asBlockBoundWitness as asBlockBoundWitness2, asBlockBoundWitnessWithStorageMeta, asChainStakeIntent as asChainStakeIntent2 } from "@xyo-network/xl1-sdk";
+import { Mutex as Mutex2 } from "async-mutex";
 import { LRUCache } from "lru-cache";
-function _ts_decorate9(decorators, target, key, desc) {
+function _ts_decorate7(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);
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-__name(_ts_decorate9, "_ts_decorate");
+__name(_ts_decorate7, "_ts_decorate");
 var ACTIVE_STAKE_TTL = 1e3 * 60 * 60 * 2;
 var NO_ACTIVE_STAKE_TTL = 1e3 * 2;
 var STAKE_CACHE_MAX_ENTRIES = 1e4;
-var XyoStakeIntentService = class extends BaseService {
+var XyoStakeIntentService = class _XyoStakeIntentService extends AbstractCreatableProvider7 {
   static {
     __name(this, "XyoStakeIntentService");
   }
+  static defaultMoniker = "StakeIntent";
+  static dependencies = [];
+  static monikers = [
+    _XyoStakeIntentService.defaultMoniker
+  ];
+  moniker = "StakeIntent";
   // TODO: Use hash instead of block number to handle chain reorgs
   _lastIndexedBlockHash = void 0;
   // TODO: Interval tree per declaration (bank, validator, etc.)
@@ -1410,26 +1191,26 @@ var XyoStakeIntentService = class extends BaseService {
   _stakeCache = new LRUCache({
     max: STAKE_CACHE_MAX_ENTRIES
   });
-  _updateMutex = new Mutex3();
+  _updateMutex = new Mutex2();
   _blockViewer;
   _chainStakeViewer;
   get blockViewer() {
     return this._blockViewer;
   }
   get chainArchivist() {
-    return assertEx13(this.params.chainArchivist, () => "chainArchivist not set");
+    return assertEx11(this.params.chainArchivist, () => "chainArchivist not set");
   }
   get chainStakeViewer() {
     return this._chainStakeViewer;
   }
   get stakeIntentStateArchivist() {
-    return assertEx13(this.params.stakeIntentStateArchivist, () => "stakeIntentStateArchivist not set");
+    return assertEx11(this.params.stakeIntentStateArchivist, () => "stakeIntentStateArchivist not set");
   }
   static async paramsHandler(params) {
     return {
       ...await super.paramsHandler(params),
-      chainArchivist: assertEx13(params?.chainArchivist, () => "chainArchivist is required"),
-      stakeIntentStateArchivist: assertEx13(params?.stakeIntentStateArchivist, () => "stakeIntentStateArchivist is required")
+      chainArchivist: assertEx11(params?.chainArchivist, () => "chainArchivist is required"),
+      stakeIntentStateArchivist: assertEx11(params?.stakeIntentStateArchivist, () => "stakeIntentStateArchivist is required")
     };
   }
   async createHandler() {
@@ -1441,13 +1222,13 @@ var XyoStakeIntentService = class extends BaseService {
   }
   async getDeclaredCandidateRanges(address, intent) {
     await Promise.resolve();
-    assertEx13(intent === "producer", () => `Support not yet added for intent ${intent}`);
+    assertEx11(intent === "producer", () => `Support not yet added for intent ${intent}`);
     const results = this._producers.get(address);
     return results ?? [];
   }
   async getDeclaredCandidatesForBlock(block, intent) {
     return await this.spanAsync("getDeclaredCandidatesForBlock", async () => {
-      assertEx13(intent === "producer", () => `Support not yet added for intent ${intent}`);
+      assertEx11(intent === "producer", () => `Support not yet added for intent ${intent}`);
       const results = this._producers.findAllContaining(block);
       const candidates = [
         ...results
@@ -1455,6 +1236,8 @@ var XyoStakeIntentService = class extends BaseService {
       const requiredMinimumStake = this.getRequiredMinimumStakeForIntent(intent);
       const validCandidates = await this.filterToValidStake(candidates, this.chainStakeViewer, requiredMinimumStake);
       return validCandidates;
+    }, {
+      timeBudgetLimit: 200
     });
   }
   getRequiredMinimumStakeForIntent(intent) {
@@ -1513,7 +1296,7 @@ var XyoStakeIntentService = class extends BaseService {
   }
   async recoverState(current) {
     return await timeBudget("XyoStakeIntentService.recoverState", console, async () => {
-      const currentBlock = assertEx13(asBlockBoundWitness2((await this.chainArchivist.get([
+      const currentBlock = assertEx11(asBlockBoundWitness2((await this.chainArchivist.get([
         current
       ]))?.[0]), () => `Block ${current} not found`);
       const currentBlockNum = currentBlock.block;
@@ -1555,56 +1338,48 @@ var XyoStakeIntentService = class extends BaseService {
       return await this.spanAsync("updateIndex", async () => {
         const currentHead = (await this.blockViewer.currentBlock())[0];
         if (isUndefined2(currentHead)) return;
-        return await timeBudget("XyoStakeIntentService.updateIndex", console, async () => {
-          const currentHeadHash = currentHead._hash;
-          const chainMap = readPayloadMapFromStore(this.chainArchivist);
-          const result = await analyzeChain({
-            chainMap
-          }, [
-            new ChainStakeIntentAnalyzer("producer")
-          ], currentHeadHash, this._lastIndexedBlockHash);
-          const signedDeclarations = filterAs3(result.find(isChainSummaryStakeIntent)?.intents ?? [], asChainStakeIntent2);
-          if (currentHead.block === void 0) return;
-          const currentHeadBlockNum = currentHead.block;
-          if (displayProgress) this.logger?.log(`Updating index through 0x${currentHeadBlockNum}`);
-          for (const signedDeclaration of signedDeclarations) {
-            const { exp, nbf } = signedDeclaration;
-            const start = nbf;
-            const stop = exp;
-            const address = asAddress2(signedDeclaration?.from);
-            if (start !== void 0 && stop !== void 0 && address !== void 0) {
-              this._producers.insert(address, start, stop);
-            }
+        const currentHeadHash = currentHead._hash;
+        const chainMap = readPayloadMapFromStore(this.chainArchivist);
+        const result = await analyzeChain({
+          chainMap
+        }, [
+          new ChainStakeIntentAnalyzer("producer")
+        ], currentHeadHash, this._lastIndexedBlockHash);
+        const signedDeclarations = filterAs3(result.find(isChainSummaryStakeIntent)?.intents ?? [], asChainStakeIntent2);
+        if (currentHead.block === void 0) return;
+        const currentHeadBlockNum = currentHead.block;
+        if (displayProgress) this.logger?.log(`Updating index through 0x${currentHeadBlockNum}`);
+        for (const signedDeclaration of signedDeclarations) {
+          const { exp, nbf } = signedDeclaration;
+          const start = nbf;
+          const stop = exp;
+          const address = asAddress(signedDeclaration?.from);
+          if (start !== void 0 && stop !== void 0 && address !== void 0) {
+            this._producers.insert(address, start, stop);
           }
-          this._lastIndexedBlockHash = currentHeadHash;
-        }, 2e3, true);
+        }
+        this._lastIndexedBlockHash = currentHeadHash;
+      }, {
+        timeBudgetLimit: 1e3
       });
     });
   }
 };
-XyoStakeIntentService = _ts_decorate9([
-  creatable8()
+XyoStakeIntentService = _ts_decorate7([
+  creatableProvider6()
 ], XyoStakeIntentService);
 
 // src/StepStake/BaseStepStakeService.ts
-import { creatable as creatable9 } from "@xylabs/sdk-js";
-import { StepStakeViewerMoniker } from "@xyo-network/xl1-protocol-sdk";
-function _ts_decorate10(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);
-  else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-  return c > 3 && r && Object.defineProperty(target, key, r), r;
-}
-__name(_ts_decorate10, "_ts_decorate");
-var BaseStepStakeService = class _BaseStepStakeService extends BaseService {
+import { AbstractCreatableProvider as AbstractCreatableProvider8, StepStakeViewerMoniker } from "@xyo-network/xl1-sdk";
+var AbstractStepStakeService = class _AbstractStepStakeService extends AbstractCreatableProvider8 {
   static {
-    __name(this, "BaseStepStakeService");
+    __name(this, "AbstractStepStakeService");
   }
   static defaultMoniker = StepStakeViewerMoniker;
   static monikers = [
     StepStakeViewerMoniker
   ];
-  moniker = _BaseStepStakeService.defaultMoniker;
+  moniker = _AbstractStepStakeService.defaultMoniker;
   stepStake(_step) {
     throw new Error("Method [stepStake] not implemented.");
   }
@@ -1612,21 +1387,14 @@ var BaseStepStakeService = class _BaseStepStakeService extends BaseService {
     throw new Error("Method [stepStakeForAddress] not implemented.");
   }
 };
-BaseStepStakeService = _ts_decorate10([
-  creatable9()
-], BaseStepStakeService);
 export {
-  BaseAccountableService,
+  AbstractStepStakeService,
   BaseElectionService,
   BaseNetworkStakeStepRewardService,
   BasePendingTransactionsService,
   BaseSchemasService,
-  BaseService,
-  BaseStepStakeService,
   DEFAULT_BLOCK_SIZE,
   EvmBlockRewardViewer,
-  EvmChainViewer,
-  MemoryChainViewer,
   SimpleBlockRunner,
   XYO_PRODUCER_REDECLARATION_DURATION,
   XYO_PRODUCER_REDECLARATION_WINDOW,
@@ -1635,11 +1403,8 @@ export {
   accountBalancesViewerFromArchivist,
   blockViewerFromChainIteratorAndArchivist,
   canUseEvmProvider,
-  creatableService,
   createBootstrapHead,
   getBlockSignedStakeDeclarations,
-  initChainService,
-  initEvmProvider,
-  initMemoryChainService
+  initEvmProvider
 };
 //# sourceMappingURL=index.mjs.map