From 088d7930e0895ef1802823c5fc843dd1c19b9661 Mon Sep 17 00:00:00 2001 From: kumavis Date: Wed, 16 May 2018 20:46:34 -0700 Subject: network - create provider and block-tracker via json-rpc-engine --- package.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index f6338c542..4580d0722 100644 --- a/package.json +++ b/package.json @@ -91,6 +91,7 @@ "ensnare": "^1.0.0", "eslint-plugin-react": "^7.4.0", "eth-bin-to-ops": "^1.0.1", + "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", @@ -129,7 +130,7 @@ "iframe-stream": "^3.0.0", "inject-css": "^0.1.1", "jazzicon": "^1.2.0", - "json-rpc-engine": "^3.6.1", + "json-rpc-engine": "^3.7.0", "json-rpc-middleware-stream": "^1.0.1", "lodash.debounce": "^4.0.8", "lodash.memoize": "^4.1.2", @@ -185,6 +186,7 @@ "shallow-copy": "0.0.1", "sw-controller": "^1.0.3", "sw-stream": "^2.0.2", + "swappable-obj-proxy": "^1.0.0", "textarea-caret": "^3.0.1", "through2": "^2.0.3", "valid-url": "^1.0.9", -- cgit From c2a685eb2f5973081863109a9f26433650726713 Mon Sep 17 00:00:00 2001 From: kumavis Date: Wed, 16 May 2018 21:20:35 -0700 Subject: deps - remove web3-provider-engine --- package.json | 1 - 1 file changed, 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 4580d0722..c26b45202 100644 --- a/package.json +++ b/package.json @@ -192,7 +192,6 @@ "valid-url": "^1.0.9", "vreme": "^3.0.2", "web3": "^0.20.1", - "web3-provider-engine": "^14.0.5", "web3-stream-provider": "^3.0.1", "xtend": "^4.0.1" }, -- cgit From 08dc238c9fdb23997a7fbdf57de5305455d1d930 Mon Sep 17 00:00:00 2001 From: kumavis Date: Wed, 16 May 2018 22:46:11 -0700 Subject: deps - fix incorrect dep paths and versions --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'package.json') 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", -- cgit From ae53fa09b4f01820dfe3820233d32ac03bfdada0 Mon Sep 17 00:00:00 2001 From: kumavis Date: Wed, 16 May 2018 23:53:36 -0700 Subject: deps - bump some bugfixes --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index 4a9b9ae8b..4b9149025 100644 --- a/package.json +++ b/package.json @@ -131,7 +131,7 @@ "iframe-stream": "^3.0.0", "inject-css": "^0.1.1", "jazzicon": "^1.2.0", - "json-rpc-engine": "^3.7.0", + "json-rpc-engine": "^3.7.1", "json-rpc-middleware-stream": "^1.0.1", "lodash.debounce": "^4.0.8", "lodash.memoize": "^4.1.2", @@ -187,7 +187,7 @@ "shallow-copy": "0.0.1", "sw-controller": "^1.0.3", "sw-stream": "^2.0.2", - "swappable-obj-proxy": "^1.0.1", + "swappable-obj-proxy": "^1.0.2", "textarea-caret": "^3.0.1", "through2": "^2.0.3", "valid-url": "^1.0.9", -- cgit From ee280de3d07990817ec99138190d5da876708d24 Mon Sep 17 00:00:00 2001 From: kumavis Date: Tue, 22 May 2018 13:35:52 -0700 Subject: deps - eth-block-tracker@4.0.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 5df405b27..ffdd78f82 100644 --- a/package.json +++ b/package.json @@ -92,7 +92,7 @@ "ensnare": "^1.0.0", "eslint-plugin-react": "^7.4.0", "eth-bin-to-ops": "^1.0.1", - "eth-block-tracker": "github:metamask/eth-block-tracker#acbcfda348c309ece0fb96fad78d4861d08f5a91", + "eth-block-tracker": "^4.0.1", "eth-contract-metadata": "^1.1.5", "eth-hd-keyring": "^1.2.1", "eth-json-rpc-filters": "^1.2.8", -- cgit From 9e7a9e47bd36feb1ea2179dca6c2740ba6eb2ab1 Mon Sep 17 00:00:00 2001 From: kumavis Date: Tue, 22 May 2018 16:02:26 -0700 Subject: deps - eth-json-rpc-filters@2.0.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index ffdd78f82..06173bbcd 100644 --- a/package.json +++ b/package.json @@ -95,7 +95,7 @@ "eth-block-tracker": "^4.0.1", "eth-contract-metadata": "^1.1.5", "eth-hd-keyring": "^1.2.1", - "eth-json-rpc-filters": "^1.2.8", + "eth-json-rpc-filters": "^2.0.0", "eth-json-rpc-infura": "^3.0.0", "eth-json-rpc-middleware": "^2.1.0", "eth-keyring-controller": "^3.1.1", -- cgit From 90327195986c953df40a10a6556ad9f133165712 Mon Sep 17 00:00:00 2001 From: kumavis Date: Wed, 23 May 2018 22:33:43 -0700 Subject: deps - bump eth-block-tracker for bugfix --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 06173bbcd..522f84159 100644 --- a/package.json +++ b/package.json @@ -95,7 +95,7 @@ "eth-block-tracker": "^4.0.1", "eth-contract-metadata": "^1.1.5", "eth-hd-keyring": "^1.2.1", - "eth-json-rpc-filters": "^2.0.0", + "eth-json-rpc-filters": "^2.1.1", "eth-json-rpc-infura": "^3.0.0", "eth-json-rpc-middleware": "^2.1.0", "eth-keyring-controller": "^3.1.1", -- cgit From 68aa1cce5f4a1e502cccfba29c3f17f3b29b1527 Mon Sep 17 00:00:00 2001 From: kumavis Date: Thu, 24 May 2018 13:46:16 -0700 Subject: deps - bump json-rpc modules for bugfixes --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index 522f84159..fdb032741 100644 --- a/package.json +++ b/package.json @@ -97,7 +97,7 @@ "eth-hd-keyring": "^1.2.1", "eth-json-rpc-filters": "^2.1.1", "eth-json-rpc-infura": "^3.0.0", - "eth-json-rpc-middleware": "^2.1.0", + "eth-json-rpc-middleware": "^2.1.1", "eth-keyring-controller": "^3.1.1", "eth-phishing-detect": "^1.1.4", "eth-query": "^2.1.2", @@ -132,7 +132,7 @@ "iframe-stream": "^3.0.0", "inject-css": "^0.1.1", "jazzicon": "^1.2.0", - "json-rpc-engine": "^3.7.1", + "json-rpc-engine": "^3.7.3", "json-rpc-middleware-stream": "^1.0.1", "lodash.debounce": "^4.0.8", "lodash.memoize": "^4.1.2", -- cgit From aab9691c42184b81cdf7086d389bb74279e867bf Mon Sep 17 00:00:00 2001 From: kumavis Date: Thu, 24 May 2018 15:51:46 -0700 Subject: provider - update wallet hooks for new wallet middleware --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index fdb032741..908ee23bd 100644 --- a/package.json +++ b/package.json @@ -97,7 +97,7 @@ "eth-hd-keyring": "^1.2.1", "eth-json-rpc-filters": "^2.1.1", "eth-json-rpc-infura": "^3.0.0", - "eth-json-rpc-middleware": "^2.1.1", + "eth-json-rpc-middleware": "^2.2.0", "eth-keyring-controller": "^3.1.1", "eth-phishing-detect": "^1.1.4", "eth-query": "^2.1.2", -- cgit From 41e4d27cafc3e5fa5f295552ff7d395719d5cc3f Mon Sep 17 00:00:00 2001 From: kumavis Date: Thu, 24 May 2018 16:51:47 -0700 Subject: deps - bump eth-json-rpc-middleware for fetch bugfix --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 908ee23bd..1c4d64cc9 100644 --- a/package.json +++ b/package.json @@ -97,7 +97,7 @@ "eth-hd-keyring": "^1.2.1", "eth-json-rpc-filters": "^2.1.1", "eth-json-rpc-infura": "^3.0.0", - "eth-json-rpc-middleware": "^2.2.0", + "eth-json-rpc-middleware": "^2.2.2", "eth-keyring-controller": "^3.1.1", "eth-phishing-detect": "^1.1.4", "eth-query": "^2.1.2", -- cgit From 3ce83570ee336524e1ab0da50a9f47744cddb193 Mon Sep 17 00:00:00 2001 From: kumavis Date: Thu, 7 Jun 2018 12:26:37 -0700 Subject: network - provider - infura - use block-reemit middleware --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 707a90ffe..564db99c9 100644 --- a/package.json +++ b/package.json @@ -99,7 +99,7 @@ "eth-hd-keyring": "^1.2.1", "eth-json-rpc-filters": "^2.1.1", "eth-json-rpc-infura": "^3.0.0", - "eth-json-rpc-middleware": "^2.2.2", + "eth-json-rpc-middleware": "^2.3.0", "eth-keyring-controller": "^3.1.4", "eth-phishing-detect": "^1.1.4", "eth-query": "^2.1.2", -- cgit From 02f5502e16fefc8d92392e614861e3f672c4f909 Mon Sep 17 00:00:00 2001 From: kumavis Date: Mon, 11 Jun 2018 11:04:28 -0700 Subject: test - e2e - inject metamask config to point at localhost --- package.json | 2 ++ 1 file changed, 2 insertions(+) (limited to 'package.json') diff --git a/package.json b/package.json index 564db99c9..94f4b1950 100644 --- a/package.json +++ b/package.json @@ -232,6 +232,7 @@ "eslint-plugin-mocha": "^5.0.0", "eslint-plugin-react": "^7.4.0", "file-loader": "^1.1.11", + "fs-extra": "^6.0.1", "fs-promise": "^2.0.3", "ganache-cli": "^6.1.0", "ganache-core": "^2.1.0", @@ -276,6 +277,7 @@ "open": "0.0.5", "path": "^0.12.7", "png-file-stream": "^1.0.0", + "prepend-file": "^1.3.1", "prompt": "^1.0.0", "proxyquire": "2.0.1", "qs": "^6.2.0", -- cgit From 6a2649a90f5147b505ebc33b97a75d2e90956fca Mon Sep 17 00:00:00 2001 From: kumavis Date: Tue, 12 Jun 2018 11:12:32 -0700 Subject: network - import createBlockTrackerInspectorMiddleware and rearrange cache middleware order --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 94f4b1950..0332f06b8 100644 --- a/package.json +++ b/package.json @@ -99,7 +99,7 @@ "eth-hd-keyring": "^1.2.1", "eth-json-rpc-filters": "^2.1.1", "eth-json-rpc-infura": "^3.0.0", - "eth-json-rpc-middleware": "^2.3.0", + "eth-json-rpc-middleware": "^2.4.0", "eth-keyring-controller": "^3.1.4", "eth-phishing-detect": "^1.1.4", "eth-query": "^2.1.2", -- cgit From c7236359328e6b64a5bbb8bf012073e0dbf6ac8a Mon Sep 17 00:00:00 2001 From: kumavis Date: Tue, 3 Jul 2018 13:48:49 -0700 Subject: test - run ganache rpc without vm errors --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 835474505..6489dfe24 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "test:mascara:build:locales": "mkdirp dist/chrome && cp -R app/_locales dist/chrome/_locales", "test:mascara:build:background": "browserify mascara/src/background.js -o dist/mascara/background.js", "test:mascara:build:tests": "browserify test/integration/lib/first-time.js -o dist/mascara/tests.js", - "ganache:start": "ganache-cli -m 'phrase upgrade clock rough situate wedding elder clever doctor stamp excess tent'", + "ganache:start": "ganache-cli --noVMErrorsOnRPCResponse -m 'phrase upgrade clock rough situate wedding elder clever doctor stamp excess tent'", "sentry:publish": "node ./development/sentry-publish.js", "lint": "eslint .", "lint:fix": "eslint . --fix", -- cgit From 974d623da20baa9a7bf88ffdb093f5934e90f4d1 Mon Sep 17 00:00:00 2001 From: Thomas Date: Tue, 14 Aug 2018 12:29:15 -0700 Subject: Update eth-json-rpc-filters --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index e4d1246a3..d1d2e7df1 100644 --- a/package.json +++ b/package.json @@ -111,7 +111,7 @@ "eth-keyring-controller": "^3.1.4", "eth-ens-namehash": "^2.0.8", "eth-hd-keyring": "^1.2.2", - "eth-json-rpc-filters": "^1.2.6", + "eth-json-rpc-filters": "^2.1.1", "eth-json-rpc-infura": "^3.0.0", "eth-method-registry": "^1.0.0", "eth-phishing-detect": "^1.1.4", -- cgit