m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Merge branch 'master' into i1567-FixInaccurateError

Browse Source
This commit is contained in:
Frankie 2017-06-16 16:46:13 -07:00 committed by GitHub
commit ac728189e1
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/scripts/controllers/transactions.js
View File

@ -24,10 +24,9 @@ module.exports = class TransactionController extends EventEmitter {
this.blockTracker = opts.blockTracker this.blockTracker = opts.blockTracker
this.query = opts.ethQuery this.query = opts.ethQuery
this.txProviderUtils = new TxProviderUtil(this.query) this.txProviderUtils = new TxProviderUtil(this.query)
this.blockTracker.on('block', this.checkForTxInBlock.bind(this)) this.blockTracker.on('rawBlock', this.checkForTxInBlock.bind(this))
// provider-engine only exploses the 'block' event, not 'latest' for 'sync'
this.provider._blockTracker.on('sync', this.queryPendingTxs.bind(this))
this.blockTracker.on('latest', this.resubmitPendingTxs.bind(this)) this.blockTracker.on('latest', this.resubmitPendingTxs.bind(this))
this.blockTracker.on('sync', this.queryPendingTxs.bind(this))
this.signEthTx = opts.signTransaction this.signEthTx = opts.signTransaction
this.nonceLock = Semaphore(1) this.nonceLock = Semaphore(1)
this.ethStore = opts.ethStore this.ethStore = opts.ethStore

2
package.json
View File

@ -123,7 +123,7 @@
"valid-url": "^1.0.9", "valid-url": "^1.0.9",
"vreme": "^3.0.2", "vreme": "^3.0.2",
"web3": "0.18.2", "web3": "0.18.2",
"web3-provider-engine": "^13.0.1", "web3-provider-engine": "^13.0.3",
"web3-stream-provider": "^2.0.6", "web3-stream-provider": "^2.0.6",
"xtend": "^4.0.1" "xtend": "^4.0.1"
}, },