Add gasLimitNoBuffer support for legacy transactions

MetaMask · Jan 8, 2025 · 44608df · 44608df
1 parent d96d86b
commit 44608df
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/shared/modules/gas.utils.js b/shared/modules/gas.utils.js
@@ -59,11 +59,13 @@ export function getMaximumGasTotalInHexWei({
  */
 export function getMinimumGasTotalInHexWei({
   gasLimit = '0x0',
+  gasLimitNoBuffer,
   gasPrice,
   maxPriorityFeePerGas,
   maxFeePerGas,
   baseFeePerGas,
 } = {}) {
+  const minimumGasLimit = gasLimitNoBuffer ?? gasLimit;
   const isEIP1559Estimate = Boolean(
     maxFeePerGas || maxPriorityFeePerGas || baseFeePerGas,
   );
@@ -91,16 +93,22 @@ export function getMinimumGasTotalInHexWei({
     );
   }
   if (isEIP1559Estimate === false) {
-    return getMaximumGasTotalInHexWei({ gasLimit, gasPrice });
+    return getMaximumGasTotalInHexWei({
+      gasLimit: minimumGasLimit,
+      gasPrice,
+    });
   }
   const minimumFeePerGas = new Numeric(baseFeePerGas, 16)
     .add(new Numeric(maxPriorityFeePerGas, 16))
     .toString();
 
   if (new Numeric(minimumFeePerGas, 16).greaterThan(maxFeePerGas, 16)) {
-    return getMaximumGasTotalInHexWei({ gasLimit, maxFeePerGas });
+    return getMaximumGasTotalInHexWei({
+      gasLimit: minimumGasLimit,
+      maxFeePerGas,
+    });
   }
-  return new Numeric(gasLimit, 16)
+  return new Numeric(minimumGasLimit, 16)
     .times(new Numeric(minimumFeePerGas, 16))
     .toPrefixedHexString();
 }
diff --git a/ui/pages/confirmations/hooks/useGasEstimates.js b/ui/pages/confirmations/hooks/useGasEstimates.js
@@ -69,6 +69,7 @@ export function useGasEstimates({
   // gas fees.
   let gasSettings = {
     gasLimit: decimalToHex(gasLimit),
+    gasLimitNoBuffer: transaction.gasLimitNoBuffer,
   };
   if (supportsEIP1559) {
     gasSettings = {

diff --git a/ui/selectors/confirm-transaction.js b/ui/selectors/confirm-transaction.js
@@ -216,6 +216,7 @@ export const transactionFeeSelector = function (state, txData) {
 
   const gasEstimationObject = {
     gasLimit: txData.txParams?.gas ?? '0x0',
+    gasLimitNoBuffer: txData?.gasLimitNoBuffer
   };
 
   if (networkAndAccountSupportsEIP1559) {