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 i675-LoadingBuy

Browse Source
This commit is contained in:
Dan Finlay 2016-09-22 14:29:02 +08:00 committed by GitHub
commit 47a334e542
4 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -2,6 +2,9 @@
## Current Master ## Current Master
## 2.13.0 2016-09-18
- Add Parity compatibility, fixing Geth dependency issues.
- Add a link to the transaction in history that goes to https://metamask.github.io/eth-tx-viz - Add a link to the transaction in history that goes to https://metamask.github.io/eth-tx-viz
too help visualize transactions and to where they are going. too help visualize transactions and to where they are going.
- Show "Buy Ether" button and warning on tx confirmation when sender balance is insufficient - Show "Buy Ether" button and warning on tx confirmation when sender balance is insufficient

2
app/manifest.json
View File

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

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

@ -75,6 +75,10 @@ module.exports = class MetamaskController {
} }
onRpcRequest (stream, originDomain, request) { onRpcRequest (stream, originDomain, request) {
/* Commented out for Parity compliance
* Parity does not permit additional keys, like `origin`,
* and Infura is not currently filtering this key out.
var payloads = Array.isArray(request) ? request : [request] var payloads = Array.isArray(request) ? request : [request]
payloads.forEach(function (payload) { payloads.forEach(function (payload) {
// Append origin to rpc payload // Append origin to rpc payload
@ -86,6 +90,7 @@ module.exports = class MetamaskController {
payload.params.push({ origin: originDomain }) payload.params.push({ origin: originDomain })
} }
}) })
*/
// handle rpc request // handle rpc request
this.provider.sendAsync(request, function onPayloadHandled (err, response) { this.provider.sendAsync(request, function onPayloadHandled (err, response) {

2
package.json
View File

@ -81,7 +81,7 @@
"through2": "^2.0.1", "through2": "^2.0.1",
"vreme": "^3.0.2", "vreme": "^3.0.2",
"web3": "ethereum/web3.js#260ac6e78a8ce4b2e13f5bb0fdb65f4088585876", "web3": "ethereum/web3.js#260ac6e78a8ce4b2e13f5bb0fdb65f4088585876",
"web3-provider-engine": "^8.0.5", "web3-provider-engine": "^8.0.6",
"web3-stream-provider": "^2.0.6", "web3-stream-provider": "^2.0.6",
"xtend": "^4.0.1" "xtend": "^4.0.1"
}, },