merge development

This commit is contained in:
Fabio Berger
2019-02-05 13:55:05 +00:00
137 changed files with 856 additions and 643 deletions

View File

@@ -1,6 +1,6 @@
{
"name": "0x.js",
"version": "3.0.3",
"version": "4.0.0",
"engines": {
"node": ">=6.12"
},
@@ -42,11 +42,11 @@
},
"license": "Apache-2.0",
"devDependencies": {
"@0x/abi-gen-wrappers": "^2.2.0",
"@0x/contract-addresses": "^2.2.0",
"@0x/dev-utils": "^1.0.24",
"@0x/migrations": "^2.4.0",
"@0x/tslint-config": "^2.0.2",
"@0x/abi-gen-wrappers": "^3.0.0",
"@0x/contract-addresses": "^2.2.1",
"@0x/dev-utils": "^2.0.0",
"@0x/migrations": "^3.0.0",
"@0x/tslint-config": "^3.0.0",
"@types/lodash": "4.14.104",
"@types/mocha": "^2.2.42",
"@types/node": "*",
@@ -72,18 +72,18 @@
"webpack": "^4.20.2"
},
"dependencies": {
"@0x/assert": "^1.0.23",
"@0x/base-contract": "^3.0.13",
"@0x/contract-wrappers": "^5.0.1",
"@0x/order-utils": "^3.1.2",
"@0x/order-watcher": "^2.4.3",
"@0x/subproviders": "^2.1.11",
"@0x/types": "^1.5.2",
"@0x/typescript-typings": "^3.0.8",
"@0x/utils": "^3.0.1",
"@0x/web3-wrapper": "^3.2.4",
"@0x/assert": "^2.0.0",
"@0x/base-contract": "^4.0.0",
"@0x/contract-wrappers": "^6.0.1",
"@0x/order-utils": "^4.0.0",
"@0x/order-watcher": "^3.0.0",
"@0x/subproviders": "^3.0.0",
"@0x/types": "^2.0.0",
"@0x/typescript-typings": "^4.0.0",
"@0x/utils": "^4.0.1",
"@0x/web3-wrapper": "^4.0.0",
"@types/web3-provider-engine": "^14.0.0",
"ethereum-types": "^1.1.6",
"ethereum-types": "^2.0.0",
"ethers": "~4.0.4",
"lodash": "^4.17.11",
"web3-provider-engine": "14.0.6"