@metamask-previews/transaction-controller 61.3.0-preview-dabf9bd8 → 61.3.0-preview-89bb4b56

package/CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+
+- Always run `beforeSign` hook even if using `gasFeeToken` and `isGasFeeTokenIgnoredIfBalance` ([#7172](https://github.com/MetaMask/core/pull/7172))
+
 ## [61.3.0]
 
 ### Added

package/dist/TransactionController.cjs

@@ -1604,6 +1604,7 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
         });
         __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_onTransactionStatusChange).call(this, transactionMeta);
         const rawTx = await __classPrivateFieldGet(this, _TransactionController_trace, "f").call(this, { name: 'Sign', parentContext: traceContext }, () => __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_signTransaction).call(this, transactionMeta));
+        transactionMeta = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getTransactionOrThrow).call(this, transactionId);
         if (!(await __classPrivateFieldGet(this, _TransactionController_beforePublish, "f").call(this, transactionMeta))) {
             (0, logger_1.projectLogger)('Skipping publishing transaction based on hook');
             this.messenger.publish(`${controllerName}:transactionPublishingSkipped`, transactionMeta);
@@ -1916,8 +1917,26 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
     const currentNetworkIsEIP1559Compatible = await __classPrivateFieldGet(this, _TransactionController_getCurrentNetworkEIP1559Compatibility, "f").call(this, networkClientId);
     const currentAccountIsEIP1559Compatible = await __classPrivateFieldGet(this, _TransactionController_getCurrentAccountEIP1559Compatibility, "f").call(this);
     return (currentNetworkIsEIP1559Compatible && currentAccountIsEIP1559Compatible);
-}, _TransactionController_signTransaction = async function _TransactionController_signTransaction(transactionMeta) {
-    const { chainId, id: transactionId, isExternalSign, txParams, } = transactionMeta;
+}, _TransactionController_signTransaction = async function _TransactionController_signTransaction(originalTransactionMeta) {
+    let transactionMeta = originalTransactionMeta;
+    const { id: transactionId } = transactionMeta;
+    (0, logger_1.projectLogger)('Calling before sign hook', transactionMeta);
+    const { updateTransaction } = (await __classPrivateFieldGet(this, _TransactionController_beforeSign, "f").call(this, { transactionMeta })) ?? {};
+    if (updateTransaction) {
+        __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateTransactionInternal).call(this, { transactionId, skipResimulateCheck: true, note: 'beforeSign Hook' }, updateTransaction);
+        (0, logger_1.projectLogger)('Updated transaction after before sign hook');
+    }
+    transactionMeta = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getTransactionOrThrow).call(this, 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 { chainId, isExternalSign, txParams } = transactionMeta;
     if (isExternalSign) {
         (0, logger_1.projectLogger)('Skipping sign as signed externally');
         return undefined;
@@ -1933,12 +1952,7 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
             txMeta.txParams.authorizationList = signedAuthorizationList;
         });
     }
-    (0, logger_1.projectLogger)('Calling before sign hook', transactionMeta);
-    const { updateTransaction } = (await __classPrivateFieldGet(this, _TransactionController_beforeSign, "f").call(this, { transactionMeta })) ?? {};
-    if (updateTransaction) {
-        __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateTransactionInternal).call(this, { transactionId, skipResimulateCheck: true, note: 'beforeSign Hook' }, updateTransaction);
-        (0, logger_1.projectLogger)('Updated transaction after before sign hook');
-    }
+    transactionMeta = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getTransactionOrThrow).call(this, transactionId);
     const finalTransactionMeta = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getTransactionOrThrow).call(this, transactionId);
     const { txParams: finalTxParams } = finalTransactionMeta;
     const unsignedEthTx = (0, prepare_1.prepareTransaction)(chainId, finalTxParams);