Fixed wrong handling of tx removal for mempool simulation mode

Author: rpanic

packages/sequencer/src/mempool/private/PrivateMempool.ts

@@ -194,25 +194,6 @@ export class PrivateMempool
 
       const signedTransaction = tx.toProtocolTransaction();
 
-      // eslint-disable-next-line no-await-in-loop
-      const removeTxWhen = await this.accountStateHook.removeTransactionWhen({
-        networkState: networkState,
-        transaction: signedTransaction.transaction,
-        signature: signedTransaction.signature,
-        prover: proverState,
-      });
-      if (removeTxWhen) {
-        // eslint-disable-next-line no-await-in-loop
-        await this.transactionStorage.removeTx(
-          [tx.hash().toString()],
-          "dropped"
-        );
-        log.trace(
-          `Deleting tx ${tx.hash().toString()}  from mempool because removeTransactionWhen condition is satisfied`
-        );
-        // eslint-disable-next-line no-continue
-        continue;
-      }
       // eslint-disable-next-line no-await-in-loop
       await this.accountStateHook.beforeTransaction({
         networkState: networkState,
@@ -243,6 +224,26 @@ export class PrivateMempool
           queue = queue.filter(distinctByPredicate((a, b) => a === b));
         }
       } else {
+        // eslint-disable-next-line no-await-in-loop
+        const removeTxWhen = await this.accountStateHook.removeTransactionWhen({
+          networkState: networkState,
+          transaction: signedTransaction.transaction,
+          signature: signedTransaction.signature,
+          prover: proverState,
+        });
+        if (removeTxWhen) {
+          // eslint-disable-next-line no-await-in-loop
+          await this.transactionStorage.removeTx(
+            [tx.hash().toString()],
+            "dropped"
+          );
+          log.trace(
+            `Deleting tx ${tx.hash().toString()}  from mempool because removeTransactionWhen condition is satisfied`
+          );
+          // eslint-disable-next-line no-continue
+          continue;
+        }
+
         log.trace(
           `Skipped tx ${tx.hash().toString()} because ${statusMessage}`
         );