@metamask-previews/transaction-controller 63.1.0-preview-a0caca0c0 → 63.1.0-preview-3ce0062c4

package/CHANGELOG.md

@@ -7,10 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-### Removed
+### Changed
 
-- **BREAKING:** Remove `@metamask/eth-query` dependency and all `EthQuery` usage in favour of messenger-based provider utilities ([#8273](https://github.com/MetaMask/core/pull/8273))
-  - Remove `determineTransactionType` from exported functions.
+- Add extra parameters in types and change `addTransaction` behavior ([#8052](https://github.com/MetaMask/core/pull/8052))
+  - Add optional `excludeNativeTokenForFee` in `TransactionMeta` type.
+  - Add optional `actionId` and optional `excludeNativeTokenForFee` in `TransactionBatchRequest` type.
+  - Add optional `excludeNativeTokenForFee` to `AddTransactionOptions` type.
+  - Changed `isGasFeeTokenIgnoredIfBalance` to be false if `excludeNativeTokenForFee` is passed in `addTransaction`.
 
 ## [63.1.0]
 

package/dist/TransactionController.cjs

@@ -10,11 +10,15 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _TransactionController_instances, _TransactionController_afterAdd, _TransactionController_afterSign, _TransactionController_afterSimulate, _TransactionController_approvingTransactionIds, _TransactionController_beforeCheckPendingTransaction, _TransactionController_beforePublish, _TransactionController_beforeSign, _TransactionController_gasFeeFlows, _TransactionController_getAdditionalSignArguments, _TransactionController_getCurrentAccountEIP1559Compatibility, _TransactionController_getCurrentNetworkEIP1559Compatibility, _TransactionController_getExternalPendingTransactions, _TransactionController_getGasFeeEstimates, _TransactionController_getNetworkState, _TransactionController_getPermittedAccounts, _TransactionController_getSavedGasFees, _TransactionController_getSimulationConfig, _TransactionController_incomingTransactionHelper, _TransactionController_incomingTransactionOptions, _TransactionController_internalEvents, _TransactionController_isAutomaticGasFeeUpdateEnabled, _TransactionController_isEIP7702GasFeeTokensEnabled, _TransactionController_isFirstTimeInteractionEnabled, _TransactionController_isSimulationEnabled, _TransactionController_isSwapsDisabled, _TransactionController_isTimeoutEnabled, _TransactionController_layer1GasFeeFlows, _TransactionController_methodDataHelper, _TransactionController_multichainTrackingHelper, _TransactionController_pendingTransactionOptions, _TransactionController_publicKeyEIP7702, _TransactionController_publish, _TransactionController_publishBatchHook, _TransactionController_securityProviderRequest, _TransactionController_sign, _TransactionController_signAbortCallbacks, _TransactionController_skipSimulationTransactionIds, _TransactionController_testGasFeeFlows, _TransactionController_trace, _TransactionController_retryTransaction, _TransactionController_signExternalTransaction, _TransactionController_addMetadata, _TransactionController_updateGasProperties, _TransactionController_onBootCleanup, _TransactionController_failIncompleteTransactions, _TransactionController_processApproval, _TransactionController_approveTransaction, _TransactionController_publishTransaction, _TransactionController_rejectTransaction, _TransactionController_trimTransactionsForState, _TransactionController_isFinalState, _TransactionController_isLocalFinalState, _TransactionController_requestApproval, _TransactionController_getTransaction, _TransactionController_getTransactionOrThrow, _TransactionController_getApprovalId, _TransactionController_isTransactionCompleted, _TransactionController_onIncomingTransactions, _TransactionController_generateDappSuggestedGasFees, _TransactionController_addExternalTransaction, _TransactionController_markNonceDuplicatesDropped, _TransactionController_setTransactionStatusDropped, _TransactionController_waitForTransactionFinished, _TransactionController_updateTransactionMetaRSV, _TransactionController_getEIP1559Compatibility, _TransactionController_signTransaction, _TransactionController_onTransactionStatusChange, _TransactionController_getNonceTrackerTransactions, _TransactionController_onConfirmedTransaction, _TransactionController_updatePostBalance, _TransactionController_createNonceTracker, _TransactionController_createPendingTransactionTracker, _TransactionController_checkForPendingTransactionAndStartPolling, _TransactionController_stopAllTracking, _TransactionController_addIncomingTransactionHelperListeners, _TransactionController_removePendingTransactionTrackerListeners, _TransactionController_addPendingTransactionTrackerListeners, _TransactionController_getNonceTrackerPendingTransactions, _TransactionController_publishTransactionForRetry, _TransactionController_isTransactionAlreadyConfirmedError, _TransactionController_getGasFeeFlows, _TransactionController_getLayer1GasFeeFlows, _TransactionController_updateTransactionInternal, _TransactionController_updateSimulationData, _TransactionController_onGasFeePollerTransactionUpdate, _TransactionController_onGasFeePollerTransactionBatchUpdate, _TransactionController_updateTransactionBatch, _TransactionController_getSelectedAccount, _TransactionController_getInternalAccounts, _TransactionController_updateSubmitHistory, _TransactionController_updateGasEstimate, _TransactionController_registerActionHandlers, _TransactionController_deleteTransaction, _TransactionController_isRejectError, _TransactionController_rejectTransactionAndThrow, _TransactionController_failTransaction, _TransactionController_runAfterSimulateHook, _TransactionController_defaultPublishHook, _TransactionController_getGasFeeTokens;
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+var _TransactionController_instances, _TransactionController_afterAdd, _TransactionController_afterSign, _TransactionController_afterSimulate, _TransactionController_approvingTransactionIds, _TransactionController_beforeCheckPendingTransaction, _TransactionController_beforePublish, _TransactionController_beforeSign, _TransactionController_gasFeeFlows, _TransactionController_getAdditionalSignArguments, _TransactionController_getCurrentAccountEIP1559Compatibility, _TransactionController_getCurrentNetworkEIP1559Compatibility, _TransactionController_getExternalPendingTransactions, _TransactionController_getGasFeeEstimates, _TransactionController_getNetworkState, _TransactionController_getPermittedAccounts, _TransactionController_getSavedGasFees, _TransactionController_getSimulationConfig, _TransactionController_incomingTransactionHelper, _TransactionController_incomingTransactionOptions, _TransactionController_internalEvents, _TransactionController_isAutomaticGasFeeUpdateEnabled, _TransactionController_isEIP7702GasFeeTokensEnabled, _TransactionController_isFirstTimeInteractionEnabled, _TransactionController_isSimulationEnabled, _TransactionController_isSwapsDisabled, _TransactionController_isTimeoutEnabled, _TransactionController_layer1GasFeeFlows, _TransactionController_methodDataHelper, _TransactionController_multichainTrackingHelper, _TransactionController_pendingTransactionOptions, _TransactionController_publicKeyEIP7702, _TransactionController_publish, _TransactionController_publishBatchHook, _TransactionController_securityProviderRequest, _TransactionController_sign, _TransactionController_signAbortCallbacks, _TransactionController_skipSimulationTransactionIds, _TransactionController_testGasFeeFlows, _TransactionController_trace, _TransactionController_retryTransaction, _TransactionController_signExternalTransaction, _TransactionController_addMetadata, _TransactionController_updateGasProperties, _TransactionController_onBootCleanup, _TransactionController_failIncompleteTransactions, _TransactionController_processApproval, _TransactionController_approveTransaction, _TransactionController_publishTransaction, _TransactionController_rejectTransaction, _TransactionController_trimTransactionsForState, _TransactionController_isFinalState, _TransactionController_isLocalFinalState, _TransactionController_requestApproval, _TransactionController_getTransaction, _TransactionController_getTransactionOrThrow, _TransactionController_getApprovalId, _TransactionController_isTransactionCompleted, _TransactionController_getChainId, _TransactionController_getNetworkClientId, _TransactionController_getEthQuery, _TransactionController_getProvider, _TransactionController_onIncomingTransactions, _TransactionController_generateDappSuggestedGasFees, _TransactionController_addExternalTransaction, _TransactionController_markNonceDuplicatesDropped, _TransactionController_setTransactionStatusDropped, _TransactionController_waitForTransactionFinished, _TransactionController_updateTransactionMetaRSV, _TransactionController_getEIP1559Compatibility, _TransactionController_signTransaction, _TransactionController_onTransactionStatusChange, _TransactionController_getNonceTrackerTransactions, _TransactionController_onConfirmedTransaction, _TransactionController_updatePostBalance, _TransactionController_createNonceTracker, _TransactionController_createPendingTransactionTracker, _TransactionController_checkForPendingTransactionAndStartPolling, _TransactionController_stopAllTracking, _TransactionController_addIncomingTransactionHelperListeners, _TransactionController_removePendingTransactionTrackerListeners, _TransactionController_addPendingTransactionTrackerListeners, _TransactionController_getNonceTrackerPendingTransactions, _TransactionController_publishTransactionForRetry, _TransactionController_isTransactionAlreadyConfirmedError, _TransactionController_getGasFeeFlows, _TransactionController_getLayer1GasFeeFlows, _TransactionController_updateTransactionInternal, _TransactionController_updateSimulationData, _TransactionController_onGasFeePollerTransactionUpdate, _TransactionController_onGasFeePollerTransactionBatchUpdate, _TransactionController_updateTransactionBatch, _TransactionController_getSelectedAccount, _TransactionController_getInternalAccounts, _TransactionController_updateSubmitHistory, _TransactionController_updateGasEstimate, _TransactionController_registerActionHandlers, _TransactionController_deleteTransaction, _TransactionController_isRejectError, _TransactionController_rejectTransactionAndThrow, _TransactionController_failTransaction, _TransactionController_runAfterSimulateHook, _TransactionController_defaultPublishHook, _TransactionController_getGasFeeTokens;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TransactionController = exports.ApprovalState = exports.SPEED_UP_RATE = exports.CANCEL_RATE = void 0;
 const base_controller_1 = require("@metamask/base-controller");
 const controller_utils_1 = require("@metamask/controller-utils");
+const eth_query_1 = __importDefault(require("@metamask/eth-query"));
 const network_controller_1 = require("@metamask/network-controller");
 const nonce_tracker_1 = require("@metamask/nonce-tracker");
 const rpc_errors_1 = require("@metamask/rpc-errors");
@@ -53,7 +57,6 @@ const gas_flow_1 = require("./utils/gas-flow.cjs");
 const layer1_gas_fee_flow_1 = require("./utils/layer1-gas-fee-flow.cjs");
 const nonce_1 = require("./utils/nonce.cjs");
 const prepare_1 = require("./utils/prepare.cjs");
-const provider_1 = require("./utils/provider.cjs");
 const retry_1 = require("./utils/retry.cjs");
 const swaps_1 = require("./utils/swaps.cjs");
 const transaction_type_1 = require("./utils/transaction-type.cjs");
@@ -287,8 +290,10 @@ class TransactionController extends base_controller_1.BaseController {
         __classPrivateFieldSet(this, _TransactionController_gasFeeFlows, __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getGasFeeFlows).call(this), "f");
         __classPrivateFieldSet(this, _TransactionController_layer1GasFeeFlows, __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getLayer1GasFeeFlows).call(this), "f");
         const gasFeePoller = new GasFeePoller_1.GasFeePoller({
+            findNetworkClientIdByChainId,
             gasFeeFlows: __classPrivateFieldGet(this, _TransactionController_gasFeeFlows, "f"),
             getGasFeeControllerEstimates: __classPrivateFieldGet(this, _TransactionController_getGasFeeEstimates, "f"),
+            getProvider: (networkClientId) => __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getProvider).call(this, { networkClientId }),
             getTransactions: () => this.state.transactions,
             getTransactionBatches: () => this.state.transactionBatches,
             layer1GasFeeFlows: __classPrivateFieldGet(this, _TransactionController_layer1GasFeeFlows, "f"),
@@ -300,7 +305,7 @@ class TransactionController extends base_controller_1.BaseController {
         gasFeePoller.hub.on('transaction-updated', __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_onGasFeePollerTransactionUpdate).bind(this));
         gasFeePoller.hub.on('transaction-batch-updated', __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_onGasFeePollerTransactionBatchUpdate).bind(this));
         __classPrivateFieldSet(this, _TransactionController_methodDataHelper, new MethodDataHelper_1.MethodDataHelper({
-            messenger: this.messenger,
+            getProvider: (networkClientId) => __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getProvider).call(this, { networkClientId }),
             getState: () => this.state.methodData,
         }), "f");
         __classPrivateFieldGet(this, _TransactionController_methodDataHelper, "f").hub.on('update', ({ fourBytePrefix, methodData }) => {
@@ -362,11 +367,15 @@ class TransactionController extends base_controller_1.BaseController {
         return await (0, batch_1.addTransactionBatch)({
             addTransaction: this.addTransaction.bind(this),
             estimateGas: this.estimateGas.bind(this),
+            getChainId: __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getChainId).bind(this),
+            getEthQuery: (networkClientId) => __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getEthQuery).call(this, { networkClientId }),
             getGasFeeEstimates: __classPrivateFieldGet(this, _TransactionController_getGasFeeEstimates, "f"),
             getInternalAccounts: __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getInternalAccounts).bind(this),
             getSimulationConfig: __classPrivateFieldGet(this, _TransactionController_getSimulationConfig, "f").bind(this),
             getPendingTransactionTracker: (networkClientId) => __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_createPendingTransactionTracker).call(this, {
+                provider: __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getProvider).call(this, { networkClientId }),
                 blockTracker,
+                chainId: __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getChainId).call(this, networkClientId),
                 networkClientId,
             }),
             getTransaction: (transactionId) => __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getTransactionOrThrow).call(this, transactionId),
@@ -374,7 +383,7 @@ class TransactionController extends base_controller_1.BaseController {
             messenger: this.messenger,
             publishBatchHook: __classPrivateFieldGet(this, _TransactionController_publishBatchHook, "f"),
             publicKeyEIP7702: __classPrivateFieldGet(this, _TransactionController_publicKeyEIP7702, "f"),
-            publishTransaction: (transactionMeta) => __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_publishTransaction).call(this, transactionMeta),
+            publishTransaction: (ethQuery, transactionMeta) => __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_publishTransaction).call(this, ethQuery, transactionMeta),
             request,
             signTransaction: __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_signTransaction).bind(this),
             update: this.update.bind(this),
@@ -390,6 +399,7 @@ class TransactionController extends base_controller_1.BaseController {
     async isAtomicBatchSupported(request) {
         return (0, batch_1.isAtomicBatchSupported)({
             ...request,
+            getEthQuery: (chainId) => __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getEthQuery).call(this, { chainId }),
             messenger: this.messenger,
             publicKeyEIP7702: __classPrivateFieldGet(this, _TransactionController_publicKeyEIP7702, "f"),
         });
@@ -405,13 +415,16 @@ class TransactionController extends base_controller_1.BaseController {
      */
     async addTransaction(txParams, options) {
         (0, logger_1.projectLogger)('Adding transaction', txParams, options);
-        const { actionId, assetsFiatValues, batchId, deviceConfirmedOn, disableGasBuffer, gasFeeToken, isGasFeeIncluded, isGasFeeSponsored, isStateOnly, method, nestedTransactions, networkClientId, origin, publishHook, requestId, requiredAssets, requireApproval, securityAlertResponse, skipInitialGasEstimate, swaps = {}, traceContext, type, } = options;
+        const { actionId, assetsFiatValues, batchId, deviceConfirmedOn, disableGasBuffer, gasFeeToken, excludeNativeTokenForFee, isGasFeeIncluded, isGasFeeSponsored, isStateOnly, method, nestedTransactions, networkClientId, origin, publishHook, requestId, requiredAssets, requireApproval, securityAlertResponse, skipInitialGasEstimate, swaps = {}, traceContext, type, } = options;
         // eslint-disable-next-line no-param-reassign
         txParams = (0, utils_2.normalizeTransactionParams)(txParams);
         if (!__classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").has(networkClientId)) {
             throw new Error(`Network client not found - ${networkClientId}`);
         }
-        const chainId = (0, provider_1.getChainId)({ messenger: this.messenger, networkClientId });
+        const chainId = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getChainId).call(this, networkClientId);
+        const ethQuery = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getEthQuery).call(this, {
+            networkClientId,
+        });
         const permittedAddresses = origin === undefined
             ? undefined
             : await __classPrivateFieldGet(this, _TransactionController_getPermittedAccounts, "f")?.call(this, origin);
@@ -425,7 +438,7 @@ class TransactionController extends base_controller_1.BaseController {
             txParams,
             type,
         });
-        const delegationAddressPromise = (0, eip7702_1.getDelegationAddress)(txParams.from, this.messenger, networkClientId).catch(() => undefined);
+        const delegationAddressPromise = (0, eip7702_1.getDelegationAddress)(txParams.from, ethQuery).catch(() => undefined);
         const isEIP1559Compatible = await __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getEIP1559Compatibility).call(this, networkClientId);
         (0, validation_1.validateTxParams)(txParams, isEIP1559Compatible, chainId);
         if (!txParams.type) {
@@ -438,11 +451,11 @@ class TransactionController extends base_controller_1.BaseController {
             throw new rpc_errors_1.JsonRpcError(validation_1.ErrorCode.DuplicateBundleId, 'Batch ID already exists');
         }
         const dappSuggestedGasFees = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_generateDappSuggestedGasFees).call(this, txParams, origin);
-        const transactionType = type ??
-            (await (0, transaction_type_1.determineTransactionType)(txParams, {
-                messenger: this.messenger,
-                networkClientId,
-            })).type;
+        const transactionType = type ?? (await (0, transaction_type_1.determineTransactionType)(txParams, ethQuery)).type;
+        // Original behavior was that this was set to 'true' whenever a gasFeeToken was passed.
+        // 'excludeNativeTokenForFee' optionnally overrides this behavior to prevent native token from
+        // being used when another gasFeeToken is set.
+        const isGasFeeTokenIgnoredIfBalance = Boolean(gasFeeToken) && !excludeNativeTokenForFee;
         let addedTransactionMeta = {
             actionId,
             assetsFiatValues,
@@ -452,9 +465,13 @@ class TransactionController extends base_controller_1.BaseController {
             deviceConfirmedOn,
             disableGasBuffer,
             id: (0, uuid_1.v1)(),
-            isGasFeeTokenIgnoredIfBalance: Boolean(gasFeeToken),
+            isGasFeeTokenIgnoredIfBalance,
             isGasFeeIncluded,
             isGasFeeSponsored,
+            // To avoid the property to be set as undefined.
+            ...(excludeNativeTokenForFee === undefined
+                ? {}
+                : { excludeNativeTokenForFee }),
             isFirstTimeInteraction: undefined,
             isStateOnly,
             nestedTransactions,
@@ -646,12 +663,16 @@ class TransactionController extends base_controller_1.BaseController {
      * @returns The gas and gas price.
      */
     async estimateGas(transaction, networkClientId, { ignoreDelegationSignatures, } = {}) {
+        const ethQuery = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getEthQuery).call(this, {
+            networkClientId,
+        });
         const { estimatedGas, simulationFails } = await (0, gas_1.estimateGas)({
+            chainId: __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getChainId).call(this, networkClientId),
+            ethQuery,
             ignoreDelegationSignatures,
             isSimulationEnabled: __classPrivateFieldGet(this, _TransactionController_isSimulationEnabled, "f").call(this),
             getSimulationConfig: __classPrivateFieldGet(this, _TransactionController_getSimulationConfig, "f"),
             messenger: this.messenger,
-            networkClientId,
             txParams: transaction,
         });
         return { gas: estimatedGas, simulationFails };
@@ -666,15 +687,16 @@ class TransactionController extends base_controller_1.BaseController {
      * @returns Object containing the gas limit.
      */
     async estimateGasBatch({ chainId, from, transactions, }) {
+        const ethQuery = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getEthQuery).call(this, {
+            chainId,
+        });
         return (0, gas_1.estimateGasBatch)({
+            chainId,
+            ethQuery,
             from,
             getSimulationConfig: __classPrivateFieldGet(this, _TransactionController_getSimulationConfig, "f"),
             isAtomicBatchSupported: this.isAtomicBatchSupported.bind(this),
             messenger: this.messenger,
-            networkClientId: (0, provider_1.getNetworkClientId)({
-                messenger: this.messenger,
-                chainId,
-            }),
             transactions,
         });
     }
@@ -687,11 +709,15 @@ class TransactionController extends base_controller_1.BaseController {
      * @returns The buffered estimated gas and whether the estimation failed.
      */
     async estimateGasBuffered(transaction, multiplier, networkClientId) {
+        const ethQuery = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getEthQuery).call(this, {
+            networkClientId,
+        });
         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),
             getSimulationConfig: __classPrivateFieldGet(this, _TransactionController_getSimulationConfig, "f"),
             messenger: this.messenger,
-            networkClientId,
             txParams: transaction,
         });
         const gas = (0, gas_1.addGasBuffer)(estimatedGas, blockGasLimit, multiplier);
@@ -971,11 +997,10 @@ class TransactionController extends base_controller_1.BaseController {
         editableParams.txParams = (0, lodash_1.pickBy)(editableParams.txParams);
         const updatedTransaction = (0, lodash_1.merge)({}, transactionMeta, editableParams);
         const { networkClientId } = transactionMeta;
+        const provider = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getProvider).call(this, { networkClientId });
+        const ethQuery = new eth_query_1.default(provider);
         if (updateType !== false) {
-            const { type } = await (0, transaction_type_1.determineTransactionType)(updatedTransaction.txParams, {
-                messenger: this.messenger,
-                networkClientId,
-            });
+            const { type } = await (0, transaction_type_1.determineTransactionType)(updatedTransaction.txParams, ethQuery);
             updatedTransaction.type = type;
         }
         if (containerTypes) {
@@ -984,6 +1009,7 @@ class TransactionController extends base_controller_1.BaseController {
         await (0, layer1_gas_fee_flow_1.updateTransactionLayer1GasFee)({
             layer1GasFeeFlows: __classPrivateFieldGet(this, _TransactionController_layer1GasFeeFlows, "f"),
             messenger: this.messenger,
+            provider,
             transactionMeta: updatedTransaction,
         });
         this.updateTransaction(updatedTransaction, `Update Editable Params for ${txId}`);
@@ -1025,10 +1051,7 @@ class TransactionController extends base_controller_1.BaseController {
         }
         const initialTx = listOfTxParams[0];
         const { chainId } = initialTx;
-        const networkClientId = (0, provider_1.getNetworkClientId)({
-            messenger: this.messenger,
-            chainId,
-        });
+        const networkClientId = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getNetworkClientId).call(this, { chainId });
         const initialTxAsEthTx = (0, prepare_1.prepareTransaction)(chainId, initialTx);
         const initialTxAsSerializedHex = (0, prepare_1.serializeTransaction)(initialTxAsEthTx);
         if (__classPrivateFieldGet(this, _TransactionController_approvingTransactionIds, "f").has(initialTxAsSerializedHex)) {
@@ -1207,7 +1230,7 @@ class TransactionController extends base_controller_1.BaseController {
      * @returns A promise that resolves to the estimated gas fee response.
      */
     async estimateGasFee({ transactionParams, chainId, networkClientId: requestNetworkClientId, }) {
-        const { id: networkClientId } = __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").getNetworkClient({
+        const { id: networkClientId, provider } = __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").getNetworkClient({
             chainId,
             networkClientId: requestNetworkClientId,
         });
@@ -1218,10 +1241,12 @@ class TransactionController extends base_controller_1.BaseController {
         };
         // Guaranteed as the default gas fee flow matches all transactions.
         const gasFeeFlow = (0, gas_flow_1.getGasFeeFlow)(transactionMeta, __classPrivateFieldGet(this, _TransactionController_gasFeeFlows, "f"), this.messenger);
+        const ethQuery = new eth_query_1.default(provider);
         const gasFeeControllerData = await __classPrivateFieldGet(this, _TransactionController_getGasFeeEstimates, "f").call(this, {
             networkClientId,
         });
         return gasFeeFlow.getGasFees({
+            ethQuery,
             gasFeeControllerData,
             messenger: this.messenger,
             transactionMeta,
@@ -1237,18 +1262,17 @@ class TransactionController extends base_controller_1.BaseController {
      * @returns The layer 1 gas fee.
      */
     async getLayer1GasFee({ transactionParams, chainId, networkClientId, }) {
-        const resolvedNetworkClientId = (0, provider_1.getNetworkClientId)({
-            messenger: this.messenger,
+        const provider = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getProvider).call(this, {
             chainId,
             networkClientId,
         });
         return await (0, layer1_gas_fee_flow_1.getTransactionLayer1GasFee)({
             layer1GasFeeFlows: __classPrivateFieldGet(this, _TransactionController_layer1GasFeeFlows, "f"),
             messenger: this.messenger,
+            provider,
             transactionMeta: {
                 txParams: transactionParams,
                 chainId,
-                networkClientId: resolvedNetworkClientId,
             },
         });
     }
@@ -1425,11 +1449,8 @@ class TransactionController extends base_controller_1.BaseController {
      */
     async getGasFeeTokens(request) {
         const { chainId, data, from, to, value } = request;
-        const networkClientId = (0, provider_1.getNetworkClientId)({
-            messenger: this.messenger,
-            chainId,
-        });
-        const delegationAddress = await (0, eip7702_1.getDelegationAddress)(from, this.messenger, networkClientId);
+        const ethQuery = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getEthQuery).call(this, { chainId });
+        const delegationAddress = await (0, eip7702_1.getDelegationAddress)(from, ethQuery);
         const transaction = {
             chainId,
             delegationAddress,
@@ -1478,6 +1499,8 @@ _TransactionController_afterAdd = new WeakMap(), _TransactionController_afterSig
         newFee,
         txParams: newTxParams,
     });
+    const { networkClientId } = transactionMeta;
+    const ethQuery = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getEthQuery).call(this, { networkClientId });
     const newTransactionMeta = {
         ...transactionMetaWithRsv,
         actionId,
@@ -1490,7 +1513,7 @@ _TransactionController_afterAdd = new WeakMap(), _TransactionController_afterSig
         txParams: newTxParams,
         type: transactionType,
     };
-    const hash = await __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_publishTransactionForRetry).call(this, {
+    const hash = await __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_publishTransactionForRetry).call(this, ethQuery, {
         ...newTransactionMeta,
         origin: label,
     });
@@ -1536,11 +1559,15 @@ _TransactionController_afterAdd = new WeakMap(), _TransactionController_afterSig
 }, _TransactionController_updateGasProperties = async function _TransactionController_updateGasProperties(transactionMeta, { traceContext } = {}) {
     const isEIP1559Compatible = transactionMeta.txParams.type !== types_1.TransactionEnvelopeType.legacy &&
         (await __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getEIP1559Compatibility).call(this, transactionMeta.networkClientId));
+    const { networkClientId } = transactionMeta;
+    const ethQuery = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getEthQuery).call(this, { networkClientId });
+    const provider = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getProvider).call(this, { networkClientId });
     await __classPrivateFieldGet(this, _TransactionController_trace, "f").call(this, { name: 'Update Gas', parentContext: traceContext }, async () => {
         await __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateGasEstimate).call(this, transactionMeta);
     });
     await __classPrivateFieldGet(this, _TransactionController_trace, "f").call(this, { name: 'Update Gas Fees', parentContext: traceContext }, async () => await (0, gas_fees_1.updateGasFees)({
         eip1559: isEIP1559Compatible,
+        ethQuery,
         gasFeeFlows: __classPrivateFieldGet(this, _TransactionController_gasFeeFlows, "f"),
         getGasFeeEstimates: __classPrivateFieldGet(this, _TransactionController_getGasFeeEstimates, "f"),
         getSavedGasFees: __classPrivateFieldGet(this, _TransactionController_getSavedGasFees, "f").bind(this),
@@ -1550,6 +1577,7 @@ _TransactionController_afterAdd = new WeakMap(), _TransactionController_afterSig
     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: __classPrivateFieldGet(this, _TransactionController_layer1GasFeeFlows, "f"),
         messenger: this.messenger,
+        provider,
         transactionMeta,
     }));
 }, _TransactionController_onBootCleanup = function _TransactionController_onBootCleanup() {
@@ -1690,6 +1718,7 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
         __classPrivateFieldGet(this, _TransactionController_approvingTransactionIds, "f").add(transactionId);
         clearApprovingTransactionId = () => __classPrivateFieldGet(this, _TransactionController_approvingTransactionIds, "f").delete(transactionId);
         const { networkClientId } = transactionMeta;
+        const ethQuery = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getEthQuery).call(this, { networkClientId });
         const [nonce, releaseNonce] = await (0, nonce_1.getNextNonce)(transactionMeta, (address) => __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").getNonceLock(address, transactionMeta.networkClientId));
         clearNonceLock = releaseNonce;
         // eslint-disable-next-line require-atomic-updates
@@ -1722,18 +1751,15 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
         const shouldUpdatePreTxBalance = transactionMeta.type === types_1.TransactionType.swap;
         if (shouldUpdatePreTxBalance) {
             (0, logger_1.projectLogger)('Determining pre-transaction balance');
-            preTxBalance = (await (0, provider_1.rpcRequest)({
-                messenger: this.messenger,
-                networkClientId,
-                method: 'eth_getBalance',
-                params: [transactionMeta.txParams.from, 'latest'],
-            }));
+            preTxBalance = await (0, controller_utils_1.query)(ethQuery, 'getBalance', [
+                transactionMeta.txParams.from,
+            ]);
         }
         (0, logger_1.projectLogger)('Publishing transaction', transactionMeta.txParams);
         clearNonceLock?.();
         clearNonceLock = undefined;
         let publishHook = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_defaultPublishHook).bind(this, {
-            networkClientId,
+            ethQuery,
             publishHookOverride,
             traceContext,
         });
@@ -1777,18 +1803,11 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
         clearApprovingTransactionId?.();
         clearNonceLock?.();
     }
-}, _TransactionController_publishTransaction = async function _TransactionController_publishTransaction(transactionMeta, { skipSubmitHistory } = {}) {
+}, _TransactionController_publishTransaction = async function _TransactionController_publishTransaction(ethQuery, transactionMeta, { skipSubmitHistory } = {}) {
     try {
-        const { networkClientId, rawTx } = transactionMeta;
-        if (!rawTx) {
-            throw new Error('Missing raw transaction');
-        }
-        const transactionHash = (await (0, provider_1.rpcRequest)({
-            messenger: this.messenger,
-            networkClientId,
-            method: 'eth_sendRawTransaction',
-            params: [rawTx],
-        }));
+        const transactionHash = await (0, controller_utils_1.query)(ethQuery, 'sendRawTransaction', [
+            transactionMeta.rawTx,
+        ]);
         if (skipSubmitHistory !== true) {
             __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateSubmitHistory).call(this, transactionMeta, transactionHash);
         }
@@ -1886,6 +1905,23 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
     }
     const isCompleted = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_isLocalFinalState).call(this, transaction.status);
     return { meta: transaction, isCompleted };
+}, _TransactionController_getChainId = function _TransactionController_getChainId(networkClientId) {
+    return __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").getNetworkClient({ networkClientId })
+        .configuration.chainId;
+}, _TransactionController_getNetworkClientId = function _TransactionController_getNetworkClientId({ chainId, networkClientId, }) {
+    if (networkClientId) {
+        return networkClientId;
+    }
+    return __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").getNetworkClient({
+        chainId,
+    }).id;
+}, _TransactionController_getEthQuery = function _TransactionController_getEthQuery({ chainId, networkClientId, }) {
+    return new eth_query_1.default(__classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getProvider).call(this, { chainId, networkClientId }));
+}, _TransactionController_getProvider = function _TransactionController_getProvider({ chainId, networkClientId, }) {
+    return __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").getNetworkClient({
+        chainId,
+        networkClientId,
+    }).provider;
 }, _TransactionController_onIncomingTransactions = function _TransactionController_onIncomingTransactions(transactions) {
     if (!transactions.length) {
         return;
@@ -1894,10 +1930,7 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
     for (const tx of transactions) {
         const { chainId } = tx;
         try {
-            const networkClientId = (0, provider_1.getNetworkClientId)({
-                messenger: this.messenger,
-                chainId,
-            });
+            const networkClientId = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getNetworkClientId).call(this, { chainId });
             finalTransactions.push({
                 ...tx,
                 networkClientId,
@@ -2033,9 +2066,9 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
     }
     transactionMeta = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getTransactionOrThrow).call(this, transactionId);
     const { networkClientId } = transactionMeta;
+    const ethQuery = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getEthQuery).call(this, { networkClientId });
     await (0, gas_fee_tokens_1.checkGasFeeTokenBeforePublish)({
-        messenger: this.messenger,
-        networkClientId,
+        ethQuery,
         fetchGasFeeTokens: async (tx) => (await __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getGasFeeTokens).call(this, tx)).gasFeeTokens,
         transaction: transactionMeta,
         updateTransaction: (txId, fn) => __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateTransactionInternal).call(this, { transactionId: txId }, fn),
@@ -2113,9 +2146,9 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
         if (type !== types_1.TransactionType.swap) {
             return;
         }
+        const ethQuery = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getEthQuery).call(this, { networkClientId });
         const { updatedTransactionMeta, approvalTransactionMeta } = await (0, swaps_1.updatePostTransactionBalance)(transactionMeta, {
-            messenger: this.messenger,
-            networkClientId,
+            ethQuery,
             getTransaction: __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getTransaction).bind(this),
             updateTransaction: this.updateTransaction.bind(this),
         });
@@ -2138,13 +2171,16 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
         getPendingTransactions: __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getNonceTrackerPendingTransactions).bind(this, chainId),
         getConfirmedTransactions: __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getNonceTrackerTransactions).bind(this, [types_1.TransactionStatus.confirmed], chainId),
     });
-}, _TransactionController_createPendingTransactionTracker = function _TransactionController_createPendingTransactionTracker({ blockTracker, networkClientId, }) {
-    const chainId = (0, provider_1.getChainId)({ messenger: this.messenger, networkClientId });
+}, _TransactionController_createPendingTransactionTracker = function _TransactionController_createPendingTransactionTracker({ provider, blockTracker, chainId, networkClientId, }) {
+    const ethQuery = new eth_query_1.default(provider);
     const pendingTransactionTracker = new PendingTransactionTracker_1.PendingTransactionTracker({
         blockTracker,
+        getChainId: () => chainId,
+        getEthQuery: () => ethQuery,
         getGlobalLock: () => __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").acquireNonceLockForChainIdKey({
             chainId,
         }),
+        getNetworkClientId: () => networkClientId,
         getTransactions: () => this.state.transactions,
         hooks: {
             beforeCheckPendingTransaction: __classPrivateFieldGet(this, _TransactionController_beforeCheckPendingTransaction, "f").bind(this),
@@ -2152,8 +2188,7 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
         isResubmitEnabled: __classPrivateFieldGet(this, _TransactionController_pendingTransactionOptions, "f").isResubmitEnabled,
         isTimeoutEnabled: __classPrivateFieldGet(this, _TransactionController_isTimeoutEnabled, "f"),
         messenger: this.messenger,
-        networkClientId,
-        publishTransaction: (transactionMeta) => __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_publishTransaction).call(this, transactionMeta, {
+        publishTransaction: (_ethQuery, transactionMeta) => __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_publishTransaction).call(this, _ethQuery, transactionMeta, {
             skipSubmitHistory: true,
         }),
     });
@@ -2181,9 +2216,9 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
     ], address, chainId);
     const externalPendingTransactions = __classPrivateFieldGet(this, _TransactionController_getExternalPendingTransactions, "f").call(this, address, chainId);
     return [...standardPendingTransactions, ...externalPendingTransactions];
-}, _TransactionController_publishTransactionForRetry = async function _TransactionController_publishTransactionForRetry(transactionMeta) {
+}, _TransactionController_publishTransactionForRetry = async function _TransactionController_publishTransactionForRetry(ethQuery, transactionMeta) {
     try {
-        return await __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_publishTransaction).call(this, transactionMeta);
+        return await __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_publishTransaction).call(this, ethQuery, transactionMeta);
     }
     catch (error) {
         if (__classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_isTransactionAlreadyConfirmedError).call(this, error)) {
@@ -2251,8 +2286,7 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
         const balanceChangesResult = await __classPrivateFieldGet(this, _TransactionController_trace, "f").call(this, { name: 'Simulate', parentContext: traceContext }, () => (0, balance_changes_1.getBalanceChanges)({
             blockTime,
             chainId,
-            messenger: this.messenger,
-            networkClientId,
+            ethQuery: __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getEthQuery).call(this, { networkClientId }),
             getSimulationConfig: (url, opts) => {
                 return __classPrivateFieldGet(this, _TransactionController_getSimulationConfig, "f").call(this, url, {
                     txMeta: transactionMeta,
@@ -2353,10 +2387,13 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
         submitHistory.unshift(submitHistoryEntry);
     });
 }, _TransactionController_updateGasEstimate = async function _TransactionController_updateGasEstimate(transactionMeta) {
-    const { networkClientId } = transactionMeta;
+    const { chainId, networkClientId } = transactionMeta;
     const isCustomNetwork = __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").getNetworkClient({ networkClientId })
         .configuration.type === network_controller_1.NetworkClientType.Custom;
+    const ethQuery = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getEthQuery).call(this, { networkClientId });
     await (0, gas_1.updateGas)({
+        chainId,
+        ethQuery,
         isCustomNetwork,
         isSimulationEnabled: __classPrivateFieldGet(this, _TransactionController_isSimulationEnabled, "f").call(this),
         getSimulationConfig: __classPrivateFieldGet(this, _TransactionController_getSimulationConfig, "f"),
@@ -2435,15 +2472,14 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
         updateTransaction(txMeta);
     });
     (0, logger_1.projectLogger)('Updated transaction with afterSimulate data', updatedTransactionMeta);
-}, _TransactionController_defaultPublishHook = async function _TransactionController_defaultPublishHook({ networkClientId, publishHookOverride, traceContext, }, transactionMeta, signedTx) {
+}, _TransactionController_defaultPublishHook = async function _TransactionController_defaultPublishHook({ ethQuery, publishHookOverride, traceContext, }, transactionMeta, signedTx) {
     let transactionHash;
     await __classPrivateFieldGet(this, _TransactionController_trace, "f").call(this, { name: 'Publish', parentContext: traceContext }, async () => {
         const publishHook = publishHookOverride ?? __classPrivateFieldGet(this, _TransactionController_publish, "f");
         ({ transactionHash } = await publishHook(transactionMeta, signedTx));
         // eslint-disable-next-line require-atomic-updates
-        transactionHash ?? (transactionHash = await __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_publishTransaction).call(this, {
+        transactionHash ?? (transactionHash = await __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_publishTransaction).call(this, ethQuery, {
             ...transactionMeta,
-            networkClientId,
             rawTx: signedTx,
         }));
     });