@metamask-previews/transaction-controller 65.0.0-preview-156c8ccf7 → 65.0.0-preview-7cef09c77

package/CHANGELOG.md

@@ -7,21 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-### Added
-
-- Add optional `isInternal` flag to `addTransaction` and `addTransactionBatch` to explicitly mark a request as originating from trusted internal MetaMask code ([#8633](https://github.com/MetaMask/core/pull/8633))
-  - When `true`, the controller skips validations that only apply to external requests: permitted-address check, EIP-7702 authorization rejection, calls-with-data to internal accounts, duplicate batch ID, dapp-suggested gas fee handling, and batch size limit
-  - The flag is persisted on `TransactionMeta` and `TransactionBatchMeta` so downstream logic (e.g. `userFeeLevel` selection) does not need to re-derive trust from the origin
-- Add `isInternal` field to `TransactionMeta`, `TransactionBatchMeta`, `AddTransactionOptions`, and `TransactionBatchRequest` ([#8633](https://github.com/MetaMask/core/pull/8633))
-
 ### Changed
 
-- **BREAKING:** Internal-only validation behavior is now gated by the explicit `isInternal` flag rather than `origin === ORIGIN_METAMASK` ([#8633](https://github.com/MetaMask/core/pull/8633))
-  - Setting `origin` to `ORIGIN_METAMASK` (or omitting `origin`) no longer skips external-request validations
-  - Callers that previously relied on `origin: ORIGIN_METAMASK` to suppress these validations must pass `isInternal: true` explicitly
-  - `validateTransactionOrigin` and `validateBatchRequest` now accept an `isInternal` option
-- `userFeeLevel` selection in `gas-fees.ts` now keys off `txMeta.isInternal` instead of `txMeta.origin === ORIGIN_METAMASK` ([#8633](https://github.com/MetaMask/core/pull/8633))
 - Bump `@metamask/messenger` from `^1.1.1` to `^1.2.0` ([#8632](https://github.com/MetaMask/core/pull/8632))
+- Bump `@metamask/network-controller` from `^30.0.1` to `^30.1.0` ([#8636](https://github.com/MetaMask/core/pull/8636))
 
 ## [65.0.0]
 

package/dist/TransactionController.cjs

@@ -407,7 +407,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)) {
@@ -422,7 +422,6 @@ class TransactionController extends base_controller_1.BaseController {
             data: txParams.data,
             from: txParams.from,
             internalAccounts,
-            isInternal,
             origin,
             permittedAddresses,
             txParams,
@@ -437,10 +436,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,
@@ -469,7 +468,6 @@ class TransactionController extends base_controller_1.BaseController {
                 ? {}
                 : { excludeNativeTokenForFee }),
             isFirstTimeInteraction: undefined,
-            isInternal,
             isStateOnly,
             nestedTransactions,
             networkClientId,
@@ -1937,8 +1935,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;