@metamask/transaction-controller 63.3.0 → 64.0.0

package/dist/TransactionController.mjs

@@ -9,17 +9,9 @@ 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_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;
-function $importDefault(module) {
-    if (module?.__esModule) {
-        return module.default;
-    }
-    return module;
-}
+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;
 import { BaseController } from "@metamask/base-controller";
-import { query, ApprovalType, ORIGIN_METAMASK, convertHexToDecimal } from "@metamask/controller-utils";
-import $EthQuery from "@metamask/eth-query";
-const EthQuery = $importDefault($EthQuery);
+import { ApprovalType, ORIGIN_METAMASK, convertHexToDecimal } from "@metamask/controller-utils";
 import { NetworkClientType } from "@metamask/network-controller";
 import { NonceTracker } from "@metamask/nonce-tracker";
 import { errorCodes, rpcErrors, providerErrors, JsonRpcError } from "@metamask/rpc-errors";
@@ -59,6 +51,7 @@ import { getGasFeeFlow } from "./utils/gas-flow.mjs";
 import { getTransactionLayer1GasFee, updateTransactionLayer1GasFee } from "./utils/layer1-gas-fee-flow.mjs";
 import { getAndFormatTransactionsForNonceTracker, getNextNonce } from "./utils/nonce.mjs";
 import { prepareTransaction, serializeTransaction } from "./utils/prepare.mjs";
+import { getChainId, getNetworkClientId, rpcRequest } from "./utils/provider.mjs";
 import { getTransactionParamsWithIncreasedGasFee } from "./utils/retry.mjs";
 import { updatePostTransactionBalance, updateSwapsTransaction } from "./utils/swaps.mjs";
 import { determineTransactionType } from "./utils/transaction-type.mjs";
@@ -292,10 +285,8 @@ export class TransactionController extends 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({
-            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"),
@@ -307,7 +298,7 @@ export class TransactionController extends 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({
-            getProvider: (networkClientId) => __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getProvider).call(this, { networkClientId }),
+            messenger: this.messenger,
             getState: () => this.state.methodData,
         }), "f");
         __classPrivateFieldGet(this, _TransactionController_methodDataHelper, "f").hub.on('update', ({ fourBytePrefix, methodData }) => {
@@ -369,15 +360,11 @@ export class TransactionController extends BaseController {
         return await 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),
@@ -385,7 +372,7 @@ export class TransactionController extends BaseController {
             messenger: this.messenger,
             publishBatchHook: __classPrivateFieldGet(this, _TransactionController_publishBatchHook, "f"),
             publicKeyEIP7702: __classPrivateFieldGet(this, _TransactionController_publicKeyEIP7702, "f"),
-            publishTransaction: (ethQuery, transactionMeta) => __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_publishTransaction).call(this, ethQuery, transactionMeta),
+            publishTransaction: (transactionMeta) => __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_publishTransaction).call(this, transactionMeta),
             request,
             signTransaction: __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_signTransaction).bind(this),
             update: this.update.bind(this),
@@ -401,7 +388,6 @@ export class TransactionController extends BaseController {
     async isAtomicBatchSupported(request) {
         return isAtomicBatchSupported({
             ...request,
-            getEthQuery: (chainId) => __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getEthQuery).call(this, { chainId }),
             messenger: this.messenger,
             publicKeyEIP7702: __classPrivateFieldGet(this, _TransactionController_publicKeyEIP7702, "f"),
         });
@@ -417,16 +403,13 @@ export class TransactionController extends BaseController {
      */
     async addTransaction(txParams, options) {
         log('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 = normalizeTransactionParams(txParams);
         if (!__classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").has(networkClientId)) {
             throw new Error(`Network client not found - ${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 chainId = getChainId({ messenger: this.messenger, networkClientId });
         const permittedAddresses = origin === undefined
             ? undefined
             : await __classPrivateFieldGet(this, _TransactionController_getPermittedAccounts, "f")?.call(this, origin);
@@ -440,7 +423,7 @@ export class TransactionController extends BaseController {
             txParams,
             type,
         });
-        const delegationAddressPromise = getDelegationAddress(txParams.from, ethQuery).catch(() => undefined);
+        const delegationAddressPromise = getDelegationAddress(txParams.from, this.messenger, networkClientId).catch(() => undefined);
         const isEIP1559Compatible = await __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getEIP1559Compatibility).call(this, networkClientId);
         validateTxParams(txParams, isEIP1559Compatible, chainId);
         if (!txParams.type) {
@@ -453,7 +436,17 @@ export class TransactionController extends BaseController {
             throw new JsonRpcError(ErrorCode.DuplicateBundleId, 'Batch ID already exists');
         }
         const dappSuggestedGasFees = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_generateDappSuggestedGasFees).call(this, txParams, origin);
-        const transactionType = type ?? (await determineTransactionType(txParams, ethQuery)).type;
+        const transactionType = type ??
+            (await determineTransactionType(txParams, {
+                messenger: this.messenger,
+                networkClientId,
+            })).type;
+        /**
+         * Original behavior was that this was set to 'true' whenever a gasFeeToken was passed.
+         * 'excludeNativeTokenForFee' optionally overrides this behavior to prevent native token from
+         * being used when another gasFeeToken is set.
+         */
+        const isGasFeeTokenIgnoredIfBalance = Boolean(gasFeeToken) && !excludeNativeTokenForFee;
         let addedTransactionMeta = {
             actionId,
             assetsFiatValues,
@@ -463,9 +456,13 @@ export class TransactionController extends BaseController {
             deviceConfirmedOn,
             disableGasBuffer,
             id: random(),
-            isGasFeeTokenIgnoredIfBalance: Boolean(gasFeeToken),
+            isGasFeeTokenIgnoredIfBalance,
             isGasFeeIncluded,
             isGasFeeSponsored,
+            // To avoid the property to be set as undefined.
+            ...(excludeNativeTokenForFee === undefined
+                ? {}
+                : { excludeNativeTokenForFee }),
             isFirstTimeInteraction: undefined,
             isStateOnly,
             nestedTransactions,
@@ -657,16 +654,12 @@ export class TransactionController extends 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 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 };
@@ -681,16 +674,15 @@ export class TransactionController extends 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 estimateGasBatch({
-            chainId,
-            ethQuery,
             from,
             getSimulationConfig: __classPrivateFieldGet(this, _TransactionController_getSimulationConfig, "f"),
             isAtomicBatchSupported: this.isAtomicBatchSupported.bind(this),
             messenger: this.messenger,
+            networkClientId: getNetworkClientId({
+                messenger: this.messenger,
+                chainId,
+            }),
             transactions,
         });
     }
@@ -703,15 +695,11 @@ export class TransactionController extends 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 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 = addGasBuffer(estimatedGas, blockGasLimit, multiplier);
@@ -991,10 +979,11 @@ export class TransactionController extends BaseController {
         editableParams.txParams = pickBy(editableParams.txParams);
         const updatedTransaction = merge({}, transactionMeta, editableParams);
         const { networkClientId } = transactionMeta;
-        const provider = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getProvider).call(this, { networkClientId });
-        const ethQuery = new EthQuery(provider);
         if (updateType !== false) {
-            const { type } = await determineTransactionType(updatedTransaction.txParams, ethQuery);
+            const { type } = await determineTransactionType(updatedTransaction.txParams, {
+                messenger: this.messenger,
+                networkClientId,
+            });
             updatedTransaction.type = type;
         }
         if (containerTypes) {
@@ -1003,7 +992,6 @@ export class TransactionController extends BaseController {
         await updateTransactionLayer1GasFee({
             layer1GasFeeFlows: __classPrivateFieldGet(this, _TransactionController_layer1GasFeeFlows, "f"),
             messenger: this.messenger,
-            provider,
             transactionMeta: updatedTransaction,
         });
         this.updateTransaction(updatedTransaction, `Update Editable Params for ${txId}`);
@@ -1045,7 +1033,10 @@ export class TransactionController extends BaseController {
         }
         const initialTx = listOfTxParams[0];
         const { chainId } = initialTx;
-        const networkClientId = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getNetworkClientId).call(this, { chainId });
+        const networkClientId = getNetworkClientId({
+            messenger: this.messenger,
+            chainId,
+        });
         const initialTxAsEthTx = prepareTransaction(chainId, initialTx);
         const initialTxAsSerializedHex = serializeTransaction(initialTxAsEthTx);
         if (__classPrivateFieldGet(this, _TransactionController_approvingTransactionIds, "f").has(initialTxAsSerializedHex)) {
@@ -1224,7 +1215,7 @@ export class TransactionController extends BaseController {
      * @returns A promise that resolves to the estimated gas fee response.
      */
     async estimateGasFee({ transactionParams, chainId, networkClientId: requestNetworkClientId, }) {
-        const { id: networkClientId, provider } = __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").getNetworkClient({
+        const { id: networkClientId } = __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").getNetworkClient({
             chainId,
             networkClientId: requestNetworkClientId,
         });
@@ -1235,12 +1226,10 @@ export class TransactionController extends BaseController {
         };
         // Guaranteed as the default gas fee flow matches all transactions.
         const gasFeeFlow = getGasFeeFlow(transactionMeta, __classPrivateFieldGet(this, _TransactionController_gasFeeFlows, "f"), this.messenger);
-        const ethQuery = new EthQuery(provider);
         const gasFeeControllerData = await __classPrivateFieldGet(this, _TransactionController_getGasFeeEstimates, "f").call(this, {
             networkClientId,
         });
         return gasFeeFlow.getGasFees({
-            ethQuery,
             gasFeeControllerData,
             messenger: this.messenger,
             transactionMeta,
@@ -1256,17 +1245,18 @@ export class TransactionController extends BaseController {
      * @returns The layer 1 gas fee.
      */
     async getLayer1GasFee({ transactionParams, chainId, networkClientId, }) {
-        const provider = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getProvider).call(this, {
+        const resolvedNetworkClientId = getNetworkClientId({
+            messenger: this.messenger,
             chainId,
             networkClientId,
         });
         return await getTransactionLayer1GasFee({
             layer1GasFeeFlows: __classPrivateFieldGet(this, _TransactionController_layer1GasFeeFlows, "f"),
             messenger: this.messenger,
-            provider,
             transactionMeta: {
                 txParams: transactionParams,
                 chainId,
+                networkClientId: resolvedNetworkClientId,
             },
         });
     }
@@ -1443,8 +1433,11 @@ export class TransactionController extends BaseController {
      */
     async getGasFeeTokens(request) {
         const { chainId, data, from, to, value } = request;
-        const ethQuery = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getEthQuery).call(this, { chainId });
-        const delegationAddress = await getDelegationAddress(from, ethQuery);
+        const networkClientId = getNetworkClientId({
+            messenger: this.messenger,
+            chainId,
+        });
+        const delegationAddress = await getDelegationAddress(from, this.messenger, networkClientId);
         const transaction = {
             chainId,
             delegationAddress,
@@ -1492,8 +1485,6 @@ _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,
@@ -1506,7 +1497,7 @@ _TransactionController_afterAdd = new WeakMap(), _TransactionController_afterSig
         txParams: newTxParams,
         type: transactionType,
     };
-    const hash = await __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_publishTransactionForRetry).call(this, ethQuery, {
+    const hash = await __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_publishTransactionForRetry).call(this, {
         ...newTransactionMeta,
         origin: label,
     });
@@ -1552,15 +1543,11 @@ _TransactionController_afterAdd = new WeakMap(), _TransactionController_afterSig
 }, _TransactionController_updateGasProperties = async function _TransactionController_updateGasProperties(transactionMeta, { traceContext } = {}) {
     const isEIP1559Compatible = transactionMeta.txParams.type !== 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 updateGasFees({
         eip1559: isEIP1559Compatible,
-        ethQuery,
         gasFeeFlows: __classPrivateFieldGet(this, _TransactionController_gasFeeFlows, "f"),
         getGasFeeEstimates: __classPrivateFieldGet(this, _TransactionController_getGasFeeEstimates, "f"),
         getSavedGasFees: __classPrivateFieldGet(this, _TransactionController_getSavedGasFees, "f").bind(this),
@@ -1570,7 +1557,6 @@ _TransactionController_afterAdd = new WeakMap(), _TransactionController_afterSig
     await __classPrivateFieldGet(this, _TransactionController_trace, "f").call(this, { name: 'Update Layer 1 Gas Fees', parentContext: traceContext }, async () => await updateTransactionLayer1GasFee({
         layer1GasFeeFlows: __classPrivateFieldGet(this, _TransactionController_layer1GasFeeFlows, "f"),
         messenger: this.messenger,
-        provider,
         transactionMeta,
     }));
 }, _TransactionController_onBootCleanup = function _TransactionController_onBootCleanup() {
@@ -1711,7 +1697,6 @@ 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 getNextNonce(transactionMeta, (address) => __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").getNonceLock(address, transactionMeta.networkClientId));
         clearNonceLock = releaseNonce;
         // eslint-disable-next-line require-atomic-updates
@@ -1744,15 +1729,18 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
         const shouldUpdatePreTxBalance = transactionMeta.type === TransactionType.swap;
         if (shouldUpdatePreTxBalance) {
             log('Determining pre-transaction balance');
-            preTxBalance = await query(ethQuery, 'getBalance', [
-                transactionMeta.txParams.from,
-            ]);
+            preTxBalance = (await rpcRequest({
+                messenger: this.messenger,
+                networkClientId,
+                method: 'eth_getBalance',
+                params: [transactionMeta.txParams.from, 'latest'],
+            }));
         }
         log('Publishing transaction', transactionMeta.txParams);
         clearNonceLock?.();
         clearNonceLock = undefined;
         let publishHook = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_defaultPublishHook).bind(this, {
-            ethQuery,
+            networkClientId,
             publishHookOverride,
             traceContext,
         });
@@ -1796,11 +1784,18 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
         clearApprovingTransactionId?.();
         clearNonceLock?.();
     }
-}, _TransactionController_publishTransaction = async function _TransactionController_publishTransaction(ethQuery, transactionMeta, { skipSubmitHistory } = {}) {
+}, _TransactionController_publishTransaction = async function _TransactionController_publishTransaction(transactionMeta, { skipSubmitHistory } = {}) {
     try {
-        const transactionHash = await query(ethQuery, 'sendRawTransaction', [
-            transactionMeta.rawTx,
-        ]);
+        const { networkClientId, rawTx } = transactionMeta;
+        if (!rawTx) {
+            throw new Error('Missing raw transaction');
+        }
+        const transactionHash = (await rpcRequest({
+            messenger: this.messenger,
+            networkClientId,
+            method: 'eth_sendRawTransaction',
+            params: [rawTx],
+        }));
         if (skipSubmitHistory !== true) {
             __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateSubmitHistory).call(this, transactionMeta, transactionHash);
         }
@@ -1898,23 +1893,6 @@ 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 EthQuery(__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;
@@ -1923,7 +1901,10 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
     for (const tx of transactions) {
         const { chainId } = tx;
         try {
-            const networkClientId = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getNetworkClientId).call(this, { chainId });
+            const networkClientId = getNetworkClientId({
+                messenger: this.messenger,
+                chainId,
+            });
             finalTransactions.push({
                 ...tx,
                 networkClientId,
@@ -2059,9 +2040,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 checkGasFeeTokenBeforePublish({
-        ethQuery,
+        messenger: this.messenger,
+        networkClientId,
         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),
@@ -2139,9 +2120,9 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
         if (type !== TransactionType.swap) {
             return;
         }
-        const ethQuery = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getEthQuery).call(this, { networkClientId });
         const { updatedTransactionMeta, approvalTransactionMeta } = await updatePostTransactionBalance(transactionMeta, {
-            ethQuery,
+            messenger: this.messenger,
+            networkClientId,
             getTransaction: __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getTransaction).bind(this),
             updateTransaction: this.updateTransaction.bind(this),
         });
@@ -2164,16 +2145,13 @@ 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, [TransactionStatus.confirmed], chainId),
     });
-}, _TransactionController_createPendingTransactionTracker = function _TransactionController_createPendingTransactionTracker({ provider, blockTracker, chainId, networkClientId, }) {
-    const ethQuery = new EthQuery(provider);
+}, _TransactionController_createPendingTransactionTracker = function _TransactionController_createPendingTransactionTracker({ blockTracker, networkClientId, }) {
+    const chainId = getChainId({ messenger: this.messenger, networkClientId });
     const pendingTransactionTracker = new 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),
@@ -2181,7 +2159,8 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
         isResubmitEnabled: __classPrivateFieldGet(this, _TransactionController_pendingTransactionOptions, "f").isResubmitEnabled,
         isTimeoutEnabled: __classPrivateFieldGet(this, _TransactionController_isTimeoutEnabled, "f"),
         messenger: this.messenger,
-        publishTransaction: (_ethQuery, transactionMeta) => __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_publishTransaction).call(this, _ethQuery, transactionMeta, {
+        networkClientId,
+        publishTransaction: (transactionMeta) => __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_publishTransaction).call(this, transactionMeta, {
             skipSubmitHistory: true,
         }),
     });
@@ -2209,9 +2188,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(ethQuery, transactionMeta) {
+}, _TransactionController_publishTransactionForRetry = async function _TransactionController_publishTransactionForRetry(transactionMeta) {
     try {
-        return await __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_publishTransaction).call(this, ethQuery, transactionMeta);
+        return await __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_publishTransaction).call(this, transactionMeta);
     }
     catch (error) {
         if (__classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_isTransactionAlreadyConfirmedError).call(this, error)) {
@@ -2279,7 +2258,8 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
         const balanceChangesResult = await __classPrivateFieldGet(this, _TransactionController_trace, "f").call(this, { name: 'Simulate', parentContext: traceContext }, () => getBalanceChanges({
             blockTime,
             chainId,
-            ethQuery: __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getEthQuery).call(this, { networkClientId }),
+            messenger: this.messenger,
+            networkClientId,
             getSimulationConfig: (url, opts) => {
                 return __classPrivateFieldGet(this, _TransactionController_getSimulationConfig, "f").call(this, url, {
                     txMeta: transactionMeta,
@@ -2380,13 +2360,10 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
         submitHistory.unshift(submitHistoryEntry);
     });
 }, _TransactionController_updateGasEstimate = async function _TransactionController_updateGasEstimate(transactionMeta) {
-    const { chainId, networkClientId } = transactionMeta;
+    const { networkClientId } = transactionMeta;
     const isCustomNetwork = __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").getNetworkClient({ networkClientId })
         .configuration.type === NetworkClientType.Custom;
-    const ethQuery = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getEthQuery).call(this, { networkClientId });
     await updateGas({
-        chainId,
-        ethQuery,
         isCustomNetwork,
         isSimulationEnabled: __classPrivateFieldGet(this, _TransactionController_isSimulationEnabled, "f").call(this),
         getSimulationConfig: __classPrivateFieldGet(this, _TransactionController_getSimulationConfig, "f"),
@@ -2465,14 +2442,15 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
         updateTransaction(txMeta);
     });
     log('Updated transaction with afterSimulate data', updatedTransactionMeta);
-}, _TransactionController_defaultPublishHook = async function _TransactionController_defaultPublishHook({ ethQuery, publishHookOverride, traceContext, }, transactionMeta, signedTx) {
+}, _TransactionController_defaultPublishHook = async function _TransactionController_defaultPublishHook({ networkClientId, 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, ethQuery, {
+        transactionHash ?? (transactionHash = await __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_publishTransaction).call(this, {
             ...transactionMeta,
+            networkClientId,
             rawTx: signedTx,
         }));
     });