@metamask-previews/transaction-controller 65.4.0-preview-3b99fcf40 → 65.4.0-preview-838d6b234

package/CHANGELOG.md

@@ -9,9 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
-- **BREAKING:** Replace implicit `origin === 'metamask'` trust checks with an explicit `isInternal` flag on `AddTransactionOptions`, `TransactionBatchRequest`, `TransactionMeta`, and `TransactionBatchMeta`; internal callers must now pass `isInternal: true` ([#8633](https://github.com/MetaMask/core/pull/8633))
 - Bump `@metamask/core-backend` from `^6.2.2` to `^6.3.0` ([#8813](https://github.com/MetaMask/core/pull/8813))
-- Bump `@metamask/gas-fee-controller` from `^26.2.1` to `^26.2.2` ([#8834](https://github.com/MetaMask/core/pull/8834))
 
 ### Fixed
 

package/dist/TransactionController.cjs

@@ -412,7 +412,7 @@ 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, excludeNativeTokenForFee, isGasFeeIncluded, isGasFeeSponsored, isInternal = false, 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)) {
@@ -427,7 +427,6 @@ class TransactionController extends base_controller_1.BaseController {
             data: txParams.data,
             from: txParams.from,
             internalAccounts,
-            isInternal,
             origin,
             permittedAddresses,
             txParams,
@@ -442,10 +441,10 @@ class TransactionController extends base_controller_1.BaseController {
         }
         const isDuplicateBatchId = batchId?.length &&
             this.state.transactions.some((tx) => tx.batchId?.toLowerCase() === batchId?.toLowerCase());
-        if (isDuplicateBatchId && !isInternal) {
+        if (isDuplicateBatchId && origin && origin !== controller_utils_1.ORIGIN_METAMASK) {
             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, isInternal);
+        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,
@@ -474,7 +473,6 @@ class TransactionController extends base_controller_1.BaseController {
                 ? {}
                 : { excludeNativeTokenForFee }),
             isFirstTimeInteraction: undefined,
-            isInternal,
             isStateOnly,
             nestedTransactions,
             networkClientId,
@@ -1949,8 +1947,8 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
         (0, logger_1.projectLogger)('Added incoming transactions to state', finalTransactions.length, finalTransactions);
     });
     this.messenger.publish(`${controllerName}:incomingTransactionsReceived`, finalTransactions);
-}, _TransactionController_generateDappSuggestedGasFees = function _TransactionController_generateDappSuggestedGasFees(txParams, origin, isInternal) {
-    if (isInternal || !origin) {
+}, _TransactionController_generateDappSuggestedGasFees = function _TransactionController_generateDappSuggestedGasFees(txParams, origin) {
+    if (!origin || origin === controller_utils_1.ORIGIN_METAMASK) {
         return undefined;
     }
     const { gasPrice, maxFeePerGas, maxPriorityFeePerGas, gas } = txParams;