@metamask-previews/transaction-controller 28.1.1-preview-3301ad9 → 28.1.1-preview-a1db0714

package/dist/TransactionController.js

@@ -4,7 +4,7 @@
 
 
 
-var _chunkGTNVM4MGjs = require('./chunk-GTNVM4MG.js');
+var _chunkASVFMULGjs = require('./chunk-ASVFMULG.js');
 require('./chunk-ZNZEJDOE.js');
 require('./chunk-X3KACH5P.js');
 require('./chunk-KT6UAKBB.js');
@@ -20,7 +20,7 @@ require('./chunk-YVCX6Z75.js');
 require('./chunk-TJMQEH57.js');
 require('./chunk-7DJO6UZA.js');
 require('./chunk-2XKEAKQG.js');
-require('./chunk-DTDTOMTB.js');
+require('./chunk-XC5NBJOF.js');
 require('./chunk-5XQ2KRYL.js');
 require('./chunk-EQT25RSP.js');
 require('./chunk-FDUCRHYT.js');
@@ -41,5 +41,5 @@ require('./chunk-Z4BLTVTB.js');
 
 
 
-exports.ApprovalState = _chunkGTNVM4MGjs.ApprovalState; exports.CANCEL_RATE = _chunkGTNVM4MGjs.CANCEL_RATE; exports.HARDFORK = _chunkGTNVM4MGjs.HARDFORK; exports.SPEED_UP_RATE = _chunkGTNVM4MGjs.SPEED_UP_RATE; exports.TransactionController = _chunkGTNVM4MGjs.TransactionController;
+exports.ApprovalState = _chunkASVFMULGjs.ApprovalState; exports.CANCEL_RATE = _chunkASVFMULGjs.CANCEL_RATE; exports.HARDFORK = _chunkASVFMULGjs.HARDFORK; exports.SPEED_UP_RATE = _chunkASVFMULGjs.SPEED_UP_RATE; exports.TransactionController = _chunkASVFMULGjs.TransactionController;
 //# sourceMappingURL=TransactionController.js.map

package/dist/TransactionController.mjs

@@ -4,7 +4,7 @@ import {
   HARDFORK,
   SPEED_UP_RATE,
   TransactionController
-} from "./chunk-RA7LGPVZ.mjs";
+} from "./chunk-BSTN6LDB.mjs";
 import "./chunk-NHRBO3LU.mjs";
 import "./chunk-MDRMMUMS.mjs";
 import "./chunk-K4KOSAGM.mjs";
@@ -20,7 +20,7 @@ import "./chunk-FG74Z3F5.mjs";
 import "./chunk-FMRLPVFZ.mjs";
 import "./chunk-SL3GHHKG.mjs";
 import "./chunk-NOHEXQ7Y.mjs";
-import "./chunk-Y7ENNK7L.mjs";
+import "./chunk-QWHMXCGZ.mjs";
 import "./chunk-F6E3TTR3.mjs";
 import "./chunk-CPMTUMMZ.mjs";
 import "./chunk-QZLPYOGC.mjs";

package/dist/{chunk-GTNVM4MG.js → chunk-ASVFMULG.js}

@@ -45,7 +45,7 @@ var _chunk7DJO6UZAjs = require('./chunk-7DJO6UZA.js');
 var _chunk2XKEAKQGjs = require('./chunk-2XKEAKQG.js');
 
 
-var _chunkDTDTOMTBjs = require('./chunk-DTDTOMTB.js');
+var _chunkXC5NBJOFjs = require('./chunk-XC5NBJOF.js');
 
 
 var _chunk5XQ2KRYLjs = require('./chunk-5XQ2KRYL.js');
@@ -161,7 +161,7 @@ var TransactionController = class extends _basecontroller.BaseController {
    * @param options.getNetworkState - Gets the state of the network controller.
    * @param options.getPermittedAccounts - Get accounts that a given origin has permissions for.
    * @param options.getSavedGasFees - Gets the saved gas fee config.
-   * @param options.getSelectedAddress - Gets the address of the currently selected account.
+   * @param options.getSelectedAccount - Gets the address of the currently selected account.
    * @param options.incomingTransactions - Configuration options for incoming transaction support.
    * @param options.isMultichainEnabled - Enable multichain support.
    * @param options.isSimulationEnabled - Whether new transactions will be automatically simulated.
@@ -189,7 +189,7 @@ var TransactionController = class extends _basecontroller.BaseController {
     getNetworkState,
     getPermittedAccounts,
     getSavedGasFees,
-    getSelectedAddress,
+    getSelectedAccount,
     incomingTransactions = {},
     isMultichainEnabled = false,
     isSimulationEnabled,
@@ -259,7 +259,7 @@ var TransactionController = class extends _basecontroller.BaseController {
     this.getCurrentNetworkEIP1559Compatibility = getCurrentNetworkEIP1559Compatibility;
     this.getGasFeeEstimates = getGasFeeEstimates || (() => Promise.resolve({}));
     this.getPermittedAccounts = getPermittedAccounts;
-    this.getSelectedAddress = getSelectedAddress;
+    this.getSelectedAccount = getSelectedAccount;
     this.getExternalPendingTransactions = getExternalPendingTransactions ?? (() => []);
     this.securityProviderRequest = securityProviderRequest;
     _chunkZ4BLTVTBjs.__privateSet.call(void 0, this, _incomingTransactionOptions, incomingTransactions);
@@ -456,6 +456,10 @@ var TransactionController = class extends _basecontroller.BaseController {
     networkClientId: requestNetworkClientId
   } = {}) {
     _chunkS6VGOPUYjs.projectLogger.call(void 0, "Adding transaction", txParams);
+    const selectedAccount = this.getSelectedAccount();
+    if (selectedAccount.type !== "eip155:eoa" && selectedAccount.type !== "eip155:erc4337") {
+      throw new Error("Selected account is not an EVM account");
+    }
     txParams = _chunkUGFBA4GVjs.normalizeTransactionParams.call(void 0, txParams);
     if (requestNetworkClientId && !_chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _multichainTrackingHelper).has(requestNetworkClientId)) {
       throw new Error(
@@ -470,7 +474,7 @@ var TransactionController = class extends _basecontroller.BaseController {
     if (origin) {
       await _chunkVH47Q6TSjs.validateTransactionOrigin.call(void 0, 
         await this.getPermittedAccounts(origin),
-        this.getSelectedAddress(),
+        selectedAccount.address,
         txParams.from,
         origin
       );
@@ -725,7 +729,9 @@ var TransactionController = class extends _basecontroller.BaseController {
       _chunkUGFBA4GVjs.validateGasValues.call(void 0, gasValues);
     }
     _chunkS6VGOPUYjs.projectLogger.call(void 0, "Creating speed up transaction", transactionId, gasValues);
-    const transactionMeta = this.getTransaction(transactionId);
+    const transactionMeta = this.state.transactions.find(
+      ({ id }) => id === transactionId
+    );
     if (!transactionMeta) {
       return;
     }
@@ -774,7 +780,7 @@ var TransactionController = class extends _basecontroller.BaseController {
       unsignedEthTx,
       transactionMeta.txParams.from
     );
-    const transactionMetaWithRsv = this.updateTransactionMetaRSV(
+    const transactionMetaWithRsv = await this.updateTransactionMetaRSV(
       transactionMeta,
       signedTx
     );
@@ -1278,10 +1284,10 @@ var TransactionController = class extends _basecontroller.BaseController {
       transactionMeta,
       _lodash.pickBy.call(void 0, { hash, status })
     );
-    if (updatedTransactionMeta.status === "submitted" /* submitted */) {
+    if (status === "submitted" /* submitted */) {
       updatedTransactionMeta.submittedTime = (/* @__PURE__ */ new Date()).getTime();
     }
-    if (updatedTransactionMeta.status === "failed" /* failed */) {
+    if (status === "failed" /* failed */) {
       updatedTransactionMeta.error = _chunkUGFBA4GVjs.normalizeTxError.call(void 0, new Error(errorMessage));
     }
     this.updateTransaction(
@@ -1637,104 +1643,118 @@ var TransactionController = class extends _basecontroller.BaseController {
    * @param transactionId - The ID of the transaction to approve.
    */
   async approveTransaction(transactionId) {
+    const { transactions } = this.state;
     const releaseLock = await this.mutex.acquire();
+    const index = transactions.findIndex(({ id }) => transactionId === id);
+    const transactionMeta = transactions[index];
+    const updatedTransactionMeta = _lodash.cloneDeep.call(void 0, transactionMeta);
+    const {
+      txParams: { from },
+      networkClientId
+    } = transactionMeta;
     let releaseNonceLock;
-    let txMeta = this.getTransactionOrThrow(transactionId);
     try {
       if (!this.sign) {
         releaseLock();
-        this.failTransaction(txMeta, new Error("No sign method defined."));
+        this.failTransaction(
+          transactionMeta,
+          new Error("No sign method defined.")
+        );
         return "not-approved" /* NotApproved */;
-      } else if (!txMeta.chainId) {
+      } else if (!transactionMeta.chainId) {
         releaseLock();
-        this.failTransaction(txMeta, new Error("No chainId defined."));
+        this.failTransaction(transactionMeta, new Error("No chainId defined."));
         return "not-approved" /* NotApproved */;
       }
       if (this.inProcessOfSigning.has(transactionId)) {
         _chunkS6VGOPUYjs.projectLogger.call(void 0, "Skipping approval as signing in progress", transactionId);
         return "not-approved" /* NotApproved */;
       }
-      const [nonce, tmpReleaseNonce] = await _chunkZNZEJDOEjs.getNextNonce.call(void 0, 
-        txMeta,
-        (address) => _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _multichainTrackingHelper).getNonceLock(
-          address,
-          txMeta.networkClientId
-        )
+      const [nonce, releaseNonce] = await _chunkZNZEJDOEjs.getNextNonce.call(void 0, 
+        transactionMeta,
+        (address) => _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _multichainTrackingHelper).getNonceLock(address, networkClientId)
       );
-      releaseNonceLock = tmpReleaseNonce;
-      const ethQuery = _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _multichainTrackingHelper).getEthQuery({
-        networkClientId: txMeta.networkClientId,
-        chainId: txMeta.chainId
-      });
-      const shouldUpdatePreTxBalance = txMeta.type === "swap" /* swap */;
-      let preTxBalance;
-      if (shouldUpdatePreTxBalance) {
-        _chunkS6VGOPUYjs.projectLogger.call(void 0, "Determining pre-transaction balance");
-        preTxBalance = await _controllerutils.query.call(void 0, ethQuery, "getBalance", [
-          txMeta.txParams.from
-        ]);
-      }
-      txMeta = _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _updateTransactionInternal, updateTransactionInternal_fn).call(this, {
-        transactionId,
-        note: "TransactionController#approveTransaction - Transaction approved"
-      }, (draftTxMeta) => {
-        const { txParams, chainId } = draftTxMeta;
-        const isEIP1559 = _chunkUGFBA4GVjs.isEIP1559Transaction.call(void 0, txParams);
-        draftTxMeta.status = "approved" /* approved */;
-        draftTxMeta.txParams = {
-          ...txParams,
-          nonce,
-          chainId,
-          gasLimit: txParams.gas,
-          ...isEIP1559 && {
-            estimatedBaseFee: txParams.estimatedBaseFee,
-            type: "0x2" /* feeMarket */
-          }
-        };
-        if (shouldUpdatePreTxBalance) {
-          draftTxMeta.preTxBalance = preTxBalance;
-          _chunkS6VGOPUYjs.projectLogger.call(void 0, "Updated pre-transaction balance", preTxBalance);
-        }
-      });
-      this.onTransactionStatusChange(txMeta);
-      const rawTx = await this.signTransaction(txMeta, txMeta.txParams);
-      if (!this.beforePublish(txMeta)) {
+      releaseNonceLock = releaseNonce;
+      updatedTransactionMeta.status = "approved" /* approved */;
+      updatedTransactionMeta.txParams = {
+        ...updatedTransactionMeta.txParams,
+        nonce,
+        chainId: transactionMeta.chainId
+      };
+      const baseTxParams = {
+        ...updatedTransactionMeta.txParams,
+        gasLimit: updatedTransactionMeta.txParams.gas
+      };
+      this.updateTransaction(
+        updatedTransactionMeta,
+        "TransactionController#approveTransaction - Transaction approved"
+      );
+      this.onTransactionStatusChange(updatedTransactionMeta);
+      const isEIP1559 = _chunkUGFBA4GVjs.isEIP1559Transaction.call(void 0, updatedTransactionMeta.txParams);
+      const txParams = isEIP1559 ? {
+        ...baseTxParams,
+        estimatedBaseFee: updatedTransactionMeta.txParams.estimatedBaseFee,
+        type: "0x2" /* feeMarket */
+      } : baseTxParams;
+      const rawTx = await this.signTransaction(
+        updatedTransactionMeta,
+        txParams
+      );
+      if (!this.beforePublish(updatedTransactionMeta)) {
         _chunkS6VGOPUYjs.projectLogger.call(void 0, "Skipping publishing transaction based on hook");
         this.messagingSystem.publish(
           `${controllerName}:transactionPublishingSkipped`,
-          txMeta
+          updatedTransactionMeta
         );
         return "skipped-via-before-publish-hook" /* SkippedViaBeforePublishHook */;
       }
       if (!rawTx) {
         return "not-approved" /* NotApproved */;
       }
-      _chunkS6VGOPUYjs.projectLogger.call(void 0, "Publishing transaction", txMeta.txParams);
-      let { transactionHash: hash } = await this.publish(txMeta, rawTx);
+      const ethQuery = _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _multichainTrackingHelper).getEthQuery({
+        networkClientId: transactionMeta.networkClientId,
+        chainId: transactionMeta.chainId
+      });
+      if (transactionMeta.type === "swap" /* swap */) {
+        _chunkS6VGOPUYjs.projectLogger.call(void 0, "Determining pre-transaction balance");
+        const preTxBalance = await _controllerutils.query.call(void 0, ethQuery, "getBalance", [from]);
+        updatedTransactionMeta.preTxBalance = preTxBalance;
+        _chunkS6VGOPUYjs.projectLogger.call(void 0, 
+          "Updated pre-transaction balance",
+          updatedTransactionMeta.preTxBalance
+        );
+      }
+      _chunkS6VGOPUYjs.projectLogger.call(void 0, "Publishing transaction", txParams);
+      let { transactionHash: hash } = await this.publish(
+        updatedTransactionMeta,
+        rawTx
+      );
       if (hash === void 0) {
         hash = await this.publishTransaction(ethQuery, rawTx);
       }
       _chunkS6VGOPUYjs.projectLogger.call(void 0, "Publish successful", hash);
-      txMeta = _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _updateTransactionInternal, updateTransactionInternal_fn).call(this, {
-        transactionId,
-        note: "TransactionController#approveTransaction - Transaction submitted"
-      }, (draftTxMeta) => {
-        draftTxMeta.hash = hash;
-        draftTxMeta.status = "submitted" /* submitted */;
-        draftTxMeta.submittedTime = (/* @__PURE__ */ new Date()).getTime();
-      });
+      updatedTransactionMeta.hash = hash;
+      updatedTransactionMeta.status = "submitted" /* submitted */;
+      updatedTransactionMeta.submittedTime = (/* @__PURE__ */ new Date()).getTime();
+      this.updateTransaction(
+        updatedTransactionMeta,
+        "TransactionController#approveTransaction - Transaction submitted"
+      );
       this.messagingSystem.publish(`${controllerName}:transactionSubmitted`, {
-        transactionMeta: txMeta
+        transactionMeta: updatedTransactionMeta
       });
       this.messagingSystem.publish(
         `${controllerName}:transactionFinished`,
-        txMeta
+        updatedTransactionMeta
+      );
+      _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _internalEvents).emit(
+        `${updatedTransactionMeta.id}:finished`,
+        updatedTransactionMeta
       );
-      _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _internalEvents).emit(`${transactionId}:finished`, txMeta);
-      this.onTransactionStatusChange(txMeta);
+      this.onTransactionStatusChange(updatedTransactionMeta);
       return "approved" /* Approved */;
     } catch (error) {
-      this.failTransaction(txMeta, error);
+      this.failTransaction(transactionMeta, error);
       return "not-approved" /* NotApproved */;
     } finally {
       this.inProcessOfSigning.delete(transactionId);
@@ -1861,15 +1881,6 @@ var TransactionController = class extends _basecontroller.BaseController {
     const { transactions } = this.state;
     return transactions.find(({ id }) => id === transactionId);
   }
-  getTransactionOrThrow(transactionId, errorMessagePrefix = "TransactionController") {
-    const txMeta = this.getTransaction(transactionId);
-    if (!txMeta) {
-      throw new Error(
-        `${errorMessagePrefix}: No transaction found with id ${transactionId}`
-      );
-    }
-    return txMeta;
-  }
   getApprovalId(txMeta) {
     return String(txMeta.id);
   }
@@ -2078,9 +2089,8 @@ var TransactionController = class extends _basecontroller.BaseController {
    *
    * @param transactionMeta - The TransactionMeta object to update.
    * @param signedTx - The encompassing type for all transaction types containing r, s, and v values.
-   * @returns The updated TransactionMeta object.
    */
-  updateTransactionMetaRSV(transactionMeta, signedTx) {
+  async updateTransactionMetaRSV(transactionMeta, signedTx) {
     const transactionMetaWithRsv = _lodash.cloneDeep.call(void 0, transactionMeta);
     for (const key of ["r", "s", "v"]) {
       const value = signedTx[key];
@@ -2128,7 +2138,7 @@ var TransactionController = class extends _basecontroller.BaseController {
       return void 0;
     }
     const transactionMetaWithRsv = {
-      ...this.updateTransactionMetaRSV(transactionMeta, signedTx),
+      ...await this.updateTransactionMetaRSV(transactionMeta, signedTx),
       status: "signed" /* signed */
     };
     this.updateTransaction(
@@ -2255,9 +2265,9 @@ createIncomingTransactionHelper_fn = function({
   etherscanRemoteTransactionSource,
   chainId
 }) {
-  const incomingTransactionHelper = new (0, _chunkDTDTOMTBjs.IncomingTransactionHelper)({
+  const incomingTransactionHelper = new (0, _chunkXC5NBJOFjs.IncomingTransactionHelper)({
     blockTracker,
-    getCurrentAccount: this.getSelectedAddress,
+    getCurrentAccount: this.getSelectedAccount,
     getLastFetchedBlockNumbers: () => this.state.lastFetchedBlockNumbers,
     getChainId: chainId ? () => chainId : this.getChainId.bind(this),
     isEnabled: _chunkZ4BLTVTBjs.__privateGet.call(void 0, this, _incomingTransactionOptions).isEnabled,
@@ -2380,14 +2390,14 @@ updateTransactionInternal_fn = function({
   transactionId,
   note,
   skipHistory
-}, mutationFn) {
+}, callback) {
   let updatedTransactionParams = [];
   this.update((state) => {
     const index = state.transactions.findIndex(
       ({ id }) => id === transactionId
     );
     let transactionMeta2 = state.transactions[index];
-    transactionMeta2 = mutationFn(transactionMeta2) ?? transactionMeta2;
+    transactionMeta2 = callback(transactionMeta2) ?? transactionMeta2;
     transactionMeta2.txParams = _chunkUGFBA4GVjs.normalizeTransactionParams.call(void 0, 
       transactionMeta2.txParams
     );
@@ -2407,7 +2417,6 @@ updateTransactionInternal_fn = function({
   if (updatedTransactionParams.length > 0) {
     _chunkZ4BLTVTBjs.__privateMethod.call(void 0, this, _onTransactionParamsUpdated, onTransactionParamsUpdated_fn).call(this, transactionMeta, updatedTransactionParams);
   }
-  return transactionMeta;
 };
 _checkIfTransactionParamsUpdated = new WeakSet();
 checkIfTransactionParamsUpdated_fn = function(newTransactionMeta) {
@@ -2542,4 +2551,4 @@ isCustomNetwork_fn = function(networkClientId) {
 
 
 exports.HARDFORK = HARDFORK; exports.CANCEL_RATE = CANCEL_RATE; exports.SPEED_UP_RATE = SPEED_UP_RATE; exports.ApprovalState = ApprovalState; exports.TransactionController = TransactionController;
-//# sourceMappingURL=chunk-GTNVM4MG.js.map
+//# sourceMappingURL=chunk-ASVFMULG.js.map