@xyo-network/xl1-cli-lib 1.16.26 → 1.17.0

package/src/orchestration/services/implementation/pendingTransactions.ts

@@ -1,16 +1,35 @@
-import type { Promisable } from '@xylabs/sdk-js'
+import { isDefined, type Promisable } from '@xylabs/sdk-js'
 import { BasePendingTransactionsService, type BasePendingTransactionsServiceParams } from '@xyo-network/chain-services'
-import type { Initializable } from '@xyo-network/xl1-protocol'
-import { type PendingTransactionsService, timeBudget } from '@xyo-network/xl1-protocol-sdk'
+import type { Initializable, InitializableParams } from '@xyo-network/xl1-protocol'
+import type { Config, MempoolViewer } from '@xyo-network/xl1-protocol-sdk'
+import { timeBudget } from '@xyo-network/xl1-protocol-sdk'
+import {
+  HttpRpcTransport, JsonRpcMempoolViewer, MempoolViewerRpcSchemas,
+} from '@xyo-network/xl1-rpc'
 
-let serviceSingleton: Promisable<PendingTransactionsService> | undefined
+let serviceSingleton: Promisable<MempoolViewer> | undefined
 
-export const initPendingTransactions: Initializable<BasePendingTransactionsServiceParams, PendingTransactionsService> = async (
-  params: BasePendingTransactionsServiceParams,
-): Promise<PendingTransactionsService> => {
+export type InitPendingTransactionsServiceParams = InitializableParams<{
+  config: Config
+  params?: BasePendingTransactionsServiceParams
+}>
+
+export const initPendingTransactions: Initializable<InitPendingTransactionsServiceParams, MempoolViewer> = async (
+  {
+    config, params, logger,
+  }: InitPendingTransactionsServiceParams,
+): Promise<MempoolViewer> => {
   if (serviceSingleton) return serviceSingleton
-  return await timeBudget('initPendingTransactions', params.logger, async () => {
-    serviceSingleton = await BasePendingTransactionsService.create(params)
+  return await timeBudget('initPendingTransactions', logger, async () => {
+    const endpoint = config.services?.apiEndpoint
+    if (isDefined(endpoint)) {
+      const transport = new HttpRpcTransport(endpoint, { ...MempoolViewerRpcSchemas })
+      const viewer = new JsonRpcMempoolViewer(transport)
+      logger?.log('Using MempoolViewer RPC service at', endpoint)
+      return viewer
+    } else {
+      serviceSingleton = await BasePendingTransactionsService.create(params)
+    }
     return serviceSingleton
   }, 2000, true)
 }

package/src/orchestration/services/implementation/time.ts

@@ -9,7 +9,7 @@ import { canUseEvmProvider, initEvmProvider } from './evm/index.ts'
 let timeSyncServiceSingleton: Promisable<TimeSyncViewer> | undefined
 
 export const initTimeService: Initializable<BaseTimeServiceParams<Pick<Config, 'evm'>>, TimeSyncViewer> = async ({
-  chainArchivist, chainIterator, config, logger, meterProvider, traceProvider,
+  blockViewer, config, logger, meterProvider, traceProvider,
 }) => {
   if (timeSyncServiceSingleton) return timeSyncServiceSingleton
 
@@ -19,7 +19,7 @@ export const initTimeService: Initializable<BaseTimeServiceParams<Pick<Config, '
 
     // Create service
     timeSyncServiceSingleton = BaseTimeSyncService.create({
-      chainArchivist, chainIterator, ethProvider, logger, meterProvider, traceProvider,
+      blockViewer, ethProvider, logger, meterProvider, traceProvider,
     })
     return await timeSyncServiceSingleton
   }, 2000, true)

package/dist/node/orchestration/actor/implementation/ChainHeadUpdateActor.d.ts

@@ -1,20 +0,0 @@
-import type { Promisable } from '@xylabs/sdk-js';
-import type { Payload } from '@xyo-network/payload-model';
-import type { ChainServiceCollectionV2, Config } from '@xyo-network/xl1-protocol-sdk';
-import type { ActorParams } from '../model/index.ts';
-import { Actor } from '../model/index.ts';
-export type ChainHeadUpdateActorParams = ActorParams<Pick<ChainServiceCollectionV2, 'chainIterator' | 'chainArchivist'> & {
-    config: Config;
-}>;
-export declare class ChainHeadUpdateActor extends Actor<ChainHeadUpdateActorParams> {
-    private _pollForNewHeadMutex;
-    protected constructor(params: ChainHeadUpdateActorParams);
-    protected get chainFinalizedArchivist(): import("@xyo-network/archivist-model").ArchivistInstance<import("@xyo-network/archivist-model").ArchivistParams<import("@xyo-network/module-model").AnyConfigSchema<import("@xyo-network/archivist-model").ArchivistConfig>>, import("@xyo-network/archivist-model").ArchivistModuleEventData, Payload>;
-    protected get chainIterator(): import("@xyo-network/xl1-protocol-sdk").EventingChainBlockNumberIteratorService;
-    static create(params: ChainHeadUpdateActorParams): Promisable<ChainHeadUpdateActor>;
-    start(): Promise<void>;
-    private checkInsertedForNewHead;
-    private pollForNewHead;
-    private updateHeadIfNewer;
-}
-//# sourceMappingURL=ChainHeadUpdateActor.d.ts.map

package/dist/node/orchestration/actor/implementation/ChainHeadUpdateActor.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ChainHeadUpdateActor.d.ts","sourceRoot":"","sources":["../../../../../src/orchestration/actor/implementation/ChainHeadUpdateActor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAGhD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAGzD,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAA;AAGrF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AACpD,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAEzC,MAAM,MAAM,0BAA0B,GAAG,WAAW,CAAC,IAAI,CAAC,wBAAwB,EAAE,eAAe,GAAG,gBAAgB,CAAC,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAAA;AAE7I,qBAAa,oBAAqB,SAAQ,KAAK,CAAC,0BAA0B,CAAC;IACzE,OAAO,CAAC,oBAAoB,CAAc;IAE1C,SAAS,aAAa,MAAM,EAAE,0BAA0B;IAIxD,SAAS,KAAK,uBAAuB,4SAEpC;IAED,SAAS,KAAK,aAAa,oFAE1B;IAED,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,0BAA0B,GAAG,UAAU,CAAC,oBAAoB,CAAC;IAIpE,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;YAUvB,uBAAuB;YAKvB,cAAc;YAWd,iBAAiB;CAYhC"}

package/src/orchestration/actor/implementation/ChainHeadUpdateActor.ts

@@ -1,72 +0,0 @@
-import type { Promisable } from '@xylabs/sdk-js'
-import { assertEx, toHex } from '@xylabs/sdk-js'
-import { findMostRecentBlock, sortBlocks } from '@xyo-network/chain-protocol'
-import type { Payload } from '@xyo-network/payload-model'
-import type { BlockBoundWitness } from '@xyo-network/xl1-protocol'
-import { isBlockBoundWitness } from '@xyo-network/xl1-protocol'
-import type { ChainServiceCollectionV2, Config } from '@xyo-network/xl1-protocol-sdk'
-import { Mutex } from 'async-mutex'
-
-import type { ActorParams } from '../model/index.ts'
-import { Actor } from '../model/index.ts'
-
-export type ChainHeadUpdateActorParams = ActorParams<Pick<ChainServiceCollectionV2, 'chainIterator' | 'chainArchivist'> & { config: Config }>
-
-export class ChainHeadUpdateActor extends Actor<ChainHeadUpdateActorParams> {
-  private _pollForNewHeadMutex = new Mutex()
-
-  protected constructor(params: ChainHeadUpdateActorParams) {
-    super('ChainHeadUpdate', 'ChainHeadUpdate', params)
-  }
-
-  protected get chainFinalizedArchivist() {
-    return assertEx(this.params.chainArchivist, () => 'ChainArchivist not set')
-  }
-
-  protected get chainIterator() {
-    return assertEx(this.params.chainIterator, () => 'chainIterator not set')
-  }
-
-  static create(params: ChainHeadUpdateActorParams): Promisable<ChainHeadUpdateActor> {
-    return new ChainHeadUpdateActor(params)
-  }
-
-  override async start(): Promise<void> {
-    await super.start()
-    // Register event handler on all insert event to check for new head
-    this.chainFinalizedArchivist.on('inserted', async (data: { payloads: Payload[] }) => {
-      await this.checkInsertedForNewHead(data)
-    })
-    // Poll in case we missed an event
-    this.registerTimer('ChainHeadUpdateTimer', async () => await this.pollForNewHead(), 0, 2500/* 250 */)
-  }
-
-  private async checkInsertedForNewHead(data: { payloads: Payload[] }) {
-    const candidateBlock = sortBlocks(data.payloads.filter(isBlockBoundWitness)).at(-1)
-    await this.updateHeadIfNewer(candidateBlock)
-  }
-
-  private async pollForNewHead() {
-    if (this._pollForNewHeadMutex.isLocked()) {
-      this.logger?.log('Skipping poll for new head, previous poll still in progress')
-      return
-    }
-    await this._pollForNewHeadMutex.runExclusive(async () => {
-      const candidateBlock = await findMostRecentBlock(this.chainFinalizedArchivist)
-      await this.updateHeadIfNewer(candidateBlock)
-    })
-  }
-
-  private async updateHeadIfNewer(candidateBlock?: BlockBoundWitness) {
-    if (!candidateBlock) return
-    const currentHead = await this.chainIterator.head()
-    const candidateBlockNumber = candidateBlock.block
-    const candidateBlockNumberDisplay = `0x${toHex(candidateBlockNumber)}`
-    const currentBlockNumber = currentHead?.block ?? -1
-    if (candidateBlockNumber > currentBlockNumber) {
-      this.logger?.log('Found more recent head:', candidateBlockNumber, candidateBlockNumberDisplay)
-      await this.chainIterator.updateHead(candidateBlock)
-      this.logger?.log('Updated head:', candidateBlockNumber, candidateBlockNumberDisplay)
-    }
-  }
-}