@xyo-network/chain-services 1.17.0 → 1.17.1

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

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

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

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

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

@@ -0,0 +1,117 @@
+import { AbstractCreatable, Address, CreatableParams, 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';
+/**
+ * The default block size for a block
+ */
+export declare const DEFAULT_BLOCK_SIZE = 10;
+/**
+ * The amount of time for which a producer will restake their intent
+ */
+export declare const XYO_PRODUCER_REDECLARATION_DURATION = 10000;
+/**
+ * The number of blocks within which a producer will redeclare
+ * 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 & {
+    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;
+    /**
+     * The default block size for a block
+     */
+    static get DefaultBlockSize(): number;
+    /**
+     * The amount of time for which the producer will redeclare
+     * their intent to continue producing blocks
+     */
+    static get RedeclarationDuration(): number;
+    /**
+     * The number of blocks within which the producer will redeclare
+     * their intent to continue producing blocks
+     */
+    static get RedeclarationWindow(): number;
+    get address(): Address;
+    protected get account(): AccountInstance;
+    protected get balanceViewer(): AccountBalanceViewer;
+    protected get blockRewardViewer(): BlockRewardViewer;
+    protected get chainId(): Hex;
+    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>;
+    next(head: WithHashMeta<BlockBoundWitness>): Promise<SignedHydratedBlockWithHashMeta | undefined>;
+    produceNextBlock(head: SignedBlockBoundWitnessWithHashMeta, force: true): Promise<SignedHydratedBlockWithHashMeta>;
+    produceNextBlock(head: SignedBlockBoundWitnessWithHashMeta, force?: false): Promise<SignedHydratedBlockWithHashMeta | undefined>;
+    protected getBlockRewardTransfers(block: number): Promise<Transfer[]>;
+    /**
+     * Handles the producer redeclaration logic
+     * @param head The current head block
+     * @returns chain stake intent for the producer redeclaration, or undefined if no redeclaration is needed
+     */
+    protected getProducerRedeclaration(head: WithHashMeta<BlockBoundWitness>): Promisable<ChainStakeIntent | undefined>;
+    protected proposeNextValidBlock(head: WithHashMeta<BlockBoundWitness>, validateBalances?: boolean, force?: boolean): Promise<[{
+        schema: "network.xyo.boundwitness";
+        addresses: Address[];
+        payload_hashes: import("@xylabs/sdk-js").Hash[];
+        payload_schemas: string[];
+        previous_hashes: (import("@xylabs/sdk-js").Hash | null)[];
+        $signatures: Hex[];
+        block: import("@xyo-network/xl1-protocol").XL1BlockNumber;
+        chain: Hex;
+        previous: import("@xylabs/sdk-js").Hash | null;
+        $epoch: number;
+        _hash: import("@xylabs/sdk-js").Hash;
+        _dataHash: import("@xylabs/sdk-js").Hash;
+        $destination?: Address | undefined;
+        $sourceQuery?: import("@xylabs/sdk-js").Hash | undefined;
+        protocol?: number | undefined;
+        step_hashes?: import("@xylabs/sdk-js").Hash[] | undefined;
+    }, {
+        schema: string;
+        _hash: import("@xylabs/sdk-js").Hash;
+        _dataHash: import("@xylabs/sdk-js").Hash;
+    }[]] | undefined>;
+    private filterByFunded;
+    private generateTimePayload;
+    /**
+     * Check if a heartbeat block is required based on network activity.
+     * @param head The current head block
+     * @returns True if a heartbeat is required, false otherwise
+     */
+    private heartbeatRequired;
+}
+//# sourceMappingURL=SimpleBlockRunner.d.ts.map

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

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

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

@@ -0,0 +1 @@
+{"version":3,"file":"generateTransactionFeeTransfers.d.ts","sourceRoot":"","sources":["../../../../../src/simple/block/runner/generateTransactionFeeTransfers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAAiB,MAAM,gBAAgB,CAAA;AAG5D,OAAO,KAAK,EACV,yBAAyB,EACzB,QAAQ,EAET,MAAM,2BAA2B,CAAA;AAKlC,wBAAsB,+BAA+B,CAAC,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,yBAAyB,EAAE,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC,CA0CtI"}

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

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

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/simple/block/runner/index.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAA"}

package/dist/neutral/simple/block/runner/spec/SimpleBlockRewardViewer.d.ts

@@ -0,0 +1,2 @@
+import '@xylabs/vitest-extended';
+//# sourceMappingURL=SimpleBlockRewardViewer.d.ts.map

package/dist/neutral/simple/block/runner/spec/SimpleBlockRewardViewer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"SimpleBlockRewardViewer.d.ts","sourceRoot":"","sources":["../../../../../../src/simple/block/runner/spec/SimpleBlockRewardViewer.ts"],"names":[],"mappings":"AAAA,OAAO,yBAAyB,CAAA"}

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

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

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/simple/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAA"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "http://json.schemastore.org/package.json",
   "name": "@xyo-network/chain-services",
-  "version": "1.17.0",
+  "version": "1.17.1",
   "description": "XYO Layer One SDK Services",
   "homepage": "https://xylabs.com",
   "bugs": {
@@ -40,44 +40,47 @@
   ],
   "dependencies": {
     "@opentelemetry/api": "~1.9.0",
-    "@xylabs/sdk-js": "~5.0.46",
-    "@xylabs/telemetry": "~5.0.46",
-    "@xyo-network/account-model": "~5.2.10",
-    "@xyo-network/archivist-memory": "~5.2.10",
-    "@xyo-network/archivist-model": "~5.2.10",
-    "@xyo-network/boundwitness-model": "~5.2.10",
-    "@xyo-network/boundwitness-validator": "~5.2.10",
-    "@xyo-network/boundwitness-wrapper": "~5.2.10",
-    "@xyo-network/chain-analyze": "~1.17.0",
-    "@xyo-network/chain-modules": "~1.17.0",
-    "@xyo-network/chain-protocol": "~1.17.0",
-    "@xyo-network/chain-utils": "~1.17.0",
-    "@xyo-network/payload-builder": "~5.2.10",
-    "@xyo-network/payload-model": "~5.2.10",
+    "@xylabs/sdk-js": "~5.0.48",
+    "@xylabs/telemetry": "~5.0.48",
+    "@xyo-network/account-model": "~5.2.13",
+    "@xyo-network/archivist-memory": "~5.2.13",
+    "@xyo-network/archivist-model": "~5.2.13",
+    "@xyo-network/boundwitness-model": "~5.2.13",
+    "@xyo-network/boundwitness-validator": "~5.2.13",
+    "@xyo-network/boundwitness-wrapper": "~5.2.13",
+    "@xyo-network/chain-analyze": "~1.17.1",
+    "@xyo-network/chain-modules": "~1.17.1",
+    "@xyo-network/chain-protocol": "~1.17.1",
+    "@xyo-network/chain-utils": "~1.17.1",
+    "@xyo-network/payload-builder": "~5.2.13",
+    "@xyo-network/payload-model": "~5.2.13",
     "@xyo-network/typechain": "~4.0.10",
-    "@xyo-network/xl1-protocol": "~1.14.15",
-    "@xyo-network/xl1-protocol-sdk": "~1.17.0",
-    "@xyo-network/xl1-validation": "~1.17.0",
-    "@xyo-network/xl1-wrappers": "~1.17.0",
+    "@xyo-network/xl1-protocol": "~1.14.16",
+    "@xyo-network/xl1-protocol-sdk": "~1.17.1",
+    "@xyo-network/xl1-rpc": "~1.17.1",
+    "@xyo-network/xl1-validation": "~1.17.1",
+    "@xyo-network/xl1-wrappers": "~1.17.1",
     "async-mutex": "~0.5.0",
     "ethers": "6.15.0",
-    "lru-cache": "~11.2.2",
+    "lru-cache": "~11.2.4",
     "zod": "~4.1.13"
   },
   "devDependencies": {
     "@types/node": "~24.10.1",
-    "@xylabs/sdk-js": "~5.0.46",
+    "@xylabs/sdk-js": "~5.0.48",
     "@xylabs/ts-scripts-yarn3": "~7.2.8",
     "@xylabs/tsconfig": "~7.2.8",
-    "@xylabs/vitest-extended": "~5.0.46",
-    "@xyo-network/account": "~5.2.10",
-    "@xyo-network/account-model": "~5.2.10",
-    "@xyo-network/chain-validation": "~1.17.0",
-    "@xyo-network/wallet": "~5.2.10",
+    "@xylabs/vitest-extended": "~5.0.48",
+    "@xyo-network/account": "~5.2.13",
+    "@xyo-network/account-model": "~5.2.13",
+    "@xyo-network/chain-validation": "~1.17.1",
+    "@xyo-network/wallet": "~5.2.13",
+    "@xyo-network/wallet-model": "~5.2.13",
+    "cosmiconfig": "^9.0.0",
     "eslint": "^9.39.1",
     "tslib": "~2.8.1",
     "typescript": "~5.9.3",
-    "vitest": "~4.0.14",
+    "vitest": "~4.0.15",
     "vitest-mock-extended": "~3.1.0",
     "web3-types": "~1.10.0"
   },

package/src/AccountBalance/accountBalanceServiceFromArchivist.ts

@@ -4,16 +4,18 @@ import type { ReadArchivist } 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 } from '@xyo-network/xl1-protocol-sdk'
+import type {
+  AccountBalanceViewer, BalancesStepSummary, SimpleAccountBalanceViewerParams, SimpleBlockViewerParams, TransfersStepSummary,
+} from '@xyo-network/xl1-protocol-sdk'
 import {
   findMostRecentBlock, LruCacheMap, readPayloadMapFromStore,
+  SimpleAccountBalanceViewer,
+  SimpleBlockViewer,
 } from '@xyo-network/xl1-protocol-sdk'
 import { Semaphore } from 'async-mutex'
 
-import { BaseAccountBalanceService } from './BaseAccountBalanceService.ts'
-
 // this is intended to only be used for testing
-export const accountBalancesServiceFromArchivist = async (
+export const accountBalancesViewerFromArchivist = async (
   chainId: ChainId,
   archivist: ReadArchivist<WithStorageMeta<Payload>>,
 ): Promise<AccountBalanceViewer> => {
@@ -23,12 +25,21 @@ export const accountBalancesServiceFromArchivist = async (
     noDisposeOnSet: false,
     updateAgeOnGet: true,
   })
+
+  const transferSummaryMap = new LruCacheMap<string, TransfersStepSummary>({
+    max: 100_000,
+    allowStale: true,
+    noDisposeOnSet: false,
+    updateAgeOnGet: true,
+  })
+
   const chainMap = readPayloadMapFromStore<WithStorageMeta<Payload>>(archivist)
   const headFunc = async (): Promise<[Hash, number]> => {
-    const head = await findMostRecentBlock(archivist)
-    return [assertEx(head?._hash, () => 'No head found in chainArchivist'), assertEx(head?.block, () => 'No head found in chainArchivist')]
+    const head = assertEx(await findMostRecentBlock(archivist), () => 'No blocks found in chainArchivist')
+    return [head._hash, head.block]
   }
-  const service = await BaseAccountBalanceService.create({
+
+  const service = await SimpleAccountBalanceViewer.create({
     context: {
       chainId,
       store: { chainMap },
@@ -36,6 +47,22 @@ export const accountBalancesServiceFromArchivist = async (
       summaryMap,
       head: headFunc,
     },
-  })
+    transfersSummaryContext: {
+      chainId,
+      store: { chainMap },
+      stepSemaphores: StepSizes.map(() => new Semaphore(20)),
+      summaryMap: transferSummaryMap,
+      head: headFunc,
+
+    },
+    blockViewer: await SimpleBlockViewer.create({
+      context: {
+        chainId,
+        head: headFunc,
+        store: { chainMap },
+      },
+      finalizedArchivist: archivist,
+    } satisfies SimpleBlockViewerParams),
+  } satisfies SimpleAccountBalanceViewerParams)
   return service
 }

package/src/AccountBalance/index.ts

@@ -1,2 +1 @@
 export * from './accountBalanceServiceFromArchivist.ts'
-export * from './BaseAccountBalanceService.ts'

package/src/BaseService.ts

@@ -1,6 +1,5 @@
 import type { EventData, Promisable } from '@xylabs/sdk-js'
 import { AbstractCreatable, creatable } from '@xylabs/sdk-js'
-import { spanRoot, spanRootAsync } from '@xylabs/telemetry'
 import { Mutex } from 'async-mutex'
 
 import type { BaseAccountableServiceParams, BaseServiceParams } from './model/index.ts'
@@ -24,18 +23,6 @@ export class BaseService<TParams extends BaseServiceParams = BaseServiceParams,
       return await this.create(params) as TService
     })
   }
-
-  paramsHandler(params?: Partial<TParams>): TParams {
-    return params as TParams
-  }
-
-  span<T>(name: string, fn: () => T): T {
-    return spanRoot(name, fn, this.tracer)
-  }
-
-  async spanAsync<T>(name: string, fn: () => Promise<T>): Promise<T> {
-    return await spanRootAsync(name, fn, this.tracer)
-  }
 }
 
 export abstract class BaseAccountableService<

package/src/BlockReward/EvmBlockRewardViewer.ts

@@ -0,0 +1,50 @@
+import {
+  AbstractCreatable,
+  assertEx, creatable, CreatableParams, toEthAddress,
+} from '@xylabs/sdk-js'
+import { XyoChainRewards__factory as XyoChainRewardsFactory } from '@xyo-network/typechain'
+import {
+  asAttoXL1, AttoXL1, XL1BlockNumber,
+} from '@xyo-network/xl1-protocol'
+import {
+  BlockRewardViewer,
+  ChainContractViewer,
+} from '@xyo-network/xl1-protocol-sdk'
+import { Provider } from 'ethers/providers'
+
+export interface EvmBlockRewardViewerParams extends CreatableParams {
+  chainContractViewer: ChainContractViewer
+  provider: Provider
+}
+
+@creatable()
+export class EvmBlockRewardViewer extends AbstractCreatable<EvmBlockRewardViewerParams> implements BlockRewardViewer {
+  protected _contractAddress: string | undefined
+
+  protected get chainContractViewer() {
+    return assertEx(this.params.chainContractViewer, () => 'chainContractViewer is required')
+  }
+
+  protected get contractAddress() {
+    return assertEx(this._contractAddress, () => 'contractAddress is required')
+  }
+
+  protected get provider() {
+    return assertEx(this.params.provider, () => 'provider is required')
+  }
+
+  async allowedRewardForBlock(blockNumber: XL1BlockNumber): Promise<AttoXL1> {
+    const contract = XyoChainRewardsFactory.connect(toEthAddress(this.contractAddress), this.provider)
+    return asAttoXL1(await contract.calcBlockReward(blockNumber))
+  }
+
+  override async createHandler() {
+    await super.createHandler()
+    try {
+      this._contractAddress = await this.chainContractViewer.rewardsContract()
+    } catch (ex) {
+      const error = ex as Error
+      throw new Error(`Failed to get rewards contract address: ${error.message}`)
+    }
+  }
+}

package/src/BlockReward/index.ts

@@ -1,3 +1 @@
-export * from './BaseBlockRewardService.ts'
-export * from './EvmBlockRewardService.ts'
-export * from './MemoryBlockRewardService.ts'
+export * from './EvmBlockRewardViewer.ts'

package/src/ChainBlockNumberIteration/ChainBlockNumberIterationService.ts

@@ -1,10 +1,14 @@
-import type { Hash, Hex } from '@xylabs/sdk-js'
+import type {
+  Hash, Hex, Promisable,
+} from '@xylabs/sdk-js'
 import {
   assertEx,
   isDefined, isNull, isUndefined,
 } from '@xylabs/sdk-js'
 import { PayloadBuilder } from '@xyo-network/payload-builder'
-import type { Payload, WithStorageMeta } from '@xyo-network/payload-model'
+import type {
+  Payload, WithHashMeta, WithStorageMeta,
+} from '@xyo-network/payload-model'
 import type {
   BlockBoundWitness, SignedHydratedBlockWithHashMeta, XL1BlockNumber,
 } from '@xyo-network/xl1-protocol'
@@ -124,6 +128,14 @@ export class ChainBlockNumberIterationService extends BaseService<XyoChainIterat
     return await this.get(nextBlockNumber)
   }
 
+  payloadByHash(_hash: Hash): Promisable<WithHashMeta<Payload> | null> {
+    throw new Error('Method [payloadByHash] not implemented.')
+  }
+
+  payloadsByHash(_hashes: Hash[]): Promisable<WithHashMeta<Payload>[]> {
+    throw new Error('Method [payloadsByHash] not implemented.')
+  }
+
   // TODO: Decide on inclusive/exclusive (probably need inclusive to account for chain head)
   // and then communicate via method name and documentation
   async previous(block: number | undefined = undefined, count: number = 1): Promise<WithStorageMeta<BlockBoundWitness>[]> {

package/src/ChainService/Evm/Evm.ts

@@ -6,6 +6,7 @@ import {
 } 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 type { ChainService } from '@xyo-network/xl1-protocol-sdk'
 import { getAddress } from 'ethers/address'
 import type { ContractRunner } from 'ethers/providers'
@@ -23,10 +24,6 @@ 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 {
-  get runner(): ContractRunner {
-    return assertEx(this.params.runner)
-  }
-
   async active(): Promise<bigint> {
     return await (await this.contract()).active()
   }
@@ -89,6 +86,10 @@ export class EvmChainService extends BaseService<EvmChainServiceParams> implemen
     return true
   }
 
+  rewardForBlock(_block: XL1BlockNumber): Promisable<AttoXL1> {
+    throw new Error('Method not implemented.')
+  }
+
   async rewardsContract(): Promise<string> {
     return await (await this.contract()).rewardsContract()
   }

package/src/ChainService/Memory/Memory.ts

@@ -4,6 +4,7 @@ import type {
 import {
   assertEx, toAddress, ZERO_ADDRESS,
 } from '@xylabs/sdk-js'
+import type { AttoXL1, XL1BlockNumber } from '@xyo-network/xl1-protocol'
 import type { ChainService, Config } from '@xyo-network/xl1-protocol-sdk'
 
 import { BaseService } from '../../BaseService.ts'
@@ -73,6 +74,10 @@ export class MemoryChainService extends BaseService<MemoryChainServiceParams> im
     return await Promise.resolve(true)
   }
 
+  rewardForBlock(_block: XL1BlockNumber): Promisable<AttoXL1> {
+    throw new Error('Method not implemented.')
+  }
+
   async rewardsContract(): Promise<string> {
     return await Promise.resolve('')
   }

package/src/ChainValidator/XyoValidator.ts

@@ -2,61 +2,56 @@ import {
   assertEx, creatable, EmptyObject,
   Promisable,
 } from '@xylabs/sdk-js'
-import { AccountInstance } from '@xyo-network/account-model'
-import { ArchivistInstance } from '@xyo-network/archivist-model'
 import {
   BlockBoundWitness,
-  ChainId,
   SignedHydratedTransactionWithStorageMeta,
 } from '@xyo-network/xl1-protocol'
-import {
-  BlockRewardService, BlockViewer, ElectionService, HydratedBlockStateValidationFunction, StakeIntentService,
-} from '@xyo-network/xl1-protocol-sdk'
+import { BlockViewer, 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> {
-  account: AccountInstance
+  // account: AccountInstance
+  // blockRewardService: BlockRewardService
   blockViewer: BlockViewer
-  chainId: ChainId
-  electionService: ElectionService
-  pendingBundledTransactionsArchivist: ArchivistInstance
-  rewardService: BlockRewardService
-  stakeIntentService: StakeIntentService
+  // chainId: ChainId
+  // electionService: ElectionService
+  // pendingBundledTransactionsArchivist: ArchivistInstance
+  // stakeIntentService: StakeIntentService
   validateHydratedBlockState: HydratedBlockStateValidationFunction
 }
 
 @creatable()
 export class XyoValidator<TParams extends XyoValidatorParams = XyoValidatorParams> extends BaseService<TParams> implements Validator {
-  get address() {
-    return this.account.address
-  }
+  // get address() {
+  //   return this.account.address
+  // }
 
-  protected get account() {
-    return assertEx(this.params.account, () => 'account is required')
-  }
+  // protected get account() {
+  //   return assertEx(this.params.account, () => 'account is required')
+  // }
 
   protected get blockViewer() {
     return assertEx(this.params.blockViewer, () => 'blockViewer is required')
   }
 
-  protected get chainInfo() {
-    return assertEx(this.params.chainId, () => 'chainInfo is required')
-  }
+  // protected get chainInfo() {
+  //   return assertEx(this.params.chainId, () => 'chainInfo is required')
+  // }
 
-  protected get electionService() {
-    return assertEx(this.params.electionService, () => 'electionService is required')
-  }
+  // protected get electionService() {
+  //   return assertEx(this.params.electionService, () => 'electionService is required')
+  // }
 
-  protected get pendingBundledTransactionsArchivist() {
-    return assertEx(this.params.pendingBundledTransactionsArchivist, () => 'pendingBundledTransactions is required')
-  }
+  // protected get pendingBundledTransactionsArchivist() {
+  //   return assertEx(this.params.pendingBundledTransactionsArchivist, () => 'pendingBundledTransactions is required')
+  // }
 
-  protected get rewardService() {
-    return assertEx(this.params.rewardService, () => 'rewardService is required')
-  }
+  // protected get blockRewardService() {
+  //   return assertEx(this.params.blockRewardService, () => 'blockRewardService is required')
+  // }
 
   validatePendingBlock(_block: BlockBoundWitness): Promisable<Error[]> {
     return [] // await validateBlockProtocol(block, this.chainInfo)