@xyo-network/chain-services 1.19.14 → 1.19.16

package/src/simple/block/runner/SimpleBlockRunner.ts

@@ -3,13 +3,13 @@ import {
 } from '@xylabs/sdk-js'
 import { AccountInstance } from '@xyo-network/account-model'
 import { MemoryArchivist } from '@xyo-network/archivist-memory'
-import { ArchivistInstance } from '@xyo-network/archivist-model'
 import {
   BlockRewardDiviner, FixedPercentageBlockRewardDiviner, FixedPercentageBlockRewardDivinerConfigSchema,
 } from '@xyo-network/chain-modules'
 import { buildNextBlock } from '@xyo-network/chain-protocol'
-import { PayloadBuilder } from '@xyo-network/payload-builder'
-import { WithHashMeta } from '@xyo-network/payload-model'
+import {
+  ArchivistInstance, PayloadBuilder, WithHashMeta,
+} from '@xyo-network/sdk-js'
 import {
   AbstractCreatableProvider, AccountBalanceViewer, AccountBalanceViewerMoniker, AllowedBlockPayload, asBlockBoundWitness, AttoXL1, BlockBoundWitness,
   BlockNumberPayload, BlockNumberSchema, BlockRewardViewer, BlockRewardViewerMoniker, BlockRunner, BlockRunnerMoniker, BlockValidationViewer,
@@ -39,6 +39,8 @@ export const XYO_PRODUCER_REDECLARATION_WINDOW = 500
 
 export interface SimpleBlockRunnerParams extends CreatableProviderParams {
   account: AccountInstance
+  disableIntentRedeclaration?: boolean
+  heartbeatInterval?: number
   rejectedTransactionsArchivist?: ArchivistInstance
   rewardAddress: Address
   validateHydratedBlockState?: HydratedBlockStateValidationFunction
@@ -121,9 +123,9 @@ export class SimpleBlockRunner extends AbstractCreatableProvider<SimpleBlockRunn
     return this._chainId
   }
 
-  // protected get electionService() {
-  //   return assertEx(this.params.electionService, () => 'electionService is required')
-  // }
+  protected get heartbeatInterval() {
+    return this.params.heartbeatInterval ?? 3_600_000
+  }
 
   protected get mempoolRunner() {
     return this._mempoolRunner!
@@ -167,7 +169,7 @@ export class SimpleBlockRunner extends AbstractCreatableProvider<SimpleBlockRunn
     this._chainId = this.context.config.chain.id
     this._mempoolRunner = await this.locateAndCreate<MempoolRunner>(MempoolRunnerMoniker)
     this._mempoolViewer = await this.locateAndCreate<MempoolViewer>(MempoolViewerMoniker)
-    this._rewardAddress = this.params.rewardAddress ?? this.context.config.actors.producer.rewardAddress
+    this._rewardAddress = this.params.rewardAddress
     this._timeSyncViewer = await this.locateAndCreate<TimeSyncViewer>(TimeSyncViewerMoniker)
   }
 
@@ -222,7 +224,7 @@ export class SimpleBlockRunner extends AbstractCreatableProvider<SimpleBlockRunn
   protected getProducerRedeclaration(head: WithHashMeta<BlockBoundWitness>): Promisable<ChainStakeIntent | undefined> {
     // TODO: Do not redeclare on every block
     // Decide if we should redeclare intent
-    if (this.params.context.config.actors?.producer?.disableIntentRedeclaration) return
+    if (this.params.disableIntentRedeclaration) return
     // Decide if we need to redeclare intent
     // const ranges = await this.stakeIntentService.getDeclaredCandidateRanges(this.address, 'producer')
     // TODO: This doesn't handle the case where the producer had declared a range for the future
@@ -350,11 +352,8 @@ export class SimpleBlockRunner extends AbstractCreatableProvider<SimpleBlockRunn
    */
   private heartbeatRequired(head: WithHashMeta<BlockBoundWitness>): boolean {
     const epoch = head.$epoch
-    if (isDefined(epoch)) {
-      const { heartbeatInterval } = assertEx(this.params.context.config.actors?.producer)
-      if (Date.now() - epoch > heartbeatInterval) {
-        return true
-      }
+    if (isDefined(epoch) && Date.now() - epoch > this.heartbeatInterval) {
+      return true
     }
     return false
   }

package/src/simple/block/runner/generateTransactionFeeTransfers.ts

@@ -1,6 +1,6 @@
 import { type Address, hexFromBigInt } from '@xylabs/sdk-js'
 import { assertEx } from '@xylabs/sdk-js'
-import { PayloadBuilder } from '@xyo-network/payload-builder'
+import { PayloadBuilder } from '@xyo-network/sdk-js'
 import type {
   SignedHydratedTransaction,
   Transfer,

package/dist/neutral/PendingTransactions/BasePendingTransactions.d.ts

@@ -1,64 +0,0 @@
-import { ArchivistInstance } from '@xyo-network/archivist-model';
-import { AbstractCreatableProvider, ChainId, HydratedTransactionValidationFunction, MempoolViewer, PendingBlocksOptions, PendingTransactionsOptions, SignedHydratedBlockWithHashMeta, SignedHydratedTransactionWithStorageMeta } from '@xyo-network/xl1-sdk';
-import { BaseServiceParams } from '../model/index.ts';
-export interface BasePendingTransactionsServiceParams extends BaseServiceParams {
-    additionalPendingTransactionValidators?: HydratedTransactionValidationFunction[];
-    chainArchivist: ArchivistInstance;
-    chainId: ChainId;
-    pendingBundledTransactionsArchivist: ArchivistInstance;
-    rejectedTransactionsArchivist: ArchivistInstance;
-}
-export declare class BasePendingTransactionsService extends AbstractCreatableProvider<BasePendingTransactionsServiceParams> implements MempoolViewer {
-    static readonly defaultMoniker: "MempoolViewer";
-    static readonly dependencies: never[];
-    static readonly monikers: "MempoolViewer"[];
-    private static readonly MutexPriority;
-    moniker: "MempoolViewer";
-    /**
-     * A mutex to ensure that the counting the number of pending transactions is
-     * not called concurrently
-     */
-    private _countPendingTransactionsMutex;
-    /**
-     * A local Archivist optimized for fast retrieval that stores only validated
-     * pending transactions
-     */
-    private _curatedPendingBundledTransactionsArchivist;
-    /**
-     * The last count of total pending transactions
-     */
-    private _pendingTransactionsCount;
-    /**
-     * 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;
-    /**
-     * A mutex to ensure that the curated pending transactions archivist is
-     * updated in a thread-safe manner
-     */
-    private _updateCuratedPendingTransactionsArchivistMutex;
-    private get additionalPendingTransactionValidators();
-    private get chainArchivist();
-    private get pendingBundledTransactionsArchivist();
-    private get pendingBundledTransactionsLocalArchivist();
-    private get pendingTransactionsCount();
-    private get rejectedTransactionsArchivist();
-    createHandler(): Promise<void>;
-    pendingBlocks(_options?: PendingBlocksOptions): Promise<SignedHydratedBlockWithHashMeta[]>;
-    pendingTransactions({ limit }?: PendingTransactionsOptions): Promise<SignedHydratedTransactionWithStorageMeta[]>;
-    private cleanupWorker;
-    private countPendingTransactions;
-    private filterAlreadyFinalizedTransactions;
-    private 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;
-    private pruneCuratedPendingTransactionsArchivist;
-}
-//# sourceMappingURL=BasePendingTransactions.d.ts.map

package/dist/neutral/PendingTransactions/BasePendingTransactions.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"BasePendingTransactions.d.ts","sourceRoot":"","sources":["../../../src/PendingTransactions/BasePendingTransactions.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAA;AAIhE,OAAO,EACL,yBAAyB,EAC0B,OAAO,EACrC,qCAAqC,EAC1D,aAAa,EAAwB,oBAAoB,EAAE,0BAA0B,EACrF,+BAA+B,EAE/B,wCAAwC,EAGzC,MAAM,sBAAsB,CAAA;AAG7B,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AAIrD,MAAM,WAAW,oCAAqC,SAAQ,iBAAiB;IAC7E,sCAAsC,CAAC,EAAE,qCAAqC,EAAE,CAAA;IAChF,cAAc,EAAE,iBAAiB,CAAA;IACjC,OAAO,EAAE,OAAO,CAAA;IAChB,mCAAmC,EAAE,iBAAiB,CAAA;IACtD,6BAA6B,EAAE,iBAAiB,CAAA;CACjD;AAED,qBACa,8BAA+B,SAAQ,yBAAyB,CAAC,oCAAoC,CAAE,YAAW,aAAa;IAC1I,MAAM,CAAC,QAAQ,CAAC,cAAc,kBAAuB;IACrD,MAAM,CAAC,QAAQ,CAAC,YAAY,UAAK;IACjC,MAAM,CAAC,QAAQ,CAAC,QAAQ,oBAAyB;IAEjD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,aAAa,CAa3B;IAED,OAAO,kBAAgD;IAEhE;;;OAGG;IACH,OAAO,CAAC,8BAA8B,CAAc;IAEpD;;;OAGG;IACH,OAAO,CAAC,2CAA2C,CAA6B;IAEhF;;OAEG;IACH,OAAO,CAAC,yBAAyB,CAAY;IAE7C;;;;OAIG;IACH,OAAO,CAAC,kCAAkC,CAAuB;IAEjE;;;OAGG;IACH,OAAO,CAAC,+CAA+C,CAAc;IAErE,OAAO,KAAK,sCAAsC,GAEjD;IAED,OAAO,KAAK,cAAc,GAEzB;IAED,OAAO,KAAK,mCAAmC,GAE9C;IAED,OAAO,KAAK,wCAAwC,GAEnD;IAED,OAAO,KAAK,wBAAwB,GAGnC;IAED,OAAO,KAAK,6BAA6B,GAExC;IAEc,aAAa;IAgC5B,aAAa,CAAC,QAAQ,CAAC,EAAE,oBAAoB,GAAG,OAAO,CAAC,+BAA+B,EAAE,CAAC;IAIpF,mBAAmB,CAAC,EAAE,KAAW,EAAE,GAAE,0BAA+B,GAAG,OAAO,CAAC,wCAAwC,EAAE,CAAC;YA8ElH,aAAa;YAOb,wBAAwB;YAQxB,kCAAkC;YAUlC,qBAAqB;IA0BnC;;;;;OAKG;IACH,OAAO,CAAC,qCAAqC;YAO/B,wCAAwC;CAsEvD"}

package/dist/neutral/PendingTransactions/bundledPayloadToHydratedTransaction.d.ts

@@ -1,4 +0,0 @@
-import type { PayloadBundle, WithStorageMeta } from '@xyo-network/payload-model';
-import type { SignedHydratedTransactionWithHashMeta } from '@xyo-network/xl1-sdk';
-export declare const bundledPayloadToHydratedTransaction: (payload: WithStorageMeta<PayloadBundle>) => Promise<SignedHydratedTransactionWithHashMeta | undefined>;
-//# sourceMappingURL=bundledPayloadToHydratedTransaction.d.ts.map

package/dist/neutral/PendingTransactions/bundledPayloadToHydratedTransaction.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"bundledPayloadToHydratedTransaction.d.ts","sourceRoot":"","sources":["../../../src/PendingTransactions/bundledPayloadToHydratedTransaction.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAChF,OAAO,KAAK,EAAE,qCAAqC,EAAE,MAAM,sBAAsB,CAAA;AAGjF,eAAO,MAAM,mCAAmC,GAC9C,SAAS,eAAe,CAAC,aAAa,CAAC,KACtC,OAAO,CAAC,qCAAqC,GAAG,SAAS,CAM3D,CAAA"}

package/dist/neutral/PendingTransactions/hydratedTransactionToPayloadBundle.d.ts

@@ -1,4 +0,0 @@
-import type { PayloadBundle } from '@xyo-network/payload-model';
-import type { SignedHydratedTransactionWithHashMeta } from '@xyo-network/xl1-sdk';
-export declare const hydratedTransactionToPayloadBundle: (transaction: SignedHydratedTransactionWithHashMeta) => PayloadBundle;
-//# sourceMappingURL=hydratedTransactionToPayloadBundle.d.ts.map

package/dist/neutral/PendingTransactions/hydratedTransactionToPayloadBundle.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"hydratedTransactionToPayloadBundle.d.ts","sourceRoot":"","sources":["../../../src/PendingTransactions/hydratedTransactionToPayloadBundle.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAA;AAE/D,OAAO,KAAK,EAAE,qCAAqC,EAAE,MAAM,sBAAsB,CAAA;AAGjF,eAAO,MAAM,kCAAkC,GAAI,aAAa,qCAAqC,KAAG,aAGvG,CAAA"}

package/dist/neutral/PendingTransactions/index.d.ts

@@ -1,2 +0,0 @@
-export * from './BasePendingTransactions.ts';
-//# sourceMappingURL=index.d.ts.map

package/dist/neutral/PendingTransactions/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/PendingTransactions/index.ts"],"names":[],"mappings":"AAAA,cAAc,8BAA8B,CAAA"}

package/dist/neutral/StakeIntent/XyoStakeIntentService.d.ts

@@ -1,47 +0,0 @@
-import { Address, Hash } from '@xylabs/sdk-js';
-import { ArchivistInstance } from '@xyo-network/archivist-model';
-import { IntervalMap } from '@xyo-network/chain-utils';
-import { Payload } from '@xyo-network/payload-model';
-import { AbstractCreatableProvider, BlockViewer, ChainStakeViewer, StakeIntentService } from '@xyo-network/xl1-sdk';
-import { type Intent } from '@xyo-network/xl1-sdk';
-import { Mutex } from 'async-mutex';
-import { LRUCache } from 'lru-cache';
-import { BaseServiceParams } from '../model/index.ts';
-export interface XyoStakeIntentServiceParams extends BaseServiceParams {
-    blockViewer: BlockViewer;
-    chainArchivist: ArchivistInstance;
-    chainStakeViewer: ChainStakeViewer;
-    stakeIntentStateArchivist: ArchivistInstance;
-}
-export declare class XyoStakeIntentService extends AbstractCreatableProvider<XyoStakeIntentServiceParams> implements StakeIntentService {
-    static readonly defaultMoniker = "StakeIntent";
-    static readonly dependencies: never[];
-    static readonly monikers: string[];
-    moniker: string;
-    protected _lastIndexedBlockHash: Hash | undefined;
-    protected _producers: IntervalMap<Address>;
-    protected _stakeCache: LRUCache<Lowercase<string> & {
-        readonly __hex: true;
-    } & {
-        readonly __address: true;
-    }, bigint, unknown>;
-    protected _updateMutex: Mutex;
-    private _blockViewer?;
-    private _chainStakeViewer?;
-    protected get blockViewer(): BlockViewer<"BlockViewer">;
-    protected get chainArchivist(): 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 chainStakeViewer(): ChainStakeViewer;
-    protected get stakeIntentStateArchivist(): 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>;
-    static paramsHandler(params: Partial<XyoStakeIntentServiceParams>): Promise<XyoStakeIntentServiceParams>;
-    createHandler(): Promise<void>;
-    getDeclaredCandidateRanges(address: Address, intent: Intent): Promise<Readonly<Readonly<[number, number]>[]>>;
-    getDeclaredCandidatesForBlock(block: number, intent: Intent): Promise<Address[]>;
-    getRequiredMinimumStakeForIntent(intent: Intent): bigint;
-    isStakedForBlock(block: number, intent: Intent, address: Address): Promise<boolean>;
-    startHandler(): Promise<void>;
-    private filterToValidStake;
-    private persistState;
-    private recoverState;
-    private updateIndex;
-}
-//# sourceMappingURL=XyoStakeIntentService.d.ts.map

package/dist/neutral/StakeIntent/XyoStakeIntentService.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"XyoStakeIntentService.d.ts","sourceRoot":"","sources":["../../../src/StakeIntent/XyoStakeIntentService.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EAAiC,IAAI,EAE7C,MAAM,gBAAgB,CAAA;AACvB,OAAO,EAAE,iBAAiB,EAAwB,MAAM,8BAA8B,CAAA;AAKtF,OAAO,EAEc,WAAW,EAE/B,MAAM,0BAA0B,CAAA;AAEjC,OAAO,EAAE,OAAO,EAAmB,MAAM,4BAA4B,CAAA;AACrE,OAAO,EACL,yBAAyB,EAEzB,WAAW,EAEiD,gBAAgB,EAK5E,kBAAkB,EAEnB,MAAM,sBAAsB,CAAA;AAC7B,OAAO,EACwE,KAAK,MAAM,EACzF,MAAM,sBAAsB,CAAA;AAC7B,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AACnC,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAA;AAEpC,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AAErD,MAAM,WAAW,2BAA4B,SAAQ,iBAAiB;IACpE,WAAW,EAAE,WAAW,CAAA;IACxB,cAAc,EAAE,iBAAiB,CAAA;IACjC,gBAAgB,EAAE,gBAAgB,CAAA;IAClC,yBAAyB,EAAE,iBAAiB,CAAA;CAC7C;AAWD,qBACa,qBAAsB,SAAQ,yBAAyB,CAAC,2BAA2B,CAAE,YAAW,kBAAkB;IAC7H,MAAM,CAAC,QAAQ,CAAC,cAAc,iBAAgB;IAC9C,MAAM,CAAC,QAAQ,CAAC,YAAY,UAAK;IACjC,MAAM,CAAC,QAAQ,CAAC,QAAQ,WAAyC;IACjE,OAAO,SAAgB;IAEvB,SAAS,CAAC,qBAAqB,EAAE,IAAI,GAAG,SAAS,CAAY;IAS7D,SAAS,CAAC,UAAU,EAAE,WAAW,CAAC,OAAO,CAAC,CAAoB;IAC9D,SAAS,CAAC,WAAW;;;;wBAAkE;IACvF,SAAS,CAAC,YAAY,QAAc;IAEpC,OAAO,CAAC,YAAY,CAAC,CAAa;IAClC,OAAO,CAAC,iBAAiB,CAAC,CAAkB;IAE5C,SAAS,KAAK,WAAW,+BAExB;IAED,SAAS,KAAK,cAAc,qQAE3B;IAED,SAAS,KAAK,gBAAgB,qBAE7B;IAED,SAAS,KAAK,yBAAyB,qQAEtC;WAEqB,aAAa,CAAC,MAAM,EAAE,OAAO,CAAC,2BAA2B,CAAC,GAAG,OAAO,CAAC,2BAA2B,CAAC;IAQxG,aAAa;IAQtB,0BAA0B,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC;IAO7G,6BAA6B,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAWtF,gCAAgC,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;IASlD,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAK1E,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;YAI9B,kBAAkB;YAkClB,YAAY;YAQZ,YAAY;YAiCZ,WAAW;CAuC1B"}

package/dist/neutral/StakeIntent/index.d.ts

@@ -1,3 +0,0 @@
-export * from './lib/index.ts';
-export * from './XyoStakeIntentService.ts';
-//# sourceMappingURL=index.d.ts.map

package/dist/neutral/StakeIntent/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/StakeIntent/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAA;AAC9B,cAAc,4BAA4B,CAAA"}

package/dist/neutral/StakeIntent/lib/getBlockSignedStakeDeclarations.d.ts

@@ -1,4 +0,0 @@
-import type { ArchivistInstance } from '@xyo-network/archivist-model';
-import type { BlockBoundWitness, ChainStakeIntent, Intent } from '@xyo-network/xl1-sdk';
-export declare const getBlockSignedStakeDeclarations: (block: BlockBoundWitness, archivist: ArchivistInstance, intent: Intent) => Promise<ChainStakeIntent[]>;
-//# sourceMappingURL=getBlockSignedStakeDeclarations.d.ts.map

package/dist/neutral/StakeIntent/lib/getBlockSignedStakeDeclarations.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"getBlockSignedStakeDeclarations.d.ts","sourceRoot":"","sources":["../../../../src/StakeIntent/lib/getBlockSignedStakeDeclarations.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAA;AAKrE,OAAO,KAAK,EACV,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,EAC5C,MAAM,sBAAsB,CAAA;AAG7B,eAAO,MAAM,+BAA+B,GAAU,OAAO,iBAAiB,EAAE,WAAW,iBAAiB,EAAE,QAAQ,MAAM,KAAG,OAAO,CAAC,gBAAgB,EAAE,CAyBxJ,CAAA"}

package/dist/neutral/StakeIntent/lib/index.d.ts

@@ -1,2 +0,0 @@
-export * from './getBlockSignedStakeDeclarations.ts';
-//# sourceMappingURL=index.d.ts.map

package/dist/neutral/StakeIntent/lib/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/StakeIntent/lib/index.ts"],"names":[],"mappings":"AAAA,cAAc,sCAAsC,CAAA"}

package/src/PendingTransactions/BasePendingTransactions.ts

@@ -1,382 +0,0 @@
-import { ValueType } from '@opentelemetry/api'
-import {
-  assertEx,
-  exists,
-  filterAs, filterAsync, forget, Hash,
-  isDefined, isUndefined,
-} from '@xylabs/sdk-js'
-import { MemoryArchivist } from '@xyo-network/archivist-memory'
-import { ArchivistInstance } from '@xyo-network/archivist-model'
-import {
-  Payload, PayloadBundle, Sequence, WithStorageMeta,
-} from '@xyo-network/payload-model'
-import {
-  AbstractCreatableProvider,
-  asBlockBoundWitnessWithHashMeta, asXL1BlockNumber, ChainId, creatableProvider,
-  findMostRecentBlock, HydratedTransactionValidationFunction, isTransactionBoundWitnessWithStorageMeta,
-  MempoolViewer, MempoolViewerMoniker, PendingBlocksOptions, PendingTransactionsOptions,
-  SignedHydratedBlockWithHashMeta,
-  SignedHydratedTransactionWithHashMeta,
-  SignedHydratedTransactionWithStorageMeta,
-  TransactionJsonSchemaValidator, validateTransaction,
-  XL1BlockNumber,
-} from '@xyo-network/xl1-sdk'
-import { Mutex } from 'async-mutex'
-
-import { BaseServiceParams } from '../model/index.ts'
-import { bundledPayloadToHydratedTransaction } from './bundledPayloadToHydratedTransaction.ts'
-import { hydratedTransactionToPayloadBundle } from './hydratedTransactionToPayloadBundle.ts'
-
-export interface BasePendingTransactionsServiceParams extends BaseServiceParams {
-  additionalPendingTransactionValidators?: HydratedTransactionValidationFunction[]
-  chainArchivist: ArchivistInstance
-  chainId: ChainId
-  pendingBundledTransactionsArchivist: ArchivistInstance
-  rejectedTransactionsArchivist: ArchivistInstance
-}
-
-@creatableProvider()
-export class BasePendingTransactionsService extends AbstractCreatableProvider<BasePendingTransactionsServiceParams> implements MempoolViewer {
-  static readonly defaultMoniker = MempoolViewerMoniker
-  static readonly dependencies = []
-  static readonly monikers = [MempoolViewerMoniker]
-
-  private static readonly MutexPriority = {
-    /**
-     * Priority for inserting new transactions
-     */
-    InsertNewTransactions: 5,
-    /**
-     * Priority for reading pending transactions
-     */
-    ReadTransactions: 3,
-    /**
-     * Priority for removing finalized/expired/rejected transactions
-     */
-    PurgeTransactions: 1,
-  } as const
-
-  override moniker = BasePendingTransactionsService.defaultMoniker
-
-  /**
-   * A mutex to ensure that the counting the number of pending transactions is
-   * not called concurrently
-   */
-  private _countPendingTransactionsMutex = new Mutex()
-
-  /**
-   * A local Archivist optimized for fast retrieval that stores only validated
-   * pending transactions
-   */
-  private _curatedPendingBundledTransactionsArchivist: MemoryArchivist | undefined
-
-  /**
-   * The last count of total pending transactions
-   */
-  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()
-
-  /**
-   * A mutex to ensure that the curated pending transactions archivist is
-   * updated in a thread-safe manner
-   */
-  private _updateCuratedPendingTransactionsArchivistMutex = new Mutex()
-
-  private get additionalPendingTransactionValidators() {
-    return this.params.additionalPendingTransactionValidators ?? []
-  }
-
-  private get chainArchivist() {
-    return assertEx(this.params.chainArchivist, () => 'No completed blocks with data archivist')
-  }
-
-  private get pendingBundledTransactionsArchivist() {
-    return assertEx(this.params.pendingBundledTransactionsArchivist, () => 'No pending bundled transactions archivist')
-  }
-
-  private get pendingBundledTransactionsLocalArchivist() {
-    return assertEx(this._curatedPendingBundledTransactionsArchivist, () => 'No pending bundled transactions curated archivist')
-  }
-
-  private get pendingTransactionsCount() {
-    forget(this.countPendingTransactions())
-    return this._pendingTransactionsCount
-  }
-
-  private get rejectedTransactionsArchivist() {
-    return assertEx(this.params.rejectedTransactionsArchivist, () => 'No rejected transactions archivist')
-  }
-
-  override async createHandler() {
-    await super.createHandler()
-    this._curatedPendingBundledTransactionsArchivist = await MemoryArchivist.create({ account: 'random' })
-
-    // On new pending transactions, insert them into the curated archivist
-    this.pendingBundledTransactionsArchivist.on('inserted', ({ payloads }) => {
-      forget(this.insertNewTransactions(payloads as WithStorageMeta<PayloadBundle>[]))
-    })
-
-    // On new finalized blocks, remove the transactions from the curated archivist
-    this.chainArchivist.on('inserted', ({ payloads }) => {
-      this.markAnyIncludedTransactionsForRemoval(payloads)
-      forget(this.cleanupWorker())
-    })
-
-    // On new rejected transactions, remove the transactions from the curated archivist
-    this.rejectedTransactionsArchivist.on('inserted', ({ payloads }) => {
-      this.markAnyIncludedTransactionsForRemoval(payloads)
-      forget(this.cleanupWorker())
-    })
-
-    const pendingTransactionsCounter = this.meter?.createObservableUpDownCounter(
-      'xyo_pending_transactions_counter',
-      {
-        description: 'The current number of pending transactions', valueType: ValueType.INT, unit: '1',
-      },
-    )
-    pendingTransactionsCounter?.addCallback((observer) => {
-      observer.observe(this.pendingTransactionsCount)
-    })
-  }
-
-  pendingBlocks(_options?: PendingBlocksOptions): Promise<SignedHydratedBlockWithHashMeta[]> {
-    throw new Error('Method [pendingBlocks] not implemented.')
-  }
-
-  async pendingTransactions({ limit = 100 }: PendingTransactionsOptions = {}): Promise<SignedHydratedTransactionWithStorageMeta[]> {
-    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 () => {
-        // Find the supplied head
-        let lastHead = (filterAs(await this.chainArchivist.next({ limit: 100 }), x => asBlockBoundWitnessWithHashMeta(x))).at(-1)
-        if (isUndefined(lastHead)) return []
-
-        await this.pruneCuratedPendingTransactionsArchivist(lastHead._hash)
-
-        const foundPendingTransactions: SignedHydratedTransactionWithStorageMeta[] = []
-        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 pendingBundledTransactions = await this.pendingBundledTransactionsLocalArchivist.next({
-            limit: 100,
-            order: 'asc',
-            cursor,
-          }) as WithStorageMeta<PayloadBundle>[]
-
-          // Exit if no more payloads are available.
-          if (pendingBundledTransactions.length === 0) break
-
-          // Update the cursor for the next iteration to fetch subsequent payloads.
-          cursor = pendingBundledTransactions.at(-1)?._sequence
-
-          // Keep only those payloads that are not marked for deletion.
-          const undeletedTransactionBundles = pendingBundledTransactions.filter(tx =>
-            !this._removablePendingTransactionHashes.has(tx.root))
-
-          // Convert each undeleted payload bundle into a hydrated transaction.
-          const transactions = (await Promise.all(
-            undeletedTransactionBundles.map(p => bundledPayloadToHydratedTransaction(p)),
-          )).filter(exists)
-
-          // Filter transactions to only include those that are active for the next
-          // potential block based on the last supplied head.
-          const activeTransactions = transactions.filter(isTransactionActive(asXL1BlockNumber(lastHead.block + 1, true)))
-
-          const txValidationResults = await Promise.all(activeTransactions.map(async tx => ([tx, await validateTransaction(
-            { ...this.context, chainId: this.params.chainId },
-            tx,
-            this.additionalPendingTransactionValidators,
-          )])))
-
-          const validTransactions = txValidationResults.filter((
-            [, errors],
-          ) => errors.length === 0).map(([tx]) => tx) as SignedHydratedTransactionWithStorageMeta[]
-
-          const invalidTransactions = txValidationResults.filter((
-            [, errors],
-          ) => errors.length > 0).map(([tx]) => tx) as SignedHydratedTransactionWithStorageMeta[]
-
-          if (invalidTransactions.length > 0) {
-            this.logger?.warn(`getPendingTransactions: Found ${invalidTransactions.length} invalid pending transactions`)
-            for (const tx of invalidTransactions) {
-              this.logger?.warn(tx[0]._hash)
-            }
-          }
-
-          // Add the valid hydrated transactions to the result set.
-          foundPendingTransactions.push(...validTransactions)
-        }
-
-        if (foundPendingTransactions.length > 0) {
-          this.logger?.log(`getPendingTransactions: Found ${foundPendingTransactions.length} pending transactions`)
-          for (const tx of foundPendingTransactions) {
-            this.logger?.log(tx[0]._hash)
-          }
-        }
-
-        return foundPendingTransactions
-      }, BasePendingTransactionsService.MutexPriority.ReadTransactions)
-    }, this.context)
-  }
-
-  private async cleanupWorker() {
-    return await this._updateCuratedPendingTransactionsArchivistMutex.runExclusive(async () => {
-      const lastHead = await findMostRecentBlock(this.chainArchivist)
-      if (isDefined(lastHead)) await this.pruneCuratedPendingTransactionsArchivist(lastHead._hash)
-    }, BasePendingTransactionsService.MutexPriority.PurgeTransactions)
-  }
-
-  private async countPendingTransactions() {
-    if (this._countPendingTransactionsMutex.isLocked()) return
-    await this._countPendingTransactionsMutex.runExclusive(async () => {
-      const payloads = (await this._curatedPendingBundledTransactionsArchivist?.all()) ?? []
-      this._pendingTransactionsCount = payloads.length
-    })
-  }
-
-  private async filterAlreadyFinalizedTransactions(
-    incomingTransactions: WithStorageMeta<PayloadBundle>[],
-  ): Promise<WithStorageMeta<PayloadBundle>[]> {
-    const incomingTransactionHashes = incomingTransactions.map(payload => payload.root)
-    const finalizedTransactions = await this.chainArchivist.get(incomingTransactionHashes)
-    const finalizedTransactionHashes = new Set(finalizedTransactions.map(item => item._hash))
-    const nonFinalizedTransactions = incomingTransactions.filter(item => !finalizedTransactionHashes.has(item._hash))
-    return nonFinalizedTransactions
-  }
-
-  private async insertNewTransactions(payloads: WithStorageMeta<PayloadBundle>[]) {
-    if (payloads.length === 0) return
-    return await this.spanAsync('InsertNewTransactions', async () => {
-      return await this._updateCuratedPendingTransactionsArchivistMutex.runExclusive(async () => {
-        // Check incoming transactions against finalized transactions
-        const unprocessedTransactions = await this.filterAlreadyFinalizedTransactions(payloads)
-        // Hydrate all unprocessed transactions
-        const hydratedUnprocessedTransactions = (await Promise.all(unprocessedTransactions.map(async (tx) => {
-          return await bundledPayloadToHydratedTransaction(tx)
-        }))).filter(exists)
-        // Filter to only valid transactions
-        const validTransactions = await filterAsync(hydratedUnprocessedTransactions, async (tx) => {
-          const errors = await validateTransaction({ ...this.context, chainId: this.params.chainId }, tx, [TransactionJsonSchemaValidator])
-          if (errors.length > 0) {
-            this.logger?.warn('validateTransaction', errors)
-          }
-          return errors.length > 0 ? false : true
-        })
-        if (validTransactions.length > 0) {
-          const bundledTransactions = validTransactions.map(tx => hydratedTransactionToPayloadBundle(tx))
-          await this.pendingBundledTransactionsLocalArchivist.insert(bundledTransactions)
-        }
-      }, BasePendingTransactionsService.MutexPriority.InsertNewTransactions)
-    }, this.context)
-  }
-
-  /**
-   * 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 pruneCuratedPendingTransactionsArchivist(head: Hash) {
-    return await this.spanAsync('pruneCuratedPendingTransactionsArchivist', async () => {
-      const foundPendingTransactionsToDeleteHashes: Hash[] = []
-
-      let cursor: Sequence | undefined
-      let [lastHead] = filterAs(await this.chainArchivist.get([head]), x => asBlockBoundWitnessWithHashMeta(x))
-
-      // Continue fetching until the desired number of transactions is reached.
-      while (isDefined(lastHead)) {
-        // Fetch the next batch of payloads
-        const pendingBundledTransactions = await this.pendingBundledTransactionsLocalArchivist.next({
-          limit: 100,
-          order: 'asc',
-          cursor,
-        }) as WithStorageMeta<PayloadBundle>[]
-
-        // Exit if no more payloads are available.
-        if (pendingBundledTransactions.length === 0) {
-          break
-        }
-
-        // Update the cursor for the next iteration to fetch subsequent payloads.
-        cursor = pendingBundledTransactions.at(-1)?._sequence
-
-        // Filter out bundles that are marked as removable.
-        const deletedTransactionBundles = pendingBundledTransactions.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 = pendingBundledTransactions.filter(tx =>
-          !this._removablePendingTransactionHashes.has(tx.root))
-
-        // Convert each undeleted payload bundle into a hydrated transaction.
-        const transactions = (await Promise.all(
-          undeletedTransactionBundles.map(p => bundledPayloadToHydratedTransaction(p)),
-        )).filter(exists)
-
-        // Find expired transactions based on the last supplied head
-        const expiredTransactions = transactions.filter(isTransactionExpired(asXL1BlockNumber(lastHead.block + 1, true)))
-        // Find the corresponding bundle hashes for the expired transactions
-        const expiredBundleHashes = expiredTransactions
-          .map(expiredHydratedTx =>
-          // Find the corresponding payload bundle hash for the expired transaction
-            pendingBundledTransactions.find(bundledTx => bundledTx.root === expiredHydratedTx[0]._hash)?._hash)
-          .filter(exists)
-          // Mark all expired bundled transactions for deletion.
-        foundPendingTransactionsToDeleteHashes.push(...expiredBundleHashes)
-      }
-
-      // Actually delete the marked payload bundles from the archivist
-      const deletedHashes = await this.pendingBundledTransactionsLocalArchivist.delete(foundPendingTransactionsToDeleteHashes)
-
-      // Remove all deleted hashes from the "pending delete" set now that they are deleted
-      for (const payload of deletedHashes) {
-        this._removablePendingTransactionHashes.delete(payload._hash)
-      }
-
-      if (deletedHashes.length > 0) {
-        this.logger?.log(`foundPendingTransactionsToDeleteHashes: Found ${deletedHashes.length} deletable transactions`)
-        for (const payload of deletedHashes) {
-          this.logger?.log(payload._hash)
-        }
-      }
-    }, this.context)
-  }
-}
-
-/**
- * Checks if a transaction is expired for a given block.
- * @param block The block number to check against the transaction's validity period.
- * @returns True if the transaction is expired for the given block, false otherwise.
- */
-const isTransactionExpired = (block: XL1BlockNumber) =>
-  ([txBw]: SignedHydratedTransactionWithHashMeta): boolean =>
-    txBw.exp < block
-
-/**
- * Checks if a transaction is active for a given block.
- * @param block The block number to check against the transaction's validity period.
- * @returns True if the transaction is active for the given block, false otherwise.
- */
-const isTransactionActive = (block: XL1BlockNumber) =>
-  ([txBw]: SignedHydratedTransactionWithHashMeta): boolean =>
-    txBw.nbf <= block && txBw.exp >= block

package/src/PendingTransactions/bundledPayloadToHydratedTransaction.ts

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