aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeonid <logvinov.leon@gmail.com>2017-06-10 21:07:50 +0800
committerGitHub <noreply@github.com>2017-06-10 21:07:50 +0800
commit4c812c99c2d55dcae6c2ac5d0547ebcafc8521be (patch)
tree7e74fdbc1b1e5ac73569ea525f98f36dfcd52c31
parent2a97091ecbce55ab5b5ac0b9b125c076a265743f (diff)
parenta2c5b340691fd34c41d46e4b5d7ef1dfd52aaaa6 (diff)
downloaddexon-0x-contracts-4c812c99c2d55dcae6c2ac5d0547ebcafc8521be.tar.gz
dexon-0x-contracts-4c812c99c2d55dcae6c2ac5d0547ebcafc8521be.tar.zst
dexon-0x-contracts-4c812c99c2d55dcae6c2ac5d0547ebcafc8521be.zip
Merge pull request #58 from 0xProject/remove-console-trash
Remove unneccessary console output from block tracker
-rw-r--r--package.json2
-rw-r--r--yarn.lock35
2 files changed, 36 insertions, 1 deletions
diff --git a/package.json b/package.json
index 9d774ed7b..217c9a910 100644
--- a/package.json
+++ b/package.json
@@ -75,7 +75,7 @@
"tslint-config-0xproject": "^0.0.2",
"typedoc": "^0.7.1",
"typescript": "^2.3.3",
- "web3-provider-engine": "^12.1.0",
+ "web3-provider-engine": "https://github.com/0xProject/provider-engine.git",
"web3-typescript-typings": "0.0.8",
"webpack": "^2.6.0"
},
diff --git a/yarn.lock b/yarn.lock
index abe7ca550..668b8e6d0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1384,6 +1384,17 @@ eth-block-tracker@^1.0.15:
pify "^2.3.0"
tape "^4.6.3"
+eth-block-tracker@^1.1.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/eth-block-tracker/-/eth-block-tracker-1.1.0.tgz#443d9b5657f244f798a489186f9c98318f286a89"
+ dependencies:
+ async-eventemitter "^0.2.2"
+ babelify "^7.3.0"
+ eth-query "^2.1.0"
+ ethjs-util "^0.1.3"
+ pify "^2.3.0"
+ tape "^4.6.3"
+
eth-query@^2.1.0:
version "2.1.1"
resolved "https://registry.yarnpkg.com/eth-query/-/eth-query-2.1.1.tgz#0a8ee5bd24c7b5c04a0ccc8ba47fc6aba4298d92"
@@ -4157,6 +4168,30 @@ web3-provider-engine@^12.1.0:
xhr "^2.2.0"
xtend "^4.0.1"
+"web3-provider-engine@https://github.com/0xProject/provider-engine.git":
+ version "12.2.3"
+ resolved "https://github.com/0xProject/provider-engine.git#4be49e889ef6a9ca36e849ef8ddda715bbfd29f9"
+ dependencies:
+ async "^2.1.2"
+ clone "^2.0.0"
+ eth-block-tracker "^1.1.0"
+ eth-sig-util "^1.2.1"
+ ethereumjs-block "^1.2.2"
+ ethereumjs-tx "^1.2.0"
+ ethereumjs-util "^5.1.1"
+ ethereumjs-vm "^2.0.2"
+ fetch-ponyfill "^4.0.0"
+ json-rpc-error "^2.0.0"
+ json-stable-stringify "^1.0.1"
+ promise-to-callback "^1.0.0"
+ readable-stream "^2.2.9"
+ request "^2.67.0"
+ semaphore "^1.0.3"
+ solc "^0.4.2"
+ tape "^4.4.0"
+ xhr "^2.2.0"
+ xtend "^4.0.1"
+
web3-provider-engine@~8.1.0:
version "8.1.19"
resolved "https://registry.yarnpkg.com/web3-provider-engine/-/web3-provider-engine-8.1.19.tgz#3ccae95adecef55632e2a73bf3bee64b7e62fcf7"