@xyo-network/chain-services 1.5.28 → 1.5.30

package/src/{XyoChainBlockNumberIterator.ts → ChainBlockNumberIteration/ChainBlockNumberIterationService.ts}

@@ -1,6 +1,5 @@
 import { assertEx } from '@xylabs/assert'
 import type { BaseParams } from '@xylabs/base'
-import { BaseEmitter } from '@xylabs/events'
 import { isDefined, isNull } from '@xylabs/typeof'
 import type { ArchivistInstance } from '@xyo-network/archivist-model'
 import { PayloadBuilder } from '@xyo-network/payload-builder'
@@ -16,38 +15,25 @@ import {
 } from '@xyo-network/xl1-protocol'
 import { LRUCache } from 'lru-cache'
 
-export class XyoChainBlockNumberIterator extends BaseEmitter<BaseParams, ChainIteratorEventData> implements EventingChainBlockNumberIterator {
-  protected _blocksByBlockNumber = new LRUCache<number, BlockBoundWitness>({ max: 10_000 })
-  protected _chainArchivist: ArchivistInstance
-  protected _chainInformation: ChainIdentification
-  protected _head: BlockBoundWitness
-
-  protected constructor(params: XyoChainIteratorParams) {
-    super({})
-    const { chainArchivist: archivist, head } = params
-    this._chainArchivist = archivist
-    this._head = head
-    this._chainInformation = { id: head.chain }
-  }
+import { BaseService } from '../BaseService.ts'
 
-  get archivist(): ArchivistInstance { return this._chainArchivist }
+export class ChainBlockNumberIterationService extends BaseService<XyoChainIteratorParams, ChainIteratorEventData> implements EventingChainBlockNumberIterator {
+  protected _blocksByBlockNumber = new LRUCache<number, BlockBoundWitness>({ max: 10_000 })
 
-  get chainIdentification(): ChainIdentification { return this._chainInformation }
+  get chainArchivist(): ArchivistInstance { return assertEx(this.params.chainArchivist) }
 
-  static async create(params: XyoChainIteratorParams): Promise<XyoChainBlockNumberIterator> {
-    await Promise.resolve()
-    return new XyoChainBlockNumberIterator(params)
-  }
+  get chainIdentification(): ChainIdentification { return { id: assertEx(this.params.head?.chain) } }
 
   async get(block: number): Promise<BlockBoundWitness> {
+    const head = await this.head()
     // Bail early if the block requested is newer than the current head
-    assertEx(this._head.block >= block, () => `Block requested is newer than the current head [${block}]`)
+    assertEx(head.block >= block, () => `Block requested is newer than the current head [${block}]`)
     const cached = this._blocksByBlockNumber.get(block)
     if (cached) return cached
     // Start at the current head and traverse backwards until the requested block is found
-    const startingBlock = this._head
+    const startingBlock = head
     const currentBlockHash = await PayloadBuilder.hash(startingBlock)
-    let currentBlock = (await this._chainArchivist.get([currentBlockHash])).at(0)
+    let currentBlock = (await this.chainArchivist.get([currentBlockHash])).at(0)
     while (isDefined(currentBlock)) {
       assertEx(asBlockBoundWitness(currentBlock), () => `Expected hash to be a block bound witness [${currentBlock?._hash}]`)
       if (isBlockBoundWitness(currentBlock)) {
@@ -57,14 +43,14 @@ export class XyoChainBlockNumberIterator extends BaseEmitter<BaseParams, ChainIt
         }
         const { previous } = currentBlock
         if (isNull(previous)) break
-        currentBlock = (await this._chainArchivist.get([previous])).at(0)
+        currentBlock = (await this.chainArchivist.get([previous])).at(0)
       }
     }
     throw new Error(`Block not found: ${block}`)
   }
 
   async head(): Promise<BlockBoundWitness> {
-    return await Promise.resolve(this._head)
+    return await Promise.resolve(assertEx(this.params.head))
   }
 
   async next(block: number): Promise<BlockBoundWitness | undefined> {
@@ -77,13 +63,13 @@ export class XyoChainBlockNumberIterator extends BaseEmitter<BaseParams, ChainIt
   // and then communicate via method name and documentation
   async previous(block: number | undefined = undefined, count: number = 1): Promise<BlockBoundWitness[]> {
     const results: BlockBoundWitness[] = []
-    let currentBlock: BlockBoundWitness | undefined = isDefined(block) ? (await this.get(block)) : this._head
+    let currentBlock: BlockBoundWitness | undefined = isDefined(block) ? (await this.get(block)) : await this.head()
     while (currentBlock && results.length < count) {
       if (isBlockBoundWitness(currentBlock)) {
         results.push(currentBlock)
         const { previous } = currentBlock
         if (isNull(previous)) break
-        const nextBlock = await this._chainArchivist.get([previous])
+        const nextBlock = await this.chainArchivist.get([previous])
         currentBlock = asOptionalBlockBoundWitness(nextBlock[0])
       } else {
         const hash = PayloadBuilder.hash(currentBlock)
@@ -96,7 +82,7 @@ export class XyoChainBlockNumberIterator extends BaseEmitter<BaseParams, ChainIt
   async updateHead(head: BlockBoundWitness): Promise<void> {
     // Async to allow for re-indexing, etc.
     await Promise.resolve()
-    this._head = head
+    this.params.head = head
     void this.emit('headUpdated', { blocks: [head] })
   }
 }

package/src/ChainBlockNumberIteration/index.ts

@@ -0,0 +1,2 @@
+export * from './ChainBlockNumberIterationService.ts'
+export * from './model/index.ts'

package/src/ChainBlockNumberIteration/model/BlockNumberIteration.ts

@@ -0,0 +1,7 @@
+import type { Promisable } from '@xylabs/promise'
+import type { BlockBoundWitness, HydratedTransaction } from '@xyo-network/xl1-protocol'
+
+export interface BlockNumberIteration {
+  validatePendingBlock(block: BlockBoundWitness): Promisable<Error[]>
+  validatePendingTransaction(tx: HydratedTransaction): Promise<boolean>
+}

package/src/ChainBlockNumberIteration/model/index.ts

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

package/src/ChainIndexService.ts

@@ -9,7 +9,7 @@ import {
 
 import { BaseService, creatableService } from './BaseService.ts'
 
-export interface XyoChainIndexServiceParams extends BaseServiceParams {
+export interface ChainIndexServiceParams extends BaseServiceParams {
   archivist?: ArchivistInstance
 }
 
@@ -19,7 +19,7 @@ export interface ChainIndexService extends Service {
 }
 
 @creatableService()
-export class XyoChainIndexService extends BaseService<XyoChainIndexServiceParams> implements ChainIndexService {
+export class XyoChainIndexService extends BaseService<ChainIndexServiceParams> implements ChainIndexService {
   private _head: Hash | null = null
   private _internalArchivist: ArchivistInstance | undefined
 

package/src/PendingTransactions/PendingTransactions.ts

@@ -10,35 +10,23 @@ import { globalAttributes } from '@xyo-network/chain-telemetry'
 import { validateTransaction } from '@xyo-network/chain-validation'
 import { PayloadBuilder } from '@xyo-network/payload-builder'
 import {
-  Payload,
-  PayloadBundle, Sequence, WithStorageMeta,
+  Payload, PayloadBundle, Sequence, WithStorageMeta,
 } from '@xyo-network/payload-model'
 import {
-  asOptionalTransactionBoundWitnessWithStorageMeta, BaseServiceParams,
-  ChainIdentification, HydratedTransactionWithStorageMeta,
-  isTransactionBoundWitnessWithStorageMeta,
-  PendingTransactionsService,
+  asOptionalTransactionBoundWitnessWithStorageMeta, BaseServiceParams, ChainIdentification, HydratedTransactionWithStorageMeta,
+  isTransactionBoundWitnessWithStorageMeta, PendingTransactionsService,
 } from '@xyo-network/xl1-protocol'
-import { flattenHydratedTransaction } from '@xyo-network/xl1-protocol-sdk'
 import { Mutex } from 'async-mutex'
 
 import { BaseService, creatableService } from '../BaseService.ts'
+import { bundledPayloadToHydratedTransaction } from './bundledPayloadToHydratedTransaction.ts'
+import { hydratedTransactionWithHashStorageMetaToPayloadBundle } from './hydratedTransactionToPayloadBundle.ts'
 
 export interface XyoPendingTransactionsServiceParams extends BaseServiceParams {
   chainArchivist?: ArchivistInstance
   chainIdentification?: ChainIdentification
   pendingBundledTransactionsArchivist?: ArchivistInstance
-  rejectedBundledTransactionsArchivist?: ArchivistInstance
-}
-
-async function bundledPayloadsToHydratedTransaction(
-  payload: WithStorageMeta<PayloadBundle>,
-): Promise<HydratedTransactionWithStorageMeta | undefined> {
-  const withStorageMeta = await PayloadBuilder.addStorageMeta(payload.payloads)
-  const tx = asOptionalTransactionBoundWitnessWithStorageMeta(withStorageMeta.find(p => p._hash === payload.root))
-  if (tx) {
-    return [tx, withStorageMeta.map(p => p._hash === payload.root ? undefined : p).filter(exists)]
-  }
+  rejectedTransactionsArchivist?: ArchivistInstance
 }
 
 globalAttributes.setAttribute('XyoPendingTransactionsService:status', 'unknown')
@@ -81,6 +69,11 @@ export class XyoPendingTransactionsService extends BaseService<XyoPendingTransac
    */
   private _pendingTransactionsCount: number = 0
 
+  /**
+   * A set of transaction hashes that are pending removal from the
+   * curated pending transactions archivist. This is used to track
+   * which transactions need to be removed from the archivist.
+   */
   private _removablePendingTransactionHashes: Set<Hash> = new Set()
 
   /**
@@ -110,8 +103,8 @@ export class XyoPendingTransactionsService extends BaseService<XyoPendingTransac
     return this._pendingTransactionsCount
   }
 
-  private get rejectedBundledTransactionsArchivist() {
-    return assertEx(this.params.rejectedBundledTransactionsArchivist, () => 'No rejected bundled transactions archivist')
+  private get rejectedTransactionsArchivist() {
+    return assertEx(this.params.rejectedTransactionsArchivist, () => 'No rejected transactions archivist')
   }
 
   override async createHandler() {
@@ -125,12 +118,12 @@ export class XyoPendingTransactionsService extends BaseService<XyoPendingTransac
 
     // On new finalized blocks, remove the transactions from the curated archivist
     this.chainArchivist.on('inserted', ({ payloads }) => {
-      this.removeFinalizedTransactions(payloads)
+      this.markAnyIncludedTransactionsForRemoval(payloads)
     })
 
-    // On new rejected blocks, remove the transactions from the curated archivist
-    this.rejectedBundledTransactionsArchivist.on('inserted', ({ payloads }) => {
-      this.removeRejectedBundledTransactions(payloads)
+    // On new rejected transactions, remove the transactions from the curated archivist
+    this.rejectedTransactionsArchivist.on('inserted', ({ payloads }) => {
+      this.markAnyIncludedTransactionsForRemoval(payloads)
     })
 
     const pendingTransactionsCounter = this.meter?.createObservableUpDownCounter(
@@ -147,31 +140,58 @@ export class XyoPendingTransactionsService extends BaseService<XyoPendingTransac
 
   async getPendingTransactions(head: Hash, limit: number): Promise<HydratedTransactionWithStorageMeta[]> {
     return await this.spanAsync('getPendingTransactions', async () => {
+    // Acquires an exclusive mutex to ensure no race conditions while accessing pending transactions.
       return await this._updateCuratedPendingTransactionsArchivistMutex.runExclusive(async () => {
         const foundPendingTransactions: HydratedTransactionWithStorageMeta[] = []
         const foundPendingTransactionsToDeleteHashes: Hash[] = []
+
         let cursor: Sequence | undefined
+
+        // Continue fetching until the desired number of transactions is reached.
         while (foundPendingTransactions.length < limit) {
+        // Fetch the next batch of payloads
           const payloads = await this.pendingBundledTransactionsLocalArchivist.next({
-            limit: 100, order: 'asc', cursor,
+            limit: 100,
+            order: 'asc',
+            cursor,
           }) as WithStorageMeta<PayloadBundle>[]
+
+          // Exit if no more payloads are available.
           if (payloads.length === 0) break
+
+          // Update the cursor for the next iteration to fetch subsequent payloads.
           cursor = payloads.at(-1)?._sequence
-          const deletedTransactionBundles = payloads.filter(tx => this._removablePendingTransactionHashes.has(tx.root))
-          foundPendingTransactionsToDeleteHashes.push(...deletedTransactionBundles.map(tx => tx._hash).filter(exists))
-          const undeletedTransactionBundles = payloads.filter(tx => !this._removablePendingTransactionHashes.has(tx.root))
-          // add the items that are not to be deleted
+
+          // Filter out bundles that are marked as removable.
+          const deletedTransactionBundles = payloads.filter(tx =>
+            this._removablePendingTransactionHashes.has(tx.root))
+
+          // Queue the hashes of deletable transactions for deletion and cleanup.
+          foundPendingTransactionsToDeleteHashes.push(
+            ...deletedTransactionBundles.map(tx => tx._hash).filter(exists),
+          )
+
+          // Keep only those payloads that are not marked for deletion.
+          const undeletedTransactionBundles = payloads.filter(tx =>
+            !this._removablePendingTransactionHashes.has(tx.root))
+
+          // Convert each undeleted payload bundle into a hydrated transaction.
           const transactions = (await Promise.all(
-            undeletedTransactionBundles.map(p => bundledPayloadsToHydratedTransaction(p)),
+            undeletedTransactionBundles.map(p => bundledPayloadToHydratedTransaction(p)),
           )).filter(exists)
+
+          // Add the valid hydrated transactions to the result set.
           foundPendingTransactions.push(...transactions)
         }
-        // remove the hashes from delete queue
+
+        // Actually delete the marked payload bundles from the archivist
+        await this.pendingBundledTransactionsLocalArchivist.delete(foundPendingTransactionsToDeleteHashes)
+
+        // Remove deleted hashes from the "pending delete" set now that they are deleted
         for (const hash of foundPendingTransactionsToDeleteHashes) {
           this._removablePendingTransactionHashes.delete(hash)
         }
-        // actually delete the bundles
-        await this.pendingBundledTransactionsLocalArchivist.delete(foundPendingTransactionsToDeleteHashes)
+
         return foundPendingTransactions
       }, XyoPendingTransactionsService.MutexPriority.ReadTransactions)
     })
@@ -196,6 +216,7 @@ export class XyoPendingTransactionsService extends BaseService<XyoPendingTransac
   }
 
   private async insertNewTransactions(payloads: WithStorageMeta<PayloadBundle>[]) {
+    if (payloads.length === 0) return
     this.logger?.log('insertNewTransactions', payloads)
     return await this.spanAsync('InsertNewTransactions', async () => {
       return await this._updateCuratedPendingTransactionsArchivistMutex.runExclusive(async () => {
@@ -203,7 +224,7 @@ export class XyoPendingTransactionsService extends BaseService<XyoPendingTransac
         const unprocessedTransactions = await this.filterAlreadyFinalizedTransactions(payloads)
         // Hydrate all unprocessed transactions
         const hydratedUnprocessedTransactions = (await Promise.all(unprocessedTransactions.map(async (tx) => {
-          return await bundledPayloadsToHydratedTransaction(tx)
+          return await bundledPayloadToHydratedTransaction(tx)
         }))).filter(exists)
         // Filter to only valid transactions
         const validTransactions = await filterAsync(hydratedUnprocessedTransactions, async (tx) => {
@@ -214,17 +235,26 @@ export class XyoPendingTransactionsService extends BaseService<XyoPendingTransac
           return errors.length > 0 ? false : true
         })
         if (validTransactions.length > 0) {
-          await this.pendingBundledTransactionsLocalArchivist.insert(validTransactions.map((tx) => {
-            return {
-              root: tx[0]._hash,
-              payloads: flattenHydratedTransaction(tx),
-            } as PayloadBundle
-          }))
+          const bundledTransactions = validTransactions.map(tx => hydratedTransactionWithHashStorageMetaToPayloadBundle(tx))
+          await this.pendingBundledTransactionsLocalArchivist.insert(bundledTransactions)
         }
       }, XyoPendingTransactionsService.MutexPriority.InsertNewTransactions)
     })
   }
 
+  /**
+   * Marks any included transactions in the provided payloads for removal preventing them
+   * from being included in the curated pending transactions archivist and from being offered
+   * during the next retrieval of pending transactions.
+   * @param payloads An array of payloads that may contain transactions.
+   */
+  private markAnyIncludedTransactionsForRemoval(payloads: WithStorageMeta<Payload>[]) {
+    const hashes = payloads.filter(isTransactionBoundWitnessWithStorageMeta).map(p => p._hash)
+    for (const hash of hashes) {
+      this._removablePendingTransactionHashes.add(hash)
+    }
+  }
+
   private async removeBundledTransactions(
     bundledPayloads: WithStorageMeta<PayloadBundle>[],
     priority: keyof typeof XyoPendingTransactionsService.MutexPriority,
@@ -240,18 +270,4 @@ export class XyoPendingTransactionsService extends BaseService<XyoPendingTransac
       }, XyoPendingTransactionsService.MutexPriority[priority])
     })
   }
-
-  private removeFinalizedTransactions(payloads: WithStorageMeta<Payload>[]) {
-    const finalizedTransactionHashes = payloads.filter(isTransactionBoundWitnessWithStorageMeta).map(p => p._hash)
-    for (const hash of finalizedTransactionHashes) {
-      this._removablePendingTransactionHashes.add(hash)
-    }
-  }
-
-  private removeRejectedBundledTransactions(payloads: WithStorageMeta<Payload>[]) {
-    const rejectedTransactionHashes = payloads.filter(isTransactionBoundWitnessWithStorageMeta).map(p => p._hash)
-    for (const hash of rejectedTransactionHashes) {
-      this._removablePendingTransactionHashes.add(hash)
-    }
-  }
 }

package/src/PendingTransactions/bundledPayloadToHydratedTransaction.ts

@@ -0,0 +1,14 @@
+import { PayloadBuilder } from '@xyo-network/payload-builder'
+import type { PayloadBundle, WithStorageMeta } from '@xyo-network/payload-model'
+import type { HydratedTransactionWithStorageMeta } from '@xyo-network/xl1-protocol'
+import { asOptionalTransactionBoundWitnessWithStorageMeta } from '@xyo-network/xl1-protocol'
+
+export const bundledPayloadToHydratedTransaction = async (
+  payload: WithStorageMeta<PayloadBundle>,
+): Promise<HydratedTransactionWithStorageMeta | undefined> => {
+  const withStorageMeta = await PayloadBuilder.addStorageMeta(payload.payloads)
+  const tx = asOptionalTransactionBoundWitnessWithStorageMeta(withStorageMeta.find(p => p._hash === payload.root))
+  if (tx) {
+    return [tx, withStorageMeta.filter(p => p._hash !== payload.root)]
+  }
+}

package/src/PendingTransactions/hydratedTransactionToPayloadBundle.ts

@@ -0,0 +1,23 @@
+import type { Hash } from '@xylabs/hex'
+import { PayloadBuilder } from '@xyo-network/payload-builder'
+import type { PayloadBundle } from '@xyo-network/payload-model'
+import { PayloadBundleSchema } from '@xyo-network/payload-model'
+import type { HydratedTransaction, HydratedTransactionWithStorageMeta } from '@xyo-network/xl1-protocol'
+import { flattenHydratedTransaction } from '@xyo-network/xl1-protocol-sdk'
+
+export const hydratedTransactionToPayloadBundle = async (transaction: HydratedTransaction): Promise<PayloadBundle> => {
+  const root = await PayloadBuilder.hash(transaction[0])
+  return bundle(root, transaction)
+}
+
+export const hydratedTransactionWithHashStorageMetaToPayloadBundle = (transaction: HydratedTransactionWithStorageMeta): PayloadBundle => {
+  const root = transaction[0]._hash
+  return bundle(root, transaction)
+}
+
+const bundle = (root: Hash, transaction: HydratedTransaction | HydratedTransactionWithStorageMeta) => {
+  const payloads = flattenHydratedTransaction(transaction).flatMap(p => PayloadBuilder.omitStorageMeta(p))
+  return new PayloadBuilder<PayloadBundle>({ schema: PayloadBundleSchema })
+    .fields({ payloads, root })
+    .build()
+}

package/src/StakeIntent/XyoStakeIntentService.ts

@@ -19,8 +19,9 @@ import type {
   BaseServiceParams, EventingChainBlockNumberIterator, Intent,
 } from '@xyo-network/xl1-protocol'
 import {
+  asChainIndexingServiceStateWithStorageMeta,
   asOptionalBlockBoundWitness, asOptionalBlockBoundWitnessWithStorageMeta,
-  asOptionalChainIndexingServiceStateWithStorageMeta, asOptionalChainStakeIntent, ChainIndexingServiceState, ChainIndexingServiceStateSchema, ChainStakeViewer,
+  asOptionalChainStakeIntent, ChainIndexingServiceState, ChainIndexingServiceStateSchema, ChainStakeViewer,
   isChainIndexingServiceState,
   StakeIntentService,
 } from '@xyo-network/xl1-protocol'
@@ -162,7 +163,7 @@ export class XyoStakeIntentService extends BaseService<XyoStakeIntentServicePara
     const opts: ArchivistNextOptions = { ...DEFAULT_FIND_FIRST_MATCHING_NEXT_OPTIONS }
     while (true) {
       const predicate = (p: WithStorageMeta<Payload>) => {
-        const state = asOptionalChainIndexingServiceStateWithStorageMeta(p)
+        const state = asChainIndexingServiceStateWithStorageMeta(p)
         return state ? true : false
       }
       const state = await findFirstMatching(this.stakeIntentStateArchivist, predicate, opts)

package/src/Staker/Evm/Evm.ts

@@ -1,119 +1,114 @@
-import { Base } from '@xylabs/base'
+import { assertEx } from '@xylabs/assert'
 import type { Address } from '@xylabs/hex'
 import { toAddress } from '@xylabs/hex'
-import type { Promisable } from '@xylabs/promise'
+import { toEthAddress } from '@xyo-network/chain-ethereum'
 import type { StakedXyoChain } from '@xyo-network/typechain'
 import { StakedXyoChain__factory as StakedXyoChainFactory } from '@xyo-network/typechain'
 import type { BaseServiceParams, ChainService } from '@xyo-network/xl1-protocol'
 import { getAddress } from 'ethers/address'
 import type { ContractRunner } from 'ethers/providers'
 
-export interface EvmChainServiceParams extends BaseServiceParams {
+import { BaseService } from '../../BaseService.ts'
+
+export type EvmChainServiceParams = BaseServiceParams<{
   contract: StakedXyoChain
   id: Address
   runner: ContractRunner
-}
+}>
 
 /**
  * A class that represents a chain stake as backed by an EVM smart contract
  */
-export class EvmChainService extends Base<EvmChainServiceParams> implements ChainService {
-  private _contract: StakedXyoChain
-
-  protected constructor(params: EvmChainServiceParams) {
-    super(params)
-    this._contract = params.contract
+export class EvmChainService extends BaseService<EvmChainServiceParams> implements ChainService {
+  get contract() {
+    if (this.params.contract === undefined) {
+      this.params.contract = StakedXyoChainFactory.connect(
+        toEthAddress(this.id),
+        this.params.runner,
+      ) as StakedXyoChain
+    }
+    return assertEx(this.params.contract)
   }
 
   get id(): Address {
-    return this.params.id
+    return assertEx(this.params.id)
   }
 
   get runner(): ContractRunner {
-    return this.params.runner
-  }
-
-  static create({
-    id, runner, logger, traceProvider, meterProvider,
-  }: Omit<EvmChainServiceParams, 'contract'>): Promisable<EvmChainService> {
-    const contractAddress = getAddress(id)
-    const contract: StakedXyoChain = StakedXyoChainFactory.connect(contractAddress, runner)
-    return new this({
-      id, contract, runner, logger, traceProvider, meterProvider,
-    })
+    return assertEx(this.params.runner)
   }
 
   async active(): Promise<bigint> {
-    return await this._contract.active()
+    return await this.contract.active()
   }
 
   async activeByAddressStaked(address: string): Promise<bigint> {
-    return await this._contract.activeByAddressStaked(getAddress(address))
+    return await this.contract.activeByAddressStaked(getAddress(address))
   }
 
   async activeByStaker(address: string): Promise<bigint> {
-    return await this._contract.activeByStaker(getAddress(address))
+    return await this.contract.activeByStaker(getAddress(address))
   }
 
   async addStake(staked: string, amount: bigint): Promise<boolean> {
-    const result = await this._contract.addStake(getAddress(staked), amount)
+    const result = await this.contract.addStake(getAddress(staked), amount)
     await result.wait()
     return true
   }
 
   async chainId(): Promise<Address> {
-    return toAddress(await this._contract.chainId())
+    return toAddress(await this.contract.chainId())
   }
 
   async forkedAtBlockNumber(): Promise<bigint> {
-    return await this._contract.forkedAtBlockNumber()
+    return await this.contract.forkedAtBlockNumber()
   }
 
   async forkedAtHash(): Promise<bigint> {
-    return await this._contract.forkedAtHash()
+    return await this.contract.forkedAtHash()
   }
 
   async forkedChainId(): Promise<Address> {
-    return toAddress(await this._contract.forkedChainId())
+    return toAddress(await this.contract.forkedChainId())
   }
 
   async minWithdrawalBlocks(): Promise<bigint> {
-    return await this._contract.minWithdrawalBlocks()
+    return await this.contract.minWithdrawalBlocks()
   }
 
   async pending(): Promise<bigint> {
-    return await this._contract.pending()
+    return await this.contract.pending()
   }
 
   async pendingByStaker(staker: string): Promise<bigint> {
-    return await this._contract.pendingByStaker(getAddress(staker))
+    return await this.contract.pendingByStaker(getAddress(staker))
   }
 
   async removeStake(slot: bigint): Promise<boolean> {
-    const result = await this._contract.removeStake(slot)
+    const result = await this.contract.removeStake(slot)
     await result.wait()
     return true
   }
 
   async rewardsContract(): Promise<string> {
-    return await this._contract.rewardsContract()
+    return await this.contract.rewardsContract()
   }
 
   async stakingTokenAddress(): Promise<string> {
-    return await this._contract.stakingTokenAddress()
+    return await this.contract.stakingTokenAddress()
   }
 
   async withdrawStake(slot: bigint): Promise<boolean> {
-    const result = await this._contract.withdrawStake(slot)
+    const result = await this.contract.withdrawStake(slot)
     await result.wait()
     return true
   }
 
   async withdrawn(): Promise<bigint> {
-    return await this._contract.withdrawn()
+    return await this.contract.withdrawn()
   }
 
   async withdrawnByStaker(staker: string): Promise<bigint> {
-    return await this._contract.withdrawnByStaker(getAddress(staker))
+    return await this.contract.withdrawnByStaker(getAddress(staker))
   }
 }

package/src/index.ts

@@ -1,11 +1,10 @@
 export * from './AccountBalance/index.ts'
-export * from './BaseEthProvider.ts'
 export * from './BaseService.ts'
 export * from './BlockProducer/index.ts'
 export * from './BlockReward/index.ts'
+export * from './ChainBlockNumberIteration/index.ts'
 export * from './ChainValidator/index.ts'
 export * from './Election/index.ts'
 export * from './PendingTransactions/index.ts'
 export * from './StakeIntent/index.ts'
 export * from './Staker/index.ts'
-export * from './XyoChainBlockNumberIterator.ts'

package/dist/types/BaseEthProvider.d.ts

@@ -1,56 +0,0 @@
-import type { Address, BlockAPI, BlockNumberOrTag, CompileResultAPI, EthExecutionAPI, FeeHistoryResultAPI, Filter, FilterResultsAPI, HexString, HexString8Bytes, HexString32Bytes, HexString256Bytes, HexStringBytes, SignedTransactionInfoAPI, SyncingStatusAPI, TransactionCallAPI, TransactionInfoAPI, TransactionReceiptAPI, TransactionWithSenderAPI, Uint, Uint256 } from 'web3-types';
-export declare class BaseEthProvider implements EthExecutionAPI {
-    eth_accounts(): Address[];
-    eth_blockNumber(): Uint;
-    eth_call(_transaction: TransactionCallAPI, _blockNumber: BlockNumberOrTag): HexStringBytes;
-    eth_clearSubscriptions(_keepSyncing?: boolean): void;
-    eth_coinbase(): Address;
-    eth_compileLLL(_code: string): HexStringBytes;
-    eth_compileSerpent(_code: string): HexStringBytes;
-    eth_compileSolidity(_code: string): CompileResultAPI;
-    eth_estimateGas(_transaction: Partial<TransactionWithSenderAPI>, _blockNumber: BlockNumberOrTag): Uint;
-    eth_feeHistory(_blockCount: Uint, _newestBlock: BlockNumberOrTag, _rewardPercentiles: number[]): FeeHistoryResultAPI;
-    eth_gasPrice(): Uint;
-    eth_getBalance(_address: Address, _blockNumber: BlockNumberOrTag): Uint;
-    eth_getBlockByHash(_blockHash: HexString32Bytes, _hydrated: boolean): BlockAPI;
-    eth_getBlockByNumber(_blockNumber: BlockNumberOrTag, _hydrated: boolean): BlockAPI;
-    eth_getBlockTransactionCountByHash(_blockHash: HexString32Bytes): Uint;
-    eth_getBlockTransactionCountByNumber(_blockNumber: BlockNumberOrTag): Uint;
-    eth_getCode(_address: Address, _blockNumber: BlockNumberOrTag): HexStringBytes;
-    eth_getCompilers(): string[];
-    eth_getFilterChanges(_filterIdentifier: Uint): FilterResultsAPI;
-    eth_getFilterLogs(_filterIdentifier: Uint): FilterResultsAPI;
-    eth_getLogs(_filter: Filter): FilterResultsAPI;
-    eth_getStorageAt(_address: Address, _storageSlot: Uint256, _blockNumber: BlockNumberOrTag): HexStringBytes;
-    eth_getTransactionByBlockHashAndIndex(_blockHash: HexString32Bytes, _transactionIndex: Uint): TransactionInfoAPI | undefined;
-    eth_getTransactionByBlockNumberAndIndex(_blockNumber: BlockNumberOrTag, _transactionIndex: Uint): TransactionInfoAPI | undefined;
-    eth_getTransactionByHash(_transactionHash: HexString32Bytes): TransactionInfoAPI | undefined;
-    eth_getTransactionCount(_address: Address, _blockNumber: BlockNumberOrTag): Uint;
-    eth_getTransactionReceipt(_transactionHash: HexString32Bytes): TransactionReceiptAPI | undefined;
-    eth_getUncleByBlockHashAndIndex(_blockHash: HexString32Bytes, _uncleIndex: Uint): BlockAPI;
-    eth_getUncleByBlockNumberAndIndex(_blockNumber: BlockNumberOrTag, _uncleIndex: Uint): BlockAPI;
-    eth_getUncleCountByBlockHash(_blockHash: HexString32Bytes): Uint;
-    eth_getUncleCountByBlockNumber(_blockNumber: BlockNumberOrTag): Uint;
-    eth_getWork(): [HexString32Bytes, HexString32Bytes, HexString32Bytes];
-    eth_hashrate(): Uint;
-    eth_maxPriorityFeePerGas(): Uint;
-    eth_mining(): boolean;
-    eth_newBlockFilter(): Uint;
-    eth_newFilter(_filter: Filter): Uint;
-    eth_newPendingTransactionFilter(): Uint;
-    eth_protocolVersion(): string;
-    eth_sendRawTransaction(_transaction: HexStringBytes): HexString32Bytes;
-    eth_sendTransaction(_transaction: TransactionWithSenderAPI | Partial<TransactionWithSenderAPI>): HexString32Bytes;
-    eth_sign(_address: Address, _message: HexStringBytes): HexString256Bytes;
-    eth_signTransaction(_transaction: TransactionWithSenderAPI | Partial<TransactionWithSenderAPI>): HexStringBytes | SignedTransactionInfoAPI;
-    eth_submitHashrate(_hashRate: HexString32Bytes, _id: HexString32Bytes): boolean;
-    eth_submitWork(_nonce: HexString8Bytes, _hash: HexString32Bytes, _digest: HexString32Bytes): boolean;
-    eth_subscribe(..._params: ['newHeads'] | ['newPendingTransactions'] | ['syncing'] | ['logs', {
-        address?: HexString;
-        topics?: HexString[];
-    }]): HexString;
-    eth_syncing(): SyncingStatusAPI;
-    eth_uninstallFilter(_filterIdentifier: Uint): boolean;
-    eth_unsubscribe(_subscriptionId: HexString): HexString;
-}
-//# sourceMappingURL=BaseEthProvider.d.ts.map

package/dist/types/BaseEthProvider.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"BaseEthProvider.d.ts","sourceRoot":"","sources":["../../src/BaseEthProvider.ts"],"names":[],"mappings":"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"}

package/dist/types/XyoChainBlockNumberIterator.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"XyoChainBlockNumberIterator.d.ts","sourceRoot":"","sources":["../../src/XyoChainBlockNumberIterator.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAE5C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAA;AAErE,OAAO,KAAK,EACV,iBAAiB,EAAE,mBAAmB,EACtC,sBAAsB,EACtB,gCAAgC,EAChC,sBAAsB,EACvB,MAAM,2BAA2B,CAAA;AAKlC,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAA;AAEpC,qBAAa,2BAA4B,SAAQ,WAAW,CAAC,UAAU,EAAE,sBAAsB,CAAE,YAAW,gCAAgC;IAC1I,SAAS,CAAC,oBAAoB,+CAA2D;IACzF,SAAS,CAAC,eAAe,EAAE,iBAAiB,CAAA;IAC5C,SAAS,CAAC,iBAAiB,EAAE,mBAAmB,CAAA;IAChD,SAAS,CAAC,KAAK,EAAE,iBAAiB,CAAA;IAElC,SAAS,aAAa,MAAM,EAAE,sBAAsB;IAQpD,IAAI,SAAS,IAAI,iBAAiB,CAAgC;IAElE,IAAI,mBAAmB,IAAI,mBAAmB,CAAkC;WAEnE,MAAM,CAAC,MAAM,EAAE,sBAAsB,GAAG,OAAO,CAAC,2BAA2B,CAAC;IAKnF,GAAG,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAwB9C,IAAI,IAAI,OAAO,CAAC,iBAAiB,CAAC;IAIlC,IAAI,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC;IAQ3D,QAAQ,CAAC,KAAK,GAAE,MAAM,GAAG,SAAqB,EAAE,KAAK,GAAE,MAAU,GAAG,OAAO,CAAC,iBAAiB,EAAE,CAAC;IAkBhG,UAAU,CAAC,IAAI,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;CAMzD"}