aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/controllers/transactions.js
diff options
context:
space:
mode:
authorFrankie <frankie.diamond@gmail.com>2017-10-12 20:45:10 +0800
committerGitHub <noreply@github.com>2017-10-12 20:45:10 +0800
commitc4adefcc530535c41a68cc915a20a05c7fa02791 (patch)
treea525a4fbad65a33bc3bc6cd9d530b22e51ea3e89 /app/scripts/controllers/transactions.js
parent6072e71a53d015423fde254fe08674a9226d3868 (diff)
parent5c5f9297f78c965b38087b960acfec472e16818b (diff)
downloadtangerine-wallet-browser-c4adefcc530535c41a68cc915a20a05c7fa02791.tar
tangerine-wallet-browser-c4adefcc530535c41a68cc915a20a05c7fa02791.tar.gz
tangerine-wallet-browser-c4adefcc530535c41a68cc915a20a05c7fa02791.tar.bz2
tangerine-wallet-browser-c4adefcc530535c41a68cc915a20a05c7fa02791.tar.lz
tangerine-wallet-browser-c4adefcc530535c41a68cc915a20a05c7fa02791.tar.xz
tangerine-wallet-browser-c4adefcc530535c41a68cc915a20a05c7fa02791.tar.zst
tangerine-wallet-browser-c4adefcc530535c41a68cc915a20a05c7fa02791.zip
Merge pull request #2318 from MetaMask/network-controller-client
NetworkController refactor for new EthClient interface
Diffstat (limited to 'app/scripts/controllers/transactions.js')
-rw-r--r--app/scripts/controllers/transactions.js1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/scripts/controllers/transactions.js b/app/scripts/controllers/transactions.js
index ef659a300..d46dee230 100644
--- a/app/scripts/controllers/transactions.js
+++ b/app/scripts/controllers/transactions.js
@@ -46,6 +46,7 @@ module.exports = class TransactionController extends EventEmitter {
this.txStateManager.on('tx:status-update', this.emit.bind(this, 'tx:status-update'))
this.nonceTracker = new NonceTracker({
provider: this.provider,
+ blockTracker: this.blockTracker,
getPendingTransactions: this.txStateManager.getPendingTransactions.bind(this.txStateManager),
getConfirmedTransactions: (address) => {
return this.txStateManager.getFilteredTxList({