Merge pull request #4163 from MetaMask/check-nonce-ussage

Check nonce ussage

3 files changed, 17 insertions, 1 deletions

diff --git a/app/scripts/controllers/transactions/index.js b/app/scripts/controllers/transactions/index.js
index 541f1db73..a1588cfef 100644
--- a/app/scripts/controllers/transactions/index.js
+++ b/app/scripts/controllers/transactions/index.js
@@ -112,6 +112,21 @@ class TransactionController extends EventEmitter {
   }
 
   /**
+    Check if a txMeta in the list with the same nonce has been confirmed in a block
+    if the txParams dont have a nonce will return false
+    @returns {boolean} weather the nonce has been used in a transaction confirmed in a block
+    @param {object} txMeta - the txMeta object
+  */
+  async isNonceTaken (txMeta) {
+    const { from, nonce } = txMeta.txParams
+    if ('nonce' in txMeta.txParams) {
+      const sameNonceTxList = this.txStateManager.getFilteredTxList({from, nonce, status: 'confirmed'})
+      return (sameNonceTxList.length >= 1)
+    }
+    return false
+  }
+
+  /**
   add a new unapproved transaction to the pipeline
 
   @returns {Promise<string>} the hash of the transaction after being submitted to the network
diff --git a/app/scripts/controllers/transactions/tx-state-manager.js b/app/scripts/controllers/transactions/tx-state-manager.js
index 53428c333..380214c1d 100644
--- a/app/scripts/controllers/transactions/tx-state-manager.js
+++ b/app/scripts/controllers/transactions/tx-state-manager.js
@@ -262,7 +262,7 @@ class TransactionStateManager extends EventEmitter {
   */
   getTxsByMetaData (key, value, txList = this.getTxList()) {
     return txList.filter((txMeta) => {
-      if (txMeta.txParams[key]) {
+      if (key in txMeta.txParams) {
         return txMeta.txParams[key] === value
       } else {
         return txMeta[key] === value
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index c4a73d8ea..a90acb4d5 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -382,6 +382,7 @@ module.exports = class MetamaskController extends EventEmitter {
       updateTransaction: nodeify(txController.updateTransaction, txController),
       updateAndApproveTransaction: nodeify(txController.updateAndApproveTransaction, txController),
       retryTransaction: nodeify(this.retryTransaction, this),
+      isNonceTaken: nodeify(txController.isNonceTaken, txController),
 
       // messageManager
       signMessage: nodeify(this.signMessage, this),