@metamask-previews/transaction-controller 46.0.0-preview-a1eb992b → 46.0.0-preview-1cc9329c

package/dist/TransactionController.cjs

@@ -1,4 +1,6 @@
 "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");
@@ -236,7 +238,7 @@ class TransactionController extends base_controller_1.BaseController {
             hooks?.beforeCheckPendingTransaction ??
                 /* istanbul ignore next */
                 (() => true);
-        this.beforePublish = hooks?.beforePublish ?? (() => true);
+        this.beforePublish = hooks?.beforePublish ?? (() => Promise.resolve(true));
         this.getAdditionalSignArguments =
             hooks?.getAdditionalSignArguments ?? (() => []);
         this.publish =
@@ -672,6 +674,7 @@ 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;
             });
@@ -920,15 +923,18 @@ 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, }) {
+    updateCustodialTransaction(transactionId, { errorMessage, hash, status, gasLimit, gasPrice, maxFeePerGas, maxPriorityFeePerGas, nonce, type, }) {
         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,
@@ -944,6 +950,30 @@ 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);
@@ -1217,7 +1247,10 @@ class TransactionController extends base_controller_1.BaseController {
                 if (!isTxCompleted) {
                     if (error?.code === rpc_errors_1.errorCodes.provider.userRejectedRequest) {
                         this.cancelTransaction(transactionId, actionId);
-                        throw rpc_errors_1.providerErrors.userRejectedRequest('MetaMask Tx Signature: User denied transaction signature.');
+                        throw rpc_errors_1.providerErrors.userRejectedRequest({
+                            message: 'MetaMask Tx Signature: User denied transaction signature.',
+                            data: error?.data,
+                        });
                     }
                     else {
                         this.failTransaction(meta, error, actionId);
@@ -1286,7 +1319,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 (!this.beforePublish(transactionMeta)) {
+            if (!(await this.beforePublish(transactionMeta))) {
                 (0, logger_1.projectLogger)('Skipping publishing transaction based on hook');
                 this.messagingSystem.publish(`${controllerName}:transactionPublishingSkipped`, transactionMeta);
                 return ApprovalState.SkippedViaBeforePublishHook;
@@ -1869,7 +1902,6 @@ _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);