From 69652e59487a4e5cc72efce43c3fc965377c8bd7 Mon Sep 17 00:00:00 2001
From: ejMina226 <118474890+ejMina226@users.noreply.github.com>
Date: Thu, 10 Oct 2024 14:11:54 +0100
Subject: [PATCH] Various errors

---
 .../src/mempool/private/PrivateMempool.ts     | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/packages/sequencer/src/mempool/private/PrivateMempool.ts b/packages/sequencer/src/mempool/private/PrivateMempool.ts
index 8d2fb142..d8e7ce00 100644
--- a/packages/sequencer/src/mempool/private/PrivateMempool.ts
+++ b/packages/sequencer/src/mempool/private/PrivateMempool.ts
@@ -54,7 +54,7 @@ export class PrivateMempool extends SequencerModule implements Mempool {
       if (success) {
         this.events.emit("mempool-transaction-added", tx);
         log.info(
-          `Transaction added to mempool: ${tx.hash().toString()} (${(await this.getTxs()).length} transactions in mempool)`
+          `Transaction added to mempool: ${tx.hash().toString()} (${(await this.transactionStorage.getPendingUserTransactions()).length} transactions in mempool)`
         );
       } else {
         log.error(
@@ -97,23 +97,18 @@ export class PrivateMempool extends SequencerModule implements Mempool {
     );
     // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
     const networkState = (await this.getStagedNetworkState()) as NetworkState;
-    console.log("EJ - tx Should be 6", txs.length);
     const checkTxValid = async (transactions: PendingTransaction[]) => {
       for await (const tx of transactions) {
-        console.log("EJ - sender", tx.sender.toBase58());
-        console.log("EJ - nonce", tx.nonce.toBigInt());
-
+        const txStateService = new CachedStateService(baseCachedStateService);
+        this.protocol.stateServiceProvider.setCurrentStateService(
+          txStateService
+        );
         const contextInputs: RuntimeMethodExecutionData = {
           networkState: networkState,
           transaction: tx.toProtocolTransaction().transaction,
         };
         executionContext.setup(contextInputs);
 
-        const txStateService = new CachedStateService(baseCachedStateService);
-        this.protocol.stateServiceProvider.setCurrentStateService(
-          txStateService
-        );
-
         const signedTransaction = tx.toProtocolTransaction();
         await this.accountStateHook.onTransaction({
           networkState: networkState,
@@ -123,14 +118,14 @@ export class PrivateMempool extends SequencerModule implements Mempool {
         const { status, statusMessage } = executionContext.current().result;
         console.log("EJ - status message", statusMessage);
         if (status.toBoolean()) {
-          console.log("EJ - Boolean True");
           sortedTxs.push(tx);
           if (skippedTxs.includes(tx)) {
             console.log("EJ - skippedTxs includes tx", skippedTxs);
             skippedTxs.splice(skippedTxs.indexOf(tx), 1);
           }
-          txStateService.mergeIntoParent();
+          await txStateService.mergeIntoParent();
           this.protocol.stateServiceProvider.popCurrentStateService();
+
           if (skippedTxs.length > 0) {
             console.log("EJ - skippedTxs", skippedTxs.length);
             checkTxValid(skippedTxs);