feat(MMI-5803): Support transactions from account snaps that should n…

…ot be published
MetaMask · Dec 6, 2024 · d2d771d · d2d771d
1 parent c2d3c1d
commit d2d771d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 19 deletions.
diff --git a/packages/transaction-controller/src/TransactionController.test.ts b/packages/transaction-controller/src/TransactionController.test.ts
@@ -5226,7 +5226,6 @@ describe('TransactionController', () => {
       };
       transactionMeta = {
         ...baseTransaction,
-        custodyId: '123',
         history: [{ ...baseTransaction }],
       };
     });

diff --git a/packages/transaction-controller/src/TransactionController.ts b/packages/transaction-controller/src/TransactionController.ts
@@ -652,7 +652,10 @@ export class TransactionController extends BaseController<
     transactionMeta: TransactionMeta,
   ) => boolean;
 
-  private readonly beforePublish: (transactionMeta: TransactionMeta) => boolean;
+  private readonly beforePublish: (
+    transactionMeta: TransactionMeta,
+    rawTx: string,
+  ) => boolean;
 
   private readonly publish: (
     transactionMeta: TransactionMeta,
@@ -1958,10 +1961,6 @@ export class TransactionController extends BaseController<
       );
     }
 
-    if (!transactionMeta.custodyId) {
-      throw new Error('Transaction must be a custodian transaction');
-    }
-
     if (
       status &&
       ![
@@ -2535,7 +2534,7 @@ export class TransactionController extends BaseController<
         () => this.signTransaction(transactionMeta, transactionMeta.txParams),
       );
 
-      if (!this.beforePublish(transactionMeta)) {
+      if (!this.beforePublish(transactionMeta, rawTx as string)) {
         log('Skipping publishing transaction based on hook');
         this.messagingSystem.publish(
           `${controllerName}:transactionPublishingSkipped`,

diff --git a/packages/transaction-controller/src/helpers/PendingTransactionTracker.ts b/packages/transaction-controller/src/helpers/PendingTransactionTracker.ts
@@ -95,7 +95,7 @@ export class PendingTransactionTracker {
 
   #beforeCheckPendingTransaction: (transactionMeta: TransactionMeta) => boolean;
 
-  #beforePublish: (transactionMeta: TransactionMeta) => boolean;
+  #beforePublish: (transactionMeta: TransactionMeta, rawTx: string) => boolean;
 
   constructor({
     blockTracker,
@@ -121,7 +121,10 @@ export class PendingTransactionTracker {
       beforeCheckPendingTransaction?: (
         transactionMeta: TransactionMeta,
       ) => boolean;
-      beforePublish?: (transactionMeta: TransactionMeta) => boolean;
+      beforePublish?: (
+        transactionMeta: TransactionMeta,
+        rawTx: string,
+      ) => boolean;
     };
   }) {
     this.hub = new EventEmitter() as PendingTransactionTrackerEventEmitter;

diff --git a/packages/transaction-controller/src/types.ts b/packages/transaction-controller/src/types.ts
@@ -83,16 +83,6 @@ type TransactionMetaBase = {
    */
   currentTokenBalance?: string;
 
-  /**
-   * Unique ID for custodian transaction.
-   */
-  custodyId?: string;
-
-  /**
-   * Custodian transaction status.
-   */
-  custodyStatus?: string;
-
   /** The optional custom nonce override as a decimal string. */
   customNonceValue?: string;