@xyo-network/chain-services 1.15.27 → 1.16.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "http://json.schemastore.org/package.json",
   "name": "@xyo-network/chain-services",
-  "version": "1.15.27",
+  "version": "1.16.0",
   "description": "XYO Layer One SDK Services",
   "homepage": "https://xylabs.com",
   "bugs": {
@@ -37,52 +37,52 @@
   ],
   "dependencies": {
     "@opentelemetry/api": "~1.9.0",
-    "@xylabs/array": "~5.0.17",
-    "@xylabs/assert": "~5.0.17",
-    "@xylabs/creatable": "~5.0.17",
-    "@xylabs/decimal-precision": "~5.0.17",
-    "@xylabs/events": "~5.0.17",
-    "@xylabs/exists": "~5.0.17",
-    "@xylabs/forget": "~5.0.17",
-    "@xylabs/hex": "~5.0.17",
-    "@xylabs/promise": "~5.0.17",
-    "@xylabs/telemetry": "~5.0.17",
-    "@xylabs/typeof": "~5.0.17",
-    "@xyo-network/account-model": "~5.1.15",
-    "@xyo-network/archivist-memory": "~5.1.15",
-    "@xyo-network/archivist-model": "~5.1.15",
-    "@xyo-network/boundwitness-model": "~5.1.15",
-    "@xyo-network/boundwitness-validator": "~5.1.15",
-    "@xyo-network/boundwitness-wrapper": "~5.1.15",
-    "@xyo-network/chain-analyze": "~1.15.27",
-    "@xyo-network/chain-modules": "~1.15.27",
-    "@xyo-network/chain-protocol": "~1.15.27",
-    "@xyo-network/chain-utils": "~1.15.27",
-    "@xyo-network/payload-builder": "~5.1.15",
-    "@xyo-network/payload-model": "~5.1.15",
+    "@xylabs/array": "~5.0.19",
+    "@xylabs/assert": "~5.0.19",
+    "@xylabs/creatable": "~5.0.19",
+    "@xylabs/decimal-precision": "~5.0.19",
+    "@xylabs/events": "~5.0.19",
+    "@xylabs/exists": "~5.0.19",
+    "@xylabs/forget": "~5.0.19",
+    "@xylabs/hex": "~5.0.19",
+    "@xylabs/promise": "~5.0.19",
+    "@xylabs/telemetry": "~5.0.19",
+    "@xylabs/typeof": "~5.0.19",
+    "@xyo-network/account-model": "~5.1.18",
+    "@xyo-network/archivist-memory": "~5.1.18",
+    "@xyo-network/archivist-model": "~5.1.18",
+    "@xyo-network/boundwitness-model": "~5.1.18",
+    "@xyo-network/boundwitness-validator": "~5.1.18",
+    "@xyo-network/boundwitness-wrapper": "~5.1.18",
+    "@xyo-network/chain-analyze": "~1.16.0",
+    "@xyo-network/chain-modules": "~1.16.0",
+    "@xyo-network/chain-protocol": "~1.16.0",
+    "@xyo-network/chain-utils": "~1.16.0",
+    "@xyo-network/payload-builder": "~5.1.18",
+    "@xyo-network/payload-model": "~5.1.18",
     "@xyo-network/typechain": "~4.0.10",
-    "@xyo-network/xl1-protocol": "~1.12.95",
-    "@xyo-network/xl1-protocol-sdk": "~1.15.27",
-    "@xyo-network/xl1-validation": "~1.15.27",
-    "@xyo-network/xl1-wrappers": "~1.15.27",
+    "@xyo-network/xl1-protocol": "~1.13.0",
+    "@xyo-network/xl1-protocol-sdk": "~1.16.0",
+    "@xyo-network/xl1-validation": "~1.16.0",
+    "@xyo-network/xl1-wrappers": "~1.16.0",
     "async-mutex": "~0.5.0",
     "ethers": "6.15.0",
     "lru-cache": "~11.2.2"
   },
   "devDependencies": {
-    "@types/node": "~24.9.2",
-    "@xylabs/delay": "~5.0.17",
-    "@xylabs/ts-scripts-yarn3": "~7.1.8",
-    "@xylabs/tsconfig": "~7.1.8",
-    "@xylabs/vitest-extended": "~5.0.17",
-    "@xyo-network/account": "~5.1.15",
-    "@xyo-network/account-model": "~5.1.15",
-    "@xyo-network/chain-validation": "~1.15.27",
-    "@xyo-network/wallet": "~5.1.15",
-    "eslint": "^9.39.0",
+    "@types/node": "~24.10.0",
+    "@xylabs/delay": "~5.0.19",
+    "@xylabs/ts-scripts-yarn3": "~7.2.4",
+    "@xylabs/tsconfig": "~7.2.4",
+    "@xylabs/vitest-extended": "~5.0.19",
+    "@xyo-network/account": "~5.1.18",
+    "@xyo-network/account-model": "~5.1.18",
+    "@xyo-network/chain-validation": "~1.16.0",
+    "@xyo-network/wallet": "~5.1.18",
+    "eslint": "^9.39.1",
     "tslib": "~2.8.1",
     "typescript": "~5.9.3",
-    "vitest": "~3.2.4",
+    "vitest": "~4.0.8",
     "vitest-mock-extended": "~3.1.0",
     "web3-types": "~1.10.0"
   },

package/src/AccountBalance/BaseAccountBalanceService.ts

@@ -1,11 +1,9 @@
 import { creatable } from '@xylabs/creatable'
 import { Address, Hash } from '@xylabs/hex'
 import { spanRootAsync } from '@xylabs/telemetry'
+import { AttoXL1 } from '@xyo-network/xl1-protocol'
 import {
   AccountBalanceServiceV2,
-  AttoXL1,
-} from '@xyo-network/xl1-protocol'
-import {
   balancesSummary,
   BalanceStepSummaryContext,
 } from '@xyo-network/xl1-protocol-sdk'

package/src/AccountBalance/accountBalanceServiceFromArchivist.ts

@@ -1,11 +1,12 @@
 import { assertEx } from '@xylabs/assert'
+import type { Hash } from '@xylabs/hex'
 import type { ReadArchivist } from '@xyo-network/archivist-model'
-import { findMostRecentBlock, LruCacheMap } from '@xyo-network/chain-protocol'
+import { findMostRecentBlock } from '@xyo-network/chain-protocol'
 import type { Payload, WithStorageMeta } from '@xyo-network/payload-model'
-import type { AccountBalanceServiceV2, ChainId } from '@xyo-network/xl1-protocol'
+import type { ChainId } from '@xyo-network/xl1-protocol'
 import { StepSizes } from '@xyo-network/xl1-protocol'
-import type { BalancesStepSummary } from '@xyo-network/xl1-protocol-sdk'
-import { readPayloadMapFromStore } from '@xyo-network/xl1-protocol-sdk'
+import type { AccountBalanceServiceV2, BalancesStepSummary } from '@xyo-network/xl1-protocol-sdk'
+import { LruCacheMap, readPayloadMapFromStore } from '@xyo-network/xl1-protocol-sdk'
 import { Semaphore } from 'async-mutex'
 
 import { BaseAccountBalanceService } from './BaseAccountBalanceService.ts'
@@ -21,9 +22,9 @@ export const accountBalancesServiceFromArchivist = async (
     updateAgeOnGet: true,
   })
   const chainMap = readPayloadMapFromStore<WithStorageMeta<Payload>>(archivist)
-  const headFunc = async () => {
+  const headFunc = async (): Promise<[Hash, number]> => {
     const head = await findMostRecentBlock(archivist)
-    return assertEx(head?._hash, () => 'No head found in chainArchivist')
+    return [assertEx(head?._hash, () => 'No head found in chainArchivist'), assertEx(head?.block, () => 'No head found in chainArchivist')]
   }
   const service = await BaseAccountBalanceService.create({
     context: {

package/src/AccountTransfers/BaseAccountTransfersService.ts

@@ -1,11 +1,9 @@
 import { creatable } from '@xylabs/creatable'
 import { Address, Hash } from '@xylabs/hex'
 import { spanRootAsync } from '@xylabs/telemetry'
+import { AttoXL1 } from '@xyo-network/xl1-protocol'
 import {
   AccountTransfersService,
-  AttoXL1,
-} from '@xyo-network/xl1-protocol'
-import {
   TransfersStepSummaryContext,
   transfersSummary,
 } from '@xyo-network/xl1-protocol-sdk'

package/src/AccountTransfers/accountTransfersServiceFromArchivist.ts

@@ -1,11 +1,12 @@
 import { assertEx } from '@xylabs/assert'
+import type { Hash } from '@xylabs/hex'
 import type { ReadArchivist } from '@xyo-network/archivist-model'
-import { findMostRecentBlock, LruCacheMap } from '@xyo-network/chain-protocol'
+import { findMostRecentBlock } from '@xyo-network/chain-protocol'
 import type { Payload, WithStorageMeta } from '@xyo-network/payload-model'
-import type { AccountTransfersService, ChainId } from '@xyo-network/xl1-protocol'
+import type { ChainId } from '@xyo-network/xl1-protocol'
 import { StepSizes } from '@xyo-network/xl1-protocol'
-import type { TransfersStepSummary } from '@xyo-network/xl1-protocol-sdk'
-import { readPayloadMapFromStore } from '@xyo-network/xl1-protocol-sdk'
+import type { AccountTransfersService, TransfersStepSummary } from '@xyo-network/xl1-protocol-sdk'
+import { LruCacheMap, readPayloadMapFromStore } from '@xyo-network/xl1-protocol-sdk'
 import { Semaphore } from 'async-mutex'
 
 import { BaseAccountTransfersService } from './BaseAccountTransfersService.ts'
@@ -21,9 +22,9 @@ export const accountTransfersServiceFromArchivist = async (
     updateAgeOnGet: true,
   })
   const chainMap = readPayloadMapFromStore<WithStorageMeta<Payload>>(archivist)
-  const headFunc = async () => {
+  const headFunc = async (): Promise<[Hash, number]> => {
     const head = await findMostRecentBlock(archivist)
-    return assertEx(head?._hash, () => 'No head found in chainArchivist')
+    return [assertEx(head?._hash, () => 'No head found in chainArchivist'), assertEx(head?.block, () => 'No head found in chainArchivist')]
   }
   const service = await BaseAccountTransfersService.create({
     context: {

package/src/BaseService.ts

@@ -3,7 +3,7 @@ import type { EventData } from '@xylabs/events'
 import { Hash } from '@xylabs/hex'
 import type { Promisable } from '@xylabs/promise'
 import { spanRoot, spanRootAsync } from '@xylabs/telemetry'
-import type { ServiceInterface } from '@xyo-network/xl1-protocol'
+import type { ServiceInterface } from '@xyo-network/xl1-protocol-sdk'
 import { Mutex } from 'async-mutex'
 
 import type { BaseAccountableServiceParams, BaseServiceParams } from './model/index.ts'

package/src/BlockProducer/BaseBlockProducerService.ts

@@ -14,12 +14,14 @@ import { buildNextBlock, createDeclarationIntent } from '@xyo-network/chain-prot
 import { PayloadBuilder } from '@xyo-network/payload-builder'
 import { WithStorageMeta } from '@xyo-network/payload-model'
 import {
-  AccountBalanceServiceV2, AllowedBlockPayload,
-  asBlockBoundWitness, AttoXL1, BlockBoundWitness, BlockNumberPayload, BlockNumberSchema, BlockProducerService,
-  ChainStakeIntent, defaultRewardRatio, HydratedBlock, PendingTransactionsService, SignedHydratedTransaction, StakeIntentService, TimePayload, TimeSchema,
-  TimeSyncViewInterfaceV2, Transfer,
-  XYO_STEP_REWARD_ADDRESS,
+  AllowedBlockPayload,
+  asBlockBoundWitness, AttoXL1, BlockBoundWitness, BlockNumberPayload, BlockNumberSchema,
+  ChainStakeIntent, defaultRewardRatio, HydratedBlock, SignedHydratedTransaction, TimePayload, TimeSchema,
+  Transfer, XYO_STEP_REWARD_ADDRESS,
 } from '@xyo-network/xl1-protocol'
+import {
+  AccountBalanceServiceV2, BlockProducerService, PendingTransactionsService, StakeIntentService, TimeSyncViewInterfaceV2,
+} from '@xyo-network/xl1-protocol-sdk'
 
 import { BaseService } from '../BaseService.ts'
 import { XyoValidatorParams } from '../ChainValidator/index.ts'

package/src/BlockProducer/spec/BaseBlockProducerService.spec.ts

@@ -21,25 +21,25 @@ import {
 } from '@xyo-network/payload-model'
 import { HDWallet } from '@xyo-network/wallet'
 import type {
-  BlockBoundWitness, BlockRewardService, ChainId, ElectionService,
+  BlockBoundWitness, ChainId,
   HydratedBlock,
-  HydratedBlockStateValidationFunctionV2,
-  StakeIntentService,
   TimeDomain, TimePayload,
-  TimeSyncViewInterfaceV2,
 } from '@xyo-network/xl1-protocol'
 import {
   asBlockBoundWitness,
   asChainStakeIntent,
   asTransactionBoundWitness,
   asTransfer,
-  HydratedBlockStateValidationError,
   TimeSchema,
   XYO_ZERO_ADDRESS,
 } from '@xyo-network/xl1-protocol'
-import type { Config } from '@xyo-network/xl1-protocol-sdk'
+import type {
+  BlockRewardService, Config, ElectionService, HydratedBlockStateValidationFunctionV2, StakeIntentService,
+  TimeSyncViewInterfaceV2,
+} from '@xyo-network/xl1-protocol-sdk'
 import {
   flattenHydratedBlock, flattenHydratedTransaction, getDefaultConfig,
+  HydratedBlockStateValidationError,
 } from '@xyo-network/xl1-protocol-sdk'
 import {
   beforeAll, beforeEach, describe, expect, it,

package/src/BlockReward/BaseBlockRewardService.ts

@@ -1,6 +1,6 @@
 import { creatable } from '@xylabs/creatable'
 import { Promisable } from '@xylabs/promise'
-import { BlockRewardService } from '@xyo-network/xl1-protocol'
+import { BlockRewardService } from '@xyo-network/xl1-protocol-sdk'
 
 import { BaseService } from '../BaseService.ts'
 import { BaseServiceParams } from '../model/index.ts'

package/src/BlockReward/EvmBlockRewardService.ts

@@ -3,7 +3,7 @@ import { creatable } from '@xylabs/creatable'
 import { toEthAddress } from '@xylabs/hex'
 import { AccountInstance } from '@xyo-network/account-model'
 import { XyoChainRewards__factory as XyoChainRewardsFactory } from '@xyo-network/typechain'
-import { BlockRewardService, ChainService } from '@xyo-network/xl1-protocol'
+import { BlockRewardService, ChainService } from '@xyo-network/xl1-protocol-sdk'
 import { Provider } from 'ethers/providers'
 
 import { BaseBlockRewardService, BaseBlockRewardServiceParams } from './BaseBlockRewardService.ts'

package/src/BlockReward/MemoryBlockRewardService.ts

@@ -3,7 +3,7 @@ import { creatable } from '@xylabs/creatable'
 import { toFixedPoint } from '@xylabs/decimal-precision'
 import { Promisable } from '@xylabs/promise'
 import { rewardFromBlockNumber } from '@xyo-network/chain-protocol'
-import { BlockRewardService } from '@xyo-network/xl1-protocol'
+import { BlockRewardService } from '@xyo-network/xl1-protocol-sdk'
 
 import { BaseBlockRewardService, BaseBlockRewardServiceParams } from './BaseBlockRewardService.ts'
 

package/src/ChainBlockIteration/ChainBlockNumberIterationService.ts

@@ -6,16 +6,13 @@ import {
 import type { ArchivistInstance } from '@xyo-network/archivist-model'
 import { PayloadBuilder } from '@xyo-network/payload-builder'
 import type { WithStorageMeta } from '@xyo-network/payload-model'
-import type {
-  BlockBoundWitness,
-  ChainIteratorServiceEventData,
-  EventingChainBlockNumberIteratorService,
-} from '@xyo-network/xl1-protocol'
+import type { BlockBoundWitness } from '@xyo-network/xl1-protocol'
 import {
   asBlockBoundWitness,
   asBlockBoundWitnessWithStorageMeta,
   isBlockBoundWitness,
 } from '@xyo-network/xl1-protocol'
+import type { ChainIteratorServiceEventData, EventingChainBlockNumberIteratorService } from '@xyo-network/xl1-protocol-sdk'
 import { LRUCache } from 'lru-cache'
 
 import { BaseService } from '../BaseService.ts'

package/src/ChainBlockNumberIteration/ChainBlockNumberIterationService.ts

@@ -5,13 +5,13 @@ import {
 } from '@xylabs/typeof'
 import { PayloadBuilder } from '@xyo-network/payload-builder'
 import type { Payload, WithStorageMeta } from '@xyo-network/payload-model'
-import type {
-  BlockBoundWitness, ChainIteratorServiceEventData, EventingChainBlockNumberIteratorService,
-} from '@xyo-network/xl1-protocol'
+import type { BlockBoundWitness } from '@xyo-network/xl1-protocol'
 import {
-  asBlockBoundWitness, asBlockBoundWitnessWithStorageMeta, isBlockBoundWitnessWithHashStorageMeta,
+  asBlockBoundWitness, asBlockBoundWitnessWithStorageMeta, isBlockBoundWitnessWithHashMeta,
 } from '@xyo-network/xl1-protocol'
-import type { PayloadMapRead } from '@xyo-network/xl1-protocol-sdk'
+import type {
+  ChainIteratorServiceEventData, EventingChainBlockNumberIteratorService, PayloadMapRead,
+} from '@xyo-network/xl1-protocol-sdk'
 import { LRUCache } from 'lru-cache'
 
 import { BaseService } from '../BaseService.ts'
@@ -39,7 +39,7 @@ export class ChainBlockNumberIterationService extends BaseService<XyoChainIterat
     let currentBlock = (await this.chainMap.get(currentBlockHash))
     while (isDefined(currentBlock)) {
       assertEx(asBlockBoundWitness(currentBlock), () => `Expected hash to be a block bound witness [${currentBlock?._hash}]`)
-      if (isBlockBoundWitnessWithHashStorageMeta(currentBlock)) {
+      if (isBlockBoundWitnessWithHashMeta(currentBlock)) {
         this._blocksByBlockNumber.set(currentBlock.block, currentBlock)
         if (currentBlock.block === block) {
           return currentBlock
@@ -74,7 +74,7 @@ export class ChainBlockNumberIterationService extends BaseService<XyoChainIterat
     const results: WithStorageMeta<BlockBoundWitness>[] = []
     let currentBlock: WithStorageMeta<BlockBoundWitness> | undefined = isDefined(block) ? (await this.get(block)) : await this.head()
     while (isDefined(currentBlock) && (results.length < count)) {
-      if (isBlockBoundWitnessWithHashStorageMeta(currentBlock)) {
+      if (isBlockBoundWitnessWithHashMeta(currentBlock)) {
         results.push(currentBlock)
         const { previous } = currentBlock as BlockBoundWitness
         if (isNull(previous)) break

package/src/ChainService/Evm/Evm.ts

@@ -3,7 +3,7 @@ import type { Address } from '@xylabs/hex'
 import { toAddress, toEthAddress } from '@xylabs/hex'
 import type { StakedXyoChain } from '@xyo-network/typechain'
 import { StakedXyoChain__factory as StakedXyoChainFactory } from '@xyo-network/typechain'
-import type { ChainService } from '@xyo-network/xl1-protocol'
+import type { ChainService } from '@xyo-network/xl1-protocol-sdk'
 import { getAddress } from 'ethers/address'
 import type { ContractRunner } from 'ethers/providers'
 

package/src/ChainService/Memory/Memory.ts

@@ -1,6 +1,6 @@
 import type { Address } from '@xylabs/hex'
 import { ZERO_ADDRESS } from '@xylabs/hex'
-import type { ChainService } 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'

package/src/ChainValidator/XyoValidator.ts

@@ -5,13 +5,12 @@ import { AccountInstance } from '@xyo-network/account-model'
 import { ArchivistInstance, ReadArchivist } from '@xyo-network/archivist-model'
 import {
   BlockBoundWitness,
-  BlockRewardService,
   ChainId,
-  ElectionService,
-  HydratedBlockStateValidationFunctionV2,
   SignedHydratedTransactionWithStorageMeta,
-  StakeIntentService,
 } from '@xyo-network/xl1-protocol'
+import {
+  BlockRewardService, ElectionService, HydratedBlockStateValidationFunctionV2, StakeIntentService,
+} from '@xyo-network/xl1-protocol-sdk'
 
 import { BaseService } from '../BaseService.ts'
 import { BaseServiceParams } from '../model/index.ts'

package/src/Election/BaseElectionService.ts

@@ -2,11 +2,11 @@ import { assertEx } from '@xylabs/assert'
 import { creatable } from '@xylabs/creatable'
 import { Address, Hash } from '@xylabs/hex'
 import { hexToLast4BytesInt, shuffleWithSeed } from '@xyo-network/chain-utils'
-import { WithHashStorageMeta } from '@xyo-network/payload-model'
+import { WithHashMeta } from '@xyo-network/payload-model'
+import { BlockBoundWitness } from '@xyo-network/xl1-protocol'
 import type {
-  ChainBlockNumberIteratorService, ChainStakeViewer, StakeIntentService,
-} from '@xyo-network/xl1-protocol'
-import { BlockBoundWitness, ElectionService } from '@xyo-network/xl1-protocol'
+  ChainBlockNumberIteratorService, ChainStakeViewer, ElectionService, StakeIntentService,
+} from '@xyo-network/xl1-protocol-sdk'
 
 import { BaseService } from '../BaseService.ts'
 import { BaseServiceParams } from '../model/index.ts'
@@ -31,7 +31,7 @@ export class BaseElectionService extends BaseService<BaseElectionServicesParams>
     return assertEx(this.params.stakeIntentService, () => 'No staked intent service')
   }
 
-  async getCreatorCommitteeForNextBlock(current: WithHashStorageMeta<BlockBoundWitness>): Promise<Address[]> {
+  async getCreatorCommitteeForNextBlock(current: WithHashMeta<BlockBoundWitness>): Promise<Address[]> {
     return await this.spanAsync('getCreatorCommitteeForNextBlock', async () => {
       const nextBlock = current.block + 1
       const candidates = await this.stakeIntentService.getDeclaredCandidatesForBlock(nextBlock, 'producer')

package/src/NetworkStakeStepReward/BaseNetworkStakeStepRewardService.ts

@@ -3,9 +3,10 @@ import { Address } from '@xylabs/hex'
 import { Promisable } from '@xylabs/promise'
 import { ReadArchivist } from '@xyo-network/archivist-model'
 import {
-  EventingChainBlockNumberIteratorService, NetworkStakeStepRewardService, StepIdentity,
+  StepIdentity,
   StepIdentityString,
 } from '@xyo-network/xl1-protocol'
+import { EventingChainBlockNumberIteratorService, NetworkStakeStepRewardService } from '@xyo-network/xl1-protocol-sdk'
 import { Provider } from 'ethers'
 
 import { BaseService } from '../BaseService.ts'

package/src/PendingTransactions/BasePendingTransactions.ts

@@ -13,9 +13,10 @@ import {
   Payload, PayloadBundle, Sequence, WithStorageMeta,
 } from '@xyo-network/payload-model'
 import {
-  asBlockBoundWitnessWithHashStorageMeta, ChainId, HydratedTransactionValidationFunction, isTransactionBoundWitnessWithStorageMeta, PendingTransactionsService,
+  asBlockBoundWitnessWithHashMeta, ChainId, HydratedTransactionValidationFunction, isTransactionBoundWitnessWithStorageMeta,
   SignedHydratedTransactionWithStorageMeta,
 } from '@xyo-network/xl1-protocol'
+import { PendingTransactionsService } from '@xyo-network/xl1-protocol-sdk'
 import { TransactionJsonSchemaValidator, validateTransaction } from '@xyo-network/xl1-validation'
 import { Mutex } from 'async-mutex'
 
@@ -145,7 +146,7 @@ export class BasePendingTransactionsService extends BaseService<BasePendingTrans
     // Acquires an exclusive mutex to ensure no race conditions while accessing pending transactions.
       return await this._updateCuratedPendingTransactionsArchivistMutex.runExclusive(async () => {
         // Find the supplied head
-        let [lastHead] = filterAs(await this.chainArchivist.get([head]), asBlockBoundWitnessWithHashStorageMeta)
+        let [lastHead] = filterAs(await this.chainArchivist.get([head]), asBlockBoundWitnessWithHashMeta)
         if (isUndefined(lastHead)) return []
 
         await this.pruneCuratedPendingTransactionsArchivist(lastHead._hash)
@@ -275,7 +276,7 @@ export class BasePendingTransactionsService extends BaseService<BasePendingTrans
       const foundPendingTransactionsToDeleteHashes: Hash[] = []
 
       let cursor: Sequence | undefined
-      let [lastHead] = filterAs(await this.chainArchivist.get([head]), asBlockBoundWitnessWithHashStorageMeta)
+      let [lastHead] = filterAs(await this.chainArchivist.get([head]), asBlockBoundWitnessWithHashMeta)
 
       // Continue fetching until the desired number of transactions is reached.
       while (isDefined(lastHead)) {

package/src/StakeIntent/XyoStakeIntentService.ts

@@ -17,15 +17,17 @@ import {
 } from '@xyo-network/chain-utils'
 import { PayloadBuilder } from '@xyo-network/payload-builder'
 import { Payload, WithStorageMeta } from '@xyo-network/payload-model'
-import type { EventingChainBlockNumberIteratorService, Intent } from '@xyo-network/xl1-protocol'
 import {
-  asBlockBoundWitness, asBlockBoundWitnessWithStorageMeta,
+  asBlockBoundWitness, asBlockBoundWitnessWithStorageMeta, asChainStakeIntent, type Intent,
+} from '@xyo-network/xl1-protocol'
+import {
   asChainIndexingServiceStateWithStorageMeta,
-  asChainStakeIntent, ChainIndexingServiceState, ChainIndexingServiceStateSchema, ChainStakeViewer,
+  ChainIndexingServiceState, ChainIndexingServiceStateSchema, ChainStakeViewer,
+  EventingChainBlockNumberIteratorService,
   isChainIndexingServiceState,
+  readPayloadMapFromStore,
   StakeIntentService,
-} from '@xyo-network/xl1-protocol'
-import { readPayloadMapFromStore } from '@xyo-network/xl1-protocol-sdk'
+} from '@xyo-network/xl1-protocol-sdk'
 import { Mutex } from 'async-mutex'
 import { LRUCache } from 'lru-cache'
 

package/src/StepStake/BaseStepStakeService.ts

@@ -2,10 +2,8 @@ import { creatable } from '@xylabs/creatable'
 import { Address } from '@xylabs/hex'
 import { Promisable } from '@xylabs/promise'
 import { ReadArchivist } from '@xyo-network/archivist-model'
-import {
-  StepIdentity,
-  StepStakeService,
-} from '@xyo-network/xl1-protocol'
+import { StepIdentity } from '@xyo-network/xl1-protocol'
+import { StepStakeService } from '@xyo-network/xl1-protocol-sdk'
 
 import { BaseService } from '../BaseService.ts'
 import { BaseServiceParams } from '../model/index.ts'

package/src/Time/BaseTimeSyncService.ts

@@ -6,9 +6,9 @@ import { ReadArchivist } from '@xyo-network/archivist-model'
 import { PayloadBuilder } from '@xyo-network/payload-builder'
 import {
   asTimePayload,
-  EventingChainBlockNumberIteratorService, TimeDomain, TimePayload, TimeSchema,
-  TimeSyncServiceV2,
+  TimeDomain, TimePayload, TimeSchema,
 } from '@xyo-network/xl1-protocol'
+import { EventingChainBlockNumberIteratorService, TimeSyncServiceV2 } from '@xyo-network/xl1-protocol-sdk'
 import { Provider } from 'ethers'
 
 import { BaseService } from '../BaseService.ts'