aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkumavis <aaron@kumavis.me>2018-05-17 13:46:11 +0800
committerkumavis <aaron@kumavis.me>2018-05-17 13:46:11 +0800
commit08dc238c9fdb23997a7fbdf57de5305455d1d930 (patch)
treed589655afeb139fb301516f3f557c5eef36b6f0c
parentf9074a57211277f740d1eef0f0599381df958c84 (diff)
downloadtangerine-wallet-browser-08dc238c9fdb23997a7fbdf57de5305455d1d930.tar
tangerine-wallet-browser-08dc238c9fdb23997a7fbdf57de5305455d1d930.tar.gz
tangerine-wallet-browser-08dc238c9fdb23997a7fbdf57de5305455d1d930.tar.bz2
tangerine-wallet-browser-08dc238c9fdb23997a7fbdf57de5305455d1d930.tar.lz
tangerine-wallet-browser-08dc238c9fdb23997a7fbdf57de5305455d1d930.tar.xz
tangerine-wallet-browser-08dc238c9fdb23997a7fbdf57de5305455d1d930.tar.zst
tangerine-wallet-browser-08dc238c9fdb23997a7fbdf57de5305455d1d930.zip
deps - fix incorrect dep paths and versions
-rw-r--r--app/scripts/controllers/network/createInfuraClient.js2
-rw-r--r--app/scripts/controllers/network/createJsonRpcClient.js2
-rw-r--r--app/scripts/controllers/network/createMetamaskMiddleware.js2
-rw-r--r--app/scripts/controllers/network/network.js2
-rw-r--r--package.json6
5 files changed, 7 insertions, 7 deletions
diff --git a/app/scripts/controllers/network/createInfuraClient.js b/app/scripts/controllers/network/createInfuraClient.js
index 528be80ce..adbf4c001 100644
--- a/app/scripts/controllers/network/createInfuraClient.js
+++ b/app/scripts/controllers/network/createInfuraClient.js
@@ -2,7 +2,7 @@ const mergeMiddleware = require('json-rpc-engine/src/mergeMiddleware')
const createAsyncMiddleware = require('json-rpc-engine/src/createAsyncMiddleware')
const createBlockRefMiddleware = require('eth-json-rpc-middleware/block-ref')
const createBlockCacheMiddleware = require('eth-json-rpc-middleware/block-cache')
-const createInflightMiddleware = require('eth-json-rpc-middleware/inflight')
+const createInflightMiddleware = require('eth-json-rpc-middleware/inflight-cache')
const providerFromMiddleware = require('eth-json-rpc-middleware/providerFromMiddleware')
const createInfuraMiddleware = require('eth-json-rpc-infura')
const BlockTracker = require('eth-block-tracker')
diff --git a/app/scripts/controllers/network/createJsonRpcClient.js b/app/scripts/controllers/network/createJsonRpcClient.js
index f8b67aa26..d712ed135 100644
--- a/app/scripts/controllers/network/createJsonRpcClient.js
+++ b/app/scripts/controllers/network/createJsonRpcClient.js
@@ -3,7 +3,7 @@ const createAsyncMiddleware = require('json-rpc-engine/src/createAsyncMiddleware
const createFetchMiddleware = require('eth-json-rpc-middleware/fetch')
const createBlockRefMiddleware = require('eth-json-rpc-middleware/block-ref')
const createBlockCacheMiddleware = require('eth-json-rpc-middleware/block-cache')
-const createInflightMiddleware = require('eth-json-rpc-middleware/inflight')
+const createInflightMiddleware = require('eth-json-rpc-middleware/inflight-cache')
const providerFromMiddleware = require('eth-json-rpc-middleware/providerFromMiddleware')
const BlockTracker = require('eth-block-tracker')
diff --git a/app/scripts/controllers/network/createMetamaskMiddleware.js b/app/scripts/controllers/network/createMetamaskMiddleware.js
index 7dbd90d7f..8b17829b7 100644
--- a/app/scripts/controllers/network/createMetamaskMiddleware.js
+++ b/app/scripts/controllers/network/createMetamaskMiddleware.js
@@ -1,5 +1,5 @@
const mergeMiddleware = require('json-rpc-engine/src/mergeMiddleware')
-const createScaffoldMiddleware = require('json-rpc-engine/src/scaffold')
+const createScaffoldMiddleware = require('json-rpc-engine/src/createScaffoldMiddleware')
const createAsyncMiddleware = require('json-rpc-engine/src/createAsyncMiddleware')
const createWalletSubprovider = require('eth-json-rpc-middleware/wallet')
diff --git a/app/scripts/controllers/network/network.js b/app/scripts/controllers/network/network.js
index 213013cca..9e622981b 100644
--- a/app/scripts/controllers/network/network.js
+++ b/app/scripts/controllers/network/network.js
@@ -4,7 +4,7 @@ const ObservableStore = require('obs-store')
const ComposedStore = require('obs-store/lib/composed')
const EthQuery = require('eth-query')
const JsonRpcEngine = require('json-rpc-engine')
-const providerFromEngine = require('eth-json-rpc-middle/providerFromEngine')
+const providerFromEngine = require('eth-json-rpc-middleware/providerFromEngine')
const log = require('loglevel')
const createMetamaskMiddleware = require('./createMetamaskMiddleware')
const createInfuraClient = require('./createInfuraClient')
diff --git a/package.json b/package.json
index c26b45202..4a9b9ae8b 100644
--- a/package.json
+++ b/package.json
@@ -94,8 +94,9 @@
"eth-block-tracker": "github:metamask/eth-block-tracker#acbcfda348c309ece0fb96fad78d4861d08f5a91",
"eth-contract-metadata": "^1.1.5",
"eth-hd-keyring": "^1.2.1",
- "eth-json-rpc-filters": "^1.2.6",
+ "eth-json-rpc-filters": "^1.2.8",
"eth-json-rpc-infura": "^3.0.0",
+ "eth-json-rpc-middleware": "^2.1.0",
"eth-keyring-controller": "^2.2.0",
"eth-phishing-detect": "^1.1.4",
"eth-query": "^2.1.2",
@@ -186,7 +187,7 @@
"shallow-copy": "0.0.1",
"sw-controller": "^1.0.3",
"sw-stream": "^2.0.2",
- "swappable-obj-proxy": "^1.0.0",
+ "swappable-obj-proxy": "^1.0.1",
"textarea-caret": "^3.0.1",
"through2": "^2.0.3",
"valid-url": "^1.0.9",
@@ -227,7 +228,6 @@
"eslint-plugin-json": "^1.2.0",
"eslint-plugin-mocha": "^5.0.0",
"eslint-plugin-react": "^7.4.0",
- "eth-json-rpc-middleware": "^1.6.0",
"file-loader": "^1.1.11",
"fs-promise": "^2.0.3",
"ganache-cli": "^6.1.0",