crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #709 from 0xProject/feature/pin-deps

Browse Source 
[DEVELOPMENT] Ethersjs Issue Hot Fix
This commit is contained in:
Fabio Berger
2018-06-15 14:14:45 +02:00
committed by GitHub
parent 3e061e7364 0f9ea9773e
commit bf915ce403
38 changed files with 741 additions and 894 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -93,3 +93,5 @@ packages/sol-compiler/solc_bin/
# Monorepo scripts
packages/*/scripts/
ganache.log

6
package.json
View File

@@ -32,13 +32,13 @@
"mnemonic": "concert load couple harbor equip island argue ramp clarify fence smart topic"
},
"devDependencies": {
"async-child-process": "^1.1.1",
"async-child-process": "1.1.1",
"coveralls": "^3.0.0",
"ganache-cli": "^6.1.0",
"lcov-result-merger": "^2.0.0",
"lerna": "^2.5.1",
"npm-run-all": "^4.1.2",
"prettier": "^1.11.1",
"npm-run-all": "4.1.2",
"prettier": "1.12.1",
"wsrun": "^2.2.0"
}
}

2
packages/0x.js/.npmignore
View File

@@ -9,3 +9,5 @@ test/
/generated_docs/
/scripts/
/lib/src/monorepo_scripts/
/lib/test/
ganache.log

44
packages/0x.js/package.json
View File

@@ -73,29 +73,29 @@
"@0xproject/sol-compiler": "^0.5.0",
"@0xproject/tslint-config": "^0.4.18",
"@types/lodash": "4.14.104",
"@types/mocha": "^2.2.42",
"@types/node": "^8.0.53",
"@types/sinon": "^2.2.2",
"awesome-typescript-loader": "^3.1.3",
"chai": "^4.0.1",
"chai-as-promised": "^7.1.0",
"chai-bignumber": "^2.0.1",
"copyfiles": "^1.2.0",
"dirty-chai": "^2.0.1",
"json-loader": "^0.5.4",
"make-promises-safe": "^1.1.0",
"mocha": "^4.0.1",
"npm-run-all": "^4.1.2",
"nyc": "^11.0.1",
"opn-cli": "^3.1.0",
"prettier": "^1.11.1",
"shx": "^0.2.2",
"sinon": "^4.0.0",
"source-map-support": "^0.5.0",
"@types/mocha": "2.2.48",
"@types/node": "9.6.0",
"@types/sinon": "2.3.7",
"awesome-typescript-loader": "3.5.0",
"chai": "4.1.2",
"chai-as-promised": "7.1.1",
"chai-bignumber": "2.0.1",
"copyfiles": "1.2.0",
"dirty-chai": "2.0.1",
"json-loader": "0.5.7",
"make-promises-safe": "1.1.0",
"mocha": "4.1.0",
"npm-run-all": "4.1.2",
"nyc": "11.6.0",
"opn-cli": "3.1.0",
"prettier": "1.12.1",
"shx": "0.2.2",
"sinon": "4.4.9",
"source-map-support": "0.5.4",
"tslint": "5.8.0",
"typedoc": "0xProject/typedoc",
"typescript": "2.7.1",
"webpack": "^3.1.0"
"webpack": "3.11.0"
},
"dependencies": {
"@0xproject/assert": "^0.2.10",
@@ -108,8 +108,8 @@
"@0xproject/typescript-typings": "^0.3.2",
"@0xproject/utils": "^0.6.2",
"@0xproject/web3-wrapper": "^0.6.4",
"ethers": "^3.0.15",
"lodash": "^4.17.4"
"ethers": "3.0.15",
"lodash": "4.17.10"
},
"publishConfig": {
"access": "public"

2
packages/0x.js/src/index.ts
View File

@@ -19,6 +19,8 @@ export {
TransactionReceiptWithDecodedLogs,
} from '@0xproject/types';
export { OrderWatcherConfig } from '@0xproject/order-watcher';
export {
EventCallback,
ContractEvent,

32
packages/abi-gen/package.json
View File

@@ -30,26 +30,26 @@
"@0xproject/types": "^0.7.0",
"@0xproject/typescript-typings": "^0.3.2",
"@0xproject/utils": "^0.6.2",
"chalk": "^2.3.0",
"glob": "^7.1.2",
"handlebars": "^4.0.11",
"lodash": "^4.17.4",
"mkdirp": "^0.5.1",
"to-snake-case": "^1.0.0",
"yargs": "^10.0.3"
"chalk": "2.3.2",
"glob": "7.1.1",
"handlebars": "4.0.11",
"lodash": "4.17.10",
"mkdirp": "0.5.1",
"to-snake-case": "1.0.0",
"yargs": "11.1.0"
},
"devDependencies": {
"@0xproject/monorepo-scripts": "^0.1.20",
"@0xproject/tslint-config": "^0.4.18",
"@types/glob": "^5.0.33",
"@types/handlebars": "^4.0.36",
"@types/mkdirp": "^0.5.1",
"@types/node": "^8.0.53",
"@types/yargs": "^10.0.0",
"copyfiles": "^1.2.0",
"make-promises-safe": "^1.1.0",
"npm-run-all": "^4.1.2",
"shx": "^0.2.2",
"@types/glob": "5.0.35",
"@types/handlebars": "4.0.36",
"@types/mkdirp": "0.5.2",
"@types/node": "9.6.0",
"@types/yargs": "10.0.2",
"copyfiles": "1.2.0",
"make-promises-safe": "1.1.0",
"npm-run-all": "4.1.2",
"shx": "0.2.2",
"tslint": "5.8.0",
"typescript": "2.7.1"
},

24
packages/assert/package.json
View File

@@ -33,16 +33,16 @@
"@0xproject/monorepo-scripts": "^0.1.20",
"@0xproject/tslint-config": "^0.4.18",
"@types/lodash": "4.14.104",
"@types/mocha": "^2.2.42",
"@types/valid-url": "^1.0.2",
"chai": "^4.0.1",
"copyfiles": "^1.2.0",
"dirty-chai": "^2.0.1",
"make-promises-safe": "^1.1.0",
"mocha": "^4.0.1",
"npm-run-all": "^4.1.2",
"nyc": "^11.0.1",
"shx": "^0.2.2",
"@types/mocha": "2.2.48",
"@types/valid-url": "1.0.2",
"chai": "4.1.2",
"copyfiles": "1.2.0",
"dirty-chai": "2.0.1",
"make-promises-safe": "1.1.0",
"mocha": "4.1.0",
"npm-run-all": "4.1.2",
"nyc": "11.6.0",
"shx": "0.2.2",
"tslint": "5.8.0",
"typescript": "2.7.1"
},
@@ -50,8 +50,8 @@
"@0xproject/json-schemas": "^0.7.24",
"@0xproject/typescript-typings": "^0.3.2",
"@0xproject/utils": "^0.6.2",
"lodash": "^4.17.4",
"valid-url": "^1.0.9"
"lodash": "4.17.10",
"valid-url": "1.0.9"
},
"publishConfig": {
"access": "public"

16
packages/base-contract/package.json
View File

@@ -32,12 +32,12 @@
"@0xproject/monorepo-scripts": "^0.1.20",
"@0xproject/tslint-config": "^0.4.18",
"@types/lodash": "4.14.104",
"chai": "^4.0.1",
"copyfiles": "^1.2.0",
"make-promises-safe": "^1.1.0",
"mocha": "^4.0.1",
"npm-run-all": "^4.1.2",
"shx": "^0.2.2",
"chai": "4.1.2",
"copyfiles": "1.2.0",
"make-promises-safe": "1.1.0",
"mocha": "4.1.0",
"npm-run-all": "4.1.2",
"shx": "0.2.2",
"tslint": "5.8.0",
"typescript": "2.7.1"
},
@@ -46,8 +46,8 @@
"@0xproject/typescript-typings": "^0.3.2",
"@0xproject/utils": "^0.6.2",
"@0xproject/web3-wrapper": "^0.6.4",
"ethers": "^3.0.15",
"lodash": "^4.17.4"
"ethers": "3.0.15",
"lodash": "4.17.10"
},
"publishConfig": {
"access": "public"

40
packages/connect/package.json
View File

@@ -55,32 +55,32 @@
"@0xproject/types": "^0.7.0",
"@0xproject/typescript-typings": "^0.3.2",
"@0xproject/utils": "^0.6.2",
"isomorphic-fetch": "^2.2.1",
"lodash": "^4.17.4",
"query-string": "^5.0.1",
"websocket": "^1.0.25"
"isomorphic-fetch": "2.2.1",
"lodash": "4.17.10",
"query-string": "4.3.4",
"websocket": "1.0.25"
},
"devDependencies": {
"@0xproject/monorepo-scripts": "^0.1.20",
"@0xproject/tslint-config": "^0.4.18",
"@types/fetch-mock": "^5.12.1",
"@types/fetch-mock": "5.12.2",
"@types/lodash": "4.14.104",
"@types/mocha": "^2.2.42",
"@types/query-string": "^5.0.1",
"@types/websocket": "^0.0.34",
"async-child-process": "^1.1.1",
"chai": "^4.0.1",
"chai-as-promised": "^7.1.0",
"copyfiles": "^1.2.0",
"dirty-chai": "^2.0.1",
"fetch-mock": "^5.13.1",
"make-promises-safe": "^1.1.0",
"mocha": "^4.0.1",
"npm-run-all": "^4.1.2",
"nyc": "^11.0.1",
"shx": "^0.2.2",
"@types/mocha": "2.2.48",
"@types/query-string": "5.1.0",
"@types/websocket": "0.0.34",
"async-child-process": "1.1.1",
"chai": "4.1.2",
"chai-as-promised": "7.1.1",
"copyfiles": "1.2.0",
"dirty-chai": "2.0.1",
"fetch-mock": "5.13.1",
"make-promises-safe": "1.1.0",
"mocha": "4.1.0",
"npm-run-all": "4.1.2",
"nyc": "11.6.0",
"shx": "0.2.2",
"tslint": "5.8.0",
"typedoc": "~0.8.0",
"typedoc": "0.8.0",
"typescript": "2.7.1"
},
"publishConfig": {

52
packages/contract-wrappers/package.json
View File

@@ -46,28 +46,28 @@
"@0xproject/subproviders": "^0.10.2",
"@0xproject/tslint-config": "^0.4.18",
"@types/lodash": "4.14.104",
"@types/mocha": "^2.2.42",
"@types/node": "^8.0.53",
"@types/sinon": "^2.2.2",
"@types/uuid": "^3.4.2",
"awesome-typescript-loader": "^3.1.3",
"chai": "^4.0.1",
"chai-as-promised": "^7.1.0",
"chai-bignumber": "^2.0.1",
"copyfiles": "^1.2.0",
"dirty-chai": "^2.0.1",
"make-promises-safe": "^1.1.0",
"mocha": "^4.0.1",
"npm-run-all": "^4.1.2",
"nyc": "^11.0.1",
"opn-cli": "^3.1.0",
"prettier": "^1.11.1",
"shx": "^0.2.2",
"sinon": "^4.0.0",
"source-map-support": "^0.5.0",
"@types/mocha": "2.2.48",
"@types/node": "9.6.0",
"@types/sinon": "2.3.7",
"@types/uuid": "3.4.3",
"awesome-typescript-loader": "3.5.0",
"chai": "4.1.2",
"chai-as-promised": "7.1.1",
"chai-bignumber": "2.0.1",
"copyfiles": "1.2.0",
"dirty-chai": "2.0.1",
"make-promises-safe": "1.1.0",
"mocha": "4.1.0",
"npm-run-all": "4.1.2",
"nyc": "11.6.0",
"opn-cli": "3.1.0",
"prettier": "1.12.1",
"shx": "0.2.2",
"sinon": "4.4.9",
"source-map-support": "0.5.4",
"tslint": "5.8.0",
"typescript": "2.7.1",
"web3-provider-engine": "^14.0.4"
"web3-provider-engine": "13.8.0"
},
"dependencies": {
"@0xproject/assert": "^0.2.10",
@@ -79,12 +79,12 @@
"@0xproject/typescript-typings": "^0.3.2",
"@0xproject/utils": "^0.6.2",
"@0xproject/web3-wrapper": "^0.6.4",
"ethereumjs-blockstream": "^2.0.6",
"ethereumjs-util": "^5.1.1",
"ethers": "^3.0.15",
"js-sha3": "^0.7.0",
"lodash": "^4.17.4",
"uuid": "^3.1.0"
"ethereumjs-blockstream": "2.0.7",
"ethereumjs-util": "5.1.5",
"ethers": "3.0.15",
"js-sha3": "0.7.0",
"lodash": "4.17.10",
"uuid": "3.2.1"
},
"publishConfig": {
"access": "public"

40
packages/contracts/package.json
View File

@@ -46,22 +46,22 @@
"@0xproject/dev-utils": "^0.4.2",
"@0xproject/tslint-config": "^0.4.18",
"@types/lodash": "4.14.104",
"@types/node": "^8.0.53",
"@types/yargs": "^10.0.0",
"chai": "^4.0.1",
"chai-as-promised": "^7.1.0",
"chai-bignumber": "^2.0.1",
"copyfiles": "^1.2.0",
"dirty-chai": "^2.0.1",
"make-promises-safe": "^1.1.0",
"mocha": "^4.0.1",
"npm-run-all": "^4.1.2",
"prettier": "^1.11.1",
"shx": "^0.2.2",
"solc": "^0.4.23",
"@types/node": "9.6.0",
"@types/yargs": "10.0.2",
"chai": "4.1.2",
"chai-as-promised": "7.1.1",
"chai-bignumber": "2.0.1",
"copyfiles": "1.2.0",
"dirty-chai": "2.0.1",
"make-promises-safe": "1.1.0",
"mocha": "4.1.0",
"npm-run-all": "4.1.2",
"prettier": "1.12.1",
"shx": "0.2.2",
"solc": "0.4.23",
"tslint": "5.8.0",
"typescript": "2.7.1",
"yargs": "^10.0.3"
"yargs": "11.1.0"
},
"dependencies": {
"0x.js": "^0.38.3",
@@ -71,11 +71,11 @@
"@0xproject/typescript-typings": "^0.3.2",
"@0xproject/utils": "^0.6.2",
"@0xproject/web3-wrapper": "^0.6.4",
"bn.js": "^4.11.8",
"ethereumjs-abi": "^0.6.4",
"ethereumjs-util": "^5.1.1",
"ethers": "^3.0.15",
"lodash": "^4.17.4",
"web3": "^0.20.0"
"bn.js": "4.11.7",
"ethereumjs-abi": "0.6.5",
"ethereumjs-util": "5.1.5",
"ethers": "3.0.15",
"lodash": "4.17.10",
"web3": "0.20.6"
}
}

22
packages/dev-utils/package.json
View File

@@ -32,14 +32,14 @@
"@0xproject/monorepo-scripts": "^0.1.20",
"@0xproject/tslint-config": "^0.4.18",
"@types/lodash": "4.14.104",
"@types/mocha": "^2.2.42",
"chai": "^4.0.1",
"copyfiles": "^1.2.0",
"make-promises-safe": "^1.1.0",
"mocha": "^4.0.1",
"npm-run-all": "^4.1.2",
"nyc": "^11.0.1",
"shx": "^0.2.2",
"@types/mocha": "2.2.48",
"chai": "4.1.2",
"copyfiles": "1.2.0",
"make-promises-safe": "1.1.0",
"mocha": "4.1.0",
"npm-run-all": "4.1.2",
"nyc": "11.6.0",
"shx": "0.2.2",
"tslint": "5.8.0",
"typescript": "2.7.1"
},
@@ -49,9 +49,9 @@
"@0xproject/types": "^0.7.0",
"@0xproject/typescript-typings": "^0.3.2",
"@0xproject/web3-wrapper": "^0.6.4",
"lodash": "^4.17.4",
"web3": "^0.20.0",
"web3-provider-engine": "^14.0.4"
"lodash": "4.17.10",
"web3": "0.20.6",
"web3-provider-engine": "13.8.0"
},
"publishConfig": {
"access": "public"

12
packages/fill-scenarios/package.json
View File

@@ -28,10 +28,10 @@
"@0xproject/sol-compiler": "^0.5.0",
"@0xproject/tslint-config": "^0.4.18",
"@types/lodash": "4.14.104",
"copyfiles": "^1.2.0",
"make-promises-safe": "^1.1.0",
"npm-run-all": "^4.1.2",
"shx": "^0.2.2",
"copyfiles": "1.2.0",
"make-promises-safe": "1.1.0",
"npm-run-all": "4.1.2",
"shx": "0.2.2",
"tslint": "5.8.0",
"typescript": "2.7.1"
},
@@ -42,8 +42,8 @@
"@0xproject/typescript-typings": "^0.3.2",
"@0xproject/utils": "^0.6.2",
"@0xproject/web3-wrapper": "^0.6.4",
"ethers": "^3.0.15",
"lodash": "^4.17.4"
"ethers": "3.0.15",
"lodash": "4.17.10"
},
"publishConfig": {
"access": "public"

30
packages/json-schemas/package.json
View File

@@ -46,26 +46,26 @@
"homepage": "https://github.com/0xProject/0x-monorepo/packages/json-schemas/README.md",
"dependencies": {
"@0xproject/typescript-typings": "^0.3.2",
"@types/node": "^8.0.53",
"jsonschema": "^1.2.0",
"lodash.values": "^4.3.0"
"@types/node": "9.6.0",
"jsonschema": "1.2.2",
"lodash.values": "4.3.0"
},
"devDependencies": {
"@0xproject/monorepo-scripts": "^0.1.20",
"@0xproject/tslint-config": "^0.4.18",
"@0xproject/utils": "^0.6.2",
"@types/lodash.foreach": "^4.5.3",
"@types/lodash.values": "^4.3.3",
"@types/mocha": "^2.2.42",
"chai": "^4.0.1",
"copyfiles": "^1.2.0",
"dirty-chai": "^2.0.1",
"lodash.foreach": "^4.5.0",
"make-promises-safe": "^1.1.0",
"mocha": "^4.0.1",
"npm-run-all": "^4.1.2",
"nyc": "^11.0.1",
"shx": "^0.2.2",
"@types/lodash.foreach": "4.5.3",
"@types/lodash.values": "4.3.3",
"@types/mocha": "2.2.48",
"chai": "4.1.2",
"copyfiles": "1.2.0",
"dirty-chai": "2.0.1",
"lodash.foreach": "4.5.0",
"make-promises-safe": "1.1.0",
"mocha": "4.1.0",
"npm-run-all": "4.1.2",
"nyc": "11.6.0",
"shx": "0.2.2",
"tslint": "5.8.0",
"typedoc": "0xProject/typedoc",
"typescript": "2.7.1"

20
packages/metacoin/package.json
View File

@@ -35,19 +35,19 @@
"@0xproject/types": "^0.7.0",
"@0xproject/utils": "^0.6.2",
"@0xproject/web3-wrapper": "^0.6.4",
"ethers": "^3.0.15",
"lodash": "^4.17.4",
"web3-provider-engine": "^14.0.4"
"ethers": "3.0.15",
"lodash": "4.17.10",
"web3-provider-engine": "13.8.0"
},
"devDependencies": {
"@0xproject/dev-utils": "^0.4.2",
"chai": "^4.0.1",
"chai-as-promised": "^7.1.0",
"chai-bignumber": "^2.0.1",
"dirty-chai": "^2.0.1",
"make-promises-safe": "^1.1.0",
"npm-run-all": "^4.1.2",
"shx": "^0.2.2",
"chai": "4.1.2",
"chai-as-promised": "7.1.1",
"chai-bignumber": "2.0.1",
"dirty-chai": "2.0.1",
"make-promises-safe": "1.1.0",
"npm-run-all": "4.1.2",
"shx": "0.2.2",
"tslint": "5.8.0",
"typescript": "2.7.1"
}

10
packages/migrations/package.json
View File

@@ -28,9 +28,9 @@
"@0xproject/dev-utils": "^0.4.2",
"@0xproject/tslint-config": "^0.4.18",
"@0xproject/types": "^0.7.0",
"make-promises-safe": "^1.1.0",
"npm-run-all": "^4.1.2",
"shx": "^0.2.2",
"make-promises-safe": "1.1.0",
"npm-run-all": "4.1.2",
"shx": "0.2.2",
"tslint": "5.8.0",
"typescript": "2.7.1"
},
@@ -40,8 +40,8 @@
"@0xproject/typescript-typings": "^0.3.2",
"@0xproject/utils": "^0.6.2",
"@0xproject/web3-wrapper": "^0.6.4",
"ethers": "^3.0.15",
"lodash": "^4.17.4"
"ethers": "3.0.15",
"lodash": "4.17.10"
},
"publishConfig": {
"access": "public"

40
packages/monorepo-scripts/package.json
View File

@@ -30,32 +30,32 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/monorepo-scripts/README.md",
"devDependencies": {
"@types/glob": "^5.0.33",
"@types/node": "^8.0.53",
"@types/opn": "^5.1.0",
"@types/rimraf": "^2.0.2",
"depcheck": "^0.6.9",
"lerna-get-packages": "^1.0.0",
"make-promises-safe": "^1.1.0",
"npm-run-all": "^4.1.2",
"shx": "^0.2.2",
"@types/glob": "5.0.35",
"@types/node": "9.6.0",
"@types/opn": "5.1.0",
"@types/rimraf": "2.0.2",
"depcheck": "0.6.9",
"lerna-get-packages": "1.0.0",
"make-promises-safe": "1.1.0",
"npm-run-all": "4.1.2",
"shx": "0.2.2",
"tslint": "5.8.0",
"typescript": "2.7.1"
},
"dependencies": {
"@types/depcheck": "^0.6.0",
"async-child-process": "^1.1.1",
"chalk": "^2.3.0",
"es6-promisify": "^5.0.0",
"glob": "^7.1.2",
"lodash": "^4.17.4",
"@types/depcheck": "0.6.0",
"async-child-process": "1.1.1",
"chalk": "2.3.2",
"es6-promisify": "5.0.0",
"glob": "7.1.1",
"lodash": "4.17.10",
"moment": "2.21.0",
"opn": "^5.3.0",
"promisify-child-process": "^1.0.5",
"prompt": "^1.0.0",
"opn": "5.3.0",
"promisify-child-process": "1.0.5",
"prompt": "1.0.0",
"publish-release": "0xproject/publish-release",
"rimraf": "^2.6.2",
"semver-diff": "^2.1.0",
"rimraf": "2.6.2",
"semver-diff": "2.1.0",
"semver-sort": "0.0.4"
},
"publishConfig": {

30
packages/order-utils/package.json
View File

@@ -47,16 +47,16 @@
"@0xproject/monorepo-scripts": "^0.1.20",
"@0xproject/tslint-config": "^0.4.18",
"@types/lodash": "4.14.104",
"chai": "^4.0.1",
"chai-as-promised": "^7.1.0",
"chai-bignumber": "^2.0.1",
"copyfiles": "^1.2.0",
"dirty-chai": "^2.0.1",
"make-promises-safe": "^1.1.0",
"mocha": "^4.0.1",
"npm-run-all": "^4.1.2",
"shx": "^0.2.2",
"sinon": "^4.0.0",
"chai": "4.1.2",
"chai-as-promised": "7.1.1",
"chai-bignumber": "2.0.1",
"copyfiles": "1.2.0",
"dirty-chai": "2.0.1",
"make-promises-safe": "1.1.0",
"mocha": "4.1.0",
"npm-run-all": "4.1.2",
"shx": "0.2.2",
"sinon": "4.4.9",
"tslint": "5.8.0",
"typedoc": "0xProject/typedoc",
"typescript": "2.7.1"
@@ -68,11 +68,11 @@
"@0xproject/typescript-typings": "^0.3.2",
"@0xproject/utils": "^0.6.2",
"@0xproject/web3-wrapper": "^0.6.4",
"@types/node": "^8.0.53",
"bn.js": "^4.11.8",
"ethereumjs-abi": "^0.6.4",
"ethereumjs-util": "^5.1.1",
"lodash": "^4.17.4"
"@types/node": "9.6.0",
"bn.js": "4.11.7",
"ethereumjs-abi": "0.6.5",
"ethereumjs-util": "5.1.5",
"lodash": "4.17.10"
},
"publishConfig": {
"access": "public"

46
packages/order-watcher/package.json
View File

@@ -45,27 +45,27 @@
"@0xproject/monorepo-scripts": "^0.1.20",
"@0xproject/sol-compiler": "^0.5.0",
"@0xproject/tslint-config": "^0.4.18",
"@types/bintrees": "^1.0.2",
"@types/bintrees": "1.0.2",
"@types/lodash": "4.14.104",
"@types/mocha": "^2.2.42",
"@types/node": "^8.0.53",
"@types/sinon": "^2.2.2",
"awesome-typescript-loader": "^3.1.3",
"chai": "^4.0.1",
"chai-as-promised": "^7.1.0",
"chai-bignumber": "^2.0.1",
"copyfiles": "^1.2.0",
"dirty-chai": "^2.0.1",
"json-loader": "^0.5.4",
"make-promises-safe": "^1.1.0",
"mocha": "^4.0.1",
"npm-run-all": "^4.1.2",
"nyc": "^11.0.1",
"opn-cli": "^3.1.0",
"prettier": "^1.11.1",
"shx": "^0.2.2",
"sinon": "^4.0.0",
"source-map-support": "^0.5.0",
"@types/mocha": "2.2.48",
"@types/node": "9.6.0",
"@types/sinon": "2.3.7",
"awesome-typescript-loader": "3.5.0",
"chai": "4.1.2",
"chai-as-promised": "7.1.1",
"chai-bignumber": "2.0.1",
"copyfiles": "1.2.0",
"dirty-chai": "2.0.1",
"json-loader": "0.5.7",
"make-promises-safe": "1.1.0",
"mocha": "4.1.0",
"npm-run-all": "4.1.2",
"nyc": "11.6.0",
"opn-cli": "3.1.0",
"prettier": "1.12.1",
"shx": "0.2.2",
"sinon": "4.4.9",
"source-map-support": "0.5.4",
"tslint": "5.8.0",
"typescript": "2.7.1"
},
@@ -80,9 +80,9 @@
"@0xproject/typescript-typings": "^0.3.2",
"@0xproject/utils": "^0.6.2",
"@0xproject/web3-wrapper": "^0.6.4",
"bintrees": "^1.0.2",
"ethers": "^3.0.15",
"lodash": "^4.17.4"
"bintrees": "1.0.2",
"ethers": "3.0.15",
"lodash": "4.17.10"
},
"publishConfig": {
"access": "public"

40
packages/react-docs-example/package.json
View File

@@ -29,33 +29,33 @@
"@0xproject/tslint-config": "^0.4.18",
"@types/lodash": "4.14.104",
"@types/material-ui": "0.18.0",
"@types/node": "^8.0.53",
"@types/node": "9.6.0",
"@types/react": "16.3.13",
"@types/react-dom": "^16.0.3",
"@types/react-dom": "16.0.4",
"@types/react-tap-event-plugin": "0.0.30",
"awesome-typescript-loader": "^3.1.3",
"copyfiles": "^1.2.0",
"css-loader": "^0.28.9",
"json-loader": "^0.5.4",
"less": "^2.7.2",
"less-loader": "^2.2.3",
"make-promises-safe": "^1.1.0",
"raw-loader": "^0.5.1",
"shx": "^0.2.2",
"source-map-loader": "^0.2.3",
"style-loader": "^0.20.2",
"tslint": "^5.9.1",
"awesome-typescript-loader": "3.5.0",
"copyfiles": "1.2.0",
"css-loader": "0.28.11",
"json-loader": "0.5.7",
"less": "2.7.3",
"less-loader": "2.2.3",
"make-promises-safe": "1.1.0",
"raw-loader": "0.5.1",
"shx": "0.2.2",
"source-map-loader": "0.2.3",
"style-loader": "0.20.3",
"tslint": "5.9.1",
"typescript": "2.7.1",
"webpack": "^3.11.0",
"webpack-dev-server": "^2.11.1"
"webpack": "3.11.0",
"webpack-dev-server": "2.11.2"
},
"dependencies": {
"@0xproject/react-docs": "^0.0.12",
"basscss": "^8.0.3",
"lodash": "^4.17.4",
"material-ui": "^0.17.1",
"basscss": "8.0.4",
"lodash": "4.17.10",
"material-ui": "0.17.4",
"react": "15.6.1",
"react-dom": "15.6.1",
"react-tap-event-plugin": "^2.0.1"
"react-tap-event-plugin": "2.0.1"
}
}

26
packages/react-docs/package.json
View File

@@ -28,10 +28,10 @@
"@0xproject/dev-utils": "^0.4.2",
"@0xproject/monorepo-scripts": "^0.1.20",
"@0xproject/tslint-config": "^0.4.18",
"copyfiles": "^1.2.0",
"make-promises-safe": "^1.1.0",
"shx": "^0.2.2",
"tslint": "^5.9.1",
"copyfiles": "1.2.0",
"make-promises-safe": "1.1.0",
"shx": "0.2.2",
"tslint": "5.9.1",
"typescript": "2.7.1"
},
"dependencies": {
@@ -39,19 +39,19 @@
"@0xproject/utils": "^0.6.2",
"@types/lodash": "4.14.104",
"@types/material-ui": "0.18.0",
"@types/node": "^8.0.53",
"@types/node": "9.6.0",
"@types/react": "16.3.13",
"@types/react-dom": "^16.0.3",
"@types/react-dom": "16.0.4",
"@types/react-scroll": "0.0.31",
"basscss": "^8.0.3",
"compare-versions": "^3.0.1",
"lodash": "^4.17.4",
"material-ui": "^0.17.1",
"basscss": "8.0.4",
"compare-versions": "3.1.0",
"lodash": "4.17.10",
"material-ui": "0.17.4",
"react": "15.6.1",
"react-dom": "15.6.1",
"react-markdown": "^3.2.2",
"react-scroll": "^1.5.2",
"react-tooltip": "^3.2.7"
"react-markdown": "3.2.2",
"react-scroll": "1.7.7",
"react-tooltip": "3.4.0"
},
"publishConfig": {
"access": "public"

26
packages/react-shared/package.json
View File

@@ -28,29 +28,29 @@
"@0xproject/dev-utils": "^0.4.2",
"@0xproject/monorepo-scripts": "^0.1.20",
"@0xproject/tslint-config": "^0.4.18",
"copyfiles": "^1.2.0",
"make-promises-safe": "^1.1.0",
"shx": "^0.2.2",
"tslint": "^5.9.1",
"copyfiles": "1.2.0",
"make-promises-safe": "1.1.0",
"shx": "0.2.2",
"tslint": "5.9.1",
"typescript": "2.7.1"
},
"dependencies": {
"@types/lodash": "4.14.104",
"@types/material-ui": "0.18.0",
"@types/node": "^8.0.53",
"@types/node": "9.6.0",
"@types/react": "16.3.13",
"@types/react-dom": "^16.0.3",
"@types/react-dom": "16.0.4",
"@types/react-scroll": "0.0.31",
"basscss": "^8.0.3",
"is-mobile": "^0.2.2",
"lodash": "^4.17.4",
"material-ui": "^0.17.1",
"basscss": "8.0.4",
"is-mobile": "0.2.2",
"lodash": "4.17.10",
"material-ui": "0.17.4",
"react": "15.6.1",
"react-dom": "15.6.1",
"react-highlight": "0xproject/react-highlight",
"react-markdown": "^3.2.2",
"react-scroll": "^1.5.2",
"react-tap-event-plugin": "^2.0.1"
"react-markdown": "3.2.2",
"react-scroll": "1.7.7",
"react-tap-event-plugin": "2.0.1"
},
"publishConfig": {
"access": "public"

52
packages/sol-compiler/package.json
View File

@@ -52,23 +52,23 @@
"@0xproject/dev-utils": "^0.4.2",
"@0xproject/monorepo-scripts": "^0.1.20",
"@0xproject/tslint-config": "^0.4.18",
"@types/mkdirp": "^0.5.2",
"@types/require-from-string": "^1.2.0",
"@types/semver": "^5.5.0",
"chai": "^4.0.1",
"chai-as-promised": "^7.1.0",
"copyfiles": "^1.2.0",
"dirty-chai": "^2.0.1",
"make-promises-safe": "^1.1.0",
"mocha": "^4.0.1",
"npm-run-all": "^4.1.2",
"nyc": "^11.0.1",
"shx": "^0.2.2",
"@types/mkdirp": "0.5.2",
"@types/require-from-string": "1.2.0",
"@types/semver": "5.5.0",
"chai": "4.1.2",
"chai-as-promised": "7.1.1",
"copyfiles": "1.2.0",
"dirty-chai": "2.0.1",
"make-promises-safe": "1.1.0",
"mocha": "4.1.0",
"npm-run-all": "4.1.2",
"nyc": "11.6.0",
"shx": "0.2.2",
"tslint": "5.8.0",
"typedoc": "0xProject/typedoc",
"types-bn": "^0.0.1",
"types-bn": "0.0.1",
"typescript": "2.7.1",
"web3-typescript-typings": "^0.10.2",
"web3-typescript-typings": "0.10.2",
"zeppelin-solidity": "1.8.0"
},
"dependencies": {
@@ -78,18 +78,18 @@
"@0xproject/typescript-typings": "^0.3.2",
"@0xproject/utils": "^0.6.2",
"@0xproject/web3-wrapper": "^0.6.4",
"@types/yargs": "^11.0.0",
"chalk": "^2.3.0",
"ethereumjs-util": "^5.1.1",
"isomorphic-fetch": "^2.2.1",
"lodash": "^4.17.4",
"mkdirp": "^0.5.1",
"require-from-string": "^2.0.1",
"semver": "^5.5.0",
"solc": "^0.4.23",
"web3": "^0.20.0",
"web3-eth-abi": "^1.0.0-beta.24",
"yargs": "^10.0.3"
"@types/yargs": "10.0.2",
"chalk": "2.3.2",
"ethereumjs-util": "5.1.5",
"isomorphic-fetch": "2.2.1",
"lodash": "4.17.10",
"mkdirp": "0.5.1",
"require-from-string": "2.0.1",
"semver": "5.5.0",
"solc": "0.4.23",
"web3": "0.20.6",
"web3-eth-abi": "1.0.0-beta.33",
"yargs": "11.1.0"
},
"publishConfig": {
"access": "public"

4
packages/sol-compiler/src/cli.ts
View File

@@ -32,7 +32,9 @@ const SEPARATOR = ',';
.help().argv;
const contracts = _.isUndefined(argv.contracts)
? undefined
: argv.contracts === DEFAULT_CONTRACTS_LIST ? DEFAULT_CONTRACTS_LIST : argv.contracts.split(SEPARATOR);
: argv.contracts === DEFAULT_CONTRACTS_LIST
? DEFAULT_CONTRACTS_LIST
: argv.contracts.split(SEPARATOR);
const opts: CompilerOptions = {
contractsDir: argv.contractsDir,
artifactsDir: argv.artifactsDir,

40
packages/sol-cov/package.json
View File

@@ -50,30 +50,30 @@
"@0xproject/types": "^0.7.0",
"@0xproject/typescript-typings": "^0.3.2",
"@0xproject/utils": "^0.6.2",
"ethereumjs-util": "^5.1.1",
"glob": "^7.1.2",
"istanbul": "^0.4.5",
"lodash": "^4.17.4",
"mkdirp": "^0.5.1",
"semaphore-async-await": "^1.5.1",
"solidity-parser-antlr": "^0.2.8"
"ethereumjs-util": "5.1.5",
"glob": "7.1.1",
"istanbul": "0.4.5",
"lodash": "4.17.10",
"mkdirp": "0.5.1",
"semaphore-async-await": "1.5.1",
"solidity-parser-antlr": "0.2.8"
},
"devDependencies": {
"@0xproject/monorepo-scripts": "^0.1.20",
"@0xproject/tslint-config": "^0.4.18",
"@types/istanbul": "^0.4.30",
"@types/mkdirp": "^0.5.1",
"@types/mocha": "^2.2.42",
"@types/node": "^8.0.53",
"chai": "^4.0.1",
"copyfiles": "^1.2.0",
"dirty-chai": "^2.0.1",
"make-promises-safe": "^1.1.0",
"mocha": "^4.0.1",
"npm-run-all": "^4.1.2",
"nyc": "^11.0.1",
"shx": "^0.2.2",
"sinon": "^4.0.0",
"@types/istanbul": "0.4.30",
"@types/mkdirp": "0.5.2",
"@types/mocha": "2.2.48",
"@types/node": "9.6.0",
"chai": "4.1.2",
"copyfiles": "1.2.0",
"dirty-chai": "2.0.1",
"make-promises-safe": "1.1.0",
"mocha": "4.1.0",
"npm-run-all": "4.1.2",
"nyc": "11.6.0",
"shx": "0.2.2",
"sinon": "4.4.9",
"tslint": "5.8.0",
"typedoc": "0xProject/typedoc",
"typescript": "2.7.1"

8
packages/sol-resolver/package.json
View File

@@ -26,16 +26,16 @@
"devDependencies": {
"@0xproject/monorepo-scripts": "^0.1.20",
"@0xproject/tslint-config": "^0.4.18",
"copyfiles": "^1.2.0",
"make-promises-safe": "^1.1.0",
"shx": "^0.2.2",
"copyfiles": "1.2.0",
"make-promises-safe": "1.1.0",
"shx": "0.2.2",
"tslint": "5.8.0",
"typescript": "2.7.1"
},
"dependencies": {
"@0xproject/types": "^0.7.0",
"@0xproject/typescript-typings": "^0.0.3",
"lodash": "^4.17.4"
"lodash": "4.17.10"
},
"publishConfig": {
"access": "public"

34
packages/sra-report/package.json
View File

@@ -37,28 +37,28 @@
"@0xproject/json-schemas": "^0.7.24",
"@0xproject/typescript-typings": "^0.3.2",
"@0xproject/utils": "^0.6.2",
"chalk": "^2.3.0",
"lodash": "^4.17.4",
"newman": "^3.9.3",
"yargs": "^10.0.3"
"chalk": "2.3.2",
"lodash": "4.17.10",
"newman": "3.9.3",
"yargs": "11.1.0"
},
"devDependencies": {
"@0xproject/monorepo-scripts": "^0.1.20",
"@0xproject/tslint-config": "^0.4.18",
"@types/lodash": "4.14.104",
"@types/mocha": "^2.2.48",
"@types/nock": "^9.1.2",
"@types/node": "^8.0.53",
"@types/yargs": "^10.0.0",
"chai": "^4.0.1",
"chai-as-promised": "^7.1.0",
"copyfiles": "^1.2.0",
"dirty-chai": "^2.0.1",
"make-promises-safe": "^1.1.0",
"mocha": "^4.0.1",
"nock": "^9.2.3",
"npm-run-all": "^4.1.2",
"shx": "^0.2.2",
"@types/mocha": "2.2.48",
"@types/nock": "9.1.2",
"@types/node": "9.6.0",
"@types/yargs": "10.0.2",
"chai": "4.1.2",
"chai-as-promised": "7.1.1",
"copyfiles": "1.2.0",
"dirty-chai": "2.0.1",
"make-promises-safe": "1.1.0",
"mocha": "4.1.0",
"nock": "9.2.3",
"npm-run-all": "4.1.2",
"shx": "0.2.2",
"tslint": "5.8.0",
"typescript": "2.7.1"
},

50
packages/subproviders/package.json
View File

@@ -43,43 +43,43 @@
"@0xproject/types": "^0.7.0",
"@0xproject/typescript-typings": "^0.3.2",
"@0xproject/utils": "^0.6.2",
"@ledgerhq/hw-app-eth": "^4.3.0",
"@ledgerhq/hw-transport-u2f": "^4.3.0",
"bip39": "^2.5.0",
"bn.js": "^4.11.8",
"ethereumjs-tx": "^1.3.3",
"ethereumjs-util": "^5.1.1",
"@ledgerhq/hw-app-eth": "4.7.3",
"@ledgerhq/hw-transport-u2f": "4.7.3",
"bip39": "2.5.0",
"bn.js": "4.11.7",
"ethereumjs-tx": "1.3.4",
"ethereumjs-util": "5.1.5",
"ganache-core": "0xProject/ganache-core",
"hdkey": "^0.7.1",
"lodash": "^4.17.4",
"semaphore-async-await": "^1.5.1",
"web3": "^0.20.0",
"web3-provider-engine": "^14.0.4"
"hdkey": "0.7.1",
"lodash": "4.17.10",
"semaphore-async-await": "1.5.1",
"web3": "0.20.6",
"web3-provider-engine": "13.8.0"
},
"devDependencies": {
"@0xproject/monorepo-scripts": "^0.1.20",
"@0xproject/tslint-config": "^0.4.18",
"@0xproject/utils": "^0.6.2",
"@types/bip39": "^2.4.0",
"@types/bip39": "2.4.0",
"@types/lodash": "4.14.104",
"@types/mocha": "^2.2.42",
"@types/node": "^8.0.53",
"chai": "^4.0.1",
"chai-as-promised": "^7.1.0",
"copyfiles": "^1.2.0",
"dirty-chai": "^2.0.1",
"make-promises-safe": "^1.1.0",
"mocha": "^4.0.1",
"npm-run-all": "^4.1.2",
"nyc": "^11.0.1",
"shx": "^0.2.2",
"@types/mocha": "2.2.48",
"@types/node": "9.6.0",
"chai": "4.1.2",
"chai-as-promised": "7.1.1",
"copyfiles": "1.2.0",
"dirty-chai": "2.0.1",
"make-promises-safe": "1.1.0",
"mocha": "4.1.0",
"npm-run-all": "4.1.2",
"nyc": "11.6.0",
"shx": "0.2.2",
"tslint": "5.8.0",
"typedoc": "0xProject/typedoc",
"typescript": "2.7.1",
"webpack": "^3.1.0"
"webpack": "3.11.0"
},
"optionalDependencies": {
"@ledgerhq/hw-transport-node-hid": "^4.3.0"
"@ledgerhq/hw-transport-node-hid": "4.7.3"
},
"publishConfig": {
"access": "public"

36
packages/testnet-faucets/package.json
View File

@@ -23,29 +23,29 @@
"@0xproject/types": "^0.7.0",
"@0xproject/typescript-typings": "^0.3.2",
"@0xproject/utils": "^0.6.2",
"body-parser": "^1.17.1",
"ethereumjs-tx": "^1.3.3",
"ethereumjs-util": "^5.1.1",
"express": "^4.15.2",
"lodash": "^4.17.4",
"rollbar": "^0.6.5",
"web3": "^0.20.0",
"web3-provider-engine": "^14.0.4"
"body-parser": "1.18.2",
"ethereumjs-tx": "1.3.4",
"ethereumjs-util": "5.1.5",
"express": "4.16.3",
"lodash": "4.17.10",
"rollbar": "0.6.6",
"web3": "0.20.6",
"web3-provider-engine": "13.8.0"
},
"devDependencies": {
"@0xproject/tslint-config": "^0.4.18",
"@types/body-parser": "^1.16.1",
"@types/express": "^4.0.35",
"@types/body-parser": "1.16.8",
"@types/express": "4.11.1",
"@types/lodash": "4.14.104",
"awesome-typescript-loader": "^3.1.3",
"gulp": "^3.9.1",
"make-promises-safe": "^1.1.0",
"nodemon": "^1.11.0",
"shx": "^0.2.2",
"source-map-loader": "^0.1.6",
"awesome-typescript-loader": "3.5.0",
"gulp": "3.9.1",
"make-promises-safe": "1.1.0",
"nodemon": "1.17.2",
"shx": "0.2.2",
"source-map-loader": "0.2.3",
"tslint": "5.8.0",
"typescript": "2.7.1",
"webpack": "^3.1.0",
"webpack-node-externals": "^1.6.0"
"webpack": "3.11.0",
"webpack-node-externals": "1.6.0"
}
}

14
packages/tslint-config/package.json
View File

@@ -36,17 +36,17 @@
"devDependencies": {
"@0xproject/monorepo-scripts": "^0.1.20",
"@types/lodash": "4.14.104",
"copyfiles": "^1.2.0",
"make-promises-safe": "^1.1.0",
"shx": "^0.2.2",
"copyfiles": "1.2.0",
"make-promises-safe": "1.1.0",
"shx": "0.2.2",
"typescript": "2.7.1"
},
"dependencies": {
"lodash": "^4.17.4",
"lodash": "4.17.10",
"tslint": "5.8.0",
"tslint-eslint-rules": "^4.1.1",
"tslint-react": "^3.2.0",
"tsutils": "^2.12.1"
"tslint-eslint-rules": "4.1.1",
"tslint-react": "3.5.1",
"tsutils": "2.22.2"
},
"publishConfig": {
"access": "public"

8
packages/types/package.json
View File

@@ -26,14 +26,14 @@
"devDependencies": {
"@0xproject/monorepo-scripts": "^0.1.20",
"@0xproject/tslint-config": "^0.4.18",
"copyfiles": "^1.2.0",
"make-promises-safe": "^1.1.0",
"shx": "^0.2.2",
"copyfiles": "1.2.0",
"make-promises-safe": "1.1.0",
"shx": "0.2.2",
"tslint": "5.8.0",
"typescript": "2.7.1"
},
"dependencies": {
"@types/node": "^8.0.53",
"@types/node": "9.6.0",
"bignumber.js": "~4.1.0"
},
"publishConfig": {

6
packages/typescript-typings/package.json
View File

@@ -30,9 +30,9 @@
},
"devDependencies": {
"@0xproject/monorepo-scripts": "^0.1.20",
"copyfiles": "^1.2.0",
"make-promises-safe": "^1.1.0",
"shx": "^0.2.2"
"copyfiles": "1.2.0",
"make-promises-safe": "1.1.0",
"shx": "0.2.2"
},
"publishConfig": {
"access": "public"

18
packages/utils/package.json
View File

@@ -27,22 +27,22 @@
"@0xproject/monorepo-scripts": "^0.1.20",
"@0xproject/tslint-config": "^0.4.18",
"@types/lodash": "4.14.104",
"copyfiles": "^1.2.0",
"make-promises-safe": "^1.1.0",
"npm-run-all": "^4.1.2",
"shx": "^0.2.2",
"copyfiles": "1.2.0",
"make-promises-safe": "1.1.0",
"npm-run-all": "4.1.2",
"shx": "0.2.2",
"tslint": "5.8.0",
"typescript": "2.7.1"
},
"dependencies": {
"@0xproject/types": "^0.7.0",
"@0xproject/typescript-typings": "^0.3.2",
"@types/node": "^8.0.53",
"@types/node": "9.6.0",
"bignumber.js": "~4.1.0",
"ethers": "^3.0.15",
"js-sha3": "^0.7.0",
"lodash": "^4.17.4",
"web3": "^0.20.0"
"ethers": "3.0.15",
"js-sha3": "0.7.0",
"lodash": "4.17.10",
"web3": "0.20.6"
},
"publishConfig": {
"access": "public"

26
packages/web3-wrapper/package.json
View File

@@ -46,17 +46,17 @@
"@0xproject/monorepo-scripts": "^0.1.20",
"@0xproject/tslint-config": "^0.4.18",
"@types/lodash": "4.14.104",
"chai": "^4.0.1",
"chai-as-promised": "^7.1.0",
"chai-bignumber": "^2.0.1",
"copyfiles": "^1.2.0",
"dirty-chai": "^2.0.1",
"chai": "4.1.2",
"chai-as-promised": "7.1.1",
"chai-bignumber": "2.0.1",
"copyfiles": "1.2.0",
"dirty-chai": "2.0.1",
"ganache-core": "0xProject/ganache-core",
"make-promises-safe": "^1.1.0",
"mocha": "^4.0.1",
"npm-run-all": "^4.1.2",
"nyc": "^11.0.1",
"shx": "^0.2.2",
"make-promises-safe": "1.1.0",
"mocha": "4.1.0",
"npm-run-all": "4.1.2",
"nyc": "11.6.0",
"shx": "0.2.2",
"tslint": "5.8.0",
"typedoc": "0xProject/typedoc",
"typescript": "2.7.1"
@@ -65,9 +65,9 @@
"@0xproject/types": "^0.7.0",
"@0xproject/typescript-typings": "^0.3.2",
"@0xproject/utils": "^0.6.2",
"ethers": "^3.0.15",
"lodash": "^4.17.4",
"web3": "^0.20.0"
"ethers": "3.0.15",
"lodash": "4.17.10",
"web3": "0.20.6"
},
"publishConfig": {
"access": "public"

92
packages/website/package.json
View File

@@ -25,71 +25,69 @@
"@0xproject/typescript-typings": "^0.3.2",
"@0xproject/utils": "^0.6.2",
"@0xproject/web3-wrapper": "^0.6.4",
"accounting": "^0.4.1",
"basscss": "^8.0.3",
"blockies": "^0.0.2",
"deep-equal": "^1.0.1",
"ethereumjs-util": "^5.1.1",
"find-versions": "^2.0.0",
"jsonschema": "^1.2.0",
"less": "^2.7.2",
"lodash": "^4.17.4",
"material-ui": "^0.17.1",
"accounting": "0.4.1",
"basscss": "8.0.4",
"blockies": "0.0.2",
"deep-equal": "0.2.2",
"ethereumjs-util": "5.1.5",
"find-versions": "2.0.0",
"jsonschema": "1.2.2",
"less": "2.7.3",
"lodash": "4.17.10",
"material-ui": "0.17.4",
"moment": "2.21.0",
"query-string": "^6.0.0",
"query-string": "4.3.4",
"react": "15.6.1",
"react-copy-to-clipboard": "^4.2.3",
"react-document-title": "^2.0.3",
"react-copy-to-clipboard": "4.3.1",
"react-document-title": "2.0.3",
"react-dom": "15.6.1",
"react-ga": "^2.4.1",
"react-redux": "^5.0.3",
"react-router-dom": "^4.1.1",
"react-scroll": "^1.5.2",
"react-tap-event-plugin": "^2.0.1",
"react-tooltip": "^3.2.7",
"redux": "^3.6.0",
"react-ga": "2.4.1",
"react-redux": "5.0.7",
"react-router-dom": "4.2.2",
"react-scroll": "1.7.7",
"react-tap-event-plugin": "2.0.1",
"react-tooltip": "3.4.0",
"redux": "3.7.2",
"semver-sort": "0.0.4",
"thenby": "^1.2.3",
"thenby": "1.2.3",
"truffle-contract": "2.0.1",
"web3": "^0.20.0",
"web3-provider-engine": "^14.0.4",
"whatwg-fetch": "^2.0.3",
"xml-js": "^1.3.2"
"web3": "0.20.6",
"web3-provider-engine": "13.8.0",
"whatwg-fetch": "2.0.3",
"xml-js": "1.6.2"
},
"devDependencies": {
"@types/accounting": "^0.4.1",
"@types/deep-equal": "^1.0.0",
"@types/jsonschema": "^1.1.1",
"@types/accounting": "0.4.1",
"@types/deep-equal": "1.0.1",
"@types/lodash": "4.14.104",
"@types/material-ui": "0.18.0",
"@types/node": "^8.0.53",
"@types/query-string": "^5.1.0",
"@types/node": "9.6.0",
"@types/query-string": "5.1.0",
"@types/react": "16.3.13",
"@types/react-copy-to-clipboard": "^4.2.0",
"@types/react-dom": "^16.0.3",
"@types/react-redux": "^4.4.37",
"@types/react-router-dom": "^4.0.4",
"@types/react-copy-to-clipboard": "4.2.5",
"@types/react-dom": "16.0.4",
"@types/react-redux": "4.4.47",
"@types/react-router-dom": "4.2.5",
"@types/react-scroll": "0.0.31",
"@types/react-tap-event-plugin": "0.0.30",
"@types/redux": "^3.6.0",
"awesome-typescript-loader": "^3.1.3",
"copy-webpack-plugin": "^4.0.1",
"copyfiles": "^1.2.0",
"awesome-typescript-loader": "3.5.0",
"copy-webpack-plugin": "4.5.1",
"copyfiles": "1.2.0",
"css-loader": "0.23.x",
"exports-loader": "0.6.x",
"imports-loader": "0.6.x",
"json-loader": "^0.5.4",
"less-loader": "^2.2.3",
"make-promises-safe": "^1.1.0",
"raw-loader": "^0.5.1",
"shx": "^0.2.2",
"source-map-loader": "^0.1.6",
"json-loader": "0.5.7",
"less-loader": "2.2.3",
"make-promises-safe": "1.1.0",
"raw-loader": "0.5.1",
"shx": "0.2.2",
"source-map-loader": "0.2.3",
"style-loader": "0.13.x",
"tslint": "5.8.0",
"tslint-config-0xproject": "^0.0.2",
"typescript": "2.7.1",
"webpack": "^3.1.0",
"webpack-dev-middleware": "^1.10.0",
"webpack-dev-server": "^2.5.0"
"webpack": "3.11.0",
"webpack-dev-middleware": "1.12.2",
"webpack-dev-server": "2.11.2"
}
}

4
packages/website/ts/blockchain.ts
View File

@@ -787,7 +787,9 @@ export class Blockchain {
const provider = await Blockchain._getProviderAsync(injectedWeb3, networkIdIfExists);
this.networkId = !_.isUndefined(networkIdIfExists)
? networkIdIfExists
: configs.IS_MAINNET_ENABLED ? constants.NETWORK_ID_MAINNET : constants.NETWORK_ID_KOVAN;
: configs.IS_MAINNET_ENABLED
? constants.NETWORK_ID_MAINNET
: constants.NETWORK_ID_KOVAN;
this._dispatcher.updateNetworkId(this.networkId);
const zeroExConfigs = {
networkId: this.networkId,

4
packages/website/ts/components/top_bar/provider_display.tsx
View File

@@ -41,7 +41,9 @@ export class ProviderDisplay extends React.Component<ProviderDisplayProps, Provi
this.props.providerType === ProviderType.Injected && this.props.injectedProviderName !== '0x Public';
const displayAddress = isAddressAvailable
? utils.getAddressBeginAndEnd(this.props.userAddress)
: isExternallyInjectedProvider ? 'Account locked' : '0x0000...0000';
: isExternallyInjectedProvider
? 'Account locked'
: '0x0000...0000';
// If the "injected" provider is our fallback public node, then we want to
// show the "connect a wallet" message instead of the providerName
const injectedProviderName = isExternallyInjectedProvider

677
yarn.lock
View File

File diff suppressed because it is too large Load Diff