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 pull request #1610 from MetaMask/bumpProvider

Browse Source 
Bump provider and check for the tx in the block that provider engine gives us
This commit is contained in:
kumavis 2017-06-15 14:12:06 -07:00 committed by GitHub
commit 08b8e89b88
2 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -338,12 +338,13 @@ module.exports = class TransactionController extends EventEmitter {
// checks if a signed tx is in a block and // checks if a signed tx is in a block and
// if included sets the tx status as 'confirmed' // if included sets the tx status as 'confirmed'
checkForTxInBlock () { checkForTxInBlock (block) {
var signedTxList = this.getFilteredTxList({status: 'submitted'}) var signedTxList = this.getFilteredTxList({status: 'submitted'})
if (!signedTxList.length) return if (!signedTxList.length) return
signedTxList.forEach((txMeta) => { signedTxList.forEach((txMeta) => {
var txHash = txMeta.hash var txHash = txMeta.hash
var txId = txMeta.id var txId = txMeta.id
if (!txHash) { if (!txHash) {
const errReason = { const errReason = {
errCode: 'No hash was provided', errCode: 'No hash was provided',
@ -351,20 +352,9 @@ module.exports = class TransactionController extends EventEmitter {
} }
return this.setTxStatusFailed(txId, errReason) return this.setTxStatusFailed(txId, errReason)
} }
this.query.getTransactionByHash(txHash, (err, txParams) => {
if (err || !txParams) { block.transactions.forEach((tx) => {
if (!txParams) return if (tx.hash === txHash) this.setTxStatusConfirmed(txId)
txMeta.err = {
isWarning: true,
errorCode: err,
message: 'There was a problem loading this transaction.',
}
this.updateTx(txMeta)
return log.error(err)
}
if (txParams.blockNumber) {
this.setTxStatusConfirmed(txId)
}
}) })
}) })
} }

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": "^12.2.4", "web3-provider-engine": "^13.0.1",
"web3-stream-provider": "^2.0.6", "web3-stream-provider": "^2.0.6",
"xtend": "^4.0.1" "xtend": "^4.0.1"
}, },