@xyo-network/xl1-protocol-sdk 1.16.8 → 1.16.10

package/src/model/ChainContext/ChainStakeContext.ts

@@ -1,14 +1,15 @@
+import type {
+  StakeEventsViewer, StakeRunner, StakeViewer,
+} from '../../viewers/index.ts'
 import type { ChainIdentity } from '../ChainIdentity.ts'
-import type { ChainStakeRead, ChainStakeWrite } from '../ChainStake/index.ts'
-import type { StakeEventsRead } from '../StakeEvents.ts'
 
 export interface ChainStakeContextWrite extends ChainIdentity {
-  stake: ChainStakeWrite
+  stake: StakeRunner
 }
 
 export interface ChainStakeContextRead extends ChainIdentity {
-  events: StakeEventsRead
-  stake: ChainStakeRead
+  events: StakeEventsViewer
+  stake: StakeViewer
 }
 
 export type ChainStakeContext = ChainStakeContextRead & ChainStakeContextWrite

package/src/model/index.ts

@@ -1,10 +1,8 @@
 export * from './ChainContext/index.ts'
 export * from './ChainFork/index.ts'
 export * from './ChainIdentity.ts'
-export * from './ChainStake/index.ts'
 export * from './ChainStore.ts'
 export * from './PayloadMap.ts'
 export * from './Position.ts'
 export * from './RecordKeyType.ts'
-export * from './StakeEvents.ts'
 export * from './summary.ts'

package/src/primitives/step/stepBlockRange.ts

@@ -4,5 +4,5 @@ import { asXL1BlockRange, StepSizes } from '@xyo-network/xl1-protocol'
 export function stepBlockRange({ block, step }: StepIdentity): XL1BlockRange {
   const stepSize = StepSizes[step]
   const start = block - stepSize
-  return asXL1BlockRange([start, start + stepSize - 1], true)
+  return asXL1BlockRange([start, start + stepSize - 1], { name: 'stepBlockRange' })
 }

package/src/primitives/step/stepTransferIndex.ts

@@ -13,6 +13,6 @@ export function stepTransferIndex(block: number, step: number) {
       rewardTransferCount++
     }
   }
-  assertEx(rewardTransferIndex >= 0, () => `Error: Could not find step size for step ${step} at block ${block}`)
+  assertEx(rewardTransferIndex >= 0, () => `Could not find step size for step ${step} at block ${block}`)
   return [rewardTransferIndex, rewardTransferCount]
 }

package/src/primitives/summary/balances/balancesSummary.ts

@@ -19,7 +19,10 @@ export async function balancesSummary(
     const headResult = await context.store.chainMap.get(headHash)
     const headBoundWitness = asBlockBoundWitnessWithStorageMeta(headResult, () => `Head block not found for hash: ${headHash}`, { required: true })
     const rangeStart = asXL1BlockNumber(isDefined(context.windowSize) ? Math.max(headBoundWitness.block - context.windowSize + 1, 0) : 0)
-    const ranges = deepCalculateFramesFromRange(asXL1BlockRange([rangeStart, headBoundWitness.block], true))
+    const ranges = deepCalculateFramesFromRange(asXL1BlockRange(
+      [rangeStart, headBoundWitness.block],
+      { name: 'balancesSummary' },
+    ))
     const summaries = await Promise.all(ranges.map(range => balancesStepSummaryFromRange(context, range)))
     const balances: Partial<Record<Address, bigint>> = {}
     for (let summary of summaries) {

package/src/primitives/summary/transfers/transfersSummary.ts

@@ -20,7 +20,10 @@ export async function transfersSummary(
     const headResult = await context.store.chainMap.get(headHash)
     const headBoundWitness = asBlockBoundWitnessWithStorageMeta(headResult, () => `Head block not found for hash: ${headHash}`, { required: true })
     const rangeStart = asXL1BlockNumber(isDefined(context.windowSize) ? Math.max(headBoundWitness.block - context.windowSize + 1, 0) : 0)
-    const ranges = deepCalculateFramesFromRange(asXL1BlockRange([rangeStart, headBoundWitness.block], true))
+    const ranges = deepCalculateFramesFromRange(asXL1BlockRange(
+      [rangeStart, headBoundWitness.block],
+      { name: 'transfersSummary' },
+    ))
     const summaries = await Promise.all(ranges.map(range => transfersStepSummaryFromRange(context, range)))
     const transfers: Partial<Record<Address, Partial<Record<Address, bigint>>>> = {}
     for (let summary of summaries) {

package/src/services/AccountBalanceService.ts

@@ -1,5 +1,4 @@
 import type { AccountBalancesViewerMethods, AccountBalanceViewerMethods } from '../viewers/index.ts'
-import type { ServiceInterface } from './Service.ts'
 
-export interface AccountBalanceService extends AccountBalancesViewerMethods, AccountBalanceViewerMethods, ServiceInterface {
+export interface AccountBalanceService extends AccountBalancesViewerMethods, AccountBalanceViewerMethods {
 }

package/src/services/AccountTransfersService.ts

@@ -2,11 +2,9 @@ import type { Address, Hash } from '@xylabs/hex'
 import type { Promisable } from '@xylabs/promise'
 import type { AttoXL1 } from '@xyo-network/xl1-protocol'
 
-import type { ServiceInterface } from './Service.ts'
-
 export interface AccountTransfersProvider {
   transfer(head: Hash, account: Address): Promisable<AttoXL1>
   transfers(head: Hash, accounts: Address[]): Promisable<Partial<Record<Address, AttoXL1>>>
 }
 
-export interface AccountTransfersService extends AccountTransfersProvider, ServiceInterface {}
+export interface AccountTransfersService extends AccountTransfersProvider {}

package/src/services/BlockProducerService.ts

@@ -3,8 +3,6 @@ import type {
   BlockBoundWitness, HydratedBlock, IterableRepository,
 } from '@xyo-network/xl1-protocol'
 
-import type { ServiceInterface } from './Service.ts'
-
 export type NextBlockProducer = IterableRepository<BlockBoundWitness, HydratedBlock | undefined>
 
-export interface BlockProducerService extends Addressable, NextBlockProducer, ServiceInterface {}
+export interface BlockProducerService extends Addressable, NextBlockProducer {}

package/src/services/BlockRewardService.ts

@@ -1,8 +1,6 @@
 import type { Promisable } from '@xylabs/promise'
 
-import type { ServiceInterface } from './Service.ts'
-
-export interface BlockRewardService extends ServiceInterface {
+export interface BlockRewardService {
   // The amount of xl1 to send to the producer from the block reward
   getRewardForBlock(block: bigint): Promisable<bigint>
 }

package/src/services/Chain/BaseChainService.ts

@@ -1,7 +1,5 @@
 import type { ChainId } from '@xyo-network/xl1-protocol'
 
-import type { ServiceInterface } from '../Service.ts'
-
-export interface BaseChainService extends ServiceInterface {
+export interface BaseChainService {
   chainId: ChainId
 }

package/src/services/Election.ts

@@ -2,9 +2,7 @@ import type { Address } from '@xylabs/hex'
 import type { WithHashMeta } from '@xyo-network/payload-model'
 import type { BlockBoundWitness } from '@xyo-network/xl1-protocol'
 
-import type { ServiceInterface } from './Service.ts'
-
-export interface ElectionService extends ServiceInterface {
+export interface ElectionService {
 
   /**
    * Given the current block, get the leader for the next block

package/src/services/NetworkStakeService.ts

@@ -1,4 +1,3 @@
 import type { NetworkStakeStepRewardViewer } from '../viewers/index.ts'
-import type { ServiceInterface } from './Service.ts'
 
-export interface NetworkStakeStepRewardService extends NetworkStakeStepRewardViewer, ServiceInterface {}
+export interface NetworkStakeStepRewardService extends NetworkStakeStepRewardViewer {}

package/src/services/PendingTransactionsService.ts

@@ -1,8 +1,6 @@
 import type { Hash } from '@xylabs/hex'
 import type { SignedHydratedTransaction } from '@xyo-network/xl1-protocol'
 
-import type { ServiceInterface } from './Service.ts'
-
-export interface PendingTransactionsService extends ServiceInterface {
+export interface PendingTransactionsService {
   getPendingTransactions(head: Hash, limit: number, timeout?: number): Promise<SignedHydratedTransaction[]>
 }

package/src/services/StakeIntentService/StakeIntentService.ts

@@ -1,9 +1,7 @@
 import type { Address } from '@xylabs/hex'
 import type { Intent } from '@xyo-network/xl1-protocol'
 
-import type { ServiceInterface } from '../Service.ts'
-
-export interface StakeIntentService extends ServiceInterface {
+export interface StakeIntentService {
 
   /**
    * Gets the declared ranges for an address based on historical on-chain data

package/src/services/index.ts

@@ -8,7 +8,4 @@ export * from './ChainIterator/index.ts'
 export * from './Election.ts'
 export * from './NetworkStakeService.ts'
 export * from './PendingTransactionsService.ts'
-export * from './Service.ts'
 export * from './StakeIntentService/index.ts'
-export * from './StepStakeService.ts'
-export * from './TimeSyncService.ts'

package/src/simple/accountBalance/SimpleAccountBalanceViewer.ts

@@ -0,0 +1,124 @@
+import { assertEx } from '@xylabs/assert'
+import { exists } from '@xylabs/exists'
+import type { Address, Hash } from '@xylabs/hex'
+import { spanRootAsync } from '@xylabs/telemetry'
+import { isDefined } from '@xylabs/typeof'
+import type { Signed } from '@xyo-network/boundwitness-model'
+import type { WithStorageMeta } from '@xyo-network/payload-model'
+import type {
+  BlockBoundWitness, Transfer, XL1BlockNumber, XL1BlockRange,
+} from '@xyo-network/xl1-protocol'
+import {
+  asRange, asXL1BlockNumber, asXL1BlockRange, AttoXL1,
+  StepSizes,
+  TransferSchema,
+} from '@xyo-network/xl1-protocol'
+
+import { deepCalculateFramesFromRange, transfersStepSummaryFromRange } from '../../block/index.ts'
+import type { BalanceStepSummaryContext, TransfersStepSummaryContext } from '../../model/index.ts'
+import type { TransfersStepSummary } from '../../payloads/index.ts'
+import { balancesSummary } from '../../primitives/index.ts'
+import type {
+  AccountBalanceHistoryItem, AccountBalanceViewer, BlockViewer,
+} from '../../viewers/index.ts'
+
+export class SimpleAccountBalanceViewer implements AccountBalanceViewer {
+  protected readonly blockViewer: BlockViewer
+  protected readonly context: BalanceStepSummaryContext
+  protected readonly transferContext: TransfersStepSummaryContext
+
+  constructor(context: BalanceStepSummaryContext, transferContext: TransfersStepSummaryContext, blockViewer: BlockViewer) {
+    this.context = context
+    this.transferContext = transferContext
+    this.blockViewer = blockViewer
+  }
+
+  async accountBalance(address: Address, headOrRange?: XL1BlockRange | Hash): Promise<AttoXL1> {
+    const balances = await this.accountBalances([address], headOrRange)
+    return balances[address] ?? AttoXL1(0n)
+  }
+
+  async accountBalanceHistory(address: Address, headOrRange?: XL1BlockRange | Hash): Promise<AccountBalanceHistoryItem[]> {
+    const range = asRange(headOrRange)
+    const startingRange = asXL1BlockRange(range ?? [0, await this.blockViewer.currentBlockNumber()], true)
+    const blockNumbers = await this.distillTransferHistory(address, startingRange)
+    const blocks = (await Promise.all(blockNumbers.map(async bn => await this.blockViewer.blockByNumber(bn)))).filter(exists)
+    const result: AccountBalanceHistoryItem[] = []
+    for (const block of blocks) {
+      const transferIndexes = block[0].payload_schemas.map((schema, index) => schema === TransferSchema ? index : undefined).filter(exists)
+      const transfers = transferIndexes.map((index) => {
+        const hash = block[0].payload_hashes[index]
+        return assertEx(
+          block[1].find(p => p._hash === hash) as WithStorageMeta<Transfer>,
+          () => `Error: Could not find Transfer with hash ${hash} in block ${block[0]._hash}`,
+        )
+      }).filter(exists).filter(t => ((t.from === address) || (isDefined(t.transfers[address]))))
+      if (transfers.length === 0) {
+        continue
+      }
+      const pairs: [WithStorageMeta<Signed<BlockBoundWitness>>, WithStorageMeta<Transfer>][] = (transfers.map((transfer) => {
+        return [block[0], transfer]
+      }))
+      result.push(...pairs.map(([block, transfer]) => [block,
+        null,
+        transfer] satisfies AccountBalanceHistoryItem))
+    }
+    return result
+  }
+
+  async accountBalances(address: Address[], _headOrRange?: XL1BlockRange | Hash): Promise<Partial<Record<Address, AttoXL1>>> {
+    return await spanRootAsync('balances', async () => {
+      const summary = await balancesSummary(
+        this.context,
+      )
+      const result: Record<Address, AttoXL1> = {}
+      for (const addr of address) {
+        const summaryBalance = summary[addr] ?? 0n
+        result[addr] = AttoXL1(summaryBalance < 0n ? 0n : summaryBalance)
+      }
+      return result
+    })
+  }
+
+  accountBalancesHistories(_addresses: Address[], _rangeOrHash?: XL1BlockRange | Hash): Promise<Partial<Record<Address, AccountBalanceHistoryItem[]>>> {
+    throw new Error('Method not implemented.')
+  }
+
+  private async distillTransferHistory(address: Address, range: XL1BlockRange, max: number = 50): Promise<XL1BlockNumber[]> {
+    if ((range[1] - range[0]) <= StepSizes[0] || max <= 1) {
+      return Array.from({ length: range[1] - range[0] + 1 }, (_, i) => range[1] - i).slice(0, max).map(n => asXL1BlockNumber(n, true))
+    }
+    const frames = deepCalculateFramesFromRange(asXL1BlockRange(range, true))
+    const transferSummaryPairs = await Promise.all(frames.map(
+      async (frame) => {
+        return [frame, await transfersStepSummaryFromRange(this.transferContext, frame)]
+      },
+    )) as [XL1BlockRange, WithStorageMeta<TransfersStepSummary>][]
+
+    const filteredTransferSummaryPairs = transferSummaryPairs.filter(([_, summary]) => Object.keys(summary.transfers).includes(address))
+
+    // sort it latest to earliest
+    const sortedTransferSummaryPairs = filteredTransferSummaryPairs.toSorted((a, b) => {
+      return b[0][1] - a[0][1]
+    })
+
+    const resultBlockNumbers: Set<XL1BlockNumber> = new Set()
+    for (const [frame] of sortedTransferSummaryPairs) {
+      if ((frame[1] - frame[0] + 1) > StepSizes[0]) {
+        const values = await this.distillTransferHistory(address, asXL1BlockRange([frame[0], frame[1] - 1], true), max - resultBlockNumbers.size)
+        for (const value of values) {
+          resultBlockNumbers.add(value)
+        }
+        resultBlockNumbers.add(frame[1])
+      } else {
+        for (let i = frame[0]; i <= frame[1]; i++) {
+          resultBlockNumbers.add(i)
+        }
+      }
+      if (resultBlockNumbers.size >= max) {
+        break
+      }
+    }
+    return [...resultBlockNumbers].toSorted((a, b) => b - a).slice(0, max)
+  }
+}

package/src/simple/accountBalance/index.ts

@@ -0,0 +1 @@
+export * from './SimpleAccountBalanceViewer.ts'

package/src/simple/gateway/SimpleXyoGatewayRunner.ts

@@ -81,8 +81,7 @@ export class SimpleXyoGatewayRunner implements XyoGatewayRunner {
     const signedTx = await signer.signTransaction(tx)
     await this.addPayloadsToDataLakes(signedTx[1])
     return [await runner.broadcastTransaction(
-      [await PayloadBuilder.addStorageMeta(signedTx[0]),
-        await PayloadBuilder.addStorageMeta(signedTx[1])],
+      [signedTx[0], signedTx[1]],
     ), signedTx]
   }
 

package/src/simple/index.ts

@@ -1,3 +1,4 @@
+export * from './accountBalance/index.ts'
 export * from './client/index.ts'
 export * from './datalake/index.ts'
 export * from './gateway/index.ts'
@@ -5,3 +6,4 @@ export * from './network/index.ts'
 export * from './permissions/index.ts'
 export * from './runner/index.ts'
 export * from './signer/index.ts'
+export * from './timesync/index.ts'

package/src/simple/timesync/SimpleTimeSyncViewer.ts

@@ -0,0 +1,94 @@
+import { assertEx } from '@xylabs/assert'
+import type { Hash } from '@xylabs/hex'
+import { asHash } from '@xylabs/hex'
+import type { Promisable } from '@xylabs/promise'
+import { isDefined } from '@xylabs/typeof'
+import type { TimeDomain, TimePayload } from '@xyo-network/xl1-protocol'
+import {
+  asTimePayload, asXL1BlockNumber, TimeSchema,
+} from '@xyo-network/xl1-protocol'
+import type { Provider } from 'ethers'
+
+import type { BlockViewer, TimeSyncViewer } from '../../viewers/index.ts'
+
+export class SimpleTimeSyncViewer implements TimeSyncViewer {
+  protected readonly blockViewer: BlockViewer
+  protected readonly ethProvider?: Provider
+
+  constructor(blockViewer: BlockViewer, ethProvider?: Provider) {
+    this.blockViewer = blockViewer
+    this.ethProvider = ethProvider
+  }
+
+  async convertTime(fromDomain: TimeDomain, toDomain: TimeDomain, from: number): Promise<number> {
+    switch (fromDomain) {
+      case 'xl1': {
+        const [block, payloads] = assertEx(await this.blockViewer.blockByNumber(asXL1BlockNumber(from, true)), () => 'Block not found')
+        const timeSchemaIndex = block.payload_schemas.indexOf(TimeSchema)
+        const hash = timeSchemaIndex === -1 ? undefined : block.payload_hashes[timeSchemaIndex]
+        const timePayload = asTimePayload(isDefined(hash) ? payloads.find(p => p._hash === hash) : undefined)
+        if (timePayload === undefined) return 0
+        switch (toDomain) {
+          case 'xl1': {
+            return timePayload.xl1 ?? 0
+          }
+          case 'epoch': {
+            return timePayload.epoch ?? 0
+          }
+          case 'ethereum': {
+            return timePayload.ethereum ?? 0
+          }
+          default: {
+            throw new Error(`Unsupported to toDomain: ${toDomain}`)
+          }
+        }
+      }
+      default: {
+        throw new Error(`Unsupported from fromDomain: ${fromDomain}`)
+      }
+    }
+  }
+
+  async currentTime(domain: TimeDomain): Promise<[string, number]> {
+    switch (domain) {
+      case 'xl1': {
+        return ['xl1', (await this.blockViewer.currentBlock())?.[0].block ?? -1]
+      }
+      case 'epoch': {
+        return ['epoch', Date.now()]
+      }
+      case 'ethereum': {
+        return ['ethereum', (await this.ethProvider?.getBlockNumber()) ?? 0]
+      }
+      default: {
+        throw new Error(`Unknown time domain: ${domain}`)
+      }
+    }
+  }
+
+  async currentTimeAndHash(domain: TimeDomain): Promise<[number, Hash | null]> {
+    switch (domain) {
+      case 'xl1': {
+        const [head] = await this.blockViewer.currentBlock()
+        return [head.block, head._hash]
+      }
+      case 'epoch': {
+        return [Date.now(), null]
+      }
+      case 'ethereum': {
+        const provider = assertEx(this.ethProvider, () => 'Ethereum provider not configured')
+        const blockNumber = (await provider.getBlockNumber()) ?? 0
+        const block = await provider.getBlock(blockNumber)
+        const blockHash = asHash(assertEx(block?.hash, () => 'Block hash not found'), true)
+        return [blockNumber, blockHash]
+      }
+      default: {
+        throw new Error(`Unknown time domain: ${domain}`)
+      }
+    }
+  }
+
+  currentTimePayload(): Promisable<TimePayload> {
+    throw new Error('Method not implemented.')
+  }
+}

package/src/simple/timesync/index.ts

@@ -0,0 +1 @@
+export * from './SimpleTimeSyncViewer.ts'

package/src/viewers/AccountBalance.ts

@@ -15,17 +15,13 @@ export type AccountBalanceHistoryItem = [
 ]
 
 export interface AccountBalancesViewerMethods {
-  accountBalances(address: Address[], head?: Hash): Promisable<Partial<Record<Address, AttoXL1>>>
-  accountBalances(address: Address[], range?: XL1BlockRange): Promisable<Partial<Record<Address, AttoXL1>>>
-  accountBalancesHistories(address: Address[], head?: Hash): Promisable<Partial<Record<Address, AccountBalanceHistoryItem[]>>>
-  accountBalancesHistories(address: Address[], range?: XL1BlockRange): Promisable<Partial<Record<Address, AccountBalanceHistoryItem[]>>>
+  accountBalances(address: Address[], headOrRange?: Hash | XL1BlockRange): Promisable<Partial<Record<Address, AttoXL1>>>
+  accountBalancesHistories(address: Address[], headOrRange?: Hash | XL1BlockRange): Promisable<Partial<Record<Address, AccountBalanceHistoryItem[]>>>
 }
 
 export interface AccountBalanceViewerMethods {
-  accountBalance(address: Address, head?: Hash): Promisable<AttoXL1>
-  accountBalance(address: Address, range?: XL1BlockRange): Promisable<AttoXL1>
-  accountBalanceHistory(address: Address, head?: Hash): Promisable<AccountBalanceHistoryItem[]>
-  accountBalanceHistory(address: Address, range?: XL1BlockRange): Promisable<AccountBalanceHistoryItem[]>
+  accountBalance(address: Address, headOrRange?: Hash | XL1BlockRange): Promisable<AttoXL1>
+  accountBalanceHistory(address: Address, headOrRange?: Hash | XL1BlockRange): Promisable<AccountBalanceHistoryItem[]>
 }
 
 export interface AccountBalanceViewer extends AccountBalanceViewerMethods {}

package/src/viewers/Block.ts

@@ -1,13 +1,15 @@
 import type { Hash } from '@xylabs/hex'
 import type { Promisable } from '@xylabs/promise'
-import type { HydratedBlock } from '@xyo-network/xl1-protocol'
+import type { HydratedBlock, XL1BlockNumber } from '@xyo-network/xl1-protocol'
 
 export interface BlockViewierMethods {
   blockByHash(hash: Hash): Promisable<HydratedBlock | null>
-  blockByNumber(blockNumber: number): Promisable<HydratedBlock | null>
+  blockByNumber(block: XL1BlockNumber): Promisable<HydratedBlock | null>
   blocksByHash(hash: Hash, limit?: number): Promisable<HydratedBlock[]>
 
   currentBlock(): Promisable<HydratedBlock>
   currentBlockHash(): Promisable<Hash>
-  currentBlockNumber(): Promisable<number>
+  currentBlockNumber(): Promisable<XL1BlockNumber>
 }
+
+export interface BlockViewer extends BlockViewierMethods {}

package/src/viewers/Stake.ts

@@ -2,12 +2,34 @@ import type { Address } from '@xylabs/hex'
 import type { Promisable } from '@xylabs/promise'
 
 import type { Position } from '../model/index.ts'
+import type { StakeEventsViewer } from './StakeEvents.ts'
+
+export interface StakeViewerProperties {
+  minWithdrawalBlocks: number
+  rewardsContract: Address
+  stakingTokenAddress: Address
+}
 
 export interface StakeViewerMethods {
   stakeById(id: number): Promisable<Position>
   stakeByStaker(staker: Address, slot: number): Promisable<Position>
-  /* @deprecated use stakesByStaker */
-  stakedByStaker(staker: Address): Promisable<Address[]>
   stakesByStaked(staked: Address): Promisable<Position[]>
   stakesByStaker(staker: Address): Promisable<Position[]>
 }
+
+export interface StakeViewer extends StakeViewerMethods, StakeViewerProperties {
+  active(time?: number): Promisable<bigint>
+  activeByAddressStaked(address: string, time?: number): Promisable<bigint>
+  activeByStaker(address: string, time?: number): Promisable<bigint>
+  pending(time?: number): Promisable<bigint>
+  pendingByStaker(staker: string, time?: number): Promisable<bigint>
+  withdrawn(time?: number): Promisable<bigint>
+  withdrawnByStaker(staker: string, time?: number): Promisable<bigint>
+}
+
+export interface StakeRunner extends StakeViewer {
+  events: StakeEventsViewer
+  addStake(staked: string, amount: bigint): Promise<boolean>
+  removeStake(slot: bigint): Promise<boolean>
+  withdrawStake(slot: bigint): Promise<boolean>
+}

package/src/{model → viewers}/StakeEvents.ts

@@ -33,7 +33,7 @@ export interface StakeEvent<TName extends StakeEventName = StakeEventName> exten
   args: StakeEventArgs
 }
 
-export interface StakeEventsRead {
+export interface StakeEventsViewer {
   positionCount(range: [number, number | 'latest']): Promisable<number>
   stakeEvents<TName extends StakeEventName>(range: [number, number | 'latest'], filter?: StakeEventFilter<TName>): Promisable<StakeEvent<TName>[]>
 }

package/src/viewers/TimeSync.ts

@@ -1,4 +1,3 @@
-import type { Hash } from '@xylabs/hex'
 import type { Promisable } from '@xylabs/promise'
 import type { TimeDomain, TimePayload } from '@xyo-network/xl1-protocol'
 
@@ -10,7 +9,7 @@ export interface TimeSyncViewerMethods {
   currentTime(domain: TimeDomain): Promisable<[string, number]>
 
   /** Get the current time for a given domain */
-  currentTimeAndHash(domain: TimeDomain): Promisable<[number, Hash | null]>
+  currentTimeAndHash(domain: TimeDomain): Promisable<[number, string | null]>
 
   /** Create a TimePayload with the current time from all configured domains */
   currentTimePayload(): Promisable<TimePayload>

package/src/viewers/index.ts

@@ -5,6 +5,7 @@ export * from './ChainContract.ts'
 export * from './Fork.ts'
 export * from './NetworkStakeStepReward.ts'
 export * from './Stake.ts'
+export * from './StakeEvents.ts'
 export * from './StakeTotals.ts'
 export * from './StepStake.ts'
 export * from './TimeSync.ts'

package/dist/neutral/model/ChainStake/ChainStakeRead.d.ts

@@ -1,17 +0,0 @@
-import type { Address } from '@xylabs/hex';
-import type { Promisable } from '@xylabs/promise';
-import type { Position } from '../Position.ts';
-export interface ChainStakeRead {
-    active(time?: number): Promisable<bigint>;
-    activeByAddressStaked(address: string, time?: number): Promisable<bigint>;
-    activeByStaker(address: string, time?: number): Promisable<bigint>;
-    pending(time?: number): Promisable<bigint>;
-    pendingByStaker(staker: string, time?: number): Promisable<bigint>;
-    stakeById(id: number, time?: number): Promisable<Position>;
-    stakeByStaker(staker: Address, slot: number, time?: number): Promisable<Position>;
-    stakesByStaked(staked: Address, range?: [number, number | undefined]): Promisable<Position[]>;
-    stakesByStaker(staker: Address, range?: [number, number | undefined]): Promisable<Position[]>;
-    withdrawn(time?: number): Promisable<bigint>;
-    withdrawnByStaker(staker: string, time?: number): Promisable<bigint>;
-}
-//# sourceMappingURL=ChainStakeRead.d.ts.map

package/dist/neutral/model/ChainStake/ChainStakeRead.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ChainStakeRead.d.ts","sourceRoot":"","sources":["../../../../src/model/ChainStake/ChainStakeRead.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAC1C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAEjD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAE9C,MAAM,WAAW,cAAc;IAC7B,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC,CAAA;IACzC,qBAAqB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC,CAAA;IACzE,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC,CAAA;IAClE,OAAO,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC,CAAA;IAC1C,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC,CAAA;IAClE,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAA;IAC1D,aAAa,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAA;IACjF,cAAc,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,GAAG,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAA;IAC7F,cAAc,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,GAAG,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAA;IAC7F,SAAS,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC,CAAA;IAC5C,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC,CAAA;CACrE"}

package/dist/neutral/model/ChainStake/ChainStakeStatic.d.ts

@@ -1,7 +0,0 @@
-import type { Address } from '@xylabs/hex';
-export interface ChainStakeStatic {
-    minWithdrawalBlocks: number;
-    rewardsContract: Address;
-    stakingTokenAddress: Address;
-}
-//# sourceMappingURL=ChainStakeStatic.d.ts.map

package/dist/neutral/model/ChainStake/ChainStakeStatic.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ChainStakeStatic.d.ts","sourceRoot":"","sources":["../../../../src/model/ChainStake/ChainStakeStatic.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAE1C,MAAM,WAAW,gBAAgB;IAC/B,mBAAmB,EAAE,MAAM,CAAA;IAC3B,eAAe,EAAE,OAAO,CAAA;IACxB,mBAAmB,EAAE,OAAO,CAAA;CAC7B"}

package/dist/neutral/model/ChainStake/ChainStakeWrite.d.ts

@@ -1,6 +0,0 @@
-export interface ChainStakeWrite {
-    addStake(staked: string, amount: bigint): Promise<boolean>;
-    removeStake(slot: bigint): Promise<boolean>;
-    withdrawStake(slot: bigint): Promise<boolean>;
-}
-//# sourceMappingURL=ChainStakeWrite.d.ts.map

package/dist/neutral/model/ChainStake/ChainStakeWrite.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ChainStakeWrite.d.ts","sourceRoot":"","sources":["../../../../src/model/ChainStake/ChainStakeWrite.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;IAC1D,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;IAC3C,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;CAC9C"}

package/dist/neutral/model/ChainStake/index.d.ts

@@ -1,4 +0,0 @@
-export * from './ChainStakeRead.ts';
-export * from './ChainStakeStatic.ts';
-export * from './ChainStakeWrite.ts';
-//# sourceMappingURL=index.d.ts.map

package/dist/neutral/model/ChainStake/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/model/ChainStake/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAA;AACnC,cAAc,uBAAuB,CAAA;AACrC,cAAc,sBAAsB,CAAA"}

package/dist/neutral/model/StakeEvents.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"StakeEvents.d.ts","sourceRoot":"","sources":["../../../src/model/StakeEvents.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAC1C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAChD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAEjD,eAAO,MAAM,eAAe,2DAA4D,CAAA;AACxF,MAAM,MAAM,cAAc,GAAG,OAAO,eAAe,CAAC,MAAM,CAAC,CAAA;AAE3D,MAAM,WAAW,aAAa,CAAC,KAAK,SAAS,MAAM,GAAG,MAAM,EAAE,KAAK,SAAS,UAAU,GAAG,EAAE;IACzF,IAAI,EAAE,KAAK,CAAA;IACX,IAAI,EAAE,KAAK,CAAA;IACX,IAAI,EAAE,MAAM,CAAA;CACb;AAED,MAAM,WAAW,WAAW,CAAC,KAAK,SAAS,MAAM,GAAG,MAAM;IACxD,IAAI,CAAC,EAAE,KAAK,CAAA;IACZ,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CACxB;AAED,MAAM,WAAW,cAAc;IAC7B,MAAM,EAAE,MAAM,CAAA;IACd,EAAE,EAAE,MAAM,CAAA;IACV,MAAM,EAAE,OAAO,CAAA;IACf,MAAM,EAAE,OAAO,CAAA;CAChB;AAED,MAAM,MAAM,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC,cAAc,EAAE,QAAQ,GAAG,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAA;AAE5F,MAAM,WAAW,gBAAgB,CAAC,KAAK,SAAS,cAAc,GAAG,cAAc,CAAE,SAAQ,WAAW,CAAC,KAAK,CAAC;IACzG,IAAI,CAAC,EAAE,oBAAoB,CAAA;CAC5B;AAED,MAAM,WAAW,UAAU,CAAC,KAAK,SAAS,cAAc,GAAG,cAAc,CAAE,SAAQ,aAAa,CAAC,KAAK,CAAC;IACrG,IAAI,EAAE,cAAc,CAAA;CACrB;AAED,MAAM,WAAW,eAAe;IAC9B,aAAa,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,GAAG,QAAQ,CAAC,GAAG,UAAU,CAAC,MAAM,CAAC,CAAA;IACrE,WAAW,CAAC,KAAK,SAAS,cAAc,EAAE,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,GAAG,QAAQ,CAAC,EAAE,MAAM,CAAC,EAAE,gBAAgB,CAAC,KAAK,CAAC,GAAG,UAAU,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;CACjJ"}

package/dist/neutral/services/Service.d.ts

@@ -1,5 +0,0 @@
-import type { Hash } from '@xylabs/hex';
-export interface ServiceInterface {
-    sync(head: Hash): Promise<void>;
-}
-//# sourceMappingURL=Service.d.ts.map

package/dist/neutral/services/Service.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"Service.d.ts","sourceRoot":"","sources":["../../../src/services/Service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,aAAa,CAAA;AAEvC,MAAM,WAAW,gBAAgB;IAC/B,IAAI,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;CAChC"}

package/dist/neutral/services/StepStakeService.d.ts

@@ -1,5 +0,0 @@
-import type { StepStakeViewer } from '../viewers/index.ts';
-import type { ServiceInterface } from './Service.ts';
-export interface StepStakeService extends ServiceInterface, StepStakeViewer {
-}
-//# sourceMappingURL=StepStakeService.d.ts.map

package/dist/neutral/services/StepStakeService.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"StepStakeService.d.ts","sourceRoot":"","sources":["../../../src/services/StepStakeService.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAC1D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAA;AAEpD,MAAM,WAAW,gBAAiB,SAAQ,gBAAgB,EAAE,eAAe;CAAG"}