@metamask/transaction-controller 62.2.0 → 62.3.1

package/CHANGELOG.md

@@ -7,6 +7,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [62.3.1]
+
+### Fixed
+
+- Fail required transactions of any approved and signed transactions during initialisation ([#7251](https://github.com/MetaMask/core/pull/7251))
+  - Include `isExternalSign` when fetching gas fee tokens in messenger action or before publish check.
+
+## [62.3.0]
+
+### Changed
+
+- Check balance and gas fee tokens only after before sign hook ([#7234](https://github.com/MetaMask/core/pull/7234))
+
 ## [62.2.0]
 
 ### Added
@@ -1979,7 +1992,9 @@ 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.2.0...HEAD
+[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/transaction-controller@62.3.1...HEAD
+[62.3.1]: https://github.com/MetaMask/core/compare/@metamask/transaction-controller@62.3.0...@metamask/transaction-controller@62.3.1
+[62.3.0]: https://github.com/MetaMask/core/compare/@metamask/transaction-controller@62.2.0...@metamask/transaction-controller@62.3.0
 [62.2.0]: https://github.com/MetaMask/core/compare/@metamask/transaction-controller@62.1.0...@metamask/transaction-controller@62.2.0
 [62.1.0]: https://github.com/MetaMask/core/compare/@metamask/transaction-controller@62.0.0...@metamask/transaction-controller@62.1.0
 [62.0.0]: https://github.com/MetaMask/core/compare/@metamask/transaction-controller@61.3.0...@metamask/transaction-controller@62.0.0

package/dist/TransactionController.cjs

@@ -1509,6 +1509,15 @@ _TransactionController_afterAdd = new WeakMap(), _TransactionController_afterSig
     const incompleteTransactions = this.state.transactions.filter((transaction) => [types_1.TransactionStatus.approved, types_1.TransactionStatus.signed].includes(transaction.status));
     for (const transactionMeta of incompleteTransactions) {
         __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_failTransaction).call(this, transactionMeta, new Error('Transaction incomplete at startup'));
+        const requiredTransactionIds = transactionMeta.requiredTransactionIds ?? [];
+        for (const requiredTransactionId of requiredTransactionIds) {
+            const requiredTransactionMeta = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getTransaction).call(this, requiredTransactionId);
+            if (!requiredTransactionMeta ||
+                __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_isFinalState).call(this, requiredTransactionMeta.status)) {
+                continue;
+            }
+            __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_failTransaction).call(this, requiredTransactionMeta, new Error('Parent transaction incomplete at startup'));
+        }
     }
 }, _TransactionController_processApproval = async function _TransactionController_processApproval(transactionMeta, { actionId, isExisting = false, publishHook, requireApproval, shouldShowRequest = true, traceContext, }) {
     const transactionId = transactionMeta.id;
@@ -1613,13 +1622,6 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
         clearApprovingTransactionId = () => __classPrivateFieldGet(this, _TransactionController_approvingTransactionIds, "f").delete(transactionId);
         const { networkClientId } = transactionMeta;
         const ethQuery = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getEthQuery).call(this, { networkClientId });
-        await (0, gas_fee_tokens_1.checkGasFeeTokenBeforePublish)({
-            ethQuery,
-            fetchGasFeeTokens: async (tx) => (await __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getGasFeeTokens).call(this, tx)).gasFeeTokens,
-            transaction: transactionMeta,
-            updateTransaction: (txId, fn) => __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateTransactionInternal).call(this, { transactionId: txId }, fn),
-        });
-        transactionMeta = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getTransactionOrThrow).call(this, transactionId);
         const [nonce, releaseNonce] = await (0, nonce_1.getNextNonce)(transactionMeta, (address) => __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").getNonceLock(address, transactionMeta.networkClientId));
         clearNonceLock = releaseNonce;
         transactionMeta = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateTransactionInternal).call(this, {
@@ -1753,7 +1755,8 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
 }, _TransactionController_isFinalState = function _TransactionController_isFinalState(status) {
     return (status === types_1.TransactionStatus.rejected ||
         status === types_1.TransactionStatus.confirmed ||
-        status === types_1.TransactionStatus.failed);
+        status === types_1.TransactionStatus.failed ||
+        status === types_1.TransactionStatus.dropped);
 }, _TransactionController_isLocalFinalState = function _TransactionController_isLocalFinalState(status) {
     return [
         types_1.TransactionStatus.confirmed,
@@ -2414,6 +2417,7 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
     const transaction = {
         chainId,
         delegationAddress,
+        isExternalSign: true,
         txParams: {
             data,
             from,