diff options
author | Frankie <frankie.diamond@gmail.com> | 2018-05-22 07:00:44 +0800 |
---|---|---|
committer | Alexander Tseung <alextsg@users.noreply.github.com> | 2018-05-22 07:00:44 +0800 |
commit | e8b2e11c5624d80f535c1344d9c9be48627b1319 (patch) | |
tree | 8d66e7892bc242b978590b80ea7f9bcde0d5f0a3 /app | |
parent | 45ad37162287a1db30caa8eeea89442d303ea883 (diff) | |
download | tangerine-wallet-browser-e8b2e11c5624d80f535c1344d9c9be48627b1319.tar tangerine-wallet-browser-e8b2e11c5624d80f535c1344d9c9be48627b1319.tar.gz tangerine-wallet-browser-e8b2e11c5624d80f535c1344d9c9be48627b1319.tar.bz2 tangerine-wallet-browser-e8b2e11c5624d80f535c1344d9c9be48627b1319.tar.lz tangerine-wallet-browser-e8b2e11c5624d80f535c1344d9c9be48627b1319.tar.xz tangerine-wallet-browser-e8b2e11c5624d80f535c1344d9c9be48627b1319.tar.zst tangerine-wallet-browser-e8b2e11c5624d80f535c1344d9c9be48627b1319.zip |
Reveal get filtered tx list (#4332)
* add getFilteredTxList from txController to getApi
* transactions - remove dead code (isNonceTaken)
Diffstat (limited to 'app')
-rw-r--r-- | app/scripts/controllers/transactions/index.js | 15 | ||||
-rw-r--r-- | app/scripts/metamask-controller.js | 2 |
2 files changed, 1 insertions, 16 deletions
diff --git a/app/scripts/controllers/transactions/index.js b/app/scripts/controllers/transactions/index.js index 3886db104..541f1db73 100644 --- a/app/scripts/controllers/transactions/index.js +++ b/app/scripts/controllers/transactions/index.js @@ -112,21 +112,6 @@ 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} whether 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/metamask-controller.js b/app/scripts/metamask-controller.js index 807c9a0b9..1b1d26886 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -382,7 +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), + getFilteredTxList: nodeify(txController.getFilteredTxList, txController), // messageManager signMessage: nodeify(this.signMessage, this), |