diff options
| author | Kevin Serrano <kevin.serrano@consensys.net> | 2017-09-07 04:59:52 +0800 |
|---|---|---|
| committer | Kevin Serrano <kevin.serrano@consensys.net> | 2017-09-07 04:59:52 +0800 |
| commit | 0217984a40d92e706312216561477490e59e8dcb (patch) | |
| tree | add6f99216d8dc5752ff7732791554133549b469 | |
| parent | b5f48730cd2c024997d30fa272ab08ba7f686893 (diff) | |
| parent | 351db952c52950b2702f1bd7c9d0f165df34def2 (diff) | |
| download | tangerine-wallet-browser-0217984a40d92e706312216561477490e59e8dcb.tar tangerine-wallet-browser-0217984a40d92e706312216561477490e59e8dcb.tar.gz tangerine-wallet-browser-0217984a40d92e706312216561477490e59e8dcb.tar.bz2 tangerine-wallet-browser-0217984a40d92e706312216561477490e59e8dcb.tar.lz tangerine-wallet-browser-0217984a40d92e706312216561477490e59e8dcb.tar.xz tangerine-wallet-browser-0217984a40d92e706312216561477490e59e8dcb.tar.zst tangerine-wallet-browser-0217984a40d92e706312216561477490e59e8dcb.zip | |
Merge branch 'master' into readd-loose
| -rw-r--r-- | CHANGELOG.md | 3 | ||||
| -rw-r--r-- | app/manifest.json | 2 | ||||
| -rw-r--r-- | app/scripts/lib/inpage-provider.js | 5 | ||||
| -rw-r--r-- | development/uiStore.js | 4 | ||||
| -rw-r--r-- | test/lib/mock-store.js | 4 |
5 files changed, 11 insertions, 7 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index aa9e1ab6c..c738ac375 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ ## Current Master +## 3.9.12 2017-9-6 + +- Fix bug that prevented Web3 1.0 compatibility - Make eth_sign deprecation warning less noisy - Add useful link to eth_sign deprecation warning. - Fix bug with network version serialization over synchronous RPC diff --git a/app/manifest.json b/app/manifest.json index 7ec32ea78..256737c89 100644 --- a/app/manifest.json +++ b/app/manifest.json @@ -1,7 +1,7 @@ { "name": "MetaMask", "short_name": "Metamask", - "version": "3.9.11", + "version": "3.9.12", "manifest_version": 2, "author": "https://metamask.io", "description": "Ethereum Browser Extension", diff --git a/app/scripts/lib/inpage-provider.js b/app/scripts/lib/inpage-provider.js index 7c74a62d3..c63af06dc 100644 --- a/app/scripts/lib/inpage-provider.js +++ b/app/scripts/lib/inpage-provider.js @@ -43,8 +43,9 @@ function MetamaskInpageProvider (connectionStream) { // handle sendAsync requests via asyncProvider self.sendAsync = function (payload, cb) { // rewrite request ids - var request = eachJsonMessage(payload, (message) => { - var newId = createRandomId() + var request = eachJsonMessage(payload, (_message) => { + const message = Object.assign({}, _message) + const newId = createRandomId() self.idMap[newId] = message.id message.id = newId return message diff --git a/development/uiStore.js b/development/uiStore.js index 1299ee1dc..c71d66d3b 100644 --- a/development/uiStore.js +++ b/development/uiStore.js @@ -1,7 +1,7 @@ const createStore = require('redux').createStore const applyMiddleware = require('redux').applyMiddleware -const thunkMiddleware = require('redux-thunk') -const createLogger = require('redux-logger') +const thunkMiddleware = require('redux-thunk').default +const createLogger = require('redux-logger').createLogger const rootReducer = require('../ui/app/reducers') module.exports = configureStore diff --git a/test/lib/mock-store.js b/test/lib/mock-store.js index 0d50e2d9c..8af8f6d23 100644 --- a/test/lib/mock-store.js +++ b/test/lib/mock-store.js @@ -1,7 +1,7 @@ const createStore = require('redux').createStore const applyMiddleware = require('redux').applyMiddleware -const thunkMiddleware = require('redux-thunk') -const createLogger = require('redux-logger') +const thunkMiddleware = require('redux-thunk').default +const createLogger = require('redux-logger').createLogger const rootReducer = function () {} module.exports = configureStore |