Add mutex to gasFeeUpdates

Author: OGPoyraz

packages/transaction-controller/src/TransactionController.ts

@@ -649,6 +649,8 @@ export class TransactionController extends BaseController<
 
   private readonly gasFeeFlows: GasFeeFlow[];
 
+  private readonly gasFeeUpdateMutexes: Map<string, Mutex> = new Map();
+
   private readonly getSavedGasFees: (chainId: Hex) => SavedGasFees | undefined;
 
   private readonly getNetworkState: () => NetworkState;
@@ -915,6 +917,7 @@ export class TransactionController extends BaseController<
 
     gasFeePoller.hub.on(
       'transaction-updated',
+      // eslint-disable-next-line @typescript-eslint/no-floating-promises
       this.#onGasFeePollerTransactionUpdate.bind(this),
     );
 
@@ -3892,24 +3895,35 @@ export class TransactionController extends BaseController<
     gasFeeEstimatesLoaded?: boolean;
     layer1GasFee?: Hex;
   }) {
-    const transaction = this.getTransaction(transactionId) as TransactionMeta;
-    const isEIP1559Compatible =
-      transaction?.txParams?.type !== TransactionEnvelopeType.legacy &&
-      (await this.getEIP1559Compatibility(transaction?.networkClientId));
+    if (!this.gasFeeUpdateMutexes.has(transactionId)) {
+      this.gasFeeUpdateMutexes.set(transactionId, new Mutex());
+    }
+    const mutex = this.gasFeeUpdateMutexes.get(transactionId)!;
 
-    this.#updateTransactionInternal(
-      { transactionId, skipHistory: true },
-      (txMeta) => {
-        updateTransactionGasFees({
-          txMeta,
-          gasFeeEstimates,
-          gasFeeEstimatesLoaded,
-          isEIP1559Compatible,
-          isTxParamsGasFeeUpdatesEnabled: this.isTxParamsGasFeeUpdatesEnabled,
-          layer1GasFee,
-        });
-      },
-    );
+    const release = await mutex.acquire();
+    try {
+      const transaction = this.getTransaction(transactionId) as TransactionMeta;
+      const isEIP1559Compatible =
+        transaction?.txParams?.type !== TransactionEnvelopeType.legacy &&
+        (await this.getEIP1559Compatibility(transaction?.networkClientId));
+
+      this.#updateTransactionInternal(
+        { transactionId, skipHistory: true },
+        (txMeta) => {
+          updateTransactionGasFees({
+            txMeta,
+            gasFeeEstimates,
+            gasFeeEstimatesLoaded,
+            isEIP1559Compatible,
+            isTxParamsGasFeeUpdatesEnabled: this.isTxParamsGasFeeUpdatesEnabled,
+            layer1GasFee,
+          });
+        },
+      );
+    } finally {
+      release();
+      this.gasFeeUpdateMutexes.delete(transactionId);
+    }
   }
 
   #getSelectedAccount() {