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 #1359 from MetaMask/FixBlockPolling

Browse Source 
Fix block polling
This commit is contained in:
Dan Finlay 2017-04-30 12:46:20 -07:00 committed by GitHub
commit 753de30b3b
4 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -2,7 +2,10 @@
## Current Master ## Current Master
## 3.6.1 2017-4-25
- Fix bug where error was reported in debugger console when Chrome opened a new window. - Fix bug where error was reported in debugger console when Chrome opened a new window.
- Fix bug where block-tracker could stop polling for new blocks.
## 3.6.0 2017-4-25 ## 3.6.0 2017-4-25

2
app/manifest.json
View File

@ -1,7 +1,7 @@
{ {
"name": "MetaMask", "name": "MetaMask",
"short_name": "Metamask", "short_name": "Metamask",
"version": "3.6.0", "version": "3.6.1",
"manifest_version": 2, "manifest_version": 2,
"author": "https://metamask.io", "author": "https://metamask.io",
"description": "Ethereum Browser Extension", "description": "Ethereum Browser Extension",

12
app/scripts/metamask-controller.js
View File

@ -341,9 +341,7 @@ module.exports = class MetamaskController extends EventEmitter {
console.error('Error in RPC response:\n', response.error) console.error('Error in RPC response:\n', response.error)
} }
if (request.isMetamaskInternal) return if (request.isMetamaskInternal) return
if (global.METAMASK_DEBUG) { log.info(`RPC (${originDomain}):`, request, '->', response)
console.log(`RPC (${originDomain}):`, request, '->', response)
}
} }
} }
@ -591,9 +589,7 @@ module.exports = class MetamaskController extends EventEmitter {
// Log blocks // Log blocks
logBlock (block) { logBlock (block) {
if (global.METAMASK_DEBUG) { log.info(`BLOCK CHANGED: #${block.number.toString('hex')} 0x${block.hash.toString('hex')}`)
console.log(`BLOCK CHANGED: #${block.number.toString('hex')} 0x${block.hash.toString('hex')}`)
}
this.verifyNetwork() this.verifyNetwork()
} }
@ -682,9 +678,7 @@ module.exports = class MetamaskController extends EventEmitter {
this.setNetworkState('loading') this.setNetworkState('loading')
return return
} }
if (global.METAMASK_DEBUG) { log.info('web3.getNetwork returned ' + network)
console.log('web3.getNetwork returned ' + network)
}
this.setNetworkState(network) this.setNetworkState(network)
}) })
} }

2
package.json
View File

@ -119,7 +119,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.0.2", "web3-provider-engine": "^12.0.3",
"web3-stream-provider": "^2.0.6", "web3-stream-provider": "^2.0.6",
"xtend": "^4.0.1" "xtend": "^4.0.1"
}, },