Adding a replacedById key that records the internal metamask id of the tx that replaced it and delete getTransactionByHash method

Author: VSaric

app/scripts/controllers/transactions/index.js

@@ -374,22 +374,6 @@ export default class TransactionController extends EventEmitter {
     return transactions[txId];
   }
 
-  /**
-   * @param {string} txHash - transaction hash
-   * @returns {TransactionMeta} the txMeta who matches the given hash if none found
-   * for the network returns undefined
-   */
-  _getTransactionByHash(txHash) {
-    const { transactions } = this.store.getState();
-    const txByHash = Object.values(transactions).filter((tx) => {
-      if (tx.hash && txHash && tx.hash === txHash) {
-        return tx;
-      }
-      return undefined;
-    });
-    return txByHash[0];
-  }
-
   /**
    * @param {number} txId
    * @returns {boolean}
@@ -1857,6 +1841,7 @@ export default class TransactionController extends EventEmitter {
         return;
       }
       otherTxMeta.replacedBy = txMeta.hash;
+      otherTxMeta.replacedById = txMeta.id;
       this.txStateManager.updateTransaction(
         txMeta,
         'transactions/pending-tx-tracker#event: tx:confirmed reference to confirmed txHash with same nonce',
@@ -2011,7 +1996,7 @@ export default class TransactionController extends EventEmitter {
       },
       defaultGasEstimates,
       originalType,
-      replacedBy,
+      replacedById,
       metamaskNetworkId: network,
     } = txMeta;
     const { transactions } = this.store.getState();
@@ -2115,15 +2100,21 @@ export default class TransactionController extends EventEmitter {
       transactionContractMethod = transactions[id]?.contractMethodName;
     }
 
-    const replacedTxMeta = this._getTransactionByHash(replacedBy);
+    const replacedTxMeta = this._getTransaction(replacedById);
+
+    const TRANSACTION_REPLACEMENT_METHODS = {
+      RETRY: TRANSACTION_TYPES.RETRY,
+      CANCEL: TRANSACTION_TYPES.CANCEL,
+      SAME_NONCE: 'other',
+    };
 
     let transactionReplaced;
     if (extraParams?.dropped) {
-      transactionReplaced = TRANSACTION_TYPES.OTHER;
+      transactionReplaced = TRANSACTION_REPLACEMENT_METHODS.SAME_NONCE;
       if (replacedTxMeta?.type === TRANSACTION_TYPES.CANCEL) {
-        transactionReplaced = TRANSACTION_TYPES.CANCEL;
+        transactionReplaced = TRANSACTION_REPLACEMENT_METHODS.CANCEL;
       } else if (replacedTxMeta?.type === TRANSACTION_TYPES.RETRY) {
-        transactionReplaced = TRANSACTION_TYPES.RETRY;
+        transactionReplaced = TRANSACTION_REPLACEMENT_METHODS.RETRY;
       }
     }
 

app/scripts/controllers/transactions/tx-state-manager.js

@@ -297,22 +297,6 @@ export default class TransactionStateManager extends EventEmitter {
     return transactions[txId];
   }
 
-  /**
-   * @param {string} txHash - transaction hash
-   * @returns {TransactionMeta} the txMeta who matches the given hash if none found
-   * for the network returns undefined
-   */
-  getTransactionByHash(txHash) {
-    const { transactions } = this.store.getState();
-    const txByHash = Object.values(transactions).filter((tx) => {
-      if (txHash && tx.hash && tx.hash === txHash) {
-        return tx;
-      }
-      return undefined;
-    });
-    return txByHash[0];
-  }
-
   /**
    * updates the txMeta in the list and adds a history entry
    *

shared/constants/transaction.js

@@ -37,10 +37,6 @@ import { MESSAGE_TYPE } from './app';
  *  resubmitting the same transaction with a higher gas fee. This type is also used
  *  to speed up pending transactions. This is accomplished by creating a new tx with
  *  the same nonce and higher gas fees.
- * @property {'other'} OTHER - First we must to turn on Customize transaction nonce in
- *  Settings tab, then we want to send a tx. In confirmation screen we set Max base fee
- *  and Priority fee to be lower, then save that changes and confirm a tx. This is accomplished
- *  by creating a new tx with the same nonce while pending transaction.
  */
 
 /**
@@ -62,7 +58,6 @@ export const TRANSACTION_TYPES = {
   INCOMING: 'incoming',
   PERSONAL_SIGN: MESSAGE_TYPE.PERSONAL_SIGN,
   RETRY: 'retry',
-  OTHER: 'other',
   SIGN: MESSAGE_TYPE.ETH_SIGN,
   SIGN_TYPED_DATA: MESSAGE_TYPE.ETH_SIGN_TYPED_DATA,
   SIMPLE_SEND: 'simpleSend',