@xyo-network/chain-services 1.17.7 → 1.18.0

package/src/blockViewerFromChainIteratorAndArchivist.ts

@@ -59,6 +59,15 @@ export function blockViewerFromChainIteratorAndArchivist(
       }
       return results
     },
+    chainId: async function (blockNumber: XL1BlockNumber | 'latest' = 'latest') {
+      const block = blockNumber === 'latest'
+        ? await this.currentBlock()
+        : await this.blockByNumber(blockNumber)
+      if (!block) {
+        throw new Error(`Block not found for block number: ${blockNumber}`)
+      }
+      return block[0].chain
+    },
     currentBlock: async function (): Promise<SignedHydratedBlockWithHashMeta> {
       const head = await chainIterator.head()
       return this.blockByHash(head._hash) as Promise<SignedHydratedBlockWithHashMeta>

package/src/implementation/chain/evm.ts

@@ -7,19 +7,19 @@ import type { Config } from '@xyo-network/xl1-protocol-sdk'
 import type { ContractRunner } from 'ethers'
 import { Wallet } from 'ethers/wallet'
 
-import { EvmChainService } from '../../ChainService/index.ts'
+import { EvmChainViewer } from '../../ChainService/index.ts'
 import type { BaseAccountableServiceParams } from '../../model/index.ts'
 import { canUseEvmProvider, initEvmProvider } from '../evm/index.ts'
 
-let chainStakeServiceSingleton: Promisable<EvmChainService> | undefined
+let chainStakeServiceSingleton: Promisable<EvmChainViewer> | undefined
 
 export const canUseEvmContractChainService = (config: Pick<Config, 'chain' | 'evm'>) => {
   const { id } = config.chain
   return isDefined(id) && id !== ZERO_ADDRESS && canUseEvmProvider({ config })
 }
 
-export const initEvmContractChainService: Initializable<BaseAccountableServiceParams<Pick<Config, 'chain' | 'evm'>>, EvmChainService> = async ({
-  account, config, traceProvider, meterProvider, logger,
+export const initEvmContractChainService: Initializable<BaseAccountableServiceParams, EvmChainViewer> = async ({
+  account, context: { config }, traceProvider, meterProvider, logger,
 }) => {
   if (chainStakeServiceSingleton) return chainStakeServiceSingleton
   // Parse config
@@ -30,7 +30,7 @@ export const initEvmContractChainService: Initializable<BaseAccountableServicePa
   const privateKey = assertEx(account.private?.hex, () => 'Account does not have a private key')
   const runner: ContractRunner = new Wallet(privateKey, provider)
   // Create service
-  chainStakeServiceSingleton = EvmChainService.create({
+  chainStakeServiceSingleton = EvmChainViewer.create({
     id, runner, traceProvider, meterProvider, logger,
   })
   const result = await chainStakeServiceSingleton

package/src/implementation/chain/index.ts

@@ -3,41 +3,39 @@ import {
 } from '@xylabs/sdk-js'
 import type { Initializable } from '@xyo-network/xl1-protocol'
 import type { ChainService } from '@xyo-network/xl1-protocol-sdk'
-import type { Config } from 'cosmiconfig'
 
-import { MemoryChainService } from '../../ChainService/index.ts'
+import { MemoryChainViewer } from '../../ChainService/index.ts'
 import type { BaseAccountableServiceParams } from '../../model/index.ts'
 import { canUseEvmContractChainService, initEvmContractChainService } from './evm.ts'
 
 let chainStakeServiceSingleton: Promisable<ChainService> | undefined
 
-export const initChainService: Initializable<BaseAccountableServiceParams<
-  Pick<Config, 'chain' | 'evm' | 'producer'>>,
-ChainService> = ({
-  account, config, logger,
-}) => {
+export const initChainService: Initializable<BaseAccountableServiceParams,
+  ChainService> = ({ account, context }) => {
+  const { logger } = context
   logger?.log('ChainService: Initializing...')
   const result = init({
-    config, name: 'ChainService' as CreatableName, account,
+    context,
+    name: 'ChainService' as CreatableName,
+    account,
   })
   logger?.log('ChainService: Initialized')
   return result
 }
 
-export const initMemoryChainService: Initializable<BaseAccountableServiceParams<
-  Pick<Config, 'producer'>>, ChainService> = async ({ config }) => {
-  const result = await MemoryChainService.create({
-    config,
+export const initMemoryChainService: Initializable<BaseAccountableServiceParams, ChainService> = async ({ context }) => {
+  const result = await MemoryChainViewer.create({
+    context,
     name: 'MemoryChainService' as CreatableName,
   })
   assertEx(await result.start(), () => 'Failed to start MemoryChainService')
   return result
 }
 
-const init: Initializable<BaseAccountableServiceParams<Pick<Config, 'chain' | 'evm' | 'producer'>>,
+const init: Initializable<BaseAccountableServiceParams,
   ChainService> = async (params): Promise<ChainService> => {
   if (chainStakeServiceSingleton) return chainStakeServiceSingleton
-  const { config } = params
+  const { config } = params.context
   chainStakeServiceSingleton = canUseEvmContractChainService(config)
     ? await initEvmContractChainService({ ...params, name: 'ChainStakeService' as CreatableName })
     : await initMemoryChainService(params)

package/src/implementation/head/createBootstrapHead.ts

@@ -1,16 +1,21 @@
-import {
-  buildNextBlock, createDeclarationIntent, createGenesisBlock,
-} from '@xyo-network/chain-protocol'
+import type { Address } from '@xylabs/sdk-js'
+import { buildNextBlock, createGenesisBlock } from '@xyo-network/chain-protocol'
 import type { WalletInstance } from '@xyo-network/wallet-model'
-import type { SignedHydratedBlockWithHashMeta } from '@xyo-network/xl1-protocol'
-import type { ChainService } from '@xyo-network/xl1-protocol-sdk'
+import type {
+  AttoXL1, ChainId, SignedHydratedBlockWithHashMeta,
+} from '@xyo-network/xl1-protocol'
+import { createDeclarationIntent } from '@xyo-network/xl1-protocol-sdk'
 
-export const createBootstrapHead = async (account: WalletInstance, chainService: ChainService): Promise<SignedHydratedBlockWithHashMeta[]> => {
-  const chainId = await chainService.chainId()
+export const createBootstrapHead = async (
+  account: WalletInstance,
+  chainId: ChainId,
+  genesisBlockRewardAmount: AttoXL1,
+  genesisBlockRewardAddress: Address,
+): Promise<SignedHydratedBlockWithHashMeta[]> => {
   const chain: SignedHydratedBlockWithHashMeta[] = []
 
   // Create genesis block
-  const genesisBlock = await createGenesisBlock(account, chainId, 10_000_000n, account.address)
+  const genesisBlock = await createGenesisBlock(account, chainId, genesisBlockRewardAmount, genesisBlockRewardAddress)
   chain.push(genesisBlock)
 
   // Create producer declaration block

package/src/implementation/head/index.ts

@@ -1 +1 @@
-export * from './head.ts'
+export * from './createBootstrapHead.ts'

package/src/implementation/index.ts

@@ -1,12 +1,3 @@
-export * from './accountBalance.ts'
-export * from './blockViewer.ts'
 export * from './chain/index.ts'
 export * from './evm/index.ts'
 export * from './head/index.ts'
-export * from './mempoolRunner.ts'
-export * from './mempoolViewer.ts'
-export * from './pendingTransactions.ts'
-export * from './producer.ts'
-export * from './reward.ts'
-export * from './time.ts'
-export * from './validator.ts'

package/src/index.ts

@@ -2,7 +2,6 @@ export * from './AccountBalance/index.ts'
 export * from './BaseService.ts'
 export * from './BlockReward/index.ts'
 export * from './blockViewerFromChainIteratorAndArchivist.ts'
-export * from './ChainBlockNumberIteration/index.ts'
 export * from './ChainService/index.ts'
 export * from './ChainValidator/index.ts'
 export * from './Election/index.ts'
@@ -14,4 +13,3 @@ export * from './Schemas/index.ts'
 export * from './simple/index.ts'
 export * from './StakeIntent/index.ts'
 export * from './StepStake/index.ts'
-export * from './Time/index.ts'

package/src/model/Params.ts

@@ -1,11 +1,11 @@
-import type { CreatableParams, EmptyObject } from '@xylabs/sdk-js'
 import type { AccountInstance } from '@xyo-network/account-model'
 import type { OpenTelemetryProviders } from '@xyo-network/xl1-protocol'
+import type { CreatableProviderParams } from '@xyo-network/xl1-protocol-sdk'
+
+export interface BaseServiceParams extends CreatableProviderParams, OpenTelemetryProviders {
 
-export interface BaseServiceParams<TConfig extends EmptyObject = EmptyObject> extends CreatableParams, OpenTelemetryProviders {
-  config: TConfig
 }
 
-export interface BaseAccountableServiceParams<TConfig extends EmptyObject = EmptyObject> extends BaseServiceParams<TConfig> {
+export interface BaseAccountableServiceParams extends BaseServiceParams {
   account: AccountInstance
 }

package/src/simple/block/runner/SimpleBlockRunner.ts

@@ -1,7 +1,6 @@
 import {
-  AbstractCreatable,
   Address,
-  AddressZod, asHash, assertEx, creatable, CreatableParams, exists, Hex, hexToBigInt, isDefined, Promisable,
+  assertEx, exists, Hex, hexToBigInt, isDefined, Promisable,
 } from '@xylabs/sdk-js'
 import { AccountInstance } from '@xyo-network/account-model'
 import { MemoryArchivist } from '@xyo-network/archivist-memory'
@@ -9,24 +8,36 @@ import { ArchivistInstance } from '@xyo-network/archivist-model'
 import {
   BlockRewardDiviner, FixedPercentageBlockRewardDiviner, FixedPercentageBlockRewardDivinerConfigSchema,
 } from '@xyo-network/chain-modules'
-import { buildNextBlock, createDeclarationIntent } from '@xyo-network/chain-protocol'
+import { buildNextBlock } from '@xyo-network/chain-protocol'
 import { PayloadBuilder } from '@xyo-network/payload-builder'
 import { WithHashMeta } from '@xyo-network/payload-model'
 import {
   AllowedBlockPayload, asBlockBoundWitness, AttoXL1, BlockBoundWitness, BlockNumberPayload, BlockNumberSchema,
-  ChainId,
   ChainStakeIntent, defaultRewardRatio, SignedBlockBoundWitnessWithHashMeta,
-  SignedHydratedBlockWithHashMeta, SignedHydratedTransaction, TimePayload, TimeSchema,
+  SignedHydratedBlockWithHashMeta, SignedHydratedTransaction,
   Transfer, XYO_STEP_REWARD_ADDRESS,
 } from '@xyo-network/xl1-protocol'
 import {
-  AccountBalanceViewer, BlockRewardViewer, BlockRunner, Config,
+  AbstractCreatableProvider,
+  AccountBalanceViewer,
+  AccountBalanceViewerMoniker,
+  BlockRewardViewer,
+  BlockRewardViewerMoniker,
+  BlockRunner,
+  BlockRunnerMoniker,
+  BlockValidationViewer,
+  BlockValidationViewerMoniker,
+  creatableProvider,
+  CreatableProviderParams,
+  createDeclarationIntent,
   HydratedBlockStateValidationFunction,
   MempoolRunner,
+  MempoolRunnerMoniker,
   MempoolViewer,
+  MempoolViewerMoniker,
   TimeSyncViewer,
+  TimeSyncViewerMoniker,
 } from '@xyo-network/xl1-protocol-sdk'
-import z from 'zod'
 
 import { generateTransactionFeeTransfers } from './generateTransactionFeeTransfers.ts'
 
@@ -46,38 +57,32 @@ export const XYO_PRODUCER_REDECLARATION_DURATION = 10_000
  */
 export const XYO_PRODUCER_REDECLARATION_WINDOW = 500
 
-export const SimpleBlockRunnerParamsZod = z.object({
-  balanceViewer: z.object().loose(),
-  blockRewardViewer: z.object().loose(),
-  chainId: z.string(),
-  config: z.object().loose(),
-  mempoolViewer: z.object().loose(),
-  mempoolRunner: z.object().loose(),
-  rejectedTransactionsArchivist: z.object().loose().optional(),
-  rewardAddress: AddressZod,
-  time: z.object().loose(),
-  validateHydratedBlockState: z.function().optional(),
-})
-
-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
 }
 
-@creatable()
-export class SimpleBlockRunner extends AbstractCreatable<SimpleBlockRunnerParams> implements BlockRunner {
-  protected _blockRewardDiviner: BlockRewardDiviner | undefined
-  protected _lastRedeclarationBlock: number | undefined
-  protected _rejectedTransactionsArchivist: ArchivistInstance | undefined
+@creatableProvider()
+export class SimpleBlockRunner extends AbstractCreatableProvider<SimpleBlockRunnerParams> implements BlockRunner {
+  static readonly defaultMoniker = BlockRunnerMoniker
+  static readonly monikers = [BlockRunnerMoniker]
+  moniker = SimpleBlockRunner.defaultMoniker
+
+  protected _blockRewardDiviner?: BlockRewardDiviner
+  protected _lastRedeclarationBlock?: number
+  protected _rejectedTransactionsArchivist?: ArchivistInstance
+
+  private _account?: AccountInstance
+  private _accountBalanceViewer?: AccountBalanceViewer
+  private _address?: Address
+  private _blockRewardViewer?: BlockRewardViewer
+  private _blockValidationViewer?: BlockValidationViewer
+  private _mempoolRunner?: MempoolRunner
+  private _mempoolViewer?: MempoolViewer
+  private _rewardAddress?: Address
+  private _timeSyncViewer?: TimeSyncViewer
 
   /**
    * The default block size for a block
@@ -102,24 +107,24 @@ export class SimpleBlockRunner extends AbstractCreatable<SimpleBlockRunnerParams
     return XYO_PRODUCER_REDECLARATION_WINDOW
   }
 
-  get address() {
-    return this.account.address
+  protected get account() {
+    return this._account!
   }
 
-  protected get account() {
-    return assertEx(this.params.account, () => 'account is required')
+  protected get accountBalanceViewer() {
+    return this._accountBalanceViewer!
   }
 
-  protected get balanceViewer() {
-    return assertEx(this.params.balanceViewer, () => 'balanceViewer is required')
+  protected get address() {
+    return this._address!
   }
 
   protected get blockRewardViewer() {
-    return assertEx(this.params.blockRewardViewer, () => 'blockRewardViewer is required')
+    return this._blockRewardViewer!
   }
 
-  protected get chainId() {
-    return assertEx(this.params.chainId, () => 'chainId is required')
+  protected get blockValidationViewer() {
+    return this._blockValidationViewer!
   }
 
   // protected get electionService() {
@@ -127,11 +132,11 @@ export class SimpleBlockRunner extends AbstractCreatable<SimpleBlockRunnerParams
   // }
 
   protected get mempoolRunner() {
-    return assertEx(this.params.mempoolRunner, () => 'mempoolRunner is required')
+    return this._mempoolRunner!
   }
 
   protected get mempoolViewer() {
-    return assertEx(this.params.mempoolViewer, () => 'mempoolViewer is required')
+    return this._mempoolViewer!
   }
 
   // protected get pendingTransactionsService() {
@@ -150,26 +155,30 @@ export class SimpleBlockRunner extends AbstractCreatable<SimpleBlockRunnerParams
   //   return assertEx(this.params.stakeIntentService, () => 'No StakeIntentService provided')
   // }
 
-  protected get time(): TimeSyncViewer {
-    return assertEx(this.params.time, () => 'No TimeSyncViewer provided')
+  protected get timeSyncViewer(): TimeSyncViewer {
+    return this._timeSyncViewer!
   }
 
   // protected get validateHydratedBlockState() {
   //   return assertEx(this.params.validateHydratedBlockState, () => 'validateHydratedBlockState is required')
   // }
 
-  static override async paramsHandler(params?: Partial<SimpleBlockRunnerParams> | undefined): Promise<SimpleBlockRunnerParams> {
-    // TODO: Use a real zod and move the zod check to the AbstractCreatable class
-    SimpleBlockRunnerParamsZod.parse(params)
-    const rejectedTransactionsArchivist = params?.rejectedTransactionsArchivist ?? await MemoryArchivist.create()
-    return {
-      ...(await super.paramsHandler(params)), ...params, rejectedTransactionsArchivist,
-    } as SimpleBlockRunnerParams
+  override async createHandler() {
+    this._rejectedTransactionsArchivist = this.params.rejectedTransactionsArchivist ?? await MemoryArchivist.create()
+    this._account = assertEx(this.params.account, () => 'Account is required')
+    this._rewardAddress = assertEx(this.params.rewardAddress, () => 'No reward address provided')
+    this._address = this.account.address
+    this._accountBalanceViewer = await this.locateAndCreate<AccountBalanceViewer>(AccountBalanceViewerMoniker)
+    this._blockRewardViewer = await this.locateAndCreate<BlockRewardViewer>(BlockRewardViewerMoniker)
+    this._blockValidationViewer = await this.locator.getInstance<BlockValidationViewer>(BlockValidationViewerMoniker)
+    this._mempoolRunner = await this.locateAndCreate<MempoolRunner>(MempoolRunnerMoniker)
+    this._mempoolViewer = await this.locateAndCreate<MempoolViewer>(MempoolViewerMoniker)
+    this._timeSyncViewer = await this.locateAndCreate<TimeSyncViewer>(TimeSyncViewerMoniker)
   }
 
   async next(head: WithHashMeta<BlockBoundWitness>): Promise<SignedHydratedBlockWithHashMeta | undefined> {
     // If the block is for another chain, ignore
-    if (head.chain !== this.chainId) return
+    // if (head.chain !== this.chainId) return
     // const leadersStart = Date.now()
     // const leaders = await this.electionService.getCreatorCommitteeForNextBlock(head)
     // const leadersDuration = Date.now() - leadersStart
@@ -186,7 +195,7 @@ export class SimpleBlockRunner extends AbstractCreatable<SimpleBlockRunnerParams
   async produceNextBlock(head: SignedBlockBoundWitnessWithHashMeta, force: true): Promise<SignedHydratedBlockWithHashMeta>
   async produceNextBlock(head: SignedBlockBoundWitnessWithHashMeta, force?: false): Promise<SignedHydratedBlockWithHashMeta | undefined>
   async produceNextBlock(head: SignedBlockBoundWitnessWithHashMeta, force?: boolean): Promise<SignedHydratedBlockWithHashMeta | undefined> {
-    assertEx(head.chain === this.chainId, () => 'Block chain ID does not match')
+    // assertEx(head.chain === this.chainId, () => 'Block chain ID does not match')
     const result = await this.proposeNextValidBlock(head)
     return force ? assertEx(result, () => 'Failed to produce next block') : result
   }
@@ -218,7 +227,7 @@ export class SimpleBlockRunner extends AbstractCreatable<SimpleBlockRunnerParams
   protected getProducerRedeclaration(head: WithHashMeta<BlockBoundWitness>): Promisable<ChainStakeIntent | undefined> {
     // TODO: Do not redeclare on every block
     // Decide if we should redeclare intent
-    if (this.params.config.producer.disableIntentRedeclaration) return
+    if (this.params.context.config.producer.disableIntentRedeclaration) return
     // Decide if we need to redeclare intent
     // const ranges = await this.stakeIntentService.getDeclaredCandidateRanges(this.address, 'producer')
     // TODO: This doesn't handle the case where the producer had declared a range for the future
@@ -234,65 +243,68 @@ export class SimpleBlockRunner extends AbstractCreatable<SimpleBlockRunnerParams
   }
 
   protected async proposeNextValidBlock(head: WithHashMeta<BlockBoundWitness>, validateBalances = false, force = false) {
+    // eslint-disable-next-line max-statements
     return await this.spanAsync('proposeNextValidBlock', async () => {
+      try {
       // Calculate the next block components
-      const { block: previousBlock } = assertEx(asBlockBoundWitness(head), () => 'Invalid head block')
-      const nextBlock = previousBlock + 1
-      const nextBlockTransactionsStart = Date.now()
-      const nextBlockTransactions = await this.mempoolViewer.pendingTransactions({ limit: SimpleBlockRunner.DefaultBlockSize })
-      const nextBlockTransactionsDuration = Date.now() - nextBlockTransactionsStart
-      if (nextBlockTransactionsDuration > 200) {
-        this.logger?.warn(`[Slow] Fetched ${nextBlockTransactions.length} pending transactions in ${nextBlockTransactionsDuration}ms}`)
-      }
+        const { block: previousBlock } = assertEx(asBlockBoundWitness(head), () => 'Invalid head block')
+        const nextBlock = previousBlock + 1
+        const nextBlockTransactions = await this.mempoolViewer.pendingTransactions({ limit: SimpleBlockRunner.DefaultBlockSize })
 
-      const blockPayloads: AllowedBlockPayload[] = []
+        this.logger?.info(`Pending Tx Count ${nextBlockTransactions.length}`)
 
-      // Calculate the optional producer redeclaration and add it if necessary
-      const producerRedeclarationPayload = await this.getProducerRedeclaration(head)
-      if (producerRedeclarationPayload) blockPayloads.push(producerRedeclarationPayload)
+        const blockPayloads: AllowedBlockPayload[] = []
 
-      // If there are no transactions, no payloads and no heartbeat required, we don't need to create a block
-      if (nextBlockTransactions.length === 0 && !this.heartbeatRequired(head) && !force) return
+        // Calculate the optional producer redeclaration and add it if necessary
+        const producerRedeclarationPayload = await this.getProducerRedeclaration(head)
+        if (producerRedeclarationPayload) blockPayloads.push(producerRedeclarationPayload)
 
-      // Calculate the optional block reward transfer and add if necessary
-      const rewardTransferPayloads = await this.getBlockRewardTransfers(nextBlock)
-      blockPayloads.push(...rewardTransferPayloads)
+        // If there are no transactions, no payloads and no heartbeat required, we don't need to create a block
+        if (nextBlockTransactions.length === 0 && !this.heartbeatRequired(head) && !force) return
 
-      const transactionTransfers = await generateTransactionFeeTransfers(this.address, nextBlockTransactions)
-      const timeStart = Date.now()
-      const timePayload = await this.generateTimePayload(head)
-      const timeDuration = Date.now() - timeStart
-      if (timeDuration > 100) {
-        this.logger?.warn(`[Slow] Generated time payload in ${timeDuration}ms`)
-      }
+        // Calculate the optional block reward transfer and add if necessary
+        const rewardTransferPayloads = await this.getBlockRewardTransfers(nextBlock)
+        blockPayloads.push(...rewardTransferPayloads)
+
+        const transactionTransfers = await generateTransactionFeeTransfers(this.address, nextBlockTransactions)
+        const timeStart = Date.now()
+        const timePayload = await this.generateTimePayload(head)
+        const timeDuration = Date.now() - timeStart
+        if (timeDuration > 100) {
+          this.logger?.warn(`[Slow] Generated time payload in ${timeDuration}ms`)
+        }
+
+        const [fundedNextBlockTransactions, fundedTransfers] = await this.filterByFunded(head, nextBlockTransactions, transactionTransfers, validateBalances)
 
-      const [fundedNextBlockTransactions, fundedTransfers] = await this.filterByFunded(head, nextBlockTransactions, transactionTransfers, validateBalances)
-
-      blockPayloads.push(...fundedTransfers, timePayload)
-
-      // Build the block
-      this.logger?.info(`Building block ${head.block + 1}`)
-      const startBuild = Date.now()
-      const stepRewardPoolBalance = (await this.balanceViewer.accountBalances([XYO_STEP_REWARD_ADDRESS]))[XYO_STEP_REWARD_ADDRESS]
-      const block = await buildNextBlock(head, fundedNextBlockTransactions, blockPayloads, [this.account], XYO_STEP_REWARD_ADDRESS, stepRewardPoolBalance)
-
-      this.logger?.info(
-        `Built block ${block[0].block} in ${Date.now() - startBuild}ms with ${block[1].length} payloads`,
-      )
-
-      // this.logger?.info(`Validating block ${block[0].block} with ${block[1].length} payloads`)
-      // const startValidate = Date.now()
-      // const errors = await this.validateHydratedBlockState(block, this.chainId, { accountBalance: this.balanceViewer })
-      // this.logger?.info(`Validated block ${block[0].block} in ${Date.now() - startValidate}ms with ${block[1].length} payloads`)
-
-      // if (errors.length > 0) {
-      //   this.logger?.warn(`Validation of produced block failed: ${errors.at(0)?.message}`)
-      //   const rejectedTransactions = block[1]
-      //   await this.rejectedTransactionsArchivist.insert(rejectedTransactions)
-      // } else {
-      await this.mempoolRunner.submitBlocks([block])
-      return block
-      // }
+        blockPayloads.push(...fundedTransfers, timePayload)
+
+        // Build the block
+        this.logger?.info(`Building block ${head.block + 1}`)
+        const startBuild = Date.now()
+        const stepRewardPoolBalance = (await this.accountBalanceViewer.accountBalances([XYO_STEP_REWARD_ADDRESS]))[XYO_STEP_REWARD_ADDRESS]
+        const block = await buildNextBlock(head, fundedNextBlockTransactions, blockPayloads, [this.account], XYO_STEP_REWARD_ADDRESS, stepRewardPoolBalance)
+
+        this.logger?.info(
+          `Built block ${block[0].block} in ${Date.now() - startBuild}ms with ${block[1].length} payloads`,
+        )
+
+        this.logger?.info(`Validating block ${block[0].block} with ${block[1].length} payloads`)
+        const startValidate = Date.now()
+        const errors = await this.blockValidationViewer.validateBlock(block)
+        this.logger?.info(`Validated block ${block[0].block} in ${Date.now() - startValidate}ms with ${block[1].length} payloads`)
+
+        if (errors.length > 0) {
+          this.logger?.warn(`Validation of produced block failed: ${errors.at(0)?.message}`)
+          const rejectedTransactions = block[1]
+          await this.rejectedTransactionsArchivist.insert(rejectedTransactions)
+        } else {
+          await this.mempoolRunner.submitBlocks([block])
+          return block
+        }
+      } catch (error) {
+        this.logger?.error(`Error proposing next valid block: ${(error as Error).message}`)
+        throw error
+      }
     })
   }
 
@@ -309,7 +321,7 @@ export class SimpleBlockRunner extends AbstractCreatable<SimpleBlockRunnerParams
       if (!transfer) return
       const totalTransferCost = Object.values(transfer?.transfers).reduce((acc, t) => acc + hexToBigInt(t ?? '00' as Hex), 0n)
       if (validateBalances) {
-        const balance = (await this.balanceViewer.accountBalances([transfer.from]))[transfer.from] ?? AttoXL1(0n)
+        const balance = (await this.accountBalanceViewer.accountBalances([transfer.from]))[transfer.from] ?? AttoXL1(0n)
         if (balance >= totalTransferCost) {
           fundedTransfers.push(transfer)
           return tx
@@ -323,19 +335,7 @@ export class SimpleBlockRunner extends AbstractCreatable<SimpleBlockRunnerParams
   }
 
   private async generateTimePayload(head: WithHashMeta<BlockBoundWitness>) {
-    const [ethereum, ethHashOrNull] = await this.time.currentTimeAndHash('ethereum')
-    const ethereumHash = asHash(ethHashOrNull, () => 'No ethereum hash available from time sync service')
-    const timePayload: TimePayload = {
-      schema: TimeSchema,
-      // this is for the previous block
-      xl1: head.block,
-      // this is for the previous block
-      xl1Hash: head._hash,
-      ethereum,
-      ethereumHash,
-      epoch: Date.now(),
-    }
-    return timePayload
+    return await this.timeSyncViewer.currentTimePayload()
   }
 
   /**
@@ -346,7 +346,7 @@ export class SimpleBlockRunner extends AbstractCreatable<SimpleBlockRunnerParams
   private heartbeatRequired(head: WithHashMeta<BlockBoundWitness>): boolean {
     const epoch = head.$epoch
     if (isDefined(epoch)) {
-      const { heartbeatInterval } = this.params.config.producer
+      const { heartbeatInterval } = this.params.context.config.producer
       if (Date.now() - epoch > heartbeatInterval) {
         return true
       }

package/dist/neutral/ChainBlockNumberIteration/ChainBlockNumberIterationService.d.ts

@@ -1,50 +0,0 @@
-import type { Hash, Hex, Promisable } from '@xylabs/sdk-js';
-import type { Payload, WithHashMeta, WithStorageMeta } from '@xyo-network/payload-model';
-import type { BlockBoundWitness, SignedHydratedBlockWithHashMeta, XL1BlockNumber } from '@xyo-network/xl1-protocol';
-import type { BlockViewer, ChainIteratorServiceEventData, PayloadMapRead } from '@xyo-network/xl1-protocol-sdk';
-import { LRUCache } from 'lru-cache';
-import { BaseService } from '../BaseService.ts';
-import type { XyoChainIteratorParams } from './model/index.ts';
-export declare class ChainBlockNumberIterationService extends BaseService<XyoChainIteratorParams, ChainIteratorServiceEventData> implements BlockViewer {
-    static readonly defaultMoniker: "BlockViewer";
-    static readonly monikers: "BlockViewer"[];
-    moniker: "BlockViewer";
-    protected _blocksByBlockNumber: LRUCache<number, WithStorageMeta<{
-        schema: "network.xyo.boundwitness";
-        addresses: import("@xylabs/sdk-js").Address[];
-        payload_hashes: Hash[];
-        payload_schemas: string[];
-        previous_hashes: (Hash | null)[];
-        $signatures: (Hex | null)[];
-        block: XL1BlockNumber;
-        chain: Hex;
-        previous: Hash | null;
-        $epoch: number;
-        $destination?: import("@xylabs/sdk-js").Address | undefined;
-        $sourceQuery?: Hash | undefined;
-        protocol?: number | undefined;
-        step_hashes?: Hash[] | undefined;
-    }>, unknown>;
-    protected _currentHead: WithStorageMeta<BlockBoundWitness> | undefined;
-    get chainId(): Hex;
-    get chainMap(): PayloadMapRead<WithStorageMeta<Payload>>;
-    get chainStoreRead(): {
-        chainMap: PayloadMapRead<WithStorageMeta<Payload>>;
-    };
-    blockByHash(hash: Hash): Promise<SignedHydratedBlockWithHashMeta | null>;
-    blockByNumber(block: XL1BlockNumber): Promise<SignedHydratedBlockWithHashMeta | null>;
-    blocksByHash(hash: Hash, limit?: number): Promise<SignedHydratedBlockWithHashMeta[]>;
-    blocksByNumber(blockNumber: XL1BlockNumber, limit?: number): Promise<SignedHydratedBlockWithHashMeta[]>;
-    currentBlock(): Promise<SignedHydratedBlockWithHashMeta>;
-    currentBlockHash(): Promise<Hash>;
-    currentBlockNumber(): Promise<XL1BlockNumber>;
-    get(block: number): Promise<WithStorageMeta<BlockBoundWitness>>;
-    head(): Promise<WithStorageMeta<BlockBoundWitness>>;
-    next(block: number): Promise<WithStorageMeta<BlockBoundWitness> | undefined>;
-    payloadByHash(_hash: Hash): Promisable<WithHashMeta<Payload> | null>;
-    payloadsByHash(_hashes: Hash[]): Promisable<WithHashMeta<Payload>[]>;
-    previous(block?: number | undefined, count?: number): Promise<WithStorageMeta<BlockBoundWitness>[]>;
-    updateHead(head: BlockBoundWitness): Promise<void>;
-    private getBoundWitnessAsBlockBoundWitnessWithStorageMeta;
-}
-//# sourceMappingURL=ChainBlockNumberIterationService.d.ts.map

package/dist/neutral/ChainBlockNumberIteration/ChainBlockNumberIterationService.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ChainBlockNumberIterationService.d.ts","sourceRoot":"","sources":["../../../src/ChainBlockNumberIteration/ChainBlockNumberIterationService.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,IAAI,EAAE,GAAG,EAAE,UAAU,EACtB,MAAM,gBAAgB,CAAA;AAMvB,OAAO,KAAK,EACV,OAAO,EAAE,YAAY,EAAE,eAAe,EACvC,MAAM,4BAA4B,CAAA;AACnC,OAAO,KAAK,EACV,iBAAiB,EAAE,+BAA+B,EAAE,cAAc,EACnE,MAAM,2BAA2B,CAAA;AAIlC,OAAO,KAAK,EACV,WAAW,EACX,6BAA6B,EAE7B,cAAc,EACf,MAAM,+BAA+B,CAAA;AAEtC,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAA;AAEpC,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAA;AAE9D,qBAAa,gCAAiC,SAAQ,WAAW,CAAC,sBAAsB,EAAE,6BAA6B,CACrH,YAAW,WAAW;IACtB,MAAM,CAAC,QAAQ,CAAC,cAAc,gBAAqB;IACnD,MAAM,CAAC,QAAQ,CAAC,QAAQ,kBAAuB;IAC/C,OAAO,gBAAkD;IAEzD,SAAS,CAAC,oBAAoB;;;;;;;;;;;;;;;iBAA4E;IAC1G,SAAS,CAAC,YAAY,EAAE,eAAe,CAAC,iBAAiB,CAAC,GAAG,SAAS,CAAA;IAEtE,IAAI,OAAO,IAAI,GAAG,CAA2G;IAE7H,IAAI,QAAQ,IAAI,cAAc,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,CAA0C;IAElG,IAAI,cAAc;;MAEjB;IAEK,WAAW,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,+BAA+B,GAAG,IAAI,CAAC;IAIxE,aAAa,CAAC,KAAK,EAAE,cAAc,GAAG,OAAO,CAAC,+BAA+B,GAAG,IAAI,CAAC;IAIrF,YAAY,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,GAAE,MAAY,GAAG,OAAO,CAAC,+BAA+B,EAAE,CAAC;IAYzF,cAAc,CAAC,WAAW,EAAE,cAAc,EAAE,KAAK,GAAE,MAAY,GAAG,OAAO,CAAC,+BAA+B,EAAE,CAAC;IAY5G,YAAY,IAAI,OAAO,CAAC,+BAA+B,CAAC;IAIxD,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IAKjC,kBAAkB,IAAI,OAAO,CAAC,cAAc,CAAC;IAK7C,GAAG,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,iBAAiB,CAAC,CAAC;IA0B/D,IAAI,IAAI,OAAO,CAAC,eAAe,CAAC,iBAAiB,CAAC,CAAC;IAUnD,IAAI,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,iBAAiB,CAAC,GAAG,SAAS,CAAC;IAMlF,aAAa,CAAC,KAAK,EAAE,IAAI,GAAG,UAAU,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC;IAIpE,cAAc,CAAC,OAAO,EAAE,IAAI,EAAE,GAAG,UAAU,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,CAAC;IAM9D,QAAQ,CAAC,KAAK,GAAE,MAAM,GAAG,SAAqB,EAAE,KAAK,GAAE,MAAU,GAAG,OAAO,CAAC,eAAe,CAAC,iBAAiB,CAAC,EAAE,CAAC;IAkBjH,UAAU,CAAC,IAAI,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;YAM1C,iDAAiD;CAOhE"}

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

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

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

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

package/dist/neutral/ChainBlockNumberIteration/model/BlockNumberIteration.d.ts

@@ -1,7 +0,0 @@
-import type { Promisable } from '@xylabs/sdk-js';
-import type { BlockBoundWitness, SignedHydratedTransactionWithStorageMeta } from '@xyo-network/xl1-protocol';
-export interface BlockNumberIteration {
-    validatePendingBlock(block: BlockBoundWitness): Promisable<Error[]>;
-    validatePendingTransaction(tx: SignedHydratedTransactionWithStorageMeta): Promise<boolean>;
-}
-//# sourceMappingURL=BlockNumberIteration.d.ts.map

package/dist/neutral/ChainBlockNumberIteration/model/BlockNumberIteration.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"BlockNumberIteration.d.ts","sourceRoot":"","sources":["../../../../src/ChainBlockNumberIteration/model/BlockNumberIteration.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAChD,OAAO,KAAK,EAAE,iBAAiB,EAAE,wCAAwC,EAAE,MAAM,2BAA2B,CAAA;AAE5G,MAAM,WAAW,oBAAoB;IACnC,oBAAoB,CAAC,KAAK,EAAE,iBAAiB,GAAG,UAAU,CAAC,KAAK,EAAE,CAAC,CAAA;IACnE,0BAA0B,CAAC,EAAE,EAAE,wCAAwC,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;CAC3F"}