@xyo-network/chain-orchestration 1.19.8 → 1.19.10

package/src/actor/ValidatorActor.ts

@@ -1,62 +1,46 @@
 import type { Hash } from '@xylabs/sdk-js'
-import { assertEx, creatable } from '@xylabs/sdk-js'
-import { AccountInstance } from '@xyo-network/account-model'
-import { ArchivistInstance } from '@xyo-network/archivist-model'
+import { creatable } from '@xylabs/sdk-js'
 import { processPendingBlocks } from '@xyo-network/chain-sdk'
-import { PayloadBuilder } from '@xyo-network/payload-builder'
-import type { BlockBoundWitness } from '@xyo-network/xl1-sdk'
-import {
-  Actor,
-  ActorParams,
-  BlockViewer,
+import type {
+  ActorParamsV3, BlockBoundWitness, BlockViewer, Config,
+  FinalizationRunner,
   MempoolViewer,
 } from '@xyo-network/xl1-sdk'
+import {
+  ActorV3, BlockViewerMoniker, FinalizationRunnerMoniker,
+  MempoolViewerMoniker,
+} from '@xyo-network/xl1-sdk'
 
-export type ValidatorActorParams = ActorParams<
+export type ValidatorActorParams = ActorParamsV3<
   {
-    account: AccountInstance
-    blockViewer: BlockViewer
-    finalizedArchivist: ArchivistInstance
-    mempoolViewer: MempoolViewer
+    config: Config
   }>
 
 @creatable()
-export class ValidatorActor extends Actor<ValidatorActorParams> {
+export class ValidatorActor extends ActorV3<ValidatorActorParams> {
+  protected _blockViewer!: BlockViewer
+  protected _finalizationRunner!: FinalizationRunner
   protected _lastValidatedBlock: BlockBoundWitness | undefined
   protected _lastValidatedBlockHash: Hash | undefined
+  protected _mempoolViewer!: MempoolViewer
 
   protected get blockViewer() {
-    return this.params.blockViewer
+    return this._blockViewer
   }
 
-  protected get finalizedArchivist() {
-    return assertEx(this.params.finalizedArchivist, () => 'finalizedArchivist not set')
+  protected get finalizationRunner() {
+    return this._finalizationRunner
   }
 
   protected get mempoolViewer() {
-    return this.params.mempoolViewer
+    return this._mempoolViewer
   }
 
-  static override async paramsHandler(params?: Partial<ValidatorActorParams>) {
-    return {
-      ...await super.paramsHandler(params),
-      mempoolViewer: assertEx(
-        params?.mempoolViewer,
-        () => 'mempoolViewer is required for ValidatorActor',
-      ),
-      blockViewer: assertEx(
-        params?.blockViewer,
-        () => 'blockViewer is required for ValidatorActor',
-      ),
-      finalizedArchivist: assertEx(
-        params?.finalizedArchivist,
-        () => 'finalizedArchivist is required for ValidatorActor',
-      ),
-      account: assertEx(
-        params?.account,
-        () => 'account is required for ValidatorActor',
-      ),
-    } satisfies ValidatorActorParams
+  override async createHandler() {
+    await super.startHandler()
+    this._blockViewer = await this.locator.getInstance(BlockViewerMoniker)
+    this._finalizationRunner = await this.locator.getInstance(FinalizationRunnerMoniker)
+    this._mempoolViewer = await this.locator.getInstance(MempoolViewerMoniker)
   }
 
   override async startHandler(): Promise<void> {
@@ -69,26 +53,9 @@ export class ValidatorActor extends Actor<ValidatorActorParams> {
           logger: this.logger,
           mempoolViewer: this.mempoolViewer,
           blockViewer: this.blockViewer,
-          finalizedArchivist: this.finalizedArchivist,
+          finalizationRunner: this.finalizationRunner,
         })
       }, { ...this.context, timeBudgetLimit: 1500 })
     }, 2000, 1500/* 500 */)
   }
-
-  protected async slashInvalidBlock(_block: BlockBoundWitness): Promise<boolean> {
-    // TODO: Handle slashing logic
-    const slashed = await Promise.resolve(true)
-    return slashed
-  }
-
-  protected async validateBlock(block: BlockBoundWitness): Promise<boolean> {
-    // TODO: Validate using validation logic
-    const valid = await Promise.resolve(true)
-    // Store the last validated block and its hash
-    this._lastValidatedBlock = block
-    this._lastValidatedBlockHash = await PayloadBuilder.hash(block)
-
-    // Return the validation result
-    return valid
-  }
 }

package/src/actor/index.ts

@@ -1,3 +1 @@
-export * from './BalanceActor.ts'
-export * from './MempoolActor.ts'
 export * from './ValidatorActor.ts'

package/src/init/initWallet.ts

@@ -20,6 +20,11 @@ export async function initApiWallet({ config, logger }: ConfigContext) {
   return await initWallet({ config, logger }, mnemonic)
 }
 
+export async function initBridgeWallet({ config, logger }: ConfigContext) {
+  const { mnemonic } = config.actors.bridge
+  return await initWallet({ config, logger }, mnemonic)
+}
+
 export async function initMempoolWallet({ config, logger }: ConfigContext) {
   const { mnemonic } = config.actors.mempool
   return await initWallet({ config, logger }, mnemonic)
@@ -34,3 +39,8 @@ export async function initRewardsRedemptionApiWallet({ config, logger }: ConfigC
   const { mnemonic } = config.actors.rewardRedemption
   return await initWallet({ config, logger }, mnemonic)
 }
+
+export async function initValidatorWallet({ config, logger }: ConfigContext) {
+  const { mnemonic } = config.actors.mempool
+  return await initWallet({ config, logger }, mnemonic)
+}

package/dist/neutral/actor/BalanceActor.d.ts

@@ -1,17 +0,0 @@
-import type { AccountBalanceViewer, ActorParams, BlockViewer, Config } from '@xyo-network/xl1-sdk';
-import { Actor } from '@xyo-network/xl1-sdk';
-import { Mutex } from 'async-mutex';
-export type BalanceActorParams = ActorParams<{
-    accountBalanceViewer: AccountBalanceViewer;
-    blockViewer: BlockViewer;
-} & {
-    config: Config;
-}>;
-export declare class BalanceActor extends Actor<BalanceActorParams> {
-    protected _updateMutex: Mutex;
-    protected get accountBalanceViewer(): AccountBalanceViewer;
-    protected get blockViewer(): BlockViewer<"BlockViewer">;
-    startHandler(): Promise<void>;
-    protected updateBalance(): Promise<void>;
-}
-//# sourceMappingURL=BalanceActor.d.ts.map

package/dist/neutral/actor/BalanceActor.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"BalanceActor.d.ts","sourceRoot":"","sources":["../../../src/actor/BalanceActor.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,oBAAoB,EACpB,WAAW,EAAE,WAAW,EAAE,MAAM,EACjC,MAAM,sBAAsB,CAAA;AAC7B,OAAO,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAA;AAC5C,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAEnC,MAAM,MAAM,kBAAkB,GAAG,WAAW,CAC1C;IACE,oBAAoB,EAAE,oBAAoB,CAAA;IAC1C,WAAW,EAAE,WAAW,CAAA;CACzB,GACC;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAAA;AAEvB,qBAAa,YAAa,SAAQ,KAAK,CAAC,kBAAkB,CAAC;IACzD,SAAS,CAAC,YAAY,QAAc;IAEpC,SAAS,KAAK,oBAAoB,yBAEjC;IAED,SAAS,KAAK,WAAW,+BAExB;IAEc,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;cAO5B,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;CAO/C"}

package/dist/neutral/actor/MempoolActor.d.ts

@@ -1,41 +0,0 @@
-import { ArchivistInstance } from '@xyo-network/archivist-model';
-import { Actor, ActorParams, MempoolRunner } from '@xyo-network/xl1-sdk';
-export type MempoolActorParams = ActorParams<{
-    mempoolRunner: MempoolRunner;
-    pendingBlocksArchivist: ArchivistInstance;
-    pendingTransactionsArchivist: ArchivistInstance;
-}>;
-export declare class MempoolActor extends Actor<MempoolActorParams> {
-    private _blockTimerId;
-    private _blockTimerMutex;
-    private _transactionTimerId;
-    private _transactionTimerMutex;
-    protected get mempoolRunner(): MempoolRunner;
-    protected get pendingBlocksArchivist(): 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, import("@xyo-network/payload-model").Payload>;
-    protected get pendingTransactionsArchivist(): 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, import("@xyo-network/payload-model").Payload>;
-    static paramsHandler(params?: Partial<MempoolActorParams>): Promise<{
-        mempoolRunner: MempoolRunner;
-        pendingBlocksArchivist: 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, import("@xyo-network/payload-model").Payload>;
-        pendingTransactionsArchivist: 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, import("@xyo-network/payload-model").Payload>;
-        name?: import("@xylabs/sdk-js").CreatableName;
-        statusReporter?: import("@xylabs/sdk-js").CreatableStatusReporter<void> | undefined;
-        logger: import("@xylabs/sdk-js").Logger;
-        meterProvider?: import("@opentelemetry/api").MeterProvider;
-        traceProvider?: import("@opentelemetry/api").TracerProvider;
-        account: import("@xyo-network/account-model").AccountInstance;
-        context: import("@xyo-network/xl1-sdk").ActorContext;
-        displayName: string | (string & {
-            __baseClassName: true;
-        }) | undefined;
-        id: string | (string & {
-            __baseClassName: true;
-        });
-    }>;
-    startHandler(): Promise<void>;
-    stopHandler(): Promise<void>;
-    private restartBlockTimer;
-    private restartTransactionTimer;
-    private stopBlockTimer;
-    private stopTransactionTimer;
-}
-//# sourceMappingURL=MempoolActor.d.ts.map

package/dist/neutral/actor/MempoolActor.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"MempoolActor.d.ts","sourceRoot":"","sources":["../../../src/actor/MempoolActor.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAA;AAChE,OAAO,EACL,KAAK,EAAE,WAAW,EAClB,aAAa,EACd,MAAM,sBAAsB,CAAA;AAG7B,MAAM,MAAM,kBAAkB,GAAG,WAAW,CAAC;IAC3C,aAAa,EAAE,aAAa,CAAA;IAC5B,sBAAsB,EAAE,iBAAiB,CAAA;IACzC,4BAA4B,EAAE,iBAAiB,CAAA;CAChD,CAAC,CAAA;AAEF,qBACa,YAAa,SAAQ,KAAK,CAAC,kBAAkB,CAAC;IACzD,OAAO,CAAC,aAAa,CAA8C;IACnE,OAAO,CAAC,gBAAgB,CAAc;IAEtC,OAAO,CAAC,mBAAmB,CAA8C;IACzE,OAAO,CAAC,sBAAsB,CAAc;IAE5C,SAAS,KAAK,aAAa,kBAE1B;IAED,SAAS,KAAK,sBAAsB,0SAEnC;IAED,SAAS,KAAK,4BAA4B,0SAEzC;WAEqB,aAAa,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,kBAAkB,CAAC;;;;;;;;;;;;;;;;;;IAkBzD,YAAY;IAMZ,WAAW;IAM1B,OAAO,CAAC,iBAAiB;IAYzB,OAAO,CAAC,uBAAuB;IAY/B,OAAO,CAAC,cAAc;IAOtB,OAAO,CAAC,oBAAoB;CAM7B"}

package/src/actor/BalanceActor.ts

@@ -1,41 +0,0 @@
-import { assertEx } from '@xylabs/sdk-js'
-import type {
-  AccountBalanceViewer,
-  ActorParams, BlockViewer, Config,
-} from '@xyo-network/xl1-sdk'
-import { Actor } from '@xyo-network/xl1-sdk'
-import { Mutex } from 'async-mutex'
-
-export type BalanceActorParams = ActorParams<
-  {
-    accountBalanceViewer: AccountBalanceViewer
-    blockViewer: BlockViewer
-  }
-  & { config: Config }>
-
-export class BalanceActor extends Actor<BalanceActorParams> {
-  protected _updateMutex = new Mutex()
-
-  protected get accountBalanceViewer() {
-    return assertEx(this.params.accountBalanceViewer, () => 'balanceService not set')
-  }
-
-  protected get blockViewer() {
-    return assertEx(this.params.blockViewer, () => 'blockViewer not set')
-  }
-
-  override async startHandler(): Promise<void> {
-    await super.startHandler()
-    this.registerTimer('BalanceTimer', async () => {
-      await this.updateBalance()
-    }, 1000, 10_000/* 1000 */)
-  }
-
-  protected async updateBalance(): Promise<void> {
-    if (this._updateMutex.isLocked()) return
-    await this._updateMutex.runExclusive(async () => {
-      const head = await this.blockViewer.currentBlockHash()
-      await this.accountBalanceViewer.accountBalances([], { head })
-    })
-  }
-}

package/src/actor/MempoolActor.ts

@@ -1,105 +0,0 @@
-import {
-  assertEx,
-  creatable,
-} from '@xylabs/sdk-js'
-import { ArchivistInstance } from '@xyo-network/archivist-model'
-import {
-  Actor, ActorParams,
-  MempoolRunner,
-} from '@xyo-network/xl1-sdk'
-import { Mutex } from 'async-mutex'
-
-export type MempoolActorParams = ActorParams<{
-  mempoolRunner: MempoolRunner
-  pendingBlocksArchivist: ArchivistInstance
-  pendingTransactionsArchivist: ArchivistInstance
-}>
-
-@creatable()
-export class MempoolActor extends Actor<MempoolActorParams> {
-  private _blockTimerId: ReturnType<typeof setInterval> | null = null
-  private _blockTimerMutex = new Mutex()
-
-  private _transactionTimerId: ReturnType<typeof setInterval> | null = null
-  private _transactionTimerMutex = new Mutex()
-
-  protected get mempoolRunner() {
-    return this.params.mempoolRunner
-  }
-
-  protected get pendingBlocksArchivist() {
-    return this.params.pendingBlocksArchivist
-  }
-
-  protected get pendingTransactionsArchivist() {
-    return this.params.pendingTransactionsArchivist
-  }
-
-  static override async paramsHandler(params?: Partial<MempoolActorParams>) {
-    return {
-      ...await super.paramsHandler(params),
-      mempoolRunner: assertEx(
-        params?.mempoolRunner,
-        () => 'mempoolRunner is required for MempoolActor',
-      ),
-      pendingBlocksArchivist: assertEx(
-        params?.pendingBlocksArchivist,
-        () => 'pendingBlocksArchivist is required for MempoolActor',
-      ),
-      pendingTransactionsArchivist: assertEx(
-        params?.pendingTransactionsArchivist,
-        () => 'pendingTransactionsArchivist is required for MempoolActor',
-      ),
-    } satisfies MempoolActorParams
-  }
-
-  override async startHandler() {
-    await super.startHandler()
-    // this.restartTransactionTimer()
-    this.restartBlockTimer()
-  }
-
-  override async stopHandler() {
-    await super.stopHandler()
-    // this.stopTransactionTimer()
-    this.stopBlockTimer()
-  }
-
-  private restartBlockTimer() {
-    this.stopBlockTimer()
-    this._blockTimerId = setInterval(() => {
-      if (this._blockTimerMutex.isLocked()) {
-        return
-      }
-      void this._blockTimerMutex.runExclusive(async () => {
-        await this.mempoolRunner.prunePendingBlocks({ batchSize: 50 })
-      })
-    }, 1000)
-  }
-
-  private restartTransactionTimer() {
-    this.stopTransactionTimer()
-    this._transactionTimerId = setInterval(() => {
-      if (this._transactionTimerMutex.isLocked()) {
-        return
-      }
-      void this._transactionTimerMutex.runExclusive(async () => {
-        await this.mempoolRunner.prunePendingTransactions({ batchSize: 50 })
-      })
-    }, 1000)
-  }
-
-  private stopBlockTimer() {
-    if (this._blockTimerId !== null) {
-      clearInterval(this._blockTimerId)
-    }
-    this._blockTimerId = null
-  }
-
-  private stopTransactionTimer() {
-    if (this._transactionTimerId !== null) {
-      clearInterval(this._transactionTimerId)
-    }
-    this._transactionTimerId = null
-  }
-}