@metamask-previews/transaction-controller 62.6.0-preview-565dfca2 → 62.7.0-preview-c208c1a

package/CHANGELOG.md

@@ -7,9 +7,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+
+- Include pending authorizations in nonce calculation ([#7446](https://github.com/MetaMask/core/pull/7446))
+
+## [62.7.0]
+
 ### Added
 
-- Add intent based transaction support ([#6547](https://github.com/MetaMask/core/pull/6547))
+- Adding a new transaction meta property `requestId`. It is supported for both simple and batched transactions ([#7415](https://github.com/MetaMask/core/pull/7415))
 
 ## [62.6.0]
 
@@ -21,6 +27,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - Add optional `isTimeoutEnabled` callback to disable for specific transactions.
   - Ignores transactions with future nonce.
   - Threshold determined by feature flag.
+- Adding a new transaction meta property `requestId`. It is supported for both simple and batched transactions ([#7415](https://github.com/MetaMask/core/pull/7415))
 
 ### Changed
 
@@ -2032,7 +2039,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
     All changes listed after this point were applied to this package following the monorepo conversion.
 
-[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/transaction-controller@62.6.0...HEAD
+[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/transaction-controller@62.7.0...HEAD
+[62.7.0]: https://github.com/MetaMask/core/compare/@metamask/transaction-controller@62.6.0...@metamask/transaction-controller@62.7.0
 [62.6.0]: https://github.com/MetaMask/core/compare/@metamask/transaction-controller@62.5.0...@metamask/transaction-controller@62.6.0
 [62.5.0]: https://github.com/MetaMask/core/compare/@metamask/transaction-controller@62.4.0...@metamask/transaction-controller@62.5.0
 [62.4.0]: https://github.com/MetaMask/core/compare/@metamask/transaction-controller@62.3.1...@metamask/transaction-controller@62.4.0

package/dist/TransactionController.cjs

@@ -391,7 +391,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, isGasFeeIncluded, isGasFeeSponsored, method, nestedTransactions, networkClientId, origin, publishHook, requireApproval, securityAlertResponse, sendFlowHistory, skipInitialGasEstimate, swaps = {}, traceContext, type, } = options;
+        const { actionId, assetsFiatValues, batchId, deviceConfirmedOn, disableGasBuffer, gasFeeToken, isGasFeeIncluded, isGasFeeSponsored, method, nestedTransactions, networkClientId, origin, publishHook, requestId, requireApproval, securityAlertResponse, sendFlowHistory, 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)) {
@@ -449,6 +449,7 @@ class TransactionController extends base_controller_1.BaseController {
                 nestedTransactions,
                 networkClientId,
                 origin,
+                requestId,
                 securityAlertResponse,
                 selectedGasFeeToken: gasFeeToken,
                 status: types_1.TransactionStatus.unapproved,
@@ -466,26 +467,12 @@ class TransactionController extends base_controller_1.BaseController {
             addedTransactionMeta.txParamsOriginal = (0, lodash_1.cloneDeep)(addedTransactionMeta.txParams);
             updateTransaction(addedTransactionMeta);
         }
+        // eslint-disable-next-line no-negated-condition
         if (!skipInitialGasEstimate) {
             await __classPrivateFieldGet(this, _TransactionController_trace, "f").call(this, { name: 'Estimate Gas Properties', parentContext: traceContext }, (context) => __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateGasProperties).call(this, addedTransactionMeta, {
                 traceContext: context,
             }));
         }
-        else if (isEIP1559Compatible &&
-            addedTransactionMeta.txParams.gasPrice &&
-            !addedTransactionMeta.txParams.maxFeePerGas) {
-            // Convert legacy gasPrice to EIP-1559 fees for intent transactions on EIP-1559 networks
-            addedTransactionMeta.txParams.maxFeePerGas =
-                addedTransactionMeta.txParams.gasPrice;
-            addedTransactionMeta.txParams.maxPriorityFeePerGas =
-                addedTransactionMeta.txParams.gasPrice;
-            addedTransactionMeta.txParams.type = types_1.TransactionEnvelopeType.feeMarket;
-            delete addedTransactionMeta.txParams.gasPrice; // Remove legacy gas price
-        }
-        else if (!isEIP1559Compatible && addedTransactionMeta.txParams.gasPrice) {
-            // Ensure legacy type for non-EIP-1559 networks
-            addedTransactionMeta.txParams.type = types_1.TransactionEnvelopeType.legacy;
-        }
         else {
             const newTransactionMeta = (0, lodash_1.cloneDeep)(addedTransactionMeta);
             __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateGasProperties).call(this, newTransactionMeta)
@@ -1600,31 +1587,6 @@ _TransactionController_afterAdd = new WeakMap(), _TransactionController_afterSig
                     this.updateTransaction(updatedTransaction, 'TransactionController#processApproval - Updated with approval data');
                 }
             }
-            // For intent-based transactions (e.g., CoW intents) that are not meant to be
-            // published on-chain by the TransactionController, skip the approve/publish flow.
-            // These are tracked externally and should not be signed or sent.
-            const isIntentTransaction = Boolean(
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getTransaction).call(this, transactionId)?.swapMetaData
-                ?.isIntentTx === true);
-            if (requireApproval === false && isIntentTransaction) {
-                const submittedTxMeta = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateTransactionInternal).call(this, {
-                    transactionId,
-                    note: 'TransactionController#processApproval - Intent transaction auto-submitted',
-                    skipValidation: true,
-                }, (draftTxMeta) => {
-                    draftTxMeta.status = types_1.TransactionStatus.submitted;
-                    draftTxMeta.submittedTime = new Date().getTime();
-                });
-                this.messenger.publish(`${controllerName}:transactionSubmitted`, {
-                    transactionMeta: submittedTxMeta,
-                });
-                this.messenger.publish(`${controllerName}:transactionFinished`, submittedTxMeta);
-                __classPrivateFieldGet(this, _TransactionController_internalEvents, "f").emit(`${transactionId}:finished`, submittedTxMeta);
-                // Short-circuit normal flow; result callbacks will be handled by the
-                // finished promise below.
-                return ApprovalState.Approved;
-            }
             const { isCompleted: isTxCompleted } = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_isTransactionCompleted).call(this, transactionId);
             if (!isTxCompleted) {
                 const approvalResult = await __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_approveTransaction).call(this, transactionId, traceContext, publishHook);