@xyo-network/xl1-cli-lib 1.16.26 → 1.17.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xyo-network/xl1-cli-lib",
-  "version": "1.16.26",
+  "version": "1.17.0",
   "description": "XYO Layer One CLI Library",
   "homepage": "https://xylabs.com",
   "bugs": {
@@ -49,22 +49,23 @@
     "@xyo-network/archivist-lmdb": "~5.2.10",
     "@xyo-network/archivist-memory": "~5.2.10",
     "@xyo-network/archivist-model": "~5.2.10",
-    "@xyo-network/chain-api": "~1.16.26",
-    "@xyo-network/chain-bridge": "~1.16.26",
-    "@xyo-network/chain-mempool": "~1.16.26",
-    "@xyo-network/chain-orchestration": "~1.16.26",
-    "@xyo-network/chain-protocol": "~1.16.26",
-    "@xyo-network/chain-reward-redemption": "~1.16.26",
-    "@xyo-network/chain-services": "~1.16.26",
-    "@xyo-network/chain-telemetry": "~1.16.26",
-    "@xyo-network/chain-utils": "~1.16.26",
-    "@xyo-network/chain-validation": "~1.16.26",
+    "@xyo-network/chain-api": "~1.17.0",
+    "@xyo-network/chain-bridge": "~1.17.0",
+    "@xyo-network/chain-mempool": "~1.17.0",
+    "@xyo-network/chain-orchestration": "~1.17.0",
+    "@xyo-network/chain-protocol": "~1.17.0",
+    "@xyo-network/chain-reward-redemption": "~1.17.0",
+    "@xyo-network/chain-services": "~1.17.0",
+    "@xyo-network/chain-telemetry": "~1.17.0",
+    "@xyo-network/chain-utils": "~1.17.0",
+    "@xyo-network/chain-validation": "~1.17.0",
     "@xyo-network/payload-builder": "~5.2.10",
     "@xyo-network/payload-model": "~5.2.10",
     "@xyo-network/wallet-model": "~5.2.10",
     "@xyo-network/xl1-protocol": "~1.14.15",
-    "@xyo-network/xl1-protocol-sdk": "~1.16.26",
-    "@xyo-network/xl1-validation": "~1.16.26",
+    "@xyo-network/xl1-protocol-sdk": "~1.17.0",
+    "@xyo-network/xl1-rpc": "~1.17.0",
+    "@xyo-network/xl1-validation": "~1.17.0",
     "async-mutex": "~0.5.0",
     "cosmiconfig": "~9.0.0",
     "dotenv": "~17.2.3",
@@ -77,16 +78,17 @@
     "@xylabs/tsconfig": "~7.2.8",
     "@xylabs/vitest-extended": "~5.0.46",
     "@xyo-network/account-model": "~5.2.10",
-    "@xyo-network/chain-test": "~1.16.26",
+    "@xyo-network/archivist-mongodb": "~5.2.10",
+    "@xyo-network/chain-test": "~1.17.0",
     "@xyo-network/wallet": "~5.2.10",
-    "@xyo-network/xl1-rpc": "~1.16.26",
+    "@xyo-network/xl1-rpc": "~1.17.0",
     "eslint": "^9.39.1",
     "lmdb": "~3.4.4",
     "nodemon": "~3.1.11",
     "rimraf": "~6.1.2",
     "tslib": "~2.8.1",
     "typescript": "~5.9.3",
-    "vitest": "~4.0.13",
+    "vitest": "~4.0.14",
     "vitest-mock-extended": "~3.1.0"
   },
   "peerDependencies": {

package/src/commands/producer/runProducer.ts

@@ -1,9 +1,11 @@
-import type { Logger } from '@xylabs/sdk-js'
+import {
+  exists, isDefined, type Logger,
+} from '@xylabs/sdk-js'
 import type { Config } from '@xyo-network/xl1-protocol-sdk'
 
 import type { Orchestrator } from '../../orchestration/index.ts'
 import {
-  BalanceActor, ChainHeadUpdateActor, initServices, ProducerActor,
+  BalanceActor, initServices, ProducerActor,
 } from '../../orchestration/index.ts'
 
 interface RunProducerContext {
@@ -24,10 +26,10 @@ export const runProducer = async (context: RunProducerContext) => {
 
   // Create actors
   const params = { ...services, config }
-  const chainHeadUpdate = await ChainHeadUpdateActor.create({ ...params, name: 'ChainHeadUpdateActor' })
-  const balances = await BalanceActor.create({ ...params, name: 'BalanceActor' })
+  const apiEndpoint = config.services.apiEndpoint
+  const balances = isDefined(apiEndpoint) ? undefined : await BalanceActor.create({ ...params, name: 'BalanceActor' })
   const producer = await ProducerActor.create({ ...params, name: 'ProducerActor' })
-  const actors = [chainHeadUpdate, balances, producer]
+  const actors = [balances, producer].filter(exists)
 
   for (const actor of actors) {
   // Register the actor with the orchestrator

package/src/commands/validator/runValidator.ts

@@ -3,7 +3,7 @@ import type { Config } from '@xyo-network/xl1-protocol-sdk'
 
 import type { Orchestrator } from '../../orchestration/index.ts'
 import {
-  BalanceActor, ChainHeadUpdateActor, initServices, ValidatorActor,
+  BalanceActor, initServices, ValidatorActor,
 } from '../../orchestration/index.ts'
 
 interface RunValidatorContext {
@@ -24,10 +24,9 @@ export const runValidator = async (context: RunValidatorContext) => {
 
   // Create actors
   const params = { ...services, config }
-  const chainHeadUpdate = await ChainHeadUpdateActor.create({ ...params, name: 'ChainHeadUpdateActor' })
   const balances = await BalanceActor.create({ ...params, name: 'BalanceActor' })
   const producer = await ValidatorActor.create({ ...params, name: 'ValidatorActor' })
-  const actors = [chainHeadUpdate, balances, producer]
+  const actors = [balances, producer]
 
   for (const actor of actors) {
   // Register the actor with the orchestrator

package/src/orchestration/actor/implementation/BalanceActor.ts

@@ -8,7 +8,7 @@ import type { ActorParams } from '../model/index.ts'
 import { Actor } from '../model/index.ts'
 
 export type BalanceActorParams = ActorParams<
-  Pick<ChainServiceCollectionV2, 'balance' | 'chainIterator'>
+  Pick<ChainServiceCollectionV2, 'balance' | 'blockViewer'>
   & { config: Config }>
 
 export class BalanceActor extends Actor<BalanceActorParams> {
@@ -22,8 +22,8 @@ export class BalanceActor extends Actor<BalanceActorParams> {
     return assertEx(this.params.balance, () => 'balanceService not set')
   }
 
-  protected get chainIterator() {
-    return assertEx(this.params.chainIterator, () => 'chainIterator not set')
+  protected get blockViewer() {
+    return assertEx(this.params.blockViewer, () => 'blockViewer not set')
   }
 
   static create(params: BalanceActorParams): Promisable<BalanceActor> {
@@ -32,9 +32,6 @@ export class BalanceActor extends Actor<BalanceActorParams> {
 
   override async start(): Promise<void> {
     await super.start()
-    this.chainIterator.on('headUpdate', async () => {
-      await this.updateBalance()
-    })
     this.registerTimer('BalanceTimer', async () => {
       await this.updateBalance()
     }, 1000, 10_000/* 1000 */)
@@ -43,7 +40,7 @@ export class BalanceActor extends Actor<BalanceActorParams> {
   protected async updateBalance(): Promise<void> {
     if (this._updateMutex.isLocked()) return
     await this._updateMutex.runExclusive(async () => {
-      const head = await PayloadBuilder.hash(await this.chainIterator.head())
+      const head = await this.blockViewer.currentBlockHash()
       await this.balanceService.accountsBalances([], head)
     })
   }

package/src/orchestration/actor/implementation/ProducerActor.ts

@@ -27,7 +27,7 @@ export type ProducerActorParams = ActorParams<
     ChainServiceCollectionV2,
     'account'
     | 'balance'
-    | 'chainIterator'
+    | 'blockViewer'
     | 'chainStakeViewer'
     | 'chainSubmissionsArchivistWrite'
     | 'pendingBundledTransactionsArchivistWrite'
@@ -82,8 +82,8 @@ export class ProducerActor extends Actor<ProducerActorParams> {
     return assertEx(this.params.balance, () => 'balanceService not set')
   }
 
-  protected get chainIterator() {
-    return assertEx(this.params.chainIterator, () => 'chainIterator not set')
+  protected get blockViewer() {
+    return assertEx(this.params.blockViewer, () => 'blockViewer not set')
   }
 
   protected get chainStakeViewer() {
@@ -154,7 +154,7 @@ export class ProducerActor extends Actor<ProducerActorParams> {
       await this._produceBlockMutex.runExclusive(async () => {
       // Get the updated head
         const headStart = Date.now()
-        const head = await this.chainIterator.head()
+        const head = (await this.blockViewer.currentBlock())[0]
         const headDuration = Date.now() - headStart
         if (headDuration > 500) this.logger?.warn(`[Slow] Fetched head in ${headDuration}ms: 0x${toHex(head._hash)}`)
         // Check if we've already produced the next block for this head
@@ -193,7 +193,7 @@ export class ProducerActor extends Actor<ProducerActorParams> {
       if (this.params.config.producer.disableIntentRedeclaration) return
 
       // Get the current block
-      const head = await this.chainIterator.head()
+      const head = (await this.blockViewer.currentBlock())[0]
       if (isUndefined(head)) return
       const currentBlock = head.block
 
@@ -256,7 +256,7 @@ export class ProducerActor extends Actor<ProducerActorParams> {
     this.logger?.log('Submitting redeclaration intent for producer:', this.account.address)
     // Create a transaction to submit the redeclaration intent
     const tx = await buildTransaction(
-      this.chainIterator.chainId,
+      await this.chainStakeViewer.chainId(),
       [redeclarationIntent],
       [],
       this.account,

package/src/orchestration/actor/implementation/ValidatorActor.ts

@@ -13,7 +13,7 @@ export type ValidatorActorParams = ActorParams<
   Pick<ChainServiceCollectionV2,
   'account'
   | 'balance'
-  | 'chainIterator'
+  | 'blockViewer'
   | 'chainStakeViewer'
   | 'chainSubmissionsArchivistWrite'
   | 'pendingBundledTransactionsArchivistWrite'
@@ -38,8 +38,8 @@ export class ValidatorActor extends Actor<ValidatorActorParams> {
     return assertEx(this.params.balance, () => 'balanceService not set')
   }
 
-  protected get chainIterator() {
-    return assertEx(this.params.chainIterator, () => 'chainIterator not set')
+  protected get blockViewer() {
+    return assertEx(this.params.blockViewer, () => 'blockViewer not set')
   }
 
   protected get chainStakeViewer() {
@@ -72,7 +72,7 @@ export class ValidatorActor extends Actor<ValidatorActorParams> {
     this.registerTimer('BlockProductionTimer', async () => {
       await this.spanAsync('produceBlock', async () => {
         // Get the updated head
-        const block = await this.chainIterator.head()
+        const block = (await this.blockViewer.currentBlock())[0]
         if (isUndefined(block)) return
         // Check if we've already validated this head
         const hash = await PayloadBuilder.hash(block)

package/src/orchestration/actor/implementation/index.ts

@@ -1,4 +1,3 @@
 export * from './BalanceActor.ts'
-export * from './ChainHeadUpdateActor.ts'
 export * from './ProducerActor.ts'
 export * from './ValidatorActor.ts'

package/src/orchestration/initServices.ts

@@ -6,35 +6,27 @@ import {
   asAddress, assertEx, isDefined,
 } from '@xylabs/sdk-js'
 import {
-  initChainIterator, initElectionService, initProducerAccount, initStakeIntentService,
+  initElectionService, initProducerAccount, initStakeIntentService,
 } from '@xyo-network/chain-orchestration'
-import {
-  type BaseBlockProducerServiceParams, blockViewerFromChainIteratorAndArchivist, type XyoValidatorParams,
-} from '@xyo-network/chain-services'
+import { type BaseBlockProducerServiceParams, type XyoValidatorParams } from '@xyo-network/chain-services'
 import { initTelemetry } from '@xyo-network/chain-telemetry'
 import { startupSpanAsync } from '@xyo-network/chain-utils'
 import { validateHydratedBlockState } from '@xyo-network/chain-validation'
-import type { Payload, WithStorageMeta } from '@xyo-network/payload-model'
-import { StepSizes } from '@xyo-network/xl1-protocol'
-import type {
-  BalanceStepSummaryContext, ChainServiceCollectionV2, Config, TransfersStepSummaryContext,
-} from '@xyo-network/xl1-protocol-sdk'
-import { readPayloadMapFromStore } from '@xyo-network/xl1-protocol-sdk'
+import type { ChainServiceCollectionV2, Config } from '@xyo-network/xl1-protocol-sdk'
 import {
   CompletedStepRewardAddressValidatorFactory, DerivedReceiveAddressValidatorFactory, SelfSignerValidator, TransactionTransfersValidatorFactory,
 } from '@xyo-network/xl1-validation'
-import { Semaphore } from 'async-mutex'
 
 import {
-  initChainFinalizedArchivist, initChainSubmissionsArchivist, initPendingBundledTransactionsArchivist, initRejectedTransactionsArchivist,
+  initChainSubmissionsArchivist, initPendingBundledTransactionsArchivist, initRejectedTransactionsArchivist,
   initStakeIntentStateArchivist,
 } from './archivists/index.ts'
 import type { ChainInitializableParams } from './ChainInitializableParams.ts'
 import { initHealthEndpoints } from './health/index.ts'
 import { initBalanceSummaryMap, initTransferSummaryMap } from './map/index.ts'
 import {
-  initAccountBalanceService, initBlockProducer, initBlockRewardService, initChainService, initHead,
-  initPendingTransactions, initTimeService, initTransferService,
+  initAccountBalanceService, initBlockProducer, initBlockRewardService, initBlockViewer, initChainService,
+  initPendingTransactions, initTimeService,
 } from './services/index.ts'
 import { RuntimeStatusMonitor } from './status/index.ts'
 
@@ -96,19 +88,13 @@ export const initServices = async (context: InitServicesContext): Promise<ChainS
 
   // Archivists
   const [
-    chainArchivist,
     [pendingBundledTransactionsArchivist, pendingBundledTransactionsArchivistWrite],
     rejectedTransactionsArchivist,
     chainSubmissionsArchivistWrite,
     stakeIntentStateArchivist,
     chainService,
     balanceSummaryMap,
-    transferSummaryMap,
   ] = await Promise.all([
-    startupSpanAsync(
-      'ChainFinalizedArchivist',
-      () => initChainFinalizedArchivist(initParams),
-    ),
     startupSpanAsync(
       'PendingBundledTransactionsArchivist',
       () => initPendingBundledTransactionsArchivist(initParams),
@@ -142,14 +128,10 @@ export const initServices = async (context: InitServicesContext): Promise<ChainS
     ),
   ])
 
-  const chainId = chainService.chainId
-  const chainMap = readPayloadMapFromStore<WithStorageMeta<Payload>>(chainArchivist)
+  const chainId = await chainService.chainId()
   const chainContractViewer = chainService
   const chainStakeViewer = chainService
   const chainStaker = chainService
-  const head = await startupSpanAsync('initHead', () => initHead({
-    ...initParams, account, chainArchivist, chainSubmissionsArchivistWrite, chainService,
-  }))
 
   const additionalPendingTransactionValidators = [TransactionTransfersValidatorFactory(
     [
@@ -162,16 +144,17 @@ export const initServices = async (context: InitServicesContext): Promise<ChainS
   const [
     pendingTransactionsService,
     rewardService,
-    chainIterator,
   ] = await Promise.all([
     startupSpanAsync('PendingTransactions', () => initPendingTransactions({
-      name: 'PendingTransactionsService' as CreatableName,
-      chainArchivist,
-      chainId,
-      pendingBundledTransactionsArchivist,
-      rejectedTransactionsArchivist,
-      additionalPendingTransactionValidators,
-      ...initParams,
+      config,
+      params: {
+        name: 'PendingTransactionsService' as CreatableName,
+        chainId,
+        pendingBundledTransactionsArchivist,
+        rejectedTransactionsArchivist,
+        additionalPendingTransactionValidators,
+        ...initParams,
+      },
     })),
     startupSpanAsync(
       'RewardService',
@@ -182,76 +165,24 @@ export const initServices = async (context: InitServicesContext): Promise<ChainS
         ...initParams,
       }),
     ),
-    startupSpanAsync(
-      'ChainIterator',
-      () => initChainIterator({
-        name: 'ChainIterator' as CreatableName,
-        chainMap,
-        head,
-        ...initParams,
-      }),
-    ),
   ])
 
-  const blockViewer = blockViewerFromChainIteratorAndArchivist(chainIterator, chainArchivist)
-
-  const balanceContext = {
-    stepSemaphores: StepSizes.map(() => new Semaphore(20)),
-    store: { chainMap },
-    head: async () => {
-      const head = await chainIterator.head()
-      return [head._hash, head.block]
-    },
-    chainId,
-    summaryMap: balanceSummaryMap,
-  } satisfies BalanceStepSummaryContext
-
-  const transferContext = {
-    stepSemaphores: StepSizes.map(() => new Semaphore(20)),
-    store: { chainMap },
-    head: async () => {
-      const head = await chainIterator.head()
-      return [head._hash, head.block]
-    },
-    chainId,
-    summaryMap: transferSummaryMap,
-  } satisfies TransfersStepSummaryContext
+  const blockViewer = await startupSpanAsync(
+    'BlockViewer',
+    () => initBlockViewer({ ...initParams }),
+  )
 
-  const [
-    balanceService,
-  ] = await Promise.all([
-    startupSpanAsync(
-      'BalanceService',
-      () => initAccountBalanceService({
-        params: {
-          name: 'BalanceService' as CreatableName,
-          config: {},
-          context: balanceContext,
-          blockViewer,
-          chainArchivist,
-          chainIterator,
-          transferContext,
-        },
-        ...initParams,
-      }),
-    ),
-    startupSpanAsync(
-      'TransferService',
-      () => initTransferService({
-        name: 'TransferService' as CreatableName,
-        context: transferContext,
-        ...initParams,
-      }),
-    ),
-  ])
+  const balanceService = await startupSpanAsync(
+    'BalanceService',
+    () => initAccountBalanceService({ ...initParams }),
+  )
 
   const [stakeIntentService, time] = await Promise.all([
     startupSpanAsync(
       'StakeIntentService',
       () => initStakeIntentService({
         name: 'StakeIntentService' as CreatableName,
-        chainArchivist,
-        chainIterator,
+        blockViewer,
         chainStakeViewer,
         stakeIntentStateArchivist,
         ...initParams,
@@ -261,8 +192,7 @@ export const initServices = async (context: InitServicesContext): Promise<ChainS
       'TimeService',
       () => initTimeService({
         name: 'TimeService' as CreatableName,
-        chainArchivist,
-        chainIterator,
+        blockViewer,
         ...initParams,
       }),
     ),
@@ -272,7 +202,7 @@ export const initServices = async (context: InitServicesContext): Promise<ChainS
     'ElectionService',
     () => initElectionService({
       name: 'ElectionService' as CreatableName,
-      chainIterator,
+      blockViewer,
       chainStakeViewer,
       stakeIntentService,
       ...initParams,
@@ -284,7 +214,7 @@ export const initServices = async (context: InitServicesContext): Promise<ChainS
     account,
     chainId,
     pendingBundledTransactionsArchivist,
-    chainArchivist,
+    blockViewer,
     electionService,
     rewardService,
     stakeIntentService,
@@ -299,7 +229,7 @@ export const initServices = async (context: InitServicesContext): Promise<ChainS
     ...validatorParams,
     name: 'Producer' as CreatableName,
     balanceService,
-    chainArchivist,
+    blockViewer,
     pendingBundledTransactionsArchivist,
     pendingTransactionsService,
     rejectedTransactionsArchivist,
@@ -312,9 +242,8 @@ export const initServices = async (context: InitServicesContext): Promise<ChainS
   const services: ChainServiceCollectionV2 = {
     account,
     balance: balanceService,
-    chainArchivist,
     chainContractViewer,
-    chainIterator,
+    blockViewer,
     chainStaker,
     chainStakeViewer,
     chainSubmissionsArchivistWrite,

package/src/orchestration/services/implementation/accountBalance.ts

@@ -1,8 +1,6 @@
 import { isDefined, type Promisable } from '@xylabs/sdk-js'
-import { BaseAccountBalanceService, type BaseAccountBalanceServiceParams } from '@xyo-network/chain-services'
 import type { Initializable, InitializableParams } from '@xyo-network/xl1-protocol'
 import type { AccountBalanceViewer, Config } from '@xyo-network/xl1-protocol-sdk'
-import { timeBudget } from '@xyo-network/xl1-protocol-sdk'
 import {
   AccountBalanceViewerRpcSchemas,
   HttpRpcTransport,
@@ -13,24 +11,19 @@ let balanceServiceSingleton: Promisable<AccountBalanceViewer> | undefined
 
 export type InitAccountBalanceServiceParams = InitializableParams<{
   config: Config
-  params?: BaseAccountBalanceServiceParams
 }>
 
 export const initAccountBalanceService: Initializable<InitAccountBalanceServiceParams, AccountBalanceViewer>
-  = async (params): Promise<AccountBalanceViewer> => {
+  = (params): Promisable<AccountBalanceViewer> => {
     const { config, logger } = params
     if (balanceServiceSingleton) return balanceServiceSingleton
-    return await timeBudget('initAccountBalanceService', params.logger, async () => {
-      const endpoint = config.services?.accountBalanceViewerEndpoint ?? config.services?.apiEndpoint
-      balanceServiceSingleton = await BaseAccountBalanceService.create(params.params)
-      // if (isDefined(endpoint)) {
-      //   const transport = new HttpRpcTransport(endpoint, { ...AccountBalanceViewerRpcSchemas })
-      //   const viewer = new JsonRpcAccountBalanceViewer(transport)
-      //   logger?.log('Using AccountBalanceViewer RPC service at', endpoint)
-      //   return viewer
-      // } else {
-      //   balanceServiceSingleton = await BaseAccountBalanceService.create(params.params)
-      // }
-      return balanceServiceSingleton
-    }, 2000, true)
+    const endpoint = config.services?.accountBalanceViewerEndpoint ?? config.services?.apiEndpoint
+    if (isDefined(endpoint)) {
+      const transport = new HttpRpcTransport(endpoint, { ...AccountBalanceViewerRpcSchemas })
+      const viewer = new JsonRpcAccountBalanceViewer(transport)
+      logger?.log('Using AccountBalanceViewer RPC service at', endpoint)
+      return viewer
+    } else {
+      throw new Error('No AccountBalanceViewer endpoint configured')
+    }
   }

package/src/orchestration/services/implementation/blockViewer.ts

@@ -0,0 +1,29 @@
+import { isDefined, type Promisable } from '@xylabs/sdk-js'
+import type { Initializable, InitializableParams } from '@xyo-network/xl1-protocol'
+import type { BlockViewer, Config } from '@xyo-network/xl1-protocol-sdk'
+import {
+  BlockViewerRpcSchemas,
+  HttpRpcTransport,
+  JsonRpcBlockViewer,
+} from '@xyo-network/xl1-rpc'
+
+let blockViewerSingleton: Promisable<BlockViewer> | undefined
+
+export type InitBlockViewerParams = InitializableParams<{
+  config: Config
+}>
+
+export const initBlockViewer: Initializable<InitBlockViewerParams, BlockViewer>
+  = (params): Promisable<BlockViewer> => {
+    const { config, logger } = params
+    if (blockViewerSingleton) return blockViewerSingleton
+    const endpoint = config.services?.apiEndpoint
+    if (isDefined(endpoint)) {
+      const transport = new HttpRpcTransport(endpoint, { ...BlockViewerRpcSchemas })
+      const viewer = new JsonRpcBlockViewer(transport)
+      logger?.log('Using BlockViewer RPC service at', endpoint)
+      return viewer
+    } else {
+      throw new Error('No BlockViewer endpoint configured')
+    }
+  }

package/src/orchestration/services/implementation/head/createBootstrapHead.ts

@@ -6,7 +6,7 @@ import type { SignedHydratedBlockWithHashMeta } from '@xyo-network/xl1-protocol'
 import type { ChainService } from '@xyo-network/xl1-protocol-sdk'
 
 export const createBootstrapHead = async (account: WalletInstance, chainService: ChainService): Promise<SignedHydratedBlockWithHashMeta[]> => {
-  const chainId = chainService.chainId
+  const chainId = await chainService.chainId()
   const chain: SignedHydratedBlockWithHashMeta[] = []
 
   // Create genesis block

package/src/orchestration/services/implementation/head/createForkedHead/config/getBridgeSourceDetails.ts

@@ -4,16 +4,16 @@ import type { ChainService } from '@xyo-network/xl1-protocol-sdk'
 
 import { getForkBlockRewardHex } from './getForkDetails.ts'
 
-export const getBridgeSrcChainId = (chainService: ChainService) => chainService.chainId
+export const getBridgeSrcChainId = (chainService: ChainService) => chainService.chainId()
 export const getBridgeSrcAddress = (account: AccountInstance) => account.address
-export const getBridgeSrcToken = (chainService: ChainService) => chainService.chainId
+export const getBridgeSrcToken = (chainService: ChainService) => chainService.chainId()
 export const getBridgeSrcAmount = () => getForkBlockRewardHex()
 
-export const getBridgeSourceDetails = (account: AccountInstance, chainService: ChainService): BridgeDetailsSourceFields => {
+export const getBridgeSourceDetails = async (account: AccountInstance, chainService: ChainService): Promise<BridgeDetailsSourceFields> => {
   return {
-    src: getBridgeSrcChainId(chainService),
+    src: await getBridgeSrcChainId(chainService),
     srcAddress: getBridgeSrcAddress(account),
-    srcToken: getBridgeSrcToken(chainService),
+    srcToken: await getBridgeSrcToken(chainService),
     srcAmount: getBridgeSrcAmount(),
   }
 }

package/src/orchestration/services/implementation/head/createForkedHead/getBridgeDestinationObservation.ts

@@ -25,7 +25,7 @@ export const getBridgeDestinationObservation = async (
   chainService: ChainService,
 ): Promise<SignedHydratedBlockWithHashMeta> => {
   const bridgeDestinationObservationFields: BridgeDestinationObservationFields = {
-    ...getBridgeSourceDetails(account, chainService),
+    ...await getBridgeSourceDetails(account, chainService),
     ...getBridgeDestinationDetails(),
     destConfirmation: getBridgeDestConfirmation(),
   }

package/src/orchestration/services/implementation/head/createForkedHead/getBridgeIntent.ts

@@ -34,7 +34,7 @@ export const getBridgeIntent = async (
 
   // Create Bridge Intent
   const bridgeIntentFields: BridgeIntentFields = {
-    ...getBridgeSourceDetails(account, chainService),
+    ...await getBridgeSourceDetails(account, chainService),
     ...getBridgeDestinationDetails(),
     nonce,
   }

package/src/orchestration/services/implementation/head/createForkedHead/getBridgeSourceObservation.ts

@@ -27,7 +27,7 @@ export const getBridgeSourceObservation = async (
   const srcTxHash = previousBlock[0]._hash
 
   const bridgeSourceObservationFields: BridgeSourceObservationFields = {
-    ...getBridgeSourceDetails(account, chainService),
+    ...await getBridgeSourceDetails(account, chainService),
     ...getBridgeDestinationDetails(),
     // Observation
     srcConfirmation: srcTxHash,

package/src/orchestration/services/implementation/head/createForkedHead/getFirstBlockForNewChain.ts

@@ -23,7 +23,7 @@ export const getFirstBlockForNewChain = async (
   const {
     _hash: previousBlockHash, block: previousBlockNumber, step_hashes: previousStepHashes = [], protocol,
   } = forkBlock
-  const chainId = chainService.chainId
+  const chainId = await chainService.chainId()
   const options: BuildNextBlockOptions = {
     blockPayloads: [],
     chainId,

package/src/orchestration/services/implementation/head/getForkFromBlock.ts

@@ -20,7 +20,7 @@ export const getForkFromBlock = async (
   chainArchivist: ArchivistInstance,
 ): Promise<SignedBlockBoundWitnessWithHashMeta | undefined> => {
   // If the head's chain doesn't match our chainId, we may need to fork
-  if (head.chain !== chainService.chainId) {
+  if (head.chain !== await chainService.chainId()) {
     // Get the forked at hash from the chain service
     const forkedAtBigInt = await chainService.forkedAtHash()
     const forkedAtHex = hexFromBigInt(forkedAtBigInt) // Validate it's a proper hex string

package/src/orchestration/services/implementation/head/head.ts

@@ -1,10 +1,9 @@
 import type { Promisable } from '@xylabs/sdk-js'
 import { assertEx, isDefined } from '@xylabs/sdk-js'
 import type { ArchivistInstance } from '@xyo-network/archivist-model'
-import { findMostRecentBlock } from '@xyo-network/chain-protocol'
 import type { WalletInstance } from '@xyo-network/wallet-model'
 import type { Initializable, SignedBlockBoundWitnessWithHashMeta } from '@xyo-network/xl1-protocol'
-import type { ChainService } from '@xyo-network/xl1-protocol-sdk'
+import { type ChainService, findMostRecentBlock } from '@xyo-network/xl1-protocol-sdk'
 
 import { createBootstrapHead } from './createBootstrapHead.ts'
 import { createForkedHead } from './createForkedHead/index.ts'

package/src/orchestration/services/implementation/index.ts

@@ -1,4 +1,5 @@
 export * from './accountBalance.ts'
+export * from './blockViewer.ts'
 export * from './chain/index.ts'
 export * from './evm/index.ts'
 export * from './head/index.ts'