@xyo-network/xl1-protocol-sdk 1.25.8 → 1.25.9

package/dist/neutral/index.mjs

@@ -4312,7 +4312,9 @@ import {
   ChainContractViewerMoniker as ChainContractViewerMoniker4,
   FinalizationViewerMoniker as FinalizationViewerMoniker4,
   isHydratedBlockWithHashMeta,
+  isHydratedTransactionWithHashMeta,
   isSignedHydratedBlockWithHashMeta,
+  isSignedHydratedTransactionWithHashMeta,
   MempoolRunnerMoniker
 } from "@xyo-network/xl1-protocol";
 var SimpleMempoolRunner = class extends AbstractCreatableProvider {
@@ -4363,7 +4365,7 @@ var SimpleMempoolRunner = class extends AbstractCreatableProvider {
     });
     this.logger?.info(`Starting prunePendingBlocks with batchSize=${batchSize}, maxPrune=${maxPrune}, maxCheck=${maxCheck}`);
     while (batch.length > 0 && pruned < maxPrune && total < maxCheck) {
-      const blocksAndBundles = await this.simpleValidationCheck(batch);
+      const blocksAndBundles = await this.simpleBlockValidationCheck(batch);
       const blocks = blocksAndBundles.map(([b]) => b);
       const bundles = blocksAndBundles.map(([_, p]) => p);
       let valid = blocks.map((b) => !!b);
@@ -4405,8 +4407,62 @@ var SimpleMempoolRunner = class extends AbstractCreatableProvider {
     this.logger?.info(`prunePendingBlocks completed: pruned=${pruned}, totalChecked=${total}`);
     return [pruned, total];
   }
-  prunePendingTransactions(_options) {
-    throw new Error("Method not implemented.");
+  async prunePendingTransactions({
+    batchSize = 10,
+    maxPrune = 1e3,
+    maxCheck = 1e3
+  } = {}) {
+    let total = 0;
+    let pruned = 0;
+    let cursor;
+    let batch = await this.pendingTransactionsArchivist.next({
+      limit: batchSize,
+      cursor,
+      order: "desc"
+    });
+    this.logger?.info(`Starting prunePendingTransactions with batchSize=${batchSize}, maxPrune=${maxPrune}, maxCheck=${maxCheck}`);
+    while (batch.length > 0 && pruned < maxPrune && total < maxCheck) {
+      const transactionsAndBundles = await this.simpleTransactionValidationCheck(batch);
+      const transactions = transactionsAndBundles.map(([t]) => t);
+      const bundles = transactionsAndBundles.map(([_, p]) => p);
+      let valid = transactions.map((t) => !!t);
+      let remainingTransactionMap = [];
+      let remainingTransactions = transactions.map((t, i) => {
+        if (t) {
+          remainingTransactionMap.push(i);
+          return t;
+        }
+      }).filter(exists8);
+      assertEx38(
+        remainingTransactionMap.length === remainingTransactions.length,
+        () => `remainingTransactionMap length should match remainingTransactions length [${remainingTransactionMap.length}/${remainingTransactions.length}]`
+      );
+      const validationResults = remainingTransactions.map((t) => t);
+      for (const [i, r] of validationResults.entries()) {
+        const validated = isHydratedTransactionWithHashMeta(r);
+        if (!validated) {
+          this.logger?.info(`Pruning transaction ${bundles[remainingTransactionMap[i]]._hash} during transaction validation`);
+          this.logger?.info(`  - validation result: ${JSON.stringify(r, null, 2)}`);
+        }
+        valid[remainingTransactionMap[i]] = validated;
+      }
+      const pruneHashes = bundles.map((p, i) => {
+        if (!valid[i]) {
+          return p._hash;
+        }
+      }).filter(exists8);
+      pruned += pruneHashes.length;
+      total += batch.length;
+      await this.pendingTransactionsArchivist.delete(pruneHashes);
+      cursor = batch.at(-1)?._sequence;
+      batch = cursor ? await this.pendingTransactionsArchivist.next({
+        limit: batchSize,
+        cursor,
+        order: "desc"
+      }) : [];
+    }
+    this.logger?.info(`prunePendingTransactions completed: pruned=${pruned}, totalChecked=${total}`);
+    return [pruned, total];
   }
   async submitBlocks(blocks) {
     const bundles = await Promise.all(blocks.map(async ([bw, payloads]) => {
@@ -4428,7 +4484,7 @@ var SimpleMempoolRunner = class extends AbstractCreatableProvider {
     const inserted = await this.pendingTransactionsArchivist.insert(bundles);
     return inserted.map((p) => p._hash);
   }
-  async simpleValidationCheck(payloads) {
+  async simpleBlockValidationCheck(payloads) {
     const headNumber = await this.finalizationViewer.headNumber();
     const chainId = await this.chainContractViewer.chainId();
     const blockBundles = await Promise.all(payloads.map(async (p) => {
@@ -4451,6 +4507,38 @@ var SimpleMempoolRunner = class extends AbstractCreatableProvider {
       return [validatedBlock, bundle3];
     });
   }
+  async simpleTransactionValidationCheck(payloads) {
+    const headNumber = await this.finalizationViewer.headNumber();
+    const chainId = await this.chainContractViewer.chainId();
+    const transactionBundles = await Promise.all(payloads.map(async (p) => {
+      return [isPayloadBundle(p) ? await bundledPayloadToHydratedTransaction(p) : void 0, p];
+    }));
+    return await Promise.all(transactionBundles.map(async ([transaction, bundle3]) => {
+      const transactionCheckPassed = !!transaction;
+      const chainIdPassed = transactionCheckPassed ? transaction[0].chain === chainId : false;
+      const expPassed = transactionCheckPassed ? transaction[0].exp > headNumber : false;
+      const typeCheckPassed = transactionCheckPassed ? isSignedHydratedTransactionWithHashMeta(transaction) : false;
+      let opcodeCheckPassed = false;
+      try {
+        await validateTransactionsOpcodes(transaction ? [transaction] : []);
+        opcodeCheckPassed = true;
+      } catch (e) {
+        this.logger?.info(`Opcode validation failed for transaction ${bundle3._hash} during simpleValidationCheck`);
+        this.logger?.info(`  - error: ${e.message}`);
+      }
+      const validationPassed = transactionCheckPassed && chainIdPassed && expPassed && typeCheckPassed && opcodeCheckPassed;
+      const validatedTransaction = validationPassed ? transaction : void 0;
+      if (!validationPassed) {
+        this.logger?.info(`Pruning block bundle ${bundle3._hash} during simpleValidationCheck`);
+        this.logger?.info(`  - chainId match: ${chainIdPassed}`);
+        this.logger?.info(`  - exp check: ${expPassed}`);
+        this.logger?.info(`  - opcode check: ${opcodeCheckPassed}`);
+        this.logger?.info(`  - typeCheck: ${typeCheckPassed}`);
+        this.logger?.info(`  - bundle hash: ${bundle3._hash}`);
+      }
+      return [validatedTransaction, bundle3];
+    }));
+  }
 };
 __publicField(SimpleMempoolRunner, "defaultMoniker", MempoolRunnerMoniker);
 __publicField(SimpleMempoolRunner, "dependencies", [FinalizationViewerMoniker4, BlockValidationViewerMoniker2, ChainContractViewerMoniker4]);