Add "prioritized" category to audits

backend/src/api/audit.ts

@@ -7,13 +7,14 @@ const PROPAGATION_MARGIN = 180; // in seconds, time since a transaction is first
 
 class Audit {
   auditBlock(transactions: MempoolTransactionExtended[], projectedBlocks: MempoolBlockWithTransactions[], mempool: { [txId: string]: MempoolTransactionExtended }, useAccelerations: boolean = false)
-   : { censored: string[], added: string[], fresh: string[], sigop: string[], fullrbf: string[], accelerated: string[], score: number, similarity: number } {
+   : { censored: string[], added: string[], prioritized: string[], fresh: string[], sigop: string[], fullrbf: string[], accelerated: string[], score: number, similarity: number } {
     if (!projectedBlocks?.[0]?.transactionIds || !mempool) {
-      return { censored: [], added: [], fresh: [], sigop: [], fullrbf: [], accelerated: [], score: 1, similarity: 1 };
+      return { censored: [], added: [], prioritized: [], fresh: [], sigop: [], fullrbf: [], accelerated: [], score: 1, similarity: 1 };
     }
 
     const matches: string[] = []; // present in both mined block and template
     const added: string[] = []; // present in mined block, not in template
+    const prioritized: string[] = [] // present in the mined block, not in the template, but further down in the mempool
     const fresh: string[] = []; // missing, but firstSeen or lastBoosted within PROPAGATION_MARGIN
     const rbf: string[] = []; // either missing or present, and either part of a full-rbf replacement, or a conflict with the mined block
     const accelerated: string[] = []; // prioritized by the mempool accelerator
@@ -68,12 +69,17 @@ class Audit {
 
     // we can expect an honest miner to include 'displaced' transactions in place of recent arrivals and censored txs
     // these displaced transactions should occupy the first N weight units of the next projected block
-    let displacedWeightRemaining = displacedWeight;
+    let displacedWeightRemaining = displacedWeight + 4000;
     let index = 0;
     let lastFeeRate = Infinity;
     let failures = 0;
-    while (projectedBlocks[1] && index < projectedBlocks[1].transactionIds.length && failures < 500) {
-      const txid = projectedBlocks[1].transactionIds[index];
+    let blockIndex = 1;
+    while (projectedBlocks[blockIndex] && failures < 500) {
+      if (index >= projectedBlocks[blockIndex].transactionIds.length) {
+        index = 0;
+        blockIndex++;
+      }
+      const txid = projectedBlocks[blockIndex].transactionIds[index];
       const tx = mempool[txid];
       if (tx) {
         const fits = (tx.weight - displacedWeightRemaining) < 4000;
@@ -106,7 +112,11 @@ class Audit {
         if (rbfCache.has(tx.txid)) {
           rbf.push(tx.txid);
         } else if (!isDisplaced[tx.txid]) {
-          added.push(tx.txid);
+          if (mempool[tx.txid]) {
+            prioritized.push(tx.txid);
+          } else {
+            added.push(tx.txid);
+          }
         }
         overflowWeight += tx.weight;
       }
@@ -155,6 +165,7 @@ class Audit {
     return {
       censored: Object.keys(isCensored),
       added,
+      prioritized,
       fresh,
       sigop: [],
       fullrbf: rbf,

backend/src/api/database-migration.ts

@@ -7,7 +7,7 @@ import cpfpRepository from '../repositories/CpfpRepository';
 import { RowDataPacket } from 'mysql2';
 
 class DatabaseMigration {
-  private static currentVersion = 75;
+  private static currentVersion = 76;
   private queryTimeout = 3600_000;
   private statisticsAddedIndexed = false;
   private uniqueLogs: string[] = [];
@@ -654,6 +654,11 @@ class DatabaseMigration {
       await this.$executeQuery('ALTER TABLE `prices` ADD `ZAR` float DEFAULT "-1"');
       await this.updateToSchemaVersion(75);
     }
+
+    if (databaseSchemaVersion < 76 && isBitcoin === true) {
+      await this.$executeQuery('ALTER TABLE `blocks_audits` ADD prioritized_txs JSON DEFAULT "[]"');
+      await this.updateToSchemaVersion(76);
+    }
   }
 
   /**

backend/src/api/websocket-handler.ts

@@ -868,7 +868,7 @@ class WebsocketHandler {
       }
 
       if (Common.indexingEnabled()) {
-        const { censored, added, fresh, sigop, fullrbf, accelerated, score, similarity } = Audit.auditBlock(transactions, projectedBlocks, auditMempool);
+        const { censored, added, prioritized, fresh, sigop, fullrbf, accelerated, score, similarity } = Audit.auditBlock(transactions, projectedBlocks, auditMempool);
         const matchRate = Math.round(score * 100 * 100) / 100;
 
         const stripped = projectedBlocks[0]?.transactions ? projectedBlocks[0].transactions : [];
@@ -894,6 +894,7 @@ class WebsocketHandler {
           height: block.height,
           hash: block.id,
           addedTxs: added,
+          prioritizedTxs: prioritized,
           missingTxs: censored,
           freshTxs: fresh,
           sigopTxs: sigop,