@xyo-network/chain-services 1.18.0 → 1.18.2

package/src/Schemas/BaseSchemasService.ts

@@ -1,28 +1,31 @@
-import {
-  creatable, Hash, spanRootAsync,
-} from '@xylabs/sdk-js'
+import { Hash } from '@xylabs/sdk-js'
 import { Schema } from '@xyo-network/payload-model'
 import {
+  AbstractCreatableProvider,
+  creatableProvider,
   SchemasService,
   SchemasStepSummaryContext,
   schemasSummary,
-} from '@xyo-network/xl1-protocol-sdk'
+} from '@xyo-network/xl1-sdk'
 
-import { BaseService } from '../BaseService.ts'
 import { BaseServiceParams } from '../model/index.ts'
 
 export interface BaseSchemasServiceParams extends BaseServiceParams {
   schemasStepSummaryContext: SchemasStepSummaryContext
 }
 
-@creatable()
-export class BaseSchemasService extends BaseService<BaseSchemasServiceParams> implements SchemasService {
+@creatableProvider()
+export class BaseSchemasService extends AbstractCreatableProvider<BaseSchemasServiceParams> implements SchemasService {
+  static readonly defaultMoniker = 'SchemasService'
+  static readonly dependencies = []
+  static readonly monikers = [BaseSchemasService.defaultMoniker]
+  moniker = BaseSchemasService.defaultMoniker
   async schema(head: Hash, schema: Schema): Promise<number> {
     return (await this.schemas(head, [schema]))[schema] ?? 0
   }
 
   async schemas(head: Hash, schemas: Schema[]): Promise<Partial<Record<Schema, number>>> {
-    return await spanRootAsync('transfers', async () => {
+    return await this.spanAsync('schemas', async () => {
       const [summary] = await schemasSummary(this.params.schemasStepSummaryContext)
       const result: Record<Schema, number> = {}
       for (const schema of schemas) {
@@ -30,6 +33,6 @@ export class BaseSchemasService extends BaseService<BaseSchemasServiceParams> im
         result[schema] = count
       }
       return result
-    })
+    }, { timeBudgetLimit: 100 })
   }
 }

package/src/StakeIntent/XyoStakeIntentService.ts

@@ -1,5 +1,5 @@
 import {
-  Address, asAddress, assertEx, creatable, filterAs, Hash,
+  Address, asAddress, assertEx, filterAs, Hash,
   isUndefined,
 } from '@xylabs/sdk-js'
 import { ArchivistInstance, ArchivistNextOptions } from '@xyo-network/archivist-model'
@@ -15,23 +15,24 @@ import {
 import { PayloadBuilder } from '@xyo-network/payload-builder'
 import { Payload, WithStorageMeta } from '@xyo-network/payload-model'
 import {
-  asBlockBoundWitness, asBlockBoundWitnessWithStorageMeta, asChainStakeIntent, type Intent,
-} from '@xyo-network/xl1-protocol'
-import {
+  AbstractCreatableProvider,
   asChainIndexingServiceStateWithStorageMeta,
   BlockViewer,
   BlockViewerMoniker,
   ChainIndexingServiceState, ChainIndexingServiceStateSchema, ChainStakeViewer,
   ChainStakeViewerMoniker,
+  creatableProvider,
   isChainIndexingServiceState,
   readPayloadMapFromStore,
   StakeIntentService,
   timeBudget,
-} from '@xyo-network/xl1-protocol-sdk'
+} from '@xyo-network/xl1-sdk'
+import {
+  asBlockBoundWitness, asBlockBoundWitnessWithStorageMeta, asChainStakeIntent, type Intent,
+} from '@xyo-network/xl1-sdk'
 import { Mutex } from 'async-mutex'
 import { LRUCache } from 'lru-cache'
 
-import { BaseService } from '../BaseService.ts'
 import { BaseServiceParams } from '../model/index.ts'
 
 export interface XyoStakeIntentServiceParams extends BaseServiceParams {
@@ -50,8 +51,12 @@ const ACTIVE_STAKE_TTL = 1000 * 60 * 60 * 2 // 2 hours in milliseconds
 const NO_ACTIVE_STAKE_TTL = 1000 * 2 // 2 seconds in milliseconds
 const STAKE_CACHE_MAX_ENTRIES = 10_000
 
-@creatable()
-export class XyoStakeIntentService extends BaseService<XyoStakeIntentServiceParams> implements StakeIntentService {
+@creatableProvider()
+export class XyoStakeIntentService extends AbstractCreatableProvider<XyoStakeIntentServiceParams> implements StakeIntentService {
+  static readonly defaultMoniker = 'StakeIntent'
+  static readonly dependencies = []
+  static readonly monikers = [XyoStakeIntentService.defaultMoniker]
+  moniker = 'StakeIntent'
   // TODO: Use hash instead of block number to handle chain reorgs
   protected _lastIndexedBlockHash: Hash | undefined = undefined
   // TODO: Interval tree per declaration (bank, validator, etc.)
@@ -116,7 +121,7 @@ export class XyoStakeIntentService extends BaseService<XyoStakeIntentServicePara
       const requiredMinimumStake = this.getRequiredMinimumStakeForIntent(intent)
       const validCandidates = await this.filterToValidStake(candidates, this.chainStakeViewer, requiredMinimumStake)
       return validCandidates
-    })
+    }, { timeBudgetLimit: 200 })
   }
 
   getRequiredMinimumStakeForIntent(intent: Intent): bigint {
@@ -220,32 +225,30 @@ export class XyoStakeIntentService extends BaseService<XyoStakeIntentServicePara
       return await this.spanAsync('updateIndex', async () => {
         const currentHead = (await this.blockViewer.currentBlock())[0]
         if (isUndefined(currentHead)) return
-        return await timeBudget('XyoStakeIntentService.updateIndex', console, async () => {
-          const currentHeadHash = currentHead._hash
-          const chainMap = readPayloadMapFromStore<WithStorageMeta<Payload>>(this.chainArchivist)
-          const result = await analyzeChain({ chainMap }, [new ChainStakeIntentAnalyzer('producer')], currentHeadHash, this._lastIndexedBlockHash)
-          const signedDeclarations = filterAs(result.find(isChainSummaryStakeIntent)?.intents ?? [], asChainStakeIntent)
-          if (currentHead.block === undefined) return
-          const currentHeadBlockNum = currentHead.block
-          if (displayProgress) this.logger?.log(`Updating index through 0x${currentHeadBlockNum}`)
-          for (const signedDeclaration of signedDeclarations) {
-            const { exp, nbf } = signedDeclaration
-            const start = nbf
-            const stop = exp
-            const address = asAddress(signedDeclaration?.from)
-            if (start !== undefined && stop !== undefined && address !== undefined) {
-              this._producers.insert(address, start, stop)
-            }
+        const currentHeadHash = currentHead._hash
+        const chainMap = readPayloadMapFromStore<WithStorageMeta<Payload>>(this.chainArchivist)
+        const result = await analyzeChain({ chainMap }, [new ChainStakeIntentAnalyzer('producer')], currentHeadHash, this._lastIndexedBlockHash)
+        const signedDeclarations = filterAs(result.find(isChainSummaryStakeIntent)?.intents ?? [], asChainStakeIntent)
+        if (currentHead.block === undefined) return
+        const currentHeadBlockNum = currentHead.block
+        if (displayProgress) this.logger?.log(`Updating index through 0x${currentHeadBlockNum}`)
+        for (const signedDeclaration of signedDeclarations) {
+          const { exp, nbf } = signedDeclaration
+          const start = nbf
+          const stop = exp
+          const address = asAddress(signedDeclaration?.from)
+          if (start !== undefined && stop !== undefined && address !== undefined) {
+            this._producers.insert(address, start, stop)
           }
-          /*
+        }
+        /*
       if (index % STATE_PERSISTENCE_INTERVAL === 0n) {
         if (displayProgress) this.logger?.info(`Persisting state at block ${index}`)
         await this.persistState(await PayloadBuilder.hash(block))
       }
         */
-          this._lastIndexedBlockHash = currentHeadHash
-        }, 2000, true)
-      })
+        this._lastIndexedBlockHash = currentHeadHash
+      }, { timeBudgetLimit: 1000 })
     })
   }
 }

package/src/StakeIntent/lib/getBlockSignedStakeDeclarations.ts

@@ -7,8 +7,8 @@ import { payloadSchemasContains } from '@xyo-network/boundwitness-validator'
 import { BoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper'
 import type {
   BlockBoundWitness, ChainStakeIntent, Intent,
-} from '@xyo-network/xl1-protocol'
-import { asChainStakeIntent, ChainStakeIntentSchema } from '@xyo-network/xl1-protocol'
+} from '@xyo-network/xl1-sdk'
+import { asChainStakeIntent, ChainStakeIntentSchema } from '@xyo-network/xl1-sdk'
 
 export const getBlockSignedStakeDeclarations = async (block: BlockBoundWitness, archivist: ArchivistInstance, intent: Intent): Promise<ChainStakeIntent[]> => {
   // Get payloads in block

package/src/StepStake/BaseStepStakeService.ts

@@ -1,22 +1,18 @@
-import {
-  Address, creatable, Promisable,
-} from '@xylabs/sdk-js'
-import { ReadArchivist } from '@xyo-network/archivist-model'
-import { StepIdentity } from '@xyo-network/xl1-protocol'
-import { StepStakeViewer, StepStakeViewerMoniker } from '@xyo-network/xl1-protocol-sdk'
+import type { Address, Promisable } from '@xylabs/sdk-js'
+import type { ReadArchivist } from '@xyo-network/archivist-model'
+import type { StepIdentity, StepStakeViewer } from '@xyo-network/xl1-sdk'
+import { AbstractCreatableProvider, StepStakeViewerMoniker } from '@xyo-network/xl1-sdk'
 
-import { BaseService } from '../BaseService.ts'
-import { BaseServiceParams } from '../model/index.ts'
+import type { BaseServiceParams } from '../model/index.ts'
 
 export interface BaseStepStakeServiceParams extends BaseServiceParams {
   chainArchivist: ReadArchivist
 }
 
-@creatable()
-export class BaseStepStakeService extends BaseService<BaseStepStakeServiceParams> implements StepStakeViewer {
+export abstract class AbstractStepStakeService extends AbstractCreatableProvider<BaseStepStakeServiceParams> implements StepStakeViewer {
   static readonly defaultMoniker = StepStakeViewerMoniker
   static readonly monikers = [StepStakeViewerMoniker]
-  moniker = BaseStepStakeService.defaultMoniker
+  override moniker = AbstractStepStakeService.defaultMoniker
 
   stepStake(_step: StepIdentity): Promisable<Record<Address, bigint>> {
     throw new Error('Method [stepStake] not implemented.')

package/src/blockViewerFromChainIteratorAndArchivist.ts

@@ -4,13 +4,14 @@ import type { ReadArchivist } from '@xyo-network/archivist-model'
 import { PayloadBuilder } from '@xyo-network/payload-builder'
 import type { Payload, WithHashMeta } from '@xyo-network/payload-model'
 import type {
+  BlockRate,
+  BlockViewer, EventingChainBlockNumberIteratorService,
   SignedHydratedBlockWithHashMeta,
   XL1BlockNumber,
-} from '@xyo-network/xl1-protocol'
-import { asSignedBlockBoundWitness, asSignedBlockBoundWitnessWithStorageMeta } from '@xyo-network/xl1-protocol'
+} from '@xyo-network/xl1-sdk'
 import {
-  type BlockViewer, BlockViewerMoniker, type EventingChainBlockNumberIteratorService,
-} from '@xyo-network/xl1-protocol-sdk'
+  asSignedBlockBoundWitness, asSignedBlockBoundWitnessWithStorageMeta, BlockViewerMoniker,
+} from '@xyo-network/xl1-sdk'
 
 export function blockViewerFromChainIteratorAndArchivist(
   chainIterator: EventingChainBlockNumberIteratorService,
@@ -87,6 +88,15 @@ export function blockViewerFromChainIteratorAndArchivist(
     payloadsByHash: function (_hashes: Hash[]): Promisable<WithHashMeta<Payload>[]> {
       throw new Error('Function not implemented.')
     },
+    rate(..._args): Promisable<BlockRate> {
+      throw new Error('Function not implemented.')
+    },
+    stepSizeRate(..._args) {
+      throw new Error('Function not implemented.')
+    },
+    timeDurationRate(..._args) {
+      throw new Error('Function not implemented.')
+    },
   } satisfies BlockViewer
   return result
 }

package/src/implementation/evm/initChainId.ts

@@ -1,7 +1,7 @@
 import {
   assertEx, hexFrom, isDefined, isHex,
 } from '@xylabs/sdk-js'
-import type { Config } from '@xyo-network/xl1-protocol-sdk'
+import type { Config } from '@xyo-network/xl1-sdk'
 
 export const canUseChainId = (config: Pick<Config, 'evm'>): boolean => {
   return isDefined(config.evm.chainId)

package/src/implementation/evm/initEvmProvider.ts

@@ -1,6 +1,6 @@
 import type { Logger } from '@xylabs/sdk-js'
 import { assertEx } from '@xylabs/sdk-js'
-import type { Config } from '@xyo-network/xl1-protocol-sdk'
+import type { Config } from '@xyo-network/xl1-sdk'
 import type { Provider } from 'ethers'
 import type { JsonRpcProvider } from 'ethers/providers'
 

package/src/implementation/evm/initInfuraProvider.ts

@@ -1,5 +1,5 @@
 import { assertEx, isDefined } from '@xylabs/sdk-js'
-import type { Config } from '@xyo-network/xl1-protocol-sdk'
+import type { Config } from '@xyo-network/xl1-sdk'
 import { InfuraProvider } from 'ethers/providers'
 
 import { canUseChainId, getChainId } from './initChainId.ts'

package/src/implementation/evm/initJsonRpcProvider.ts

@@ -1,5 +1,5 @@
 import { assertEx, isDefined } from '@xylabs/sdk-js'
-import type { Config } from '@xyo-network/xl1-protocol-sdk'
+import type { Config } from '@xyo-network/xl1-sdk'
 import { JsonRpcProvider } from 'ethers/providers'
 
 import { canUseChainId, getChainId } from './initChainId.ts'

package/src/implementation/head/createBootstrapHead.ts

@@ -3,8 +3,8 @@ import { buildNextBlock, createGenesisBlock } from '@xyo-network/chain-protocol'
 import type { WalletInstance } from '@xyo-network/wallet-model'
 import type {
   AttoXL1, ChainId, SignedHydratedBlockWithHashMeta,
-} from '@xyo-network/xl1-protocol'
-import { createDeclarationIntent } from '@xyo-network/xl1-protocol-sdk'
+} from '@xyo-network/xl1-sdk'
+import { createDeclarationIntent } from '@xyo-network/xl1-sdk'
 
 export const createBootstrapHead = async (
   account: WalletInstance,

package/src/implementation/index.ts

@@ -1,3 +1,2 @@
-export * from './chain/index.ts'
 export * from './evm/index.ts'
 export * from './head/index.ts'

package/src/index.ts

@@ -1,8 +1,6 @@
 export * from './AccountBalance/index.ts'
-export * from './BaseService.ts'
 export * from './BlockReward/index.ts'
 export * from './blockViewerFromChainIteratorAndArchivist.ts'
-export * from './ChainService/index.ts'
 export * from './ChainValidator/index.ts'
 export * from './Election/index.ts'
 export * from './implementation/index.ts'

package/src/model/Params.ts

@@ -1,6 +1,5 @@
 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'
+import type { CreatableProviderParams, OpenTelemetryProviders } from '@xyo-network/xl1-sdk'
 
 export interface BaseServiceParams extends CreatableProviderParams, OpenTelemetryProviders {
 

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

@@ -1,6 +1,5 @@
 import {
-  Address,
-  assertEx, exists, Hex, hexToBigInt, isDefined, Promisable,
+  Address, assertEx, exists, Hex, hexToBigInt, isDefined, Promisable,
 } from '@xylabs/sdk-js'
 import { AccountInstance } from '@xyo-network/account-model'
 import { MemoryArchivist } from '@xyo-network/archivist-memory'
@@ -12,32 +11,12 @@ 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,
-  ChainStakeIntent, defaultRewardRatio, SignedBlockBoundWitnessWithHashMeta,
-  SignedHydratedBlockWithHashMeta, SignedHydratedTransaction,
-  Transfer, XYO_STEP_REWARD_ADDRESS,
-} from '@xyo-network/xl1-protocol'
-import {
-  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'
+  AbstractCreatableProvider, AccountBalanceViewer, AccountBalanceViewerMoniker, AllowedBlockPayload, asBlockBoundWitness, AttoXL1, BlockBoundWitness,
+  BlockNumberPayload, BlockNumberSchema, BlockRewardViewer, BlockRewardViewerMoniker, BlockRunner, BlockRunnerMoniker, BlockValidationViewer,
+  BlockValidationViewerMoniker, ChainId, ChainStakeIntent, creatableProvider, CreatableProviderParams, createDeclarationIntent, defaultRewardRatio,
+  HydratedBlockStateValidationFunction, MempoolRunner, MempoolRunnerMoniker, MempoolViewer, MempoolViewerMoniker, SignedBlockBoundWitnessWithHashMeta,
+  SignedHydratedBlockWithHashMeta, SignedHydratedTransaction, TimeSyncViewer, TimeSyncViewerMoniker, Transfer, XYO_STEP_REWARD_ADDRESS,
+} from '@xyo-network/xl1-sdk'
 
 import { generateTransactionFeeTransfers } from './generateTransactionFeeTransfers.ts'
 
@@ -57,7 +36,7 @@ export const XYO_PRODUCER_REDECLARATION_DURATION = 10_000
  */
 export const XYO_PRODUCER_REDECLARATION_WINDOW = 500
 
-export type SimpleBlockRunnerParams = CreatableProviderParams & {
+export interface SimpleBlockRunnerParams extends CreatableProviderParams {
   account: AccountInstance
   rejectedTransactionsArchivist?: ArchivistInstance
   rewardAddress: Address
@@ -67,6 +46,15 @@ export type SimpleBlockRunnerParams = CreatableProviderParams & {
 @creatableProvider()
 export class SimpleBlockRunner extends AbstractCreatableProvider<SimpleBlockRunnerParams> implements BlockRunner {
   static readonly defaultMoniker = BlockRunnerMoniker
+  static readonly dependencies = [
+    AccountBalanceViewerMoniker,
+    BlockRewardViewerMoniker,
+    BlockValidationViewerMoniker,
+    MempoolRunnerMoniker,
+    MempoolViewerMoniker,
+    TimeSyncViewerMoniker,
+  ]
+
   static readonly monikers = [BlockRunnerMoniker]
   moniker = SimpleBlockRunner.defaultMoniker
 
@@ -79,6 +67,7 @@ export class SimpleBlockRunner extends AbstractCreatableProvider<SimpleBlockRunn
   private _address?: Address
   private _blockRewardViewer?: BlockRewardViewer
   private _blockValidationViewer?: BlockValidationViewer
+  private _chainId?: ChainId
   private _mempoolRunner?: MempoolRunner
   private _mempoolViewer?: MempoolViewer
   private _rewardAddress?: Address
@@ -127,6 +116,10 @@ export class SimpleBlockRunner extends AbstractCreatableProvider<SimpleBlockRunn
     return this._blockValidationViewer!
   }
 
+  protected get chainId() {
+    return this._chainId
+  }
+
   // protected get electionService() {
   //   return assertEx(this.params.electionService, () => 'electionService is required')
   // }
@@ -148,7 +141,7 @@ export class SimpleBlockRunner extends AbstractCreatableProvider<SimpleBlockRunn
   }
 
   protected get rewardAddress(): Address {
-    return assertEx(this.params.rewardAddress, () => 'No reward address provided')
+    return this._rewardAddress!
   }
 
   // protected get stakeIntentService(): StakeIntentService {
@@ -166,13 +159,14 @@ export class SimpleBlockRunner extends AbstractCreatableProvider<SimpleBlockRunn
   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._chainId = this.context.config.chain.id
     this._mempoolRunner = await this.locateAndCreate<MempoolRunner>(MempoolRunnerMoniker)
     this._mempoolViewer = await this.locateAndCreate<MempoolViewer>(MempoolViewerMoniker)
+    this._rewardAddress = this.params.rewardAddress ?? this.context.config.producer.rewardAddress
     this._timeSyncViewer = await this.locateAndCreate<TimeSyncViewer>(TimeSyncViewerMoniker)
   }
 
@@ -268,7 +262,7 @@ export class SimpleBlockRunner extends AbstractCreatableProvider<SimpleBlockRunn
 
         const transactionTransfers = await generateTransactionFeeTransfers(this.address, nextBlockTransactions)
         const timeStart = Date.now()
-        const timePayload = await this.generateTimePayload(head)
+        const timePayload = await this.generateTimePayload()
         const timeDuration = Date.now() - timeStart
         if (timeDuration > 100) {
           this.logger?.warn(`[Slow] Generated time payload in ${timeDuration}ms`)
@@ -282,7 +276,16 @@ export class SimpleBlockRunner extends AbstractCreatableProvider<SimpleBlockRunn
         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)
+        const block = await buildNextBlock(
+          head,
+          fundedNextBlockTransactions,
+          blockPayloads,
+          [this.account],
+          XYO_STEP_REWARD_ADDRESS,
+          stepRewardPoolBalance,
+          undefined,
+          this.chainId,
+        )
 
         this.logger?.info(
           `Built block ${block[0].block} in ${Date.now() - startBuild}ms with ${block[1].length} payloads`,
@@ -290,7 +293,7 @@ export class SimpleBlockRunner extends AbstractCreatableProvider<SimpleBlockRunn
 
         this.logger?.info(`Validating block ${block[0].block} with ${block[1].length} payloads`)
         const startValidate = Date.now()
-        const errors = await this.blockValidationViewer.validateBlock(block)
+        const errors = await this.blockValidationViewer.validateBlock(block, { head: head._hash })
         this.logger?.info(`Validated block ${block[0].block} in ${Date.now() - startValidate}ms with ${block[1].length} payloads`)
 
         if (errors.length > 0) {
@@ -305,7 +308,7 @@ export class SimpleBlockRunner extends AbstractCreatableProvider<SimpleBlockRunn
         this.logger?.error(`Error proposing next valid block: ${(error as Error).message}`)
         throw error
       }
-    })
+    }, { timeBudgetLimit: 200 })
   }
 
   // remove unfunded transactions and block transfers
@@ -334,7 +337,7 @@ export class SimpleBlockRunner extends AbstractCreatableProvider<SimpleBlockRunn
     return [fundedTransactions, fundedTransfers]
   }
 
-  private async generateTimePayload(head: WithHashMeta<BlockBoundWitness>) {
+  private async generateTimePayload() {
     return await this.timeSyncViewer.currentTimePayload()
   }
 

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

@@ -5,10 +5,11 @@ import type {
   SignedHydratedTransaction,
   Transfer,
   XL1,
-} from '@xyo-network/xl1-protocol'
-import { TransferSchema, XYO_ZERO_ADDRESS } from '@xyo-network/xl1-protocol'
-import { transactionRequiredGas } from '@xyo-network/xl1-protocol-sdk'
-import { HydratedTransactionWrapper } from '@xyo-network/xl1-wrappers'
+} from '@xyo-network/xl1-sdk'
+import {
+  HydratedTransactionWrapper,
+  transactionRequiredGas, TransferSchema, XYO_ZERO_ADDRESS,
+} from '@xyo-network/xl1-sdk'
 
 export async function generateTransactionFeeTransfers(address: Address, transactions: SignedHydratedTransaction[]): Promise<Transfer[]> {
   const txs = await Promise.all(transactions.map(async (tx) => {

package/dist/neutral/BaseService.d.ts

@@ -1,19 +0,0 @@
-import type { EventData, Promisable } from '@xylabs/sdk-js';
-import { AbstractCreatableProvider } from '@xyo-network/xl1-protocol-sdk';
-import type { BaseAccountableServiceParams, BaseServiceParams } from './model/index.ts';
-declare global {
-    var xyoServiceSingletons: Record<string, unknown>;
-}
-export declare class BaseService<TParams extends BaseServiceParams = BaseServiceParams, TEventData extends EventData = EventData> extends AbstractCreatableProvider<TParams, TEventData> {
-    private static singletonInitMutex;
-    static get singletons(): Record<string, unknown>;
-    static initSingleton<TService extends BaseService<TParams>, TParams extends BaseServiceParams>(params: Partial<TParams>): Promise<TService>;
-}
-export declare abstract class BaseAccountableService<TParams extends BaseAccountableServiceParams = BaseAccountableServiceParams> extends BaseService<TParams> {
-}
-export interface CreatableService<T extends BaseService = BaseService> {
-    new (params: T['params']): T;
-    create<T extends BaseService>(this: CreatableService<T>, params?: Partial<T['params']>): Promisable<T>;
-}
-export declare function creatableService<T extends BaseService = BaseService>(): <U extends CreatableService<T>>(constructor: U) => void;
-//# sourceMappingURL=BaseService.d.ts.map

package/dist/neutral/BaseService.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"BaseService.d.ts","sourceRoot":"","sources":["../../src/BaseService.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAE3D,OAAO,EAAE,yBAAyB,EAAE,MAAM,+BAA+B,CAAA;AAGzE,OAAO,KAAK,EAAE,4BAA4B,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AAEvF,OAAO,CAAC,MAAM,CAAC;IACb,IAAI,oBAAoB,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAClD;AAED,qBACa,WAAW,CAAC,OAAO,SAAS,iBAAiB,GAAG,iBAAiB,EAAE,UAAU,SAAS,SAAS,GAAG,SAAS,CACtH,SAAQ,yBAAyB,CAAC,OAAO,EAAE,UAAU,CAAC;IACtD,OAAO,CAAC,MAAM,CAAC,kBAAkB,CAAc;IAE/C,MAAM,KAAK,UAAU,4BAEpB;IAED,MAAM,CAAC,aAAa,CAAC,QAAQ,SAAS,WAAW,CAAC,OAAO,CAAC,EAAE,OAAO,SAAS,iBAAiB,EAAE,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC;CAMxH;AAED,8BAAsB,sBAAsB,CAC1C,OAAO,SAAS,4BAA4B,GAAG,4BAA4B,CAC3E,SAAQ,WAAW,CAAC,OAAO,CAAC;CAE7B;AAED,MAAM,WAAW,gBAAgB,CAAC,CAAC,SAAS,WAAW,GAAG,WAAW;IACnE,KAAI,MAAM,EAAE,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAA;IAC3B,MAAM,CAAC,CAAC,SAAS,WAAW,EAAE,IAAI,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAAA;CACvG;AAED,wBAAgB,gBAAgB,CAAC,CAAC,SAAS,WAAW,GAAG,WAAW,MAC1D,CAAC,SAAS,gBAAgB,CAAC,CAAC,CAAC,EAAE,aAAa,CAAC,UAItD"}

package/dist/neutral/ChainService/Evm/Evm.d.ts

@@ -1,39 +0,0 @@
-import type { Address, Hex, Promisable } from '@xylabs/sdk-js';
-import type { StakedXyoChain } from '@xyo-network/typechain';
-import type { AttoXL1, XL1BlockNumber } from '@xyo-network/xl1-protocol';
-import { type ChainService } from '@xyo-network/xl1-protocol-sdk';
-import type { ContractRunner } from 'ethers/providers';
-import { BaseService } from '../../BaseService.ts';
-import type { BaseServiceParams } from '../../model/index.ts';
-export interface EvmChainViewerParams extends BaseServiceParams {
-    contract: StakedXyoChain;
-    id: Hex;
-    runner: ContractRunner;
-}
-/**
- * A class that represents a chain stake as backed by an EVM smart contract
- */
-export declare class EvmChainViewer extends BaseService<EvmChainViewerParams> implements ChainService {
-    static readonly defaultMoniker: "ChainContractViewer";
-    static readonly monikers: "ChainContractViewer"[];
-    moniker: "ChainContractViewer";
-    protected get contract(): StakedXyoChain;
-    active(): Promise<bigint>;
-    activeByStaked(staked: Address): Promise<bigint>;
-    activeByStaker(address: Address): Promise<bigint>;
-    addStake(staked: Address, amount: bigint): Promise<boolean>;
-    forkedAtBlockNumber(): Promise<bigint>;
-    forkedAtHash(): Promise<bigint>;
-    forkedChainId(): Promise<Address>;
-    minWithdrawalBlocks(): Promise<bigint>;
-    pending(): Promise<bigint>;
-    pendingByStaker(staker: Address): Promise<bigint>;
-    removeStake(slot: bigint): Promise<boolean>;
-    rewardForBlock(_block: XL1BlockNumber): Promisable<AttoXL1>;
-    rewardsContract(): Promise<string>;
-    stakingTokenAddress(): Promise<string>;
-    withdrawStake(slot: bigint): Promise<boolean>;
-    withdrawn(): Promise<bigint>;
-    withdrawnByStaker(staker: string): Promise<bigint>;
-}
-//# sourceMappingURL=Evm.d.ts.map

package/dist/neutral/ChainService/Evm/Evm.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"Evm.d.ts","sourceRoot":"","sources":["../../../../src/ChainService/Evm/Evm.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EAAE,GAAG,EAAE,UAAU,EACzB,MAAM,gBAAgB,CAAA;AAEvB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAA;AAC5D,OAAO,KAAK,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AACxE,OAAO,EAA8B,KAAK,YAAY,EAAE,MAAM,+BAA+B,CAAA;AAE7F,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAEtD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAClD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AAE7D,MAAM,WAAW,oBAAqB,SAAQ,iBAAiB;IAC7D,QAAQ,EAAE,cAAc,CAAA;IACxB,EAAE,EAAE,GAAG,CAAA;IACP,MAAM,EAAE,cAAc,CAAA;CACvB;AAED;;GAEG;AACH,qBAAa,cAAe,SAAQ,WAAW,CAAC,oBAAoB,CAAE,YAAW,YAAY;IAC3F,MAAM,CAAC,QAAQ,CAAC,cAAc,wBAA6B;IAC3D,MAAM,CAAC,QAAQ,CAAC,QAAQ,0BAA+B;IACvD,OAAO,wBAAgC;IAEvC,SAAS,KAAK,QAAQ,mBAErB;IAEK,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC;IAIzB,cAAc,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;IAIhD,cAAc,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;IAIjD,QAAQ,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAM3D,mBAAmB,IAAI,OAAO,CAAC,MAAM,CAAC;IAItC,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC;IAI/B,aAAa,IAAI,OAAO,CAAC,OAAO,CAAC;IAIjC,mBAAmB,IAAI,OAAO,CAAC,MAAM,CAAC;IAItC,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC;IAI1B,eAAe,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;IAIjD,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAMjD,cAAc,CAAC,MAAM,EAAE,cAAc,GAAG,UAAU,CAAC,OAAO,CAAC;IAIrD,eAAe,IAAI,OAAO,CAAC,MAAM,CAAC;IAIlC,mBAAmB,IAAI,OAAO,CAAC,MAAM,CAAC;IAItC,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAM7C,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC;IAI5B,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;CAGzD"}

package/dist/neutral/ChainService/Evm/index.d.ts

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

package/dist/neutral/ChainService/Evm/index.d.ts.map

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

package/dist/neutral/ChainService/Memory/Memory.d.ts

@@ -1,38 +0,0 @@
-import type { Address, Hex, Promisable } from '@xylabs/sdk-js';
-import type { AttoXL1, XL1BlockNumber } from '@xyo-network/xl1-protocol';
-import { type ChainService } from '@xyo-network/xl1-protocol-sdk';
-import { BaseService } from '../../BaseService.ts';
-import type { BaseServiceParams } from '../../model/index.ts';
-export interface MemoryChainViewerParams extends BaseServiceParams {
-    chainId: Hex;
-}
-/**
- * A class that represents a chain stake as backed in memory
- */
-export declare class MemoryChainViewer extends BaseService<MemoryChainViewerParams> implements ChainService {
-    static readonly defaultMoniker: "ChainContractViewer";
-    static readonly monikers: "ChainContractViewer"[];
-    moniker: "ChainContractViewer";
-    protected _chainId: Hex | undefined;
-    protected _simulatedStake: bigint;
-    active(): Promise<bigint>;
-    activeByStaked(_staked: Address): Promise<bigint>;
-    activeByStaker(_address: string): Promise<bigint>;
-    addStake(_staked: string, _amount: bigint): Promise<boolean>;
-    createHandler(): void;
-    forkedAtBlockNumber(): Promise<bigint>;
-    forkedAtHash(): Promise<bigint>;
-    forkedChainId(): Promise<Address>;
-    minWithdrawalBlocks(): Promise<bigint>;
-    pending(): Promise<bigint>;
-    pendingByStaker(_staker: string): Promise<bigint>;
-    removeStake(_slot: bigint): Promise<boolean>;
-    rewardForBlock(_block: XL1BlockNumber): Promisable<AttoXL1>;
-    rewardsContract(): Promise<string>;
-    stakingTokenAddress(): Promise<string>;
-    withdrawStake(_slot: bigint): Promise<boolean>;
-    withdrawn(): Promise<bigint>;
-    withdrawnByStaker(_staker: string): Promise<bigint>;
-    protected startHandler(): Promise<void>;
-}
-//# sourceMappingURL=Memory.d.ts.map

package/dist/neutral/ChainService/Memory/Memory.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"Memory.d.ts","sourceRoot":"","sources":["../../../../src/ChainService/Memory/Memory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EAAE,GAAG,EAAE,UAAU,EACzB,MAAM,gBAAgB,CAAA;AAEvB,OAAO,KAAK,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AACxE,OAAO,EAEL,KAAK,YAAY,EAClB,MAAM,+BAA+B,CAAA;AAEtC,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAClD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AAE7D,MAAM,WAAW,uBAAwB,SAAQ,iBAAiB;IAChE,OAAO,EAAE,GAAG,CAAA;CACb;AAED;;GAEG;AACH,qBAAa,iBAAkB,SAAQ,WAAW,CAAC,uBAAuB,CAAE,YAAW,YAAY;IACjG,MAAM,CAAC,QAAQ,CAAC,cAAc,wBAA6B;IAC3D,MAAM,CAAC,QAAQ,CAAC,QAAQ,0BAA+B;IACvD,OAAO,wBAAmC;IAE1C,SAAS,CAAC,QAAQ,EAAE,GAAG,GAAG,SAAS,CAAA;IACnC,SAAS,CAAC,eAAe,EAAE,MAAM,CAAK;IAEhC,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC;IAIzB,cAAc,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;IAIjD,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAIjD,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAIzD,aAAa,IAAI,IAAI;IAKxB,mBAAmB,IAAI,OAAO,CAAC,MAAM,CAAC;IAItC,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC;IAI/B,aAAa,IAAI,OAAO,CAAC,OAAO,CAAC;IAIjC,mBAAmB,IAAI,OAAO,CAAC,MAAM,CAAC;IAItC,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC;IAI1B,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAIjD,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAIlD,cAAc,CAAC,MAAM,EAAE,cAAc,GAAG,UAAU,CAAC,OAAO,CAAC;IAIrD,eAAe,IAAI,OAAO,CAAC,MAAM,CAAC;IAIlC,mBAAmB,IAAI,OAAO,CAAC,MAAM,CAAC;IAItC,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAI9C,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC;IAI5B,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;cAIhC,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;CAIvD"}

package/dist/neutral/ChainService/Memory/index.d.ts

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

package/dist/neutral/ChainService/Memory/index.d.ts.map

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

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

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

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

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