diff options
| author | Leonid <logvinov.leon@gmail.com> | 2017-09-06 16:35:19 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-06 16:35:19 +0800 |
| commit | 35c133caeda613121d7d90f3f1347ebdc8087d66 (patch) | |
| tree | 6156865472010078a9f27b905bcaec7782f6521c /package.json | |
| parent | 18a52a1ea758ee5640680f1097eba1ce9a9e81fc (diff) | |
| parent | f0a5ad2d2063fe8ba4682147ec2f73e2763b0275 (diff) | |
| download | dexon-sol-tools-35c133caeda613121d7d90f3f1347ebdc8087d66.tar dexon-sol-tools-35c133caeda613121d7d90f3f1347ebdc8087d66.tar.gz dexon-sol-tools-35c133caeda613121d7d90f3f1347ebdc8087d66.tar.bz2 dexon-sol-tools-35c133caeda613121d7d90f3f1347ebdc8087d66.tar.lz dexon-sol-tools-35c133caeda613121d7d90f3f1347ebdc8087d66.tar.xz dexon-sol-tools-35c133caeda613121d7d90f3f1347ebdc8087d66.tar.zst dexon-sol-tools-35c133caeda613121d7d90f3f1347ebdc8087d66.zip | |
Merge branch 'development' into fix/signature-verification
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/package.json b/package.json index 90b6d9120..6983cf3d9 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "pretest:umd": "run-s clean build:umd:dev build:commonjs", "substitute_umd_bundle": "npm run remove_src_files_not_used_by_tests; shx mv _bundles/* lib/src", "remove_src_files_not_used_by_tests": "find ./lib/src \\( -path ./lib/src/utils -o -path ./lib/src/subproviders -o -path ./lib/src/schemas -o -path \"./lib/src/types.*\" \\) -prune -o -type f -print | xargs rm", - "run_mocha": "mocha lib/test/**/*_test.js --timeout 4000 --bail" + "run_mocha": "mocha lib/test/**/*_test.js --timeout 5000 --bail" }, "config": { "artifacts": "TokenTransferProxy Exchange TokenRegistry Token EtherToken", @@ -85,13 +85,13 @@ "types-bn": "^0.0.1", "types-ethereumjs-util": "^0.0.5", "typescript": "^2.4.1", - "web3_beta": "ethereum/web3.js#1.0", "web3-provider-engine": "^13.0.1", - "web3-typescript-typings": "^0.3.2", + "web3-typescript-typings": "^0.5.0", "webpack": "^3.1.0" }, "dependencies": { - "0x-json-schemas": "^0.4.0", + "0x-json-schemas": "^0.5.1", + "abi-decoder": "^1.0.8", "bignumber.js": "^4.0.2", "compare-versions": "^3.0.1", "es6-promisify": "^5.0.0", @@ -100,7 +100,6 @@ "find-versions": "^2.0.0", "lodash": "^4.17.4", "publish-release": "^1.3.3", - "truffle-contract": "^2.0.1", "web3": "^0.20.0" } } |