Merge pull request #214 from proto-kit/fix/mempool-context-clear

Fixed execution context not cleared after getTxs invocation

Author: rpanic

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

@@ -95,9 +95,7 @@ export class PrivateMempool extends SequencerModule implements Mempool {
 
   public async getTxs(limit?: number): Promise<PendingTransaction[]> {
     const txs = await this.transactionStorage.getPendingUserTransactions();
-    const executionContext = container.resolve<RuntimeMethodExecutionContext>(
-      RuntimeMethodExecutionContext
-    );
+
     const baseCachedStateService = new CachedStateService(this.stateService);
 
     const networkState =
@@ -108,17 +106,12 @@ export class PrivateMempool extends SequencerModule implements Mempool {
       baseCachedStateService,
       this.protocol.stateServiceProvider,
       networkState,
-      executionContext,
       limit
     );
     this.protocol.stateServiceProvider.popCurrentStateService();
     return sortedTxs;
   }
 
-  public async start(): Promise<void> {
-    noop();
-  }
-
   // We iterate through the transactions. For each tx we run the account state hook.
   // If the txs succeeds then it can be returned. If it fails then we keep track of it
   // in the skipped txs list and when later txs succeed we check to see if any state transition
@@ -129,16 +122,22 @@ export class PrivateMempool extends SequencerModule implements Mempool {
     baseService: CachedStateService,
     stateServiceProvider: StateServiceProvider,
     networkState: NetworkState,
-    executionContext: RuntimeMethodExecutionContext,
     limit?: number
-  ): Promise<PendingTransaction[]> {
-    const skippedTransactions: Record<string, MempoolTransactionPaths> = {};
+  ) {
+    const executionContext = container.resolve<RuntimeMethodExecutionContext>(
+      RuntimeMethodExecutionContext
+    );
+    executionContext.clear();
+
+    // Initialize starting state
     const sortedTransactions: PendingTransaction[] = [];
+    const skippedTransactions: Record<string, MempoolTransactionPaths> = {};
+
     let queue: PendingTransaction[] = [...transactions];
 
     while (
       queue.length > 0 &&
-      (limit !== undefined ? sortedTransactions.length < limit : true)
+      sortedTransactions.length < (limit ?? Number.MAX_VALUE)
     ) {
       const [tx] = queue.splice(0, 1);
       const txStateService = new CachedStateService(baseService);
@@ -147,7 +146,6 @@ export class PrivateMempool extends SequencerModule implements Mempool {
         networkState: networkState,
         transaction: tx.toProtocolTransaction().transaction,
       };
-      executionContext.clear();
       executionContext.setup(contextInputs);
 
       const signedTransaction = tx.toProtocolTransaction();
@@ -193,7 +191,13 @@ export class PrivateMempool extends SequencerModule implements Mempool {
         }
         stateServiceProvider.popCurrentStateService();
       }
+
+      executionContext.clear();
     }
     return sortedTransactions;
   }
+
+  public async start(): Promise<void> {
+    noop();
+  }
 }