@metamask-previews/transaction-controller 52.0.0-preview-5a3453d → 52.0.0-preview-e3c959f

package/CHANGELOG.md

@@ -7,10 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-### Added
+### Fixed
 
-- Adds `RandomisedEstimationsGasFeeFlow` to gas fee flows in `TransactionController` ([#5511](https://github.com/MetaMask/core/pull/5511))
-  - Added flow only will be activated if chainId is defined in feature flags.
+- Fix gas estimation for type 4 transactions ([#5519](https://github.com/MetaMask/core/pull/5519))
 
 ## [52.0.0]
 

package/dist/TransactionController.cjs

@@ -33,7 +33,6 @@ const accounts_api_1 = require("./api/accounts-api.cjs");
 const DefaultGasFeeFlow_1 = require("./gas-flows/DefaultGasFeeFlow.cjs");
 const LineaGasFeeFlow_1 = require("./gas-flows/LineaGasFeeFlow.cjs");
 const OptimismLayer1GasFeeFlow_1 = require("./gas-flows/OptimismLayer1GasFeeFlow.cjs");
-const RandomisedEstimationsGasFeeFlow_1 = require("./gas-flows/RandomisedEstimationsGasFeeFlow.cjs");
 const ScrollLayer1GasFeeFlow_1 = require("./gas-flows/ScrollLayer1GasFeeFlow.cjs");
 const TestGasFeeFlow_1 = require("./gas-flows/TestGasFeeFlow.cjs");
 const AccountsApiRemoteTransactionSource_1 = require("./helpers/AccountsApiRemoteTransactionSource.cjs");
@@ -247,7 +246,6 @@ class TransactionController extends base_controller_1.BaseController {
             getProvider: (networkClientId) => __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getProvider).call(this, { networkClientId }),
             getTransactions: () => this.state.transactions,
             layer1GasFeeFlows: this.layer1GasFeeFlows,
-            messenger: this.messagingSystem,
             onStateChange: (listener) => {
                 this.messagingSystem.subscribe('TransactionController:stateChange', listener);
             },
@@ -551,7 +549,12 @@ class TransactionController extends base_controller_1.BaseController {
         const ethQuery = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getEthQuery).call(this, {
             networkClientId,
         });
-        const { estimatedGas, simulationFails } = await (0, gas_1.estimateGas)(transaction, ethQuery);
+        const { estimatedGas, simulationFails } = await (0, gas_1.estimateGas)({
+            chainId: __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getChainId).call(this, networkClientId),
+            ethQuery,
+            isSimulationEnabled: __classPrivateFieldGet(this, _TransactionController_isSimulationEnabled, "f").call(this),
+            txParams: transaction,
+        });
         return { gas: estimatedGas, simulationFails };
     }
     /**
@@ -566,7 +569,12 @@ class TransactionController extends base_controller_1.BaseController {
         const ethQuery = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getEthQuery).call(this, {
             networkClientId,
         });
-        const { blockGasLimit, estimatedGas, simulationFails } = await (0, gas_1.estimateGas)(transaction, ethQuery);
+        const { blockGasLimit, estimatedGas, simulationFails } = await (0, gas_1.estimateGas)({
+            chainId: __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getChainId).call(this, networkClientId),
+            ethQuery,
+            isSimulationEnabled: __classPrivateFieldGet(this, _TransactionController_isSimulationEnabled, "f").call(this),
+            txParams: transaction,
+        });
         const gas = (0, gas_1.addGasBuffer)(estimatedGas, blockGasLimit, multiplier);
         return {
             gas,
@@ -817,7 +825,6 @@ class TransactionController extends base_controller_1.BaseController {
         updatedTransaction.type = type;
         await (0, layer1_gas_fee_flow_1.updateTransactionLayer1GasFee)({
             layer1GasFeeFlows: this.layer1GasFeeFlows,
-            messenger: this.messagingSystem,
             provider,
             transactionMeta: updatedTransaction,
         });
@@ -1030,7 +1037,7 @@ class TransactionController extends base_controller_1.BaseController {
             networkClientId,
         };
         // Guaranteed as the default gas fee flow matches all transactions.
-        const gasFeeFlow = (0, gas_flow_1.getGasFeeFlow)(transactionMeta, this.gasFeeFlows, this.messagingSystem);
+        const gasFeeFlow = (0, gas_flow_1.getGasFeeFlow)(transactionMeta, this.gasFeeFlows);
         const ethQuery = new eth_query_1.default(provider);
         const gasFeeControllerData = await this.getGasFeeEstimates({
             networkClientId,
@@ -1038,7 +1045,6 @@ class TransactionController extends base_controller_1.BaseController {
         return gasFeeFlow.getGasFees({
             ethQuery,
             gasFeeControllerData,
-            messenger: this.messagingSystem,
             transactionMeta,
         });
     }
@@ -1058,7 +1064,6 @@ class TransactionController extends base_controller_1.BaseController {
         });
         return await (0, layer1_gas_fee_flow_1.getTransactionLayer1GasFee)({
             layer1GasFeeFlows: this.layer1GasFeeFlows,
-            messenger: this.messagingSystem,
             provider,
             transactionMeta: {
                 txParams: transactionParams,
@@ -1185,12 +1190,10 @@ class TransactionController extends base_controller_1.BaseController {
             gasFeeFlows: this.gasFeeFlows,
             getGasFeeEstimates: this.getGasFeeEstimates,
             getSavedGasFees: this.getSavedGasFees.bind(this),
-            messenger: this.messagingSystem,
             txMeta: transactionMeta,
         }));
         await __classPrivateFieldGet(this, _TransactionController_trace, "f").call(this, { name: 'Update Layer 1 Gas Fees', parentContext: traceContext }, async () => await (0, layer1_gas_fee_flow_1.updateTransactionLayer1GasFee)({
             layer1GasFeeFlows: this.layer1GasFeeFlows,
-            messenger: this.messagingSystem,
             provider,
             transactionMeta,
         }));
@@ -1920,11 +1923,7 @@ _TransactionController_internalEvents = new WeakMap(), _TransactionController_me
     if (__classPrivateFieldGet(this, _TransactionController_testGasFeeFlows, "f")) {
         return [new TestGasFeeFlow_1.TestGasFeeFlow()];
     }
-    return [
-        new RandomisedEstimationsGasFeeFlow_1.RandomisedEstimationsGasFeeFlow(),
-        new LineaGasFeeFlow_1.LineaGasFeeFlow(),
-        new DefaultGasFeeFlow_1.DefaultGasFeeFlow(),
-    ];
+    return [new LineaGasFeeFlow_1.LineaGasFeeFlow(), new DefaultGasFeeFlow_1.DefaultGasFeeFlow()];
 }, _TransactionController_getLayer1GasFeeFlows = function _TransactionController_getLayer1GasFeeFlows() {
     return [new OptimismLayer1GasFeeFlow_1.OptimismLayer1GasFeeFlow(), new ScrollLayer1GasFeeFlow_1.ScrollLayer1GasFeeFlow()];
 }, _TransactionController_updateTransactionInternal = function _TransactionController_updateTransactionInternal({ transactionId, note, skipHistory, skipValidation, skipResimulateCheck, }, callback) {
@@ -2098,6 +2097,7 @@ _TransactionController_internalEvents = new WeakMap(), _TransactionController_me
         chainId,
         ethQuery,
         isCustomNetwork,
+        isSimulationEnabled: __classPrivateFieldGet(this, _TransactionController_isSimulationEnabled, "f").call(this),
         txMeta: transactionMeta,
     });
 }, _TransactionController_deleteTransaction = function _TransactionController_deleteTransaction(transactionId) {