@xyo-network/chain-services 1.5.10 → 1.5.12

package/dist/types/ChainValidator/XyoValidator.d.ts

@@ -9,7 +9,7 @@ export interface XyoValidatorParams extends BaseServiceParams {
     chainArchivist: ReadArchivist;
     chainInformation: ChainInformation;
     electionService: ElectionService;
-    pendingTransactionsArchivist: ArchivistInstance;
+    pendingBundledTransactionsArchivist: ArchivistInstance;
     rewardService: BlockRewardService;
     stakeIntentService: StakeIntentService;
     validateHydratedBlockState: HydratedBlockStateValidationFunction;
@@ -20,7 +20,7 @@ export declare class XyoValidator<TParams extends XyoValidatorParams = XyoValida
     protected get chainArchivist(): TParams["chainArchivist"];
     protected get chainInfo(): TParams["chainInformation"];
     protected get electionService(): TParams["electionService"];
-    protected get pendingTransactionsArchivist(): TParams["pendingTransactionsArchivist"];
+    protected get pendingBundledTransactionsArchivist(): TParams["pendingBundledTransactionsArchivist"];
     protected get rewardService(): TParams["rewardService"];
     validatePendingBlock(_block: BlockBoundWitness): Promisable<Error[]>;
     validatePendingTransaction(hydratedTransaction: HydratedTransaction): Promise<boolean>;

package/dist/types/ChainValidator/XyoValidator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"XyoValidator.d.ts","sourceRoot":"","sources":["../../../src/ChainValidator/XyoValidator.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAC5D,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAA;AAE/E,OAAO,EACL,iBAAiB,EACjB,iBAAiB,EACjB,kBAAkB,EAClB,gBAAgB,EAChB,eAAe,EACf,oCAAoC,EACpC,mBAAmB,EAEnB,kBAAkB,EACnB,MAAM,2BAA2B,CAAA;AAElC,OAAO,EAAE,WAAW,EAAoB,MAAM,mBAAmB,CAAA;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAM5C,MAAM,WAAW,kBAAmB,SAAQ,iBAAiB;IAC3D,OAAO,EAAE,eAAe,CAAA;IACxB,cAAc,EAAE,aAAa,CAAA;IAC7B,gBAAgB,EAAE,gBAAgB,CAAA;IAClC,eAAe,EAAE,eAAe,CAAA;IAChC,4BAA4B,EAAE,iBAAiB,CAAA;IAC/C,aAAa,EAAE,kBAAkB,CAAA;IACjC,kBAAkB,EAAE,kBAAkB,CAAA;IACtC,0BAA0B,EAAE,oCAAoC,CAAA;CACjE;AAED,qBACa,YAAY,CAAC,OAAO,SAAS,kBAAkB,GAAG,kBAAkB,CAAE,SAAQ,WAAW,CAAC,OAAO,CAAE,YAAW,SAAS;IAClI,IAAI,OAAO,sBAEV;IAED,SAAS,KAAK,OAAO,uBAEpB;IAED,SAAS,KAAK,cAAc,8BAE3B;IAED,SAAS,KAAK,SAAS,gCAEtB;IAED,SAAS,KAAK,eAAe,+BAE5B;IAED,SAAS,KAAK,4BAA4B,4CAEzC;IAED,SAAS,KAAK,aAAa,6BAE1B;IAED,oBAAoB,CAAC,MAAM,EAAE,iBAAiB,GAAG,UAAU,CAAC,KAAK,EAAE,CAAC;IAK9D,0BAA0B,CAAC,mBAAmB,EAAE,mBAAmB,GAAG,OAAO,CAAC,OAAO,CAAC;CAQ7F"}
+{"version":3,"file":"XyoValidator.d.ts","sourceRoot":"","sources":["../../../src/ChainValidator/XyoValidator.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAC5D,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAA;AAE/E,OAAO,EACL,iBAAiB,EACjB,iBAAiB,EACjB,kBAAkB,EAClB,gBAAgB,EAChB,eAAe,EACf,oCAAoC,EACpC,mBAAmB,EAEnB,kBAAkB,EACnB,MAAM,2BAA2B,CAAA;AAElC,OAAO,EAAE,WAAW,EAAoB,MAAM,mBAAmB,CAAA;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAM5C,MAAM,WAAW,kBAAmB,SAAQ,iBAAiB;IAC3D,OAAO,EAAE,eAAe,CAAA;IACxB,cAAc,EAAE,aAAa,CAAA;IAC7B,gBAAgB,EAAE,gBAAgB,CAAA;IAClC,eAAe,EAAE,eAAe,CAAA;IAChC,mCAAmC,EAAE,iBAAiB,CAAA;IACtD,aAAa,EAAE,kBAAkB,CAAA;IACjC,kBAAkB,EAAE,kBAAkB,CAAA;IACtC,0BAA0B,EAAE,oCAAoC,CAAA;CACjE;AAED,qBACa,YAAY,CAAC,OAAO,SAAS,kBAAkB,GAAG,kBAAkB,CAAE,SAAQ,WAAW,CAAC,OAAO,CAAE,YAAW,SAAS;IAClI,IAAI,OAAO,sBAEV;IAED,SAAS,KAAK,OAAO,uBAEpB;IAED,SAAS,KAAK,cAAc,8BAE3B;IAED,SAAS,KAAK,SAAS,gCAEtB;IAED,SAAS,KAAK,eAAe,+BAE5B;IAED,SAAS,KAAK,mCAAmC,mDAEhD;IAED,SAAS,KAAK,aAAa,6BAE1B;IAED,oBAAoB,CAAC,MAAM,EAAE,iBAAiB,GAAG,UAAU,CAAC,KAAK,EAAE,CAAC;IAK9D,0BAA0B,CAAC,mBAAmB,EAAE,mBAAmB,GAAG,OAAO,CAAC,OAAO,CAAC;CAQ7F"}

package/dist/types/PendingTransactions/PendingTransactions.d.ts

@@ -5,8 +5,8 @@ import { BaseService } from '../BaseService.ts';
 export interface XyoPendingTransactionsServiceParams extends BaseServiceParams {
     chainArchivist?: ArchivistInstance;
     chainIdentification?: ChainIdentification;
-    pendingTransactionsArchivist?: ArchivistInstance;
-    rejectedTransactionsArchivist?: ArchivistInstance;
+    pendingBundledTransactionsArchivist?: ArchivistInstance;
+    rejectedBundledTransactionsArchivist?: ArchivistInstance;
 }
 export declare class XyoPendingTransactionsService extends BaseService<XyoPendingTransactionsServiceParams> implements PendingTransactionsService {
     private static readonly MutexPriority;
@@ -19,11 +19,12 @@ export declare class XyoPendingTransactionsService extends BaseService<XyoPendin
      * A local Archivist optimized for fast retrieval that stores only validated
      * pending transactions
      */
-    private _curatedPendingTransactionsArchivist;
+    private _curatedPendingBundledTransactionsArchivist;
     /**
      * The last count of total pending transactions
      */
     private _pendingTransactionsCount;
+    private _removablePendingTransactionHashes;
     /**
      * A mutex to ensure that the curated pending transactions archivist is
      * updated in a thread-safe manner
@@ -31,17 +32,17 @@ export declare class XyoPendingTransactionsService extends BaseService<XyoPendin
     private _updateCuratedPendingTransactionsArchivistMutex;
     private get chainArchivist();
     private get chainIdentification();
-    private get pendingTransactionsArchivist();
+    private get pendingBundledTransactionsArchivist();
+    private get pendingBundledTransactionsLocalArchivist();
     private get pendingTransactionsCount();
-    private get pendingTransactionsLocalArchivist();
-    private get rejectedTransactionsArchivist();
+    private get rejectedBundledTransactionsArchivist();
     createHandler(): Promise<void>;
     getPendingTransactions(head: Hash, limit: number): Promise<HydratedTransactionWithStorageMeta[]>;
     private countPendingTransactions;
     private filterAlreadyFinalizedTransactions;
     private insertNewTransactions;
+    private removeBundledTransactions;
     private removeFinalizedTransactions;
-    private removeRejectedTransactions;
-    private removeTransactions;
+    private removeRejectedBundledTransactions;
 }
 //# sourceMappingURL=PendingTransactions.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"PendingTransactions.d.ts","sourceRoot":"","sources":["../../../src/PendingTransactions/PendingTransactions.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAA;AAElC,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAA;AAKhE,OAAO,EAC6C,iBAAiB,EAAE,mBAAmB,EAAE,kCAAkC,EAC5H,0BAA0B,EAC3B,MAAM,2BAA2B,CAAA;AAIlC,OAAO,EAAE,WAAW,EAAoB,MAAM,mBAAmB,CAAA;AAEjE,MAAM,WAAW,mCAAoC,SAAQ,iBAAiB;IAC5E,cAAc,CAAC,EAAE,iBAAiB,CAAA;IAClC,mBAAmB,CAAC,EAAE,mBAAmB,CAAA;IACzC,4BAA4B,CAAC,EAAE,iBAAiB,CAAA;IAChD,6BAA6B,CAAC,EAAE,iBAAiB,CAAA;CAClD;AAED,qBACa,6BAA8B,SAAQ,WAAW,CAAC,mCAAmC,CAAE,YAAW,0BAA0B;IACvI,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,aAAa,CAiB3B;IAEV;;;OAGG;IACH,OAAO,CAAC,8BAA8B,CAAc;IAEpD;;;OAGG;IACH,OAAO,CAAC,oCAAoC,CAA6B;IAEzE;;OAEG;IACH,OAAO,CAAC,yBAAyB,CAAY;IAE7C;;;OAGG;IACH,OAAO,CAAC,+CAA+C,CAAc;IAErE,OAAO,KAAK,cAAc,GAEzB;IAED,OAAO,KAAK,mBAAmB,GAE9B;IAED,OAAO,KAAK,4BAA4B,GAEvC;IAED,OAAO,KAAK,wBAAwB,GAGnC;IAED,OAAO,KAAK,iCAAiC,GAE5C;IAED,OAAO,KAAK,6BAA6B,GAExC;IAEc,aAAa;IA4BtB,sBAAsB,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,kCAAkC,EAAE,CAAC;YAsBxF,wBAAwB;YASxB,kCAAkC;YASlC,qBAAqB;YAyBrB,2BAA2B;YAI3B,0BAA0B;YAI1B,kBAAkB;CAWjC"}
+{"version":3,"file":"PendingTransactions.d.ts","sourceRoot":"","sources":["../../../src/PendingTransactions/PendingTransactions.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAA;AAElC,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAA;AAOhE,OAAO,EAC6C,iBAAiB,EACnE,mBAAmB,EAAE,kCAAkC,EAEvD,0BAA0B,EAC3B,MAAM,2BAA2B,CAAA;AAIlC,OAAO,EAAE,WAAW,EAAoB,MAAM,mBAAmB,CAAA;AAEjE,MAAM,WAAW,mCAAoC,SAAQ,iBAAiB;IAC5E,cAAc,CAAC,EAAE,iBAAiB,CAAA;IAClC,mBAAmB,CAAC,EAAE,mBAAmB,CAAA;IACzC,mCAAmC,CAAC,EAAE,iBAAiB,CAAA;IACvD,oCAAoC,CAAC,EAAE,iBAAiB,CAAA;CACzD;AAYD,qBACa,6BAA8B,SAAQ,WAAW,CAAC,mCAAmC,CAAE,YAAW,0BAA0B;IACvI,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,aAAa,CAiB3B;IAEV;;;OAGG;IACH,OAAO,CAAC,8BAA8B,CAAc;IAEpD;;;OAGG;IACH,OAAO,CAAC,2CAA2C,CAA6B;IAEhF;;OAEG;IACH,OAAO,CAAC,yBAAyB,CAAY;IAE7C,OAAO,CAAC,kCAAkC,CAAuB;IAEjE;;;OAGG;IACH,OAAO,CAAC,+CAA+C,CAAc;IAErE,OAAO,KAAK,cAAc,GAEzB;IAED,OAAO,KAAK,mBAAmB,GAE9B;IAED,OAAO,KAAK,mCAAmC,GAE9C;IAED,OAAO,KAAK,wCAAwC,GAEnD;IAED,OAAO,KAAK,wBAAwB,GAGnC;IAED,OAAO,KAAK,oCAAoC,GAE/C;IAEc,aAAa;IA4BtB,sBAAsB,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,kCAAkC,EAAE,CAAC;YAgCxF,wBAAwB;YAQxB,kCAAkC;YAUlC,qBAAqB;YA8BrB,yBAAyB;IAgBvC,OAAO,CAAC,2BAA2B;IAOnC,OAAO,CAAC,iCAAiC;CAM1C"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "http://json.schemastore.org/package.json",
   "name": "@xyo-network/chain-services",
-  "version": "1.5.10",
+  "version": "1.5.12",
   "description": "XYO Layer One SDK Services",
   "homepage": "https://xylabs.com",
   "bugs": {
@@ -46,24 +46,24 @@
     "@xylabs/promise": "^4.11.10",
     "@xylabs/telemetry": "^4.11.10",
     "@xylabs/typeof": "^4.11.10",
-    "@xyo-network/account-model": "^3.18.0",
-    "@xyo-network/archivist-memory": "^3.18.0",
-    "@xyo-network/archivist-model": "^3.18.0",
-    "@xyo-network/boundwitness-model": "^3.18.0",
-    "@xyo-network/boundwitness-validator": "^3.18.0",
-    "@xyo-network/boundwitness-wrapper": "^3.18.0",
-    "@xyo-network/chain-analyze": "^1.5.10",
-    "@xyo-network/chain-ethereum": "^1.5.10",
-    "@xyo-network/chain-modules": "^1.5.10",
-    "@xyo-network/chain-protocol": "^1.5.10",
-    "@xyo-network/chain-utils": "^1.5.10",
-    "@xyo-network/chain-validation": "^1.5.10",
-    "@xyo-network/chain-wrappers": "^1.5.10",
-    "@xyo-network/payload-builder": "^3.18.0",
-    "@xyo-network/payload-model": "^3.18.0",
+    "@xyo-network/account-model": "^3.18.2",
+    "@xyo-network/archivist-memory": "^3.18.2",
+    "@xyo-network/archivist-model": "^3.18.2",
+    "@xyo-network/boundwitness-model": "^3.18.2",
+    "@xyo-network/boundwitness-validator": "^3.18.2",
+    "@xyo-network/boundwitness-wrapper": "^3.18.2",
+    "@xyo-network/chain-analyze": "^1.5.12",
+    "@xyo-network/chain-ethereum": "^1.5.12",
+    "@xyo-network/chain-modules": "^1.5.12",
+    "@xyo-network/chain-protocol": "^1.5.12",
+    "@xyo-network/chain-utils": "^1.5.12",
+    "@xyo-network/chain-validation": "^1.5.12",
+    "@xyo-network/chain-wrappers": "^1.5.12",
+    "@xyo-network/payload-builder": "^3.18.2",
+    "@xyo-network/payload-model": "^3.18.2",
     "@xyo-network/typechain": "^3.5.4",
     "@xyo-network/xl1-protocol": "^1.4.16",
-    "@xyo-network/xl1-protocol-sdk": "^1.5.10",
+    "@xyo-network/xl1-protocol-sdk": "^1.5.12",
     "async-mutex": "^0.5.0",
     "ethers": "6.14.3",
     "lru-cache": "^11.1.0",
@@ -75,13 +75,13 @@
     "@xylabs/ts-scripts-yarn3": "^6.5.7",
     "@xylabs/tsconfig": "^6.5.7",
     "@xylabs/vitest-extended": "^4.11.10",
-    "@xyo-network/account": "^3.18.0",
-    "@xyo-network/account-model": "^3.18.0",
-    "@xyo-network/chain-validation": "^1.5.10",
-    "@xyo-network/wallet": "^3.18.0",
+    "@xyo-network/account": "^3.18.2",
+    "@xyo-network/account-model": "^3.18.2",
+    "@xyo-network/chain-validation": "^1.5.12",
+    "@xyo-network/wallet": "^3.18.2",
     "knip": "^5.59.1",
     "typescript": "^5.8.3",
-    "vitest": "^3.2.0",
+    "vitest": "^3.2.1",
     "vitest-mock-extended": "^3.1.0"
   },
   "engines": {

package/src/BlockProducer/XyoBlockProducer.ts

@@ -40,7 +40,7 @@ export const XYO_PRODUCER_RESTAKE_WINDOW = 500n
 export interface XyoBlockProducerParams extends XyoValidatorParams {
   balanceService: AccountBalanceService
   pendingTransactionsService: PendingTransactionsService
-  rejectedTransactionsArchivist: ArchivistInstance
+  rejectedBundledTransactionsArchivist: ArchivistInstance
   rewardAddress: Address
 }
 
@@ -80,8 +80,8 @@ export class XyoBlockProducer extends BaseService<XyoBlockProducerParams> implem
     return assertEx(this.params.pendingTransactionsService, () => 'Missing pendingTransactionsService')
   }
 
-  protected get rejectedTransactionsArchivist() {
-    return assertEx(this.params.rejectedTransactionsArchivist, () => 'No rejected transactions archivist')
+  protected get rejectedBundledTransactionsArchivist() {
+    return assertEx(this.params.rejectedBundledTransactionsArchivist, () => 'No rejected bundled transactions archivist')
   }
 
   protected get rewardAddress(): Address {
@@ -206,7 +206,7 @@ export class XyoBlockProducer extends BaseService<XyoBlockProducerParams> implem
       if (errors.length > 0) {
         this.logger?.warn(`Validation of produced block failed: ${errors.at(0)?.message}`)
         const rejectedTransactions = block[1]
-        await this.rejectedTransactionsArchivist.insert(rejectedTransactions)
+        await this.rejectedBundledTransactionsArchivist.insert(rejectedTransactions)
       } else {
         return block
       }

package/src/ChainValidator/XyoValidator.ts

@@ -27,7 +27,7 @@ export interface XyoValidatorParams extends BaseServiceParams {
   chainArchivist: ReadArchivist
   chainInformation: ChainInformation
   electionService: ElectionService
-  pendingTransactionsArchivist: ArchivistInstance
+  pendingBundledTransactionsArchivist: ArchivistInstance
   rewardService: BlockRewardService
   stakeIntentService: StakeIntentService
   validateHydratedBlockState: HydratedBlockStateValidationFunction
@@ -55,8 +55,8 @@ export class XyoValidator<TParams extends XyoValidatorParams = XyoValidatorParam
     return assertEx(this.params.electionService, () => 'electionService is required')
   }
 
-  protected get pendingTransactionsArchivist() {
-    return assertEx(this.params.pendingTransactionsArchivist, () => 'pendingTransactions is required')
+  protected get pendingBundledTransactionsArchivist() {
+    return assertEx(this.params.pendingBundledTransactionsArchivist, () => 'pendingBundledTransactions is required')
   }
 
   protected get rewardService() {

package/src/PendingTransactions/PendingTransactions.ts

@@ -1,5 +1,5 @@
 import { ValueType } from '@opentelemetry/api'
-import { filterAs, filterAsync } from '@xylabs/array'
+import { filterAsync } from '@xylabs/array'
 import { assertEx } from '@xylabs/assert'
 import { exists } from '@xylabs/exists'
 import { forget } from '@xylabs/forget'
@@ -7,14 +7,18 @@ import { Hash } from '@xylabs/hex'
 import { MemoryArchivist } from '@xyo-network/archivist-memory'
 import { ArchivistInstance } from '@xyo-network/archivist-model'
 import { validateTransaction } from '@xyo-network/chain-validation'
+import { PayloadBuilder } from '@xyo-network/payload-builder'
 import {
-  Payload, Sequence, WithStorageMeta,
+  Payload,
+  PayloadBundle, Sequence, WithStorageMeta,
 } from '@xyo-network/payload-model'
 import {
-  asOptionalTransactionBoundWitnessWithStorageMeta, BaseServiceParams, ChainIdentification, HydratedTransactionWithStorageMeta,
-  PendingTransactionsService, TransactionBoundWitness,
+  asOptionalTransactionBoundWitnessWithStorageMeta, BaseServiceParams,
+  ChainIdentification, HydratedTransactionWithStorageMeta,
+  isTransactionBoundWitnessWithStorageMeta,
+  PendingTransactionsService,
 } from '@xyo-network/xl1-protocol'
-import { flattenHydratedTransactions, tryHydrateTransaction } from '@xyo-network/xl1-protocol-sdk'
+import { flattenHydratedTransaction } from '@xyo-network/xl1-protocol-sdk'
 import { Mutex } from 'async-mutex'
 
 import { BaseService, creatableService } from '../BaseService.ts'
@@ -22,8 +26,18 @@ import { BaseService, creatableService } from '../BaseService.ts'
 export interface XyoPendingTransactionsServiceParams extends BaseServiceParams {
   chainArchivist?: ArchivistInstance
   chainIdentification?: ChainIdentification
-  pendingTransactionsArchivist?: ArchivistInstance
-  rejectedTransactionsArchivist?: ArchivistInstance
+  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)]
+  }
 }
 
 @creatableService()
@@ -57,13 +71,15 @@ export class XyoPendingTransactionsService extends BaseService<XyoPendingTransac
    * A local Archivist optimized for fast retrieval that stores only validated
    * pending transactions
    */
-  private _curatedPendingTransactionsArchivist: MemoryArchivist | undefined
+  private _curatedPendingBundledTransactionsArchivist: MemoryArchivist | undefined
 
   /**
    * The last count of total pending transactions
    */
   private _pendingTransactionsCount: number = 0
 
+  private _removablePendingTransactionHashes: Set<Hash> = new Set()
+
   /**
    * A mutex to ensure that the curated pending transactions archivist is
    * updated in a thread-safe manner
@@ -78,8 +94,12 @@ export class XyoPendingTransactionsService extends BaseService<XyoPendingTransac
     return assertEx(this.params.chainIdentification, () => 'No chain id')
   }
 
-  private get pendingTransactionsArchivist() {
-    return assertEx(this.params.pendingTransactionsArchivist, () => 'No pending transactions 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() {
@@ -87,31 +107,27 @@ export class XyoPendingTransactionsService extends BaseService<XyoPendingTransac
     return this._pendingTransactionsCount
   }
 
-  private get pendingTransactionsLocalArchivist() {
-    return assertEx(this._curatedPendingTransactionsArchivist, () => 'No pending transactions curated archivist')
-  }
-
-  private get rejectedTransactionsArchivist() {
-    return assertEx(this.params.rejectedTransactionsArchivist, () => 'No rejected transactions archivist')
+  private get rejectedBundledTransactionsArchivist() {
+    return assertEx(this.params.rejectedBundledTransactionsArchivist, () => 'No rejected bundled transactions archivist')
   }
 
   override async createHandler() {
     await super.createHandler()
-    this._curatedPendingTransactionsArchivist = await MemoryArchivist.create({ account: 'random' })
+    this._curatedPendingBundledTransactionsArchivist = await MemoryArchivist.create({ account: 'random' })
 
     // On new pending transactions, insert them into the curated archivist
-    this.pendingTransactionsArchivist.on('inserted', async ({ payloads }) => {
-      await this.insertNewTransactions(payloads)
+    this.pendingBundledTransactionsArchivist.on('inserted', async ({ payloads }) => {
+      await this.insertNewTransactions(payloads as WithStorageMeta<PayloadBundle>[])
     })
 
     // On new finalized blocks, remove the transactions from the curated archivist
-    this.chainArchivist.on('inserted', async ({ payloads }) => {
-      await this.removeFinalizedTransactions(payloads)
+    this.chainArchivist.on('inserted', ({ payloads }) => {
+      this.removeFinalizedTransactions(payloads)
     })
 
     // On new rejected blocks, remove the transactions from the curated archivist
-    this.rejectedTransactionsArchivist.on('inserted', async ({ payloads }) => {
-      await this.removeRejectedTransactions(payloads)
+    this.rejectedBundledTransactionsArchivist.on('inserted', ({ payloads }) => {
+      this.removeRejectedBundledTransactions(payloads)
     })
 
     const pendingTransactionsGauge = this.meter?.createObservableGauge(
@@ -126,21 +142,31 @@ export class XyoPendingTransactionsService extends BaseService<XyoPendingTransac
   async getPendingTransactions(head: Hash, limit: number): Promise<HydratedTransactionWithStorageMeta[]> {
     return await this.spanAsync('getPendingTransactions', async () => {
       return await this._updateCuratedPendingTransactionsArchivistMutex.runExclusive(async () => {
-        const foundPendingTransactions: WithStorageMeta<TransactionBoundWitness>[] = []
+        const foundPendingTransactions: HydratedTransactionWithStorageMeta[] = []
+        const foundPendingTransactionsToDeleteHashes: Hash[] = []
         let cursor: Sequence | undefined
         while (foundPendingTransactions.length < limit) {
-          const payloads = await this.pendingTransactionsLocalArchivist.next({
+          const payloads = await this.pendingBundledTransactionsLocalArchivist.next({
             limit: 100, order: 'asc', cursor,
-          })
+          }) as WithStorageMeta<PayloadBundle>[]
           if (payloads.length === 0) break
           cursor = payloads.at(-1)?._sequence
-          const transactions = payloads.map(payload => asOptionalTransactionBoundWitnessWithStorageMeta(payload)).filter(exists)
+          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
+          const transactions = (await Promise.all(
+            undeletedTransactionBundles.map(p => bundledPayloadsToHydratedTransaction(p)),
+          )).filter(exists)
           foundPendingTransactions.push(...transactions)
         }
-        const hydratedTransactions = await Promise.all(
-          foundPendingTransactions.map(tx => tryHydrateTransaction(this.pendingTransactionsLocalArchivist, tx._hash)),
-        )
-        return hydratedTransactions.filter(exists)
+        // remove the hashes from delete queue
+        for (const hash of foundPendingTransactionsToDeleteHashes) {
+          this._removablePendingTransactionHashes.delete(hash)
+        }
+        // actually delete the bundles
+        await this.pendingBundledTransactionsLocalArchivist.delete(foundPendingTransactionsToDeleteHashes)
+        return foundPendingTransactions
       }, XyoPendingTransactionsService.MutexPriority.ReadTransactions)
     })
   }
@@ -148,30 +174,30 @@ export class XyoPendingTransactionsService extends BaseService<XyoPendingTransac
   private async countPendingTransactions() {
     if (this._countPendingTransactionsMutex.isLocked()) return
     await this._countPendingTransactionsMutex.runExclusive(async () => {
-      const payloads = (await this._curatedPendingTransactionsArchivist?.all()) ?? []
-      const pendingTransactions = filterAs(payloads, asOptionalTransactionBoundWitnessWithStorageMeta)
-      this._pendingTransactionsCount = pendingTransactions.length
+      const payloads = (await this._curatedPendingBundledTransactionsArchivist?.all()) ?? []
+      this._pendingTransactionsCount = payloads.length
     })
   }
 
-  private async filterAlreadyFinalizedTransactions(payloads: WithStorageMeta<Payload>[]): Promise<WithStorageMeta<TransactionBoundWitness>[]> {
-    const incomingTransactions = filterAs(payloads, asOptionalTransactionBoundWitnessWithStorageMeta)
-    const incomingTransactionHashes = incomingTransactions.map(payload => payload._hash)
+  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<Payload>[]) {
+  private async insertNewTransactions(payloads: WithStorageMeta<PayloadBundle>[]) {
     this.logger?.log('insertNewTransactions', payloads)
     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((tx) => {
-          return tryHydrateTransaction(this.pendingTransactionsArchivist, tx._hash)
+        const hydratedUnprocessedTransactions = (await Promise.all(unprocessedTransactions.map(async (tx) => {
+          return await bundledPayloadsToHydratedTransaction(tx)
         }))).filter(exists)
         // Filter to only valid transactions
         const validTransactions = await filterAsync(hydratedUnprocessedTransactions, async (tx) => {
@@ -182,29 +208,44 @@ export class XyoPendingTransactionsService extends BaseService<XyoPendingTransac
           return errors.length > 0 ? false : true
         })
         if (validTransactions.length > 0) {
-          await this.pendingTransactionsLocalArchivist.insert(flattenHydratedTransactions(validTransactions))
+          await this.pendingBundledTransactionsLocalArchivist.insert(validTransactions.map((tx) => {
+            return {
+              root: tx[0]._hash,
+              payloads: flattenHydratedTransaction(tx),
+            } as PayloadBundle
+          }))
         }
       }, XyoPendingTransactionsService.MutexPriority.InsertNewTransactions)
     })
   }
 
-  private async removeFinalizedTransactions(payloads: WithStorageMeta<Payload>[]) {
-    return await this.removeTransactions(payloads, 'RemoveFinalizedTransactions')
-  }
-
-  private async removeRejectedTransactions(payloads: WithStorageMeta<Payload>[]) {
-    return await this.removeTransactions(payloads, 'RemoveRejectedTransactions')
-  }
-
-  private async removeTransactions(
-    payloads: WithStorageMeta<Payload>[],
+  private async removeBundledTransactions(
+    bundledPayloads: WithStorageMeta<PayloadBundle>[],
     priority: keyof typeof XyoPendingTransactionsService.MutexPriority,
   ) {
     return await this.spanAsync(priority, async () => {
       return await this._updateCuratedPendingTransactionsArchivistMutex.runExclusive(async () => {
-        const transactions = filterAs(payloads, asOptionalTransactionBoundWitnessWithStorageMeta)
-        await this.pendingTransactionsLocalArchivist.delete(transactions.map(tx => tx._hash))
+        const bundledTransactions = (await Promise.all(bundledPayloads.map(async (payload) => {
+          const withStorageMeta = await PayloadBuilder.addStorageMeta(payload.payloads)
+          const tx = asOptionalTransactionBoundWitnessWithStorageMeta(withStorageMeta.find(p => p._hash === payload.root))
+          return tx !== undefined && payload._hash !== undefined ? tx : undefined
+        }))).filter(exists)
+        await this.pendingBundledTransactionsLocalArchivist.delete(bundledTransactions.map(btx => btx._hash))
       }, 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)
+    }
+  }
 }