@xyo-network/chain-services 1.17.7 → 1.18.0

package/dist/neutral/model/Params.d.ts

@@ -1,10 +1,9 @@
-import type { CreatableParams, EmptyObject } from '@xylabs/sdk-js';
 import type { AccountInstance } from '@xyo-network/account-model';
 import type { OpenTelemetryProviders } from '@xyo-network/xl1-protocol';
-export interface BaseServiceParams<TConfig extends EmptyObject = EmptyObject> extends CreatableParams, OpenTelemetryProviders {
-    config: TConfig;
+import type { CreatableProviderParams } from '@xyo-network/xl1-protocol-sdk';
+export interface BaseServiceParams extends CreatableProviderParams, OpenTelemetryProviders {
 }
-export interface BaseAccountableServiceParams<TConfig extends EmptyObject = EmptyObject> extends BaseServiceParams<TConfig> {
+export interface BaseAccountableServiceParams extends BaseServiceParams {
     account: AccountInstance;
 }
 //# sourceMappingURL=Params.d.ts.map

package/dist/neutral/model/Params.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Params.d.ts","sourceRoot":"","sources":["../../../src/model/Params.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAClE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AACjE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAA;AAEvE,MAAM,WAAW,iBAAiB,CAAC,OAAO,SAAS,WAAW,GAAG,WAAW,CAAE,SAAQ,eAAe,EAAE,sBAAsB;IAC3H,MAAM,EAAE,OAAO,CAAA;CAChB;AAED,MAAM,WAAW,4BAA4B,CAAC,OAAO,SAAS,WAAW,GAAG,WAAW,CAAE,SAAQ,iBAAiB,CAAC,OAAO,CAAC;IACzH,OAAO,EAAE,eAAe,CAAA;CACzB"}
+{"version":3,"file":"Params.d.ts","sourceRoot":"","sources":["../../../src/model/Params.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AACjE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAA;AACvE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAA;AAE5E,MAAM,WAAW,iBAAkB,SAAQ,uBAAuB,EAAE,sBAAsB;CAEzF;AAED,MAAM,WAAW,4BAA6B,SAAQ,iBAAiB;IACrE,OAAO,EAAE,eAAe,CAAA;CACzB"}

package/dist/neutral/simple/block/runner/SimpleBlockRunner.d.ts

@@ -1,11 +1,10 @@
-import { AbstractCreatable, Address, CreatableParams, Hex, Promisable } from '@xylabs/sdk-js';
+import { Address, Hex, Promisable } from '@xylabs/sdk-js';
 import { AccountInstance } from '@xyo-network/account-model';
 import { ArchivistInstance } from '@xyo-network/archivist-model';
 import { BlockRewardDiviner } from '@xyo-network/chain-modules';
 import { WithHashMeta } from '@xyo-network/payload-model';
-import { BlockBoundWitness, ChainId, ChainStakeIntent, SignedBlockBoundWitnessWithHashMeta, SignedHydratedBlockWithHashMeta, Transfer } from '@xyo-network/xl1-protocol';
-import { AccountBalanceViewer, BlockRewardViewer, BlockRunner, Config, HydratedBlockStateValidationFunction, MempoolRunner, MempoolViewer, TimeSyncViewer } from '@xyo-network/xl1-protocol-sdk';
-import z from 'zod';
+import { BlockBoundWitness, ChainStakeIntent, SignedBlockBoundWitnessWithHashMeta, SignedHydratedBlockWithHashMeta, Transfer } from '@xyo-network/xl1-protocol';
+import { AbstractCreatableProvider, AccountBalanceViewer, BlockRewardViewer, BlockRunner, BlockValidationViewer, CreatableProviderParams, HydratedBlockStateValidationFunction, MempoolRunner, MempoolViewer, TimeSyncViewer } from '@xyo-network/xl1-protocol-sdk';
 /**
  * The default block size for a block
  */
@@ -19,35 +18,28 @@ export declare const XYO_PRODUCER_REDECLARATION_DURATION = 10000;
  * their intent to produce blocks
  */
 export declare const XYO_PRODUCER_REDECLARATION_WINDOW = 500;
-export declare const SimpleBlockRunnerParamsZod: z.ZodObject<{
-    balanceViewer: z.ZodObject<{}, z.z.core.$loose>;
-    blockRewardViewer: z.ZodObject<{}, z.z.core.$loose>;
-    chainId: z.ZodString;
-    config: z.ZodObject<{}, z.z.core.$loose>;
-    mempoolViewer: z.ZodObject<{}, z.z.core.$loose>;
-    mempoolRunner: z.ZodObject<{}, z.z.core.$loose>;
-    rejectedTransactionsArchivist: z.ZodOptional<z.ZodObject<{}, z.z.core.$loose>>;
-    rewardAddress: z.ZodPipe<z.ZodString, z.ZodTransform<Address, string>>;
-    time: z.ZodObject<{}, z.z.core.$loose>;
-    validateHydratedBlockState: z.ZodOptional<z.ZodFunction<z.z.core.$ZodFunctionArgs, z.z.core.$ZodFunctionOut>>;
-}, z.z.core.$strip>;
-export type SimpleBlockRunnerParams = CreatableParams & {
+export type SimpleBlockRunnerParams = CreatableProviderParams & {
     account: AccountInstance;
-    balanceViewer: AccountBalanceViewer;
-    blockRewardViewer: BlockRewardViewer;
-    chainId: ChainId;
-    config: Config;
-    mempoolRunner: MempoolRunner;
-    mempoolViewer: MempoolViewer;
     rejectedTransactionsArchivist?: ArchivistInstance;
     rewardAddress: Address;
-    time: TimeSyncViewer;
     validateHydratedBlockState?: HydratedBlockStateValidationFunction;
 };
-export declare class SimpleBlockRunner extends AbstractCreatable<SimpleBlockRunnerParams> implements BlockRunner {
-    protected _blockRewardDiviner: BlockRewardDiviner | undefined;
-    protected _lastRedeclarationBlock: number | undefined;
-    protected _rejectedTransactionsArchivist: ArchivistInstance | undefined;
+export declare class SimpleBlockRunner extends AbstractCreatableProvider<SimpleBlockRunnerParams> implements BlockRunner {
+    static readonly defaultMoniker: "BlockRunner";
+    static readonly monikers: "BlockRunner"[];
+    moniker: "BlockRunner";
+    protected _blockRewardDiviner?: BlockRewardDiviner;
+    protected _lastRedeclarationBlock?: number;
+    protected _rejectedTransactionsArchivist?: ArchivistInstance;
+    private _account?;
+    private _accountBalanceViewer?;
+    private _address?;
+    private _blockRewardViewer?;
+    private _blockValidationViewer?;
+    private _mempoolRunner?;
+    private _mempoolViewer?;
+    private _rewardAddress?;
+    private _timeSyncViewer?;
     /**
      * The default block size for a block
      */
@@ -62,17 +54,17 @@ export declare class SimpleBlockRunner extends AbstractCreatable<SimpleBlockRunn
      * their intent to continue producing blocks
      */
     static get RedeclarationWindow(): number;
-    get address(): Address;
     protected get account(): AccountInstance;
-    protected get balanceViewer(): AccountBalanceViewer;
+    protected get accountBalanceViewer(): AccountBalanceViewer;
+    protected get address(): Address;
     protected get blockRewardViewer(): BlockRewardViewer;
-    protected get chainId(): Hex;
+    protected get blockValidationViewer(): BlockValidationViewer;
     protected get mempoolRunner(): MempoolRunner;
     protected get mempoolViewer(): MempoolViewer;
     protected get rejectedTransactionsArchivist(): ArchivistInstance<import("@xyo-network/archivist-model").ArchivistParams<import("@xyo-network/module-model").AnyConfigSchema<import("@xyo-network/archivist-model").ArchivistConfig>>, import("@xyo-network/archivist-model").ArchivistModuleEventData, import("@xyo-network/payload-model").Payload>;
     protected get rewardAddress(): Address;
-    protected get time(): TimeSyncViewer;
-    static paramsHandler(params?: Partial<SimpleBlockRunnerParams> | undefined): Promise<SimpleBlockRunnerParams>;
+    protected get timeSyncViewer(): TimeSyncViewer;
+    createHandler(): Promise<void>;
     next(head: WithHashMeta<BlockBoundWitness>): Promise<SignedHydratedBlockWithHashMeta | undefined>;
     produceNextBlock(head: SignedBlockBoundWitnessWithHashMeta, force: true): Promise<SignedHydratedBlockWithHashMeta>;
     produceNextBlock(head: SignedBlockBoundWitnessWithHashMeta, force?: false): Promise<SignedHydratedBlockWithHashMeta | undefined>;

package/dist/neutral/simple/block/runner/SimpleBlockRunner.d.ts.map

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

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "http://json.schemastore.org/package.json",
   "name": "@xyo-network/chain-services",
-  "version": "1.17.7",
+  "version": "1.18.0",
   "description": "XYO Layer One SDK Services",
   "homepage": "https://xylabs.com",
   "bugs": {
@@ -39,7 +39,7 @@
     "!**/*.test.*"
   ],
   "dependencies": {
-    "@opentelemetry/api": "~1.9.0",
+    "@opentelemetry/api": "^1.9.0",
     "@xylabs/sdk-js": "~5.0.51",
     "@xyo-network/account-model": "~5.2.17",
     "@xyo-network/archivist-memory": "~5.2.17",
@@ -47,36 +47,34 @@
     "@xyo-network/boundwitness-model": "~5.2.17",
     "@xyo-network/boundwitness-validator": "~5.2.17",
     "@xyo-network/boundwitness-wrapper": "~5.2.17",
-    "@xyo-network/chain-analyze": "~1.17.7",
-    "@xyo-network/chain-modules": "~1.17.7",
-    "@xyo-network/chain-protocol": "~1.17.7",
-    "@xyo-network/chain-utils": "~1.17.7",
+    "@xyo-network/chain-analyze": "~1.18.0",
+    "@xyo-network/chain-modules": "~1.18.0",
+    "@xyo-network/chain-protocol": "~1.18.0",
+    "@xyo-network/chain-utils": "~1.18.0",
     "@xyo-network/payload-builder": "~5.2.17",
     "@xyo-network/payload-model": "~5.2.17",
     "@xyo-network/typechain": "~4.0.11",
     "@xyo-network/xl1-protocol": "~1.14.17",
-    "@xyo-network/xl1-protocol-sdk": "~1.17.7",
-    "@xyo-network/xl1-rpc": "~1.17.7",
-    "@xyo-network/xl1-validation": "~1.17.7",
-    "@xyo-network/xl1-wrappers": "~1.17.7",
+    "@xyo-network/xl1-protocol-sdk": "~1.18.0",
+    "@xyo-network/xl1-validation": "~1.18.0",
+    "@xyo-network/xl1-wrappers": "~1.18.0",
     "async-mutex": "~0.5.0",
     "ethers": "^6.16.0",
-    "lru-cache": "~11.2.4",
-    "zod": "~4.1.13"
+    "lru-cache": "^11.2.4"
   },
   "devDependencies": {
-    "@types/node": "~25.0.1",
+    "@types/node": "~25.0.2",
     "@xylabs/sdk-js": "~5.0.51",
-    "@xylabs/ts-scripts-yarn3": "~7.2.30",
-    "@xylabs/tsconfig": "~7.2.30",
+    "@xylabs/ts-scripts-yarn3": "~7.2.32",
+    "@xylabs/tsconfig": "~7.2.32",
     "@xylabs/vitest-extended": "~5.0.51",
     "@xyo-network/account": "~5.2.17",
     "@xyo-network/account-model": "~5.2.17",
-    "@xyo-network/chain-validation": "~1.17.7",
+    "@xyo-network/chain-validation": "~1.18.0",
     "@xyo-network/wallet": "~5.2.17",
     "@xyo-network/wallet-model": "~5.2.17",
     "cosmiconfig": "^9.0.0",
-    "eslint": "^9.39.1",
+    "eslint": "^9.39.2",
     "tslib": "~2.8.1",
     "typescript": "~5.9.3",
     "vitest": "~4.0.15",

package/src/AccountBalance/accountBalanceServiceFromArchivist.ts

@@ -1,23 +1,23 @@
 import type { Hash } from '@xylabs/sdk-js'
 import { assertEx } from '@xylabs/sdk-js'
-import type { ReadArchivist } from '@xyo-network/archivist-model'
+import type { ReadWriteArchivist } from '@xyo-network/archivist-model'
 import type { Payload, WithStorageMeta } from '@xyo-network/payload-model'
 import type { ChainId } from '@xyo-network/xl1-protocol'
 import { StepSizes } from '@xyo-network/xl1-protocol'
 import type {
-  AccountBalanceViewer, BalancesStepSummary, SimpleAccountBalanceViewerParams, SimpleBlockViewerParams, TransfersStepSummary,
+  AccountBalanceViewer, BalancesStepSummary, CreatableProviderContext, SimpleAccountBalanceViewerParams, TransfersStepSummary,
 } from '@xyo-network/xl1-protocol-sdk'
 import {
-  findMostRecentBlock, LruCacheMap, readPayloadMapFromStore,
+  findMostRecentBlock, LruCacheMap, payloadMapFromStore,
   SimpleAccountBalanceViewer,
-  SimpleBlockViewer,
 } from '@xyo-network/xl1-protocol-sdk'
 import { Semaphore } from 'async-mutex'
 
 // this is intended to only be used for testing
 export const accountBalancesViewerFromArchivist = async (
+  context: CreatableProviderContext,
   chainId: ChainId,
-  archivist: ReadArchivist<WithStorageMeta<Payload>>,
+  archivist: ReadWriteArchivist<WithStorageMeta<Payload>>,
 ): Promise<AccountBalanceViewer> => {
   const summaryMap = new LruCacheMap<string, BalancesStepSummary>({
     max: 100_000,
@@ -33,19 +33,21 @@ export const accountBalancesViewerFromArchivist = async (
     updateAgeOnGet: true,
   })
 
-  const chainMap = readPayloadMapFromStore<WithStorageMeta<Payload>>(archivist)
+  const chainMap = payloadMapFromStore<WithStorageMeta<Payload>>(archivist)
   const headFunc = async (): Promise<[Hash, number]> => {
     const head = assertEx(await findMostRecentBlock(archivist), () => 'No blocks found in chainArchivist')
     return [head._hash, head.block]
   }
 
   const service = await SimpleAccountBalanceViewer.create({
-    context: {
+    context,
+    balanceSummaryContext: {
       chainId,
       store: { chainMap },
       stepSemaphores: StepSizes.map(() => new Semaphore(20)),
       summaryMap,
       head: headFunc,
+      singletons: context.singletons,
     },
     transfersSummaryContext: {
       chainId,
@@ -53,16 +55,8 @@ export const accountBalancesViewerFromArchivist = async (
       stepSemaphores: StepSizes.map(() => new Semaphore(20)),
       summaryMap: transferSummaryMap,
       head: headFunc,
-
+      singletons: context.singletons,
     },
-    blockViewer: await SimpleBlockViewer.create({
-      context: {
-        chainId,
-        head: headFunc,
-        store: { chainMap },
-      },
-      finalizedArchivist: archivist,
-    } satisfies SimpleBlockViewerParams),
   } satisfies SimpleAccountBalanceViewerParams)
   return service
 }

package/src/BaseService.ts

@@ -1,5 +1,6 @@
 import type { EventData, Promisable } from '@xylabs/sdk-js'
-import { AbstractCreatable, creatable } from '@xylabs/sdk-js'
+import { creatable } from '@xylabs/sdk-js'
+import { AbstractCreatableProvider } from '@xyo-network/xl1-protocol-sdk'
 import { Mutex } from 'async-mutex'
 
 import type { BaseAccountableServiceParams, BaseServiceParams } from './model/index.ts'
@@ -10,7 +11,7 @@ declare global {
 
 @creatable()
 export class BaseService<TParams extends BaseServiceParams = BaseServiceParams, TEventData extends EventData = EventData>
-  extends AbstractCreatable<TParams, TEventData> {
+  extends AbstractCreatableProvider<TParams, TEventData> {
   private static singletonInitMutex = new Mutex()
 
   static get singletons() {

package/src/ChainService/Evm/Evm.ts

@@ -1,11 +1,8 @@
 import type {
   Address, Hex, Promisable,
 } from '@xylabs/sdk-js'
-import {
-  assertEx, toAddress, toEthAddress,
-} from '@xylabs/sdk-js'
+import { toAddress, toEthAddress } from '@xylabs/sdk-js'
 import type { StakedXyoChain } from '@xyo-network/typechain'
-import { StakedXyoChain__factory as StakedXyoChainFactory } from '@xyo-network/typechain'
 import type { AttoXL1, XL1BlockNumber } from '@xyo-network/xl1-protocol'
 import { ChainContractViewerMoniker, type ChainService } from '@xyo-network/xl1-protocol-sdk'
 import { getAddress } from 'ethers/address'
@@ -14,7 +11,7 @@ import type { ContractRunner } from 'ethers/providers'
 import { BaseService } from '../../BaseService.ts'
 import type { BaseServiceParams } from '../../model/index.ts'
 
-export interface EvmChainServiceParams extends BaseServiceParams {
+export interface EvmChainViewerParams extends BaseServiceParams {
   contract: StakedXyoChain
   id: Hex
   runner: ContractRunner
@@ -23,69 +20,59 @@ export interface EvmChainServiceParams extends BaseServiceParams {
 /**
  * A class that represents a chain stake as backed by an EVM smart contract
  */
-export class EvmChainService extends BaseService<EvmChainServiceParams> implements ChainService {
+export class EvmChainViewer extends BaseService<EvmChainViewerParams> implements ChainService {
   static readonly defaultMoniker = ChainContractViewerMoniker
   static readonly monikers = [ChainContractViewerMoniker]
-  moniker = EvmChainService.defaultMoniker
+  moniker = EvmChainViewer.defaultMoniker
+
+  protected get contract() {
+    return this.params.contract
+  }
 
   async active(): Promise<bigint> {
-    return await (await this.contract()).active()
+    return await (this.contract).active()
   }
 
   async activeByStaked(staked: Address): Promise<bigint> {
-    return await (await this.contract()).activeByAddressStaked(getAddress(toEthAddress(staked)))
+    return await (this.contract).activeByAddressStaked(getAddress(toEthAddress(staked)))
   }
 
   async activeByStaker(address: Address): Promise<bigint> {
-    return await (await this.contract()).activeByStaker(getAddress(toEthAddress(address)))
+    return await (this.contract).activeByStaker(getAddress(toEthAddress(address)))
   }
 
   async addStake(staked: Address, amount: bigint): Promise<boolean> {
-    const result = await (await this.contract()).addStake(getAddress(toEthAddress(staked)), amount)
+    const result = await (this.contract).addStake(getAddress(toEthAddress(staked)), amount)
     await result.wait()
     return true
   }
 
-  chainId(): Promisable<Hex> {
-    return assertEx(this.params.id)
-  }
-
-  async contract() {
-    if (this.params.contract === undefined) {
-      this.params.contract = StakedXyoChainFactory.connect(
-        toEthAddress(await this.chainId()),
-        this.params.runner,
-      ) as StakedXyoChain
-    }
-    return assertEx(this.params.contract)
-  }
-
   async forkedAtBlockNumber(): Promise<bigint> {
-    return await (await this.contract()).forkedAtBlockNumber()
+    return await (this.contract).forkedAtBlockNumber()
   }
 
   async forkedAtHash(): Promise<bigint> {
-    return await (await this.contract()).forkedAtHash()
+    return await (this.contract).forkedAtHash()
   }
 
   async forkedChainId(): Promise<Address> {
-    return toAddress(await (await this.contract()).forkedChainId())
+    return toAddress(await (this.contract).forkedChainId())
   }
 
   async minWithdrawalBlocks(): Promise<bigint> {
-    return await (await this.contract()).minWithdrawalBlocks()
+    return await (this.contract).minWithdrawalBlocks()
   }
 
   async pending(): Promise<bigint> {
-    return await (await this.contract()).pending()
+    return await (this.contract).pending()
   }
 
   async pendingByStaker(staker: Address): Promise<bigint> {
-    return await (await this.contract()).pendingByStaker(getAddress(toEthAddress(staker)))
+    return await (this.contract).pendingByStaker(getAddress(toEthAddress(staker)))
   }
 
   async removeStake(slot: bigint): Promise<boolean> {
-    const result = await (await this.contract()).removeStake(slot)
+    const result = await (this.contract).removeStake(slot)
     await result.wait()
     return true
   }
@@ -95,24 +82,24 @@ export class EvmChainService extends BaseService<EvmChainServiceParams> implemen
   }
 
   async rewardsContract(): Promise<string> {
-    return await (await this.contract()).rewardsContract()
+    return await (this.contract).rewardsContract()
   }
 
   async stakingTokenAddress(): Promise<string> {
-    return await (await this.contract()).stakingTokenAddress()
+    return await (this.contract).stakingTokenAddress()
   }
 
   async withdrawStake(slot: bigint): Promise<boolean> {
-    const result = await (await this.contract()).withdrawStake(slot)
+    const result = await (this.contract).withdrawStake(slot)
     await result.wait()
     return true
   }
 
   async withdrawn(): Promise<bigint> {
-    return await (await this.contract()).withdrawn()
+    return await (this.contract).withdrawn()
   }
 
   async withdrawnByStaker(staker: string): Promise<bigint> {
-    return await (await this.contract()).withdrawnByStaker(getAddress(staker))
+    return await (this.contract).withdrawnByStaker(getAddress(staker))
   }
 }

package/src/ChainService/Memory/Memory.ts

@@ -1,29 +1,27 @@
 import type {
   Address, Hex, Promisable,
 } from '@xylabs/sdk-js'
-import {
-  assertEx, toAddress, ZERO_ADDRESS,
-} from '@xylabs/sdk-js'
+import { toAddress, ZERO_ADDRESS } from '@xylabs/sdk-js'
 import type { AttoXL1, XL1BlockNumber } from '@xyo-network/xl1-protocol'
 import {
   ChainContractViewerMoniker,
-  type ChainService, type Config,
+  type ChainService,
 } from '@xyo-network/xl1-protocol-sdk'
 
 import { BaseService } from '../../BaseService.ts'
 import type { BaseServiceParams } from '../../model/index.ts'
 
-export interface MemoryChainServiceParams extends BaseServiceParams<Pick<Config, 'producer'>> {
+export interface MemoryChainViewerParams extends BaseServiceParams {
   chainId: Hex
 }
 
 /**
  * A class that represents a chain stake as backed in memory
  */
-export class MemoryChainService extends BaseService<MemoryChainServiceParams> implements ChainService {
+export class MemoryChainViewer extends BaseService<MemoryChainViewerParams> implements ChainService {
   static readonly defaultMoniker = ChainContractViewerMoniker
   static readonly monikers = [ChainContractViewerMoniker]
-  moniker = MemoryChainService.defaultMoniker
+  moniker = MemoryChainViewer.defaultMoniker
 
   protected _chainId: Hex | undefined
   protected _simulatedStake: bigint = 1n
@@ -44,12 +42,8 @@ export class MemoryChainService extends BaseService<MemoryChainServiceParams> im
     return await Promise.resolve(true)
   }
 
-  chainId(): Promisable<Hex> {
-    return assertEx(this._chainId, () => 'Chain ID not set')
-  }
-
   override createHandler(): void {
-    const { minStake = 1 } = this.params.config.producer ?? {}
+    const { minStake = 1 } = this.params.context.config.producer ?? {}
     this._simulatedStake = BigInt(minStake)
   }
 

package/src/ChainValidator/XyoValidator.ts

@@ -1,18 +1,20 @@
 import {
-  assertEx, creatable, EmptyObject,
+  creatable,
   Promisable,
 } from '@xylabs/sdk-js'
 import {
   BlockBoundWitness,
   SignedHydratedTransactionWithStorageMeta,
 } from '@xyo-network/xl1-protocol'
-import { BlockViewer, HydratedBlockStateValidationFunction } from '@xyo-network/xl1-protocol-sdk'
+import {
+  BlockViewer, BlockViewerMoniker, HydratedBlockStateValidationFunction,
+} from '@xyo-network/xl1-protocol-sdk'
 
 import { BaseService } from '../BaseService.ts'
 import { BaseServiceParams } from '../model/index.ts'
 import { Validator } from './model/index.ts'
 
-export interface XyoValidatorParams<TConfig extends EmptyObject = EmptyObject> extends BaseServiceParams<TConfig> {
+export interface XyoValidatorParams extends BaseServiceParams {
   // account: AccountInstance
   // blockRewardService: BlockRewardService
   blockViewer: BlockViewer
@@ -25,6 +27,7 @@ export interface XyoValidatorParams<TConfig extends EmptyObject = EmptyObject> e
 
 @creatable()
 export class XyoValidator<TParams extends XyoValidatorParams = XyoValidatorParams> extends BaseService<TParams> implements Validator {
+  private _blockViewer?: BlockViewer
   // get address() {
   //   return this.account.address
   // }
@@ -34,7 +37,7 @@ export class XyoValidator<TParams extends XyoValidatorParams = XyoValidatorParam
   // }
 
   protected get blockViewer() {
-    return assertEx(this.params.blockViewer, () => 'blockViewer is required')
+    return this._blockViewer!
   }
 
   // protected get chainInfo() {
@@ -53,6 +56,10 @@ export class XyoValidator<TParams extends XyoValidatorParams = XyoValidatorParam
   //   return assertEx(this.params.blockRewardService, () => 'blockRewardService is required')
   // }
 
+  override async createHandler() {
+    this._blockViewer = await this.locator.getInstance(BlockViewerMoniker)
+  }
+
   validatePendingBlock(_block: BlockBoundWitness): Promisable<Error[]> {
     return [] // await validateBlockProtocol(block, this.chainInfo)
   }

package/src/PendingTransactions/BasePendingTransactions.ts

@@ -96,10 +96,6 @@ export class BasePendingTransactionsService extends BaseService<BasePendingTrans
     return assertEx(this.params.chainArchivist, () => 'No completed blocks with data archivist')
   }
 
-  private get chainId() {
-    return assertEx(this.params.chainId, () => 'No chain id')
-  }
-
   private get pendingBundledTransactionsArchivist() {
     return assertEx(this.params.pendingBundledTransactionsArchivist, () => 'No pending bundled transactions archivist')
   }
@@ -196,7 +192,7 @@ export class BasePendingTransactionsService extends BaseService<BasePendingTrans
 
           const txValidationResults = await Promise.all(activeTransactions.map(async tx => ([tx, await validateTransaction(
             tx,
-            { chainId: this.chainId },
+            { chainId: this.params.chainId },
             this.additionalPendingTransactionValidators,
           )])))
 
@@ -268,7 +264,7 @@ export class BasePendingTransactionsService extends BaseService<BasePendingTrans
         }))).filter(exists)
         // Filter to only valid transactions
         const validTransactions = await filterAsync(hydratedUnprocessedTransactions, async (tx) => {
-          const errors = await validateTransaction(tx, { chainId: this.chainId }, [TransactionJsonSchemaValidator])
+          const errors = await validateTransaction(tx, { chainId: this.params.chainId }, [TransactionJsonSchemaValidator])
           if (errors.length > 0) {
             this.logger?.warn('validateTransaction', errors)
           }

package/src/Schemas/BaseSchemasService.ts

@@ -12,7 +12,7 @@ import { BaseService } from '../BaseService.ts'
 import { BaseServiceParams } from '../model/index.ts'
 
 export interface BaseSchemasServiceParams extends BaseServiceParams {
-  context: SchemasStepSummaryContext
+  schemasStepSummaryContext: SchemasStepSummaryContext
 }
 
 @creatable()
@@ -23,7 +23,7 @@ export class BaseSchemasService extends BaseService<BaseSchemasServiceParams> im
 
   async schemas(head: Hash, schemas: Schema[]): Promise<Partial<Record<Schema, number>>> {
     return await spanRootAsync('transfers', async () => {
-      const [summary] = await schemasSummary(this.params.context)
+      const [summary] = await schemasSummary(this.params.schemasStepSummaryContext)
       const result: Record<Schema, number> = {}
       for (const schema of schemas) {
         const count = summary[schema] ?? 0

package/src/StakeIntent/XyoStakeIntentService.ts

@@ -20,8 +20,9 @@ import {
 import {
   asChainIndexingServiceStateWithStorageMeta,
   BlockViewer,
+  BlockViewerMoniker,
   ChainIndexingServiceState, ChainIndexingServiceStateSchema, ChainStakeViewer,
-  Config,
+  ChainStakeViewerMoniker,
   isChainIndexingServiceState,
   readPayloadMapFromStore,
   StakeIntentService,
@@ -33,7 +34,7 @@ import { LRUCache } from 'lru-cache'
 import { BaseService } from '../BaseService.ts'
 import { BaseServiceParams } from '../model/index.ts'
 
-export interface XyoStakeIntentServiceParams extends BaseServiceParams<Pick<Config, 'producer'>> {
+export interface XyoStakeIntentServiceParams extends BaseServiceParams {
   blockViewer: BlockViewer
   chainArchivist: ArchivistInstance
   chainStakeViewer: ChainStakeViewer
@@ -65,8 +66,11 @@ export class XyoStakeIntentService extends BaseService<XyoStakeIntentServicePara
   protected _stakeCache = new LRUCache<Address, bigint>({ max: STAKE_CACHE_MAX_ENTRIES })
   protected _updateMutex = new Mutex()
 
+  private _blockViewer?: BlockViewer
+  private _chainStakeViewer?: ChainStakeViewer
+
   protected get blockViewer() {
-    return this.params.blockViewer
+    return this._blockViewer!
   }
 
   protected get chainArchivist() {
@@ -74,24 +78,24 @@ export class XyoStakeIntentService extends BaseService<XyoStakeIntentServicePara
   }
 
   protected get chainStakeViewer() {
-    return assertEx(this.params.chainStakeViewer!, () => 'chainStakeViewer not set')
+    return this._chainStakeViewer!
   }
 
   protected get stakeIntentStateArchivist() {
     return assertEx(this.params.stakeIntentStateArchivist!, () => 'stakeIntentStateArchivist not set')
   }
 
-  static override async paramsHandler(params?: Partial<XyoStakeIntentServiceParams>): Promise<XyoStakeIntentServiceParams> {
+  static override async paramsHandler(params: Partial<XyoStakeIntentServiceParams>): Promise<XyoStakeIntentServiceParams> {
     return {
       ...await super.paramsHandler(params),
-      blockViewer: assertEx(params?.blockViewer, () => 'blockViewer is required'),
       chainArchivist: assertEx(params?.chainArchivist, () => 'chainArchivist is required'),
-      chainStakeViewer: assertEx(params?.chainStakeViewer, () => 'chainStakeViewer is required'),
       stakeIntentStateArchivist: assertEx(params?.stakeIntentStateArchivist, () => 'stakeIntentStateArchivist is required'),
     } as XyoStakeIntentServiceParams
   }
 
   override async createHandler() {
+    this._blockViewer = await this.locator.getInstance(BlockViewerMoniker)
+    this._chainStakeViewer = await this.locator.getInstance(ChainStakeViewerMoniker)
     const head = await this.blockViewer.currentBlock()
     if (isUndefined(head)) return
     await this.recoverState(head[0]._hash)
@@ -118,7 +122,7 @@ export class XyoStakeIntentService extends BaseService<XyoStakeIntentServicePara
   getRequiredMinimumStakeForIntent(intent: Intent): bigint {
     switch (intent) {
       case 'producer': {
-        const { minStake } = this.params.config.producer
+        const { minStake } = this.params.context.config.producer
         return BigInt(minStake)
       }
     }