@xyo-network/chain-services 1.16.23 → 1.16.24

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "http://json.schemastore.org/package.json",
   "name": "@xyo-network/chain-services",
-  "version": "1.16.23",
+  "version": "1.16.24",
   "description": "XYO Layer One SDK Services",
   "homepage": "https://xylabs.com",
   "bugs": {
@@ -48,20 +48,21 @@
     "@xyo-network/boundwitness-model": "~5.1.24",
     "@xyo-network/boundwitness-validator": "~5.1.24",
     "@xyo-network/boundwitness-wrapper": "~5.1.24",
-    "@xyo-network/chain-analyze": "~1.16.23",
-    "@xyo-network/chain-modules": "~1.16.23",
-    "@xyo-network/chain-protocol": "~1.16.23",
-    "@xyo-network/chain-utils": "~1.16.23",
+    "@xyo-network/chain-analyze": "~1.16.24",
+    "@xyo-network/chain-modules": "~1.16.24",
+    "@xyo-network/chain-protocol": "~1.16.24",
+    "@xyo-network/chain-utils": "~1.16.24",
     "@xyo-network/payload-builder": "~5.1.24",
     "@xyo-network/payload-model": "~5.1.24",
     "@xyo-network/typechain": "~4.0.10",
     "@xyo-network/xl1-protocol": "~1.13.13",
-    "@xyo-network/xl1-protocol-sdk": "~1.16.23",
-    "@xyo-network/xl1-validation": "~1.16.23",
-    "@xyo-network/xl1-wrappers": "~1.16.23",
+    "@xyo-network/xl1-protocol-sdk": "~1.16.24",
+    "@xyo-network/xl1-validation": "~1.16.24",
+    "@xyo-network/xl1-wrappers": "~1.16.24",
     "async-mutex": "~0.5.0",
     "ethers": "6.15.0",
-    "lru-cache": "~11.2.2"
+    "lru-cache": "~11.2.2",
+    "zod": "~4.1.12"
   },
   "devDependencies": {
     "@types/node": "~24.10.1",
@@ -71,7 +72,7 @@
     "@xylabs/vitest-extended": "~5.0.39",
     "@xyo-network/account": "~5.1.24",
     "@xyo-network/account-model": "~5.1.24",
-    "@xyo-network/chain-validation": "~1.16.23",
+    "@xyo-network/chain-validation": "~1.16.24",
     "@xyo-network/wallet": "~5.1.24",
     "eslint": "^9.39.1",
     "tslib": "~2.8.1",

package/src/AccountBalance/BaseAccountBalanceService.ts

@@ -1,6 +1,5 @@
 import {
-  Address, creatable, Hash,
-  Promisable,
+  Address, assertEx, creatable, Hash,
 } from '@xylabs/sdk-js'
 import { spanRootAsync } from '@xylabs/telemetry'
 import { ReadArchivist } from '@xyo-network/archivist-model'
@@ -15,11 +14,19 @@ import {
   SimpleAccountBalanceViewer,
   TransfersStepSummaryContext,
 } from '@xyo-network/xl1-protocol-sdk'
+import z from 'zod'
 
 import { BaseService } from '../BaseService.ts'
 import { blockViewerFromChainIteratorAndArchivist } from '../blockViewerFromChainIteratorAndArchivist.ts'
 import { BaseServiceParams } from '../model/index.ts'
 
+export const BaseAccountBalanceServiceParamsZod = z.object({
+  chainArchivist: z.object().loose(),
+  chainIterator: z.object().loose(),
+  context: z.object().loose(),
+  transferContext: z.object().loose(),
+})
+
 export interface BaseAccountBalanceServiceParams extends BaseServiceParams {
   chainArchivist: ReadArchivist
   chainIterator: EventingChainBlockNumberIteratorService
@@ -32,22 +39,36 @@ export class BaseAccountBalanceService extends BaseService<BaseAccountBalanceSer
   protected accountBalanceViewer!: AccountBalanceViewer
   protected blockViewer!: BlockViewer
 
+  static override async paramsHandler(params?: Partial<BaseAccountBalanceServiceParams> | undefined): Promise<BaseAccountBalanceServiceParams> {
+    // TODO: Use a real zod and move the zod check to the AbstractCreatable class
+    BaseAccountBalanceServiceParamsZod.parse(params)
+    assertEx(params?.context?.head, () => 'BalanceStepSummaryContext is required in BaseAccountBalanceServiceParams')
+    return { ...(await super.paramsHandler(params)), ...params } as BaseAccountBalanceServiceParams
+  }
+
   async accountBalance(address: Address, headOrRange?: XL1BlockRange | Hash): Promise<AttoXL1> {
-    const balances = await this.accountBalances([address], headOrRange)
+    const balances = await this.accountsBalances([address], headOrRange)
     return balances[address] ?? AttoXL1(0n)
   }
 
   async accountBalanceHistory(address: Address): Promise<AccountBalanceHistoryItem[]>
   async accountBalanceHistory(address: Address, head: Hash): Promise<AccountBalanceHistoryItem[]>
   async accountBalanceHistory(address: Address, range: XL1BlockRange): Promise<AccountBalanceHistoryItem[]>
-  async accountBalanceHistory(address: Address, headOrRange?: Hash | XL1BlockRange): Promise<AccountBalanceHistoryItem[]> {
-    return await this.accountBalanceViewer.accountBalanceHistory(address, headOrRange)
+  accountBalanceHistory(_address: Address, _headOrRange?: Hash | XL1BlockRange): Promise<AccountBalanceHistoryItem[]> {
+    throw new Error('Method not implemented.')
   }
 
-  async accountBalances(address: Address[], _headOrRange?: XL1BlockRange | Hash): Promise<Partial<Record<Address, AttoXL1>>> {
+  async accountsBalances(address: Address[], _headOrRange?: Hash | XL1BlockRange): Promise<Partial<Record<Address, AttoXL1>>> {
     return await spanRootAsync('balances', async () => {
+      const context = {
+        head: this.params.context.head,
+        stepSemaphores: this.params.context.stepSemaphores,
+        store: this.params.context.store,
+        chainId: this.params.context.chainId,
+        summaryMap: this.params.context.summaryMap,
+      } satisfies BalanceStepSummaryContext
       const summary = await balancesSummary(
-        this.params.context,
+        context,
       )
       const result: Record<Address, AttoXL1> = {}
       for (const addr of address) {
@@ -58,15 +79,11 @@ export class BaseAccountBalanceService extends BaseService<BaseAccountBalanceSer
     })
   }
 
-  accountsBalances(address: Address[], headOrRange?: Hash | XL1BlockRange): Promisable<Partial<Record<Address, AttoXL1>>> {
-    throw new Error('Method not implemented.')
-  }
-
   async accountsBalancesHistory(addresses: Address[]): Promise<Partial<Record<Address, AccountBalanceHistoryItem[]>>>
   async accountsBalancesHistory(addresses: Address[], head: Hash): Promise<Partial<Record<Address, AccountBalanceHistoryItem[]>>>
   async accountsBalancesHistory(addresses: Address[], range: XL1BlockRange): Promise<Partial<Record<Address, AccountBalanceHistoryItem[]>>>
-  async accountsBalancesHistory(addresses: Address[], headOrRange?: Hash | XL1BlockRange): Promise<Partial<Record<Address, AccountBalanceHistoryItem[]>>> {
-    return await this.accountBalanceViewer.accountsBalancesHistory(addresses, headOrRange)
+  accountsBalancesHistory(_addresses: Address[], _headOrRange?: Hash | XL1BlockRange): Promise<Partial<Record<Address, AccountBalanceHistoryItem[]>>> {
+    throw new Error('Method not implemented.')
   }
 
   override createHandler() {

package/src/BlockProducer/BaseBlockProducerService.ts

@@ -1,6 +1,6 @@
 /* eslint-disable max-statements */
 import {
-  Address, asHash, assertEx, creatable,
+  Address, AddressZod, asHash, assertEx, creatable,
   exists,
   Hex,
   hexToBigInt,
@@ -23,6 +23,7 @@ import {
 import {
   AccountBalanceViewer, BlockProducerService, Config, PendingTransactionsService, StakeIntentService, TimeSyncViewer,
 } from '@xyo-network/xl1-protocol-sdk'
+import z from 'zod'
 
 import { BaseService } from '../BaseService.ts'
 import { XyoValidatorParams } from '../ChainValidator/index.ts'
@@ -44,6 +45,14 @@ export const XYO_PRODUCER_REDECLARATION_DURATION = 10_000
  */
 export const XYO_PRODUCER_REDECLARATION_WINDOW = 500
 
+export const BaseBlockProducerServiceParamsZod = z.object({
+  balanceService: z.object().loose(),
+  pendingTransactionsService: z.object().loose(),
+  rejectedTransactionsArchivist: z.object().loose(),
+  rewardAddress: AddressZod,
+  time: z.object().loose(),
+})
+
 export interface BaseBlockProducerServiceParams extends XyoValidatorParams<Pick<Config, 'producer'>> {
   balanceService: AccountBalanceViewer
   pendingTransactionsService: PendingTransactionsService
@@ -131,6 +140,12 @@ export class BaseBlockProducerService extends BaseService<BaseBlockProducerServi
     return assertEx(this.params.validateHydratedBlockState, () => 'validateHydratedBlockState is required')
   }
 
+  static override async paramsHandler(params?: Partial<BaseBlockProducerServiceParams> | undefined): Promise<BaseBlockProducerServiceParams> {
+    // TODO: Use a real zod and move the zod check to the AbstractCreatable class
+    BaseBlockProducerServiceParamsZod.parse(params)
+    return { ...(await super.paramsHandler(params)), ...params } as BaseBlockProducerServiceParams
+  }
+
   async next(head: WithStorageMeta<BlockBoundWitness>): Promise<HydratedBlock | undefined> {
     // If the block is for another chain, ignore
     if (head.chain !== this.chainId) return