@metamask-previews/transaction-controller 47.0.0-preview-4fbfa93f → 48.0.0-preview-22387993

package/CHANGELOG.md

@@ -9,6 +9,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- Prevent external transactions to internal accounts if `data` included ([#5418](https://github.com/MetaMask/core/pull/5418))
+
+## [48.0.0]
+
+### Changed
+
+- **BREAKING:** Bump `@metamask/accounts-controller` peer dependency to `^26.0.0` ([#5439](https://github.com/MetaMask/core/pull/5439))
 - **BREAKING:** Bump `@ethereumjs/util` from `^8.1.0` to `^9.1.0` ([#5347](https://github.com/MetaMask/core/pull/5347))
 
 ## [47.0.0]
@@ -1323,7 +1330,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@47.0.0...HEAD
+[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/transaction-controller@48.0.0...HEAD
+[48.0.0]: https://github.com/MetaMask/core/compare/@metamask/transaction-controller@47.0.0...@metamask/transaction-controller@48.0.0
 [47.0.0]: https://github.com/MetaMask/core/compare/@metamask/transaction-controller@46.0.0...@metamask/transaction-controller@47.0.0
 [46.0.0]: https://github.com/MetaMask/core/compare/@metamask/transaction-controller@45.1.0...@metamask/transaction-controller@46.0.0
 [45.1.0]: https://github.com/MetaMask/core/compare/@metamask/transaction-controller@45.0.0...@metamask/transaction-controller@45.1.0

package/dist/TransactionController.cjs

@@ -1,6 +1,4 @@
 "use strict";
-/* istanbul ignore file */
-// FIXME  - remove above ignore
 var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
     if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
     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");
@@ -213,9 +211,10 @@ class TransactionController extends base_controller_1.BaseController {
         __classPrivateFieldSet(this, _TransactionController_trace, trace ?? ((_request, fn) => fn?.()), "f");
         this.afterSign = hooks?.afterSign ?? (() => true);
         this.beforeCheckPendingTransaction =
-            /* istanbul ignore next */
-            hooks?.beforeCheckPendingTransaction ?? (() => Promise.resolve(true));
-        this.beforePublish = hooks?.beforePublish ?? (() => Promise.resolve(true));
+            hooks?.beforeCheckPendingTransaction ??
+                /* istanbul ignore next */
+                (() => true);
+        this.beforePublish = hooks?.beforePublish ?? (() => true);
         this.getAdditionalSignArguments =
             hooks?.getAdditionalSignArguments ?? (() => []);
         this.publish =
@@ -291,10 +290,6 @@ class TransactionController extends base_controller_1.BaseController {
         });
         this.onBootCleanup();
         __classPrivateFieldGet(this, _TransactionController_checkForPendingTransactionAndStartPolling, "f").call(this);
-        this.registerMessageHandlers();
-    }
-    registerMessageHandlers() {
-        this.messagingSystem.registerActionHandler(`${controllerName}:updateCustodialTransaction`, this.updateCustodialTransaction.bind(this));
     }
     /**
      * Stops polling and removes listeners to prepare the controller for garbage collection.
@@ -377,6 +372,7 @@ class TransactionController extends base_controller_1.BaseController {
         const selectedAddress = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getSelectedAccount).call(this).address;
         const internalAccounts = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getInternalAccounts).call(this);
         await (0, validation_1.validateTransactionOrigin)({
+            data: txParams.data,
             from: txParams.from,
             internalAccounts,
             origin,
@@ -657,7 +653,6 @@ class TransactionController extends base_controller_1.BaseController {
             this.onTransactionStatusChange(updatedTransactionMeta);
             // Intentional given potential duration of process.
             this.updatePostBalance(updatedTransactionMeta).catch((error) => {
-                /* istanbul ignore next */
                 (0, logger_1.projectLogger)('Error while updating post balance', error);
                 throw error;
             });
@@ -906,18 +901,15 @@ class TransactionController extends base_controller_1.BaseController {
      * @param options.errorMessage - The error message to be assigned in case transaction status update to failed.
      * @param options.hash - The new hash value to be assigned.
      * @param options.status - The new status value to be assigned.
-     * @param options.gasLimit - The new gas limit value to be assigned
-     * @param options.gasPrice - The new gas price value to be assigned
-     * @param options.maxFeePerGas - The new max fee per gas value to be assigned
-     * @param options.maxPriorityFeePerGas - The new max priority fee per gas value to be assigned
-     * @param options.nonce - The new nonce value to be assigned
-     * @param options.type - The tranasction type (hardfork) to be assigned
      */
-    updateCustodialTransaction(transactionId, { errorMessage, hash, status, gasLimit, gasPrice, maxFeePerGas, maxPriorityFeePerGas, nonce, type, }) {
+    updateCustodialTransaction(transactionId, { errorMessage, hash, status, }) {
         const transactionMeta = this.getTransaction(transactionId);
         if (!transactionMeta) {
             throw new Error(`Cannot update custodial transaction as no transaction metadata found`);
         }
+        if (!transactionMeta.custodyId) {
+            throw new Error('Transaction must be a custodian transaction');
+        }
         if (status &&
             ![
                 types_1.TransactionStatus.submitted,
@@ -933,30 +925,6 @@ class TransactionController extends base_controller_1.BaseController {
         if (updatedTransactionMeta.status === types_1.TransactionStatus.failed) {
             updatedTransactionMeta.error = (0, utils_2.normalizeTxError)(new Error(errorMessage));
         }
-        if (gasLimit) {
-            updatedTransactionMeta.txParams.gasLimit = gasLimit;
-        }
-        if (gasPrice) {
-            updatedTransactionMeta.txParams.gasPrice = gasPrice;
-        }
-        if (maxFeePerGas) {
-            updatedTransactionMeta.txParams.maxFeePerGas = maxFeePerGas;
-        }
-        if (maxPriorityFeePerGas) {
-            updatedTransactionMeta.txParams.maxPriorityFeePerGas =
-                maxPriorityFeePerGas;
-        }
-        if (type) {
-            updatedTransactionMeta.txParams.type = type;
-            // If the type was reverted to legacy, we need to remove the maxFeePerGas and maxPriorityFeePerGas values
-            if (type === types_1.TransactionEnvelopeType.legacy) {
-                updatedTransactionMeta.txParams.maxFeePerGas = undefined;
-                updatedTransactionMeta.txParams.maxPriorityFeePerGas = undefined;
-            }
-        }
-        if (nonce) {
-            updatedTransactionMeta.txParams.nonce = nonce;
-        }
         this.updateTransaction(updatedTransactionMeta, `${controllerName}:updateCustodialTransaction - Custodial transaction updated`);
         if ([types_1.TransactionStatus.submitted, types_1.TransactionStatus.failed].includes(status)) {
             this.messagingSystem.publish(`${controllerName}:transactionFinished`, updatedTransactionMeta);
@@ -1345,7 +1313,7 @@ class TransactionController extends base_controller_1.BaseController {
             });
             this.onTransactionStatusChange(transactionMeta);
             const rawTx = await __classPrivateFieldGet(this, _TransactionController_trace, "f").call(this, { name: 'Sign', parentContext: traceContext }, () => this.signTransaction(transactionMeta));
-            if (!(await this.beforePublish(transactionMeta))) {
+            if (!this.beforePublish(transactionMeta)) {
                 (0, logger_1.projectLogger)('Skipping publishing transaction based on hook');
                 this.messagingSystem.publish(`${controllerName}:transactionPublishingSkipped`, transactionMeta);
                 return ApprovalState.SkippedViaBeforePublishHook;
@@ -1928,6 +1896,7 @@ _TransactionController_internalEvents = new WeakMap(), _TransactionController_me
         }),
         hooks: {
             beforeCheckPendingTransaction: this.beforeCheckPendingTransaction.bind(this),
+            beforePublish: this.beforePublish.bind(this),
         },
     });
     __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_addPendingTransactionTrackerListeners).call(this, pendingTransactionTracker);