@xyo-network/chain-services 1.18.0 → 1.18.1

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({
@@ -53,59 +52,17 @@ var accountBalancesViewerFromArchivist = /* @__PURE__ */ __name(async (context,
   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";
-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);
-  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_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 { AbstractCreatable, assertEx as assertEx2, creatable, 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) {
+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);
   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");
+__name(_ts_decorate, "_ts_decorate");
 var EvmBlockRewardViewer = class _EvmBlockRewardViewer extends AbstractCreatable {
   static {
     __name(this, "EvmBlockRewardViewer");
@@ -139,15 +96,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,7 +181,16 @@ 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;
 }
@@ -233,9 +198,9 @@ __name(blockViewerFromChainIteratorAndArchivist, "blockViewerFromChainIteratorAn
 
 // src/ChainService/Evm/Evm.ts
 import { toAddress, toEthAddress as toEthAddress2 } from "@xylabs/sdk-js";
-import { ChainContractViewerMoniker } from "@xyo-network/xl1-protocol-sdk";
+import { AbstractCreatableProvider, ChainContractViewerMoniker } from "@xyo-network/xl1-sdk";
 import { getAddress } from "ethers/address";
-var EvmChainViewer = class _EvmChainViewer extends BaseService {
+var EvmChainViewer = class _EvmChainViewer extends AbstractCreatableProvider {
   static {
     __name(this, "EvmChainViewer");
   }
@@ -308,8 +273,8 @@ var EvmChainViewer = class _EvmChainViewer extends BaseService {
 
 // 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 {
+import { AbstractCreatableProvider as AbstractCreatableProvider2, ChainContractViewerMoniker as ChainContractViewerMoniker2 } from "@xyo-network/xl1-sdk";
+var MemoryChainViewer = class _MemoryChainViewer extends AbstractCreatableProvider2 {
   static {
     __name(this, "MemoryChainViewer");
   }
@@ -382,19 +347,12 @@ var MemoryChainViewer = class _MemoryChainViewer extends BaseService {
 };
 
 // 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 as AbstractCreatableProvider3, BlockViewerMoniker as BlockViewerMoniker2 } from "@xyo-network/xl1-sdk";
+var XyoValidator = class extends AbstractCreatableProvider3 {
   static {
     __name(this, "XyoValidator");
   }
+  moniker = "Validator";
   _blockViewer;
   // get address() {
   //   return this.account.address
@@ -430,24 +388,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 AbstractCreatableProvider4, 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 AbstractCreatableProvider4 {
   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");
   }
@@ -472,8 +434,8 @@ var BaseElectionService = class extends BaseService {
     return creatorArray.slice(0, maxSize);
   }
 };
-BaseElectionService = _ts_decorate4([
-  creatable4()
+BaseElectionService = _ts_decorate2([
+  creatableProvider()
 ], BaseElectionService);
 
 // src/implementation/chain/index.ts
@@ -625,7 +587,7 @@ var init = /* @__PURE__ */ __name(async (params) => {
 
 // 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 +603,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 AbstractCreatableProvider5, 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 AbstractCreatableProvider5 {
   static {
     __name(this, "BaseNetworkStakeStepRewardService");
   }
   static defaultMoniker = NetworkStakeStepRewardViewerMoniker;
+  static dependencies = [];
   static monikers = [
     NetworkStakeStepRewardViewerMoniker
   ];
@@ -714,22 +676,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 assertEx10, exists, filterAs, filterAsync, forget, isDefined as isDefined6, 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 AbstractCreatableProvider6, 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 +704,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 +720,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 AbstractCreatableProvider6 {
   static {
     __name(this, "BasePendingTransactionsService");
   }
   static defaultMoniker = MempoolViewerMoniker;
+  static dependencies = [];
   static monikers = [
     MempoolViewerMoniker
   ];
@@ -794,7 +755,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,7 +775,7 @@ 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 ?? [];
   }
@@ -1008,26 +969,32 @@ var BasePendingTransactionsService = class _BasePendingTransactionsService exten
     });
   }
 };
-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 { spanRootAsync } from "@xylabs/sdk-js";
+import { AbstractCreatableProvider as AbstractCreatableProvider7, 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 AbstractCreatableProvider7 {
   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
@@ -1045,8 +1012,8 @@ var BaseSchemasService = class extends BaseService {
     });
   }
 };
-BaseSchemasService = _ts_decorate7([
-  creatable7()
+BaseSchemasService = _ts_decorate5([
+  creatableProvider4()
 ], BaseSchemasService);
 
 // src/simple/block/runner/SimpleBlockRunner.ts
@@ -1055,16 +1022,13 @@ import { MemoryArchivist as MemoryArchivist2 } from "@xyo-network/archivist-memo
 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 AbstractCreatableProvider8, 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 { 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([
@@ -1103,21 +1067,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 AbstractCreatableProvider8 {
   static {
     __name(this, "SimpleBlockRunner");
   }
   static defaultMoniker = BlockRunnerMoniker;
+  static dependencies = [
+    AccountBalanceViewerMoniker,
+    BlockRewardViewerMoniker2,
+    BlockValidationViewerMoniker,
+    MempoolRunnerMoniker,
+    MempoolViewerMoniker2,
+    TimeSyncViewerMoniker
+  ];
   static monikers = [
     BlockRunnerMoniker
   ];
@@ -1185,7 +1157,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')
@@ -1199,13 +1171,13 @@ 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._address = this.account.address;
     this._accountBalanceViewer = await this.locateAndCreate(AccountBalanceViewerMoniker);
     this._blockRewardViewer = await this.locateAndCreate(BlockRewardViewerMoniker2);
     this._blockValidationViewer = await this.locator.getInstance(BlockValidationViewerMoniker);
     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) {
@@ -1264,7 +1236,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`);
@@ -1325,7 +1297,7 @@ var SimpleBlockRunner = class _SimpleBlockRunner extends AbstractCreatableProvid
       fundedTransfers
     ];
   }
-  async generateTimePayload(head) {
+  async generateTimePayload() {
     return await this.timeSyncViewer.currentTimePayload();
   }
   /**
@@ -1344,8 +1316,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 +1325,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 +1347,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 as asAddress2, assertEx as assertEx13, 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 AbstractCreatableProvider9, 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 AbstractCreatableProvider9 {
   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,7 +1388,7 @@ var XyoStakeIntentService = class extends BaseService {
   _stakeCache = new LRUCache({
     max: STAKE_CACHE_MAX_ENTRIES
   });
-  _updateMutex = new Mutex3();
+  _updateMutex = new Mutex2();
   _blockViewer;
   _chainStakeViewer;
   get blockViewer() {
@@ -1582,29 +1560,21 @@ var XyoStakeIntentService = class extends BaseService {
     });
   }
 };
-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 AbstractCreatableProvider10, StepStakeViewerMoniker } from "@xyo-network/xl1-sdk";
+var AbstractStepStakeService = class _AbstractStepStakeService extends AbstractCreatableProvider10 {
   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,17 +1582,12 @@ 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,
@@ -1635,7 +1600,6 @@ export {
   accountBalancesViewerFromArchivist,
   blockViewerFromChainIteratorAndArchivist,
   canUseEvmProvider,
-  creatableService,
   createBootstrapHead,
   getBlockSignedStakeDeclarations,
   initChainService,