@metamask-previews/transaction-controller 62.0.0-preview-4ed214fa → 62.0.0-preview-e3eb8eca

package/CHANGELOG.md

@@ -7,12 +7,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-### Changed
-
-- Performance optimisations in `addTransaction` and `addTransactionBatch` methods ([#7205](https://github.com/MetaMask/core/pull/7205))
-  - Add `skipInitialGasEstimate` option to `addTransaction` and `addTransactionBatch` methods.
-  - Add `disableUpgrade` option to `addTransactionBatch` method.
-
 ## [62.0.0]
 
 ### Added

package/dist/TransactionController.cjs

@@ -378,7 +378,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, requireApproval, securityAlertResponse, sendFlowHistory, swaps = {}, traceContext, type, } = options;
         txParams = (0, utils_2.normalizeTransactionParams)(txParams);
         if (!__classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").has(networkClientId)) {
             throw new Error(`Network client not found - ${networkClientId}`);
@@ -414,6 +414,7 @@ class TransactionController extends base_controller_1.BaseController {
         }
         const dappSuggestedGasFees = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_generateDappSuggestedGasFees).call(this, txParams, origin);
         const transactionType = type ?? (await (0, transaction_type_1.determineTransactionType)(txParams, ethQuery)).type;
+        const delegationAddress = await delegationAddressPromise;
         const existingTransactionMeta = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getTransactionWithActionId).call(this, actionId);
         // If a request to add a transaction with the same actionId is submitted again, a new transaction will not be created for it.
         let addedTransactionMeta = existingTransactionMeta
@@ -425,6 +426,7 @@ class TransactionController extends base_controller_1.BaseController {
                 batchId,
                 chainId,
                 dappSuggestedGasFees,
+                delegationAddress,
                 deviceConfirmedOn,
                 disableGasBuffer,
                 id: (0, uuid_1.v1)(),
@@ -452,32 +454,9 @@ class TransactionController extends base_controller_1.BaseController {
             addedTransactionMeta.txParamsOriginal = (0, lodash_1.cloneDeep)(addedTransactionMeta.txParams);
             updateTransaction(addedTransactionMeta);
         }
-        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 {
-            const newTransactionMeta = (0, lodash_1.cloneDeep)(addedTransactionMeta);
-            __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateGasProperties).call(this, newTransactionMeta)
-                .then(() => {
-                __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateTransactionInternal).call(this, {
-                    transactionId: newTransactionMeta.id,
-                    skipHistory: true,
-                    skipResimulateCheck: true,
-                    skipValidation: true,
-                }, (tx) => {
-                    tx.txParams.gas = newTransactionMeta.txParams.gas;
-                    tx.txParams.gasPrice = newTransactionMeta.txParams.gasPrice;
-                    tx.txParams.maxFeePerGas =
-                        newTransactionMeta.txParams.maxFeePerGas;
-                    tx.txParams.maxPriorityFeePerGas =
-                        newTransactionMeta.txParams.maxPriorityFeePerGas;
-                });
-                return undefined;
-            })
-                .catch(lodash_1.noop);
-        }
+        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,
+        }));
         // Checks if a transaction already exists with a given actionId
         if (!existingTransactionMeta) {
             // Set security provider response
@@ -499,19 +478,6 @@ class TransactionController extends base_controller_1.BaseController {
                 messenger: this.messenger,
             });
             __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_addMetadata).call(this, addedTransactionMeta);
-            delegationAddressPromise
-                .then((delegationAddress) => {
-                __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateTransactionInternal).call(this, {
-                    transactionId: addedTransactionMeta.id,
-                    skipHistory: true,
-                    skipResimulateCheck: true,
-                    skipValidation: true,
-                }, (tx) => {
-                    tx.delegationAddress = delegationAddress;
-                });
-                return undefined;
-            })
-                .catch(lodash_1.noop);
             if (requireApproval !== false) {
                 __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateSimulationData).call(this, addedTransactionMeta, {
                     traceContext,