aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2018-06-19 18:32:43 +0800
committerFabio Berger <me@fabioberger.com>2018-06-19 18:32:43 +0800
commita96abe24227b54b7a038278c432b7bf8a70c22a4 (patch)
tree85d0194106835c692e0dbd22be5a9e690d7bc7eb
parent84a4a888e65e1d623ed6f3f6205c3727c51ffb24 (diff)
downloaddexon-sol-tools-a96abe24227b54b7a038278c432b7bf8a70c22a4.tar
dexon-sol-tools-a96abe24227b54b7a038278c432b7bf8a70c22a4.tar.gz
dexon-sol-tools-a96abe24227b54b7a038278c432b7bf8a70c22a4.tar.bz2
dexon-sol-tools-a96abe24227b54b7a038278c432b7bf8a70c22a4.tar.lz
dexon-sol-tools-a96abe24227b54b7a038278c432b7bf8a70c22a4.tar.xz
dexon-sol-tools-a96abe24227b54b7a038278c432b7bf8a70c22a4.tar.zst
dexon-sol-tools-a96abe24227b54b7a038278c432b7bf8a70c22a4.zip
Fix additional versions and update yarn.lock
-rw-r--r--packages/0x.js/package.json2
-rw-r--r--packages/contract-wrappers/package.json2
-rw-r--r--packages/contracts/package.json2
-rw-r--r--packages/fill-scenarios/package.json2
-rw-r--r--packages/order-utils/package.json2
-rw-r--r--packages/order-watcher/package.json2
-rw-r--r--packages/sol-compiler/package.json2
-rw-r--r--packages/sra-report/package.json2
-rw-r--r--yarn.lock156
9 files changed, 75 insertions, 97 deletions
diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json
index 7a2c3c1a4..2aeb1ddf2 100644
--- a/packages/0x.js/package.json
+++ b/packages/0x.js/package.json
@@ -103,7 +103,7 @@
"@0xproject/assert": "^0.2.12",
"@0xproject/base-contract": "^0.3.4",
"@0xproject/contract-wrappers": "^0.0.5",
- "@0xproject/order-utils": "0.0.7",
+ "@0xproject/order-utils": "^0.0.7",
"@0xproject/order-watcher": "^0.0.6",
"@0xproject/sol-compiler": "^0.5.2",
"@0xproject/types": "^0.8.1",
diff --git a/packages/contract-wrappers/package.json b/packages/contract-wrappers/package.json
index 5d2792f54..cd4b25957 100644
--- a/packages/contract-wrappers/package.json
+++ b/packages/contract-wrappers/package.json
@@ -81,7 +81,7 @@
"@0xproject/base-contract": "^0.3.4",
"@0xproject/fill-scenarios": "^0.0.4",
"@0xproject/json-schemas": "0.8.1",
- "@0xproject/order-utils": "0.0.7",
+ "@0xproject/order-utils": "^0.0.7",
"@0xproject/types": "^0.8.1",
"@0xproject/typescript-typings": "^0.4.1",
"@0xproject/utils": "^0.7.1",
diff --git a/packages/contracts/package.json b/packages/contracts/package.json
index 272bdcad9..8807c727e 100644
--- a/packages/contracts/package.json
+++ b/packages/contracts/package.json
@@ -72,7 +72,7 @@
},
"dependencies": {
"@0xproject/base-contract": "^0.3.4",
- "@0xproject/order-utils": "^0.0.6",
+ "@0xproject/order-utils": "^1.0.0",
"@0xproject/sol-compiler": "^0.5.2",
"@0xproject/types": "^1.0.0",
"@0xproject/typescript-typings": "^0.4.1",
diff --git a/packages/fill-scenarios/package.json b/packages/fill-scenarios/package.json
index 897b32092..883300fa0 100644
--- a/packages/fill-scenarios/package.json
+++ b/packages/fill-scenarios/package.json
@@ -42,7 +42,7 @@
},
"dependencies": {
"@0xproject/base-contract": "^0.3.4",
- "@0xproject/order-utils": "^0.0.6",
+ "@0xproject/order-utils": "^1.0.0",
"@0xproject/types": "1.0.0",
"ethereum-types": "^0.0.1",
"@0xproject/typescript-typings": "^0.4.1",
diff --git a/packages/order-utils/package.json b/packages/order-utils/package.json
index 7f1351b02..bd18b7855 100644
--- a/packages/order-utils/package.json
+++ b/packages/order-utils/package.json
@@ -1,6 +1,6 @@
{
"name": "@0xproject/order-utils",
- "version": "0.0.7",
+ "version": "1.0.0",
"engines": {
"node": ">=6.12"
},
diff --git a/packages/order-watcher/package.json b/packages/order-watcher/package.json
index 09b9cef11..c407d25bd 100644
--- a/packages/order-watcher/package.json
+++ b/packages/order-watcher/package.json
@@ -82,7 +82,7 @@
"@0xproject/contract-wrappers": "^0.0.5",
"@0xproject/fill-scenarios": "^0.0.4",
"@0xproject/json-schemas": "0.8.1",
- "@0xproject/order-utils": "0.0.7",
+ "@0xproject/order-utils": "^0.0.7",
"@0xproject/types": "^0.8.1",
"@0xproject/typescript-typings": "^0.4.1",
"@0xproject/utils": "^0.7.1",
diff --git a/packages/sol-compiler/package.json b/packages/sol-compiler/package.json
index 41e225167..deeed8299 100644
--- a/packages/sol-compiler/package.json
+++ b/packages/sol-compiler/package.json
@@ -76,7 +76,7 @@
"zeppelin-solidity": "1.8.0"
},
"dependencies": {
- "@0xproject/assert": "0.2.10",
+ "@0xproject/assert": "0.2.12",
"@0xproject/json-schemas": "0.8.1",
"@0xproject/sol-resolver": "^0.0.7",
"@0xproject/types": "^0.8.1",
diff --git a/packages/sra-report/package.json b/packages/sra-report/package.json
index 49cc3d043..379b8cb1e 100644
--- a/packages/sra-report/package.json
+++ b/packages/sra-report/package.json
@@ -34,7 +34,7 @@
"dependencies": {
"@0xproject/assert": "^0.2.12",
"@0xproject/types": "^0.8.1",
- "@0xproject/order-utils": "0.0.7",
+ "@0xproject/order-utils": "^0.0.7",
"@0xproject/connect": "0.6.15",
"@0xproject/json-schemas": "0.8.1",
"@0xproject/typescript-typings": "^0.4.1",
diff --git a/yarn.lock b/yarn.lock
index d6524eff3..fdb0d53e1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6,73 +6,43 @@
version "0.3.9"
resolved "https://registry.yarnpkg.com/8fold-marked/-/8fold-marked-0.3.9.tgz#bb89c645612f8ccfaffac1ca6e3c11f168c9cf59"
-"@0xproject/connect@0.6.12":
- version "0.6.12"
- resolved "https://registry.yarnpkg.com/@0xproject/connect/-/connect-0.6.12.tgz#7d4711804f2c760f0436b5f2ddbf6631aaee36ba"
- dependencies:
- "@0xproject/assert" "^0.2.9"
- "@0xproject/json-schemas" "^0.7.23"
- "@0xproject/types" "^0.6.3"
- "@0xproject/typescript-typings" "^0.3.1"
- "@0xproject/utils" "^0.6.1"
- isomorphic-fetch "^2.2.1"
- lodash "^4.17.4"
- query-string "^5.0.1"
- websocket "^1.0.25"
-
-"@0xproject/fill-scenarios@^0.0.2":
- version "0.0.2"
- resolved "https://registry.yarnpkg.com/@0xproject/fill-scenarios/-/fill-scenarios-0.0.2.tgz#176ac2cba13f527e84346fbf06da84965a852bab"
- dependencies:
- "@0xproject/base-contract" "^0.3.2"
- "@0xproject/order-utils" "^0.0.5"
- "@0xproject/types" "^0.7.0"
- "@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"
-
-"@0xproject/json-schemas@0.7.22":
- version "0.7.22"
- resolved "https://registry.yarnpkg.com/@0xproject/json-schemas/-/json-schemas-0.7.22.tgz#95cbdc9ec0eff3d1920903960284d491eb668f28"
- dependencies:
- "@0xproject/typescript-typings" "^0.3.0"
- "@types/node" "^8.0.53"
- jsonschema "^1.2.0"
- lodash.values "^4.3.0"
-
-"@0xproject/json-schemas@^0.7.23", "@0xproject/json-schemas@^0.7.24":
- version "0.7.24"
- resolved "https://registry.yarnpkg.com/@0xproject/json-schemas/-/json-schemas-0.7.24.tgz#21a12b43ab0ab4aa302d02c4891668cda36b6c64"
+"@0xproject/fill-scenarios@^0.0.4":
+ version "0.0.4"
+ resolved "https://registry.yarnpkg.com/@0xproject/fill-scenarios/-/fill-scenarios-0.0.4.tgz#4d23c75abda7e9f117b698c0b8b142af07e0c69e"
+ dependencies:
+ "@0xproject/base-contract" "^0.3.4"
+ "@0xproject/order-utils" "^0.0.7"
+ "@0xproject/types" "^0.8.1"
+ "@0xproject/typescript-typings" "^0.4.1"
+ "@0xproject/utils" "^0.7.1"
+ "@0xproject/web3-wrapper" "^0.7.1"
+ ethers "3.0.22"
+ lodash "4.17.10"
+
+"@0xproject/json-schemas@0.8.1", "@0xproject/json-schemas@^0.8.1":
+ version "0.8.1"
+ resolved "https://registry.yarnpkg.com/@0xproject/json-schemas/-/json-schemas-0.8.1.tgz#2613fd9405728bc65f2eb78e86258d44b4925ab0"
dependencies:
- "@0xproject/typescript-typings" "^0.3.2"
- "@types/node" "^8.0.53"
- jsonschema "^1.2.0"
- lodash.values "^4.3.0"
+ "@0xproject/typescript-typings" "^0.4.1"
+ "@types/node" "9.6.0"
+ jsonschema "1.2.2"
+ lodash.values "4.3.0"
-"@0xproject/order-utils@0.0.5", "@0xproject/order-utils@^0.0.5":
- version "0.0.5"
- resolved "https://registry.yarnpkg.com/@0xproject/order-utils/-/order-utils-0.0.5.tgz#c8d92a112740b0020e08f13137844f8c183c863b"
- dependencies:
- "@0xproject/assert" "^0.2.10"
- "@0xproject/json-schemas" "^0.7.24"
- "@0xproject/types" "^0.7.0"
- "@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"
-
-"@0xproject/types@0.7.0", "@0xproject/types@^0.7.0":
- version "0.7.0"
- resolved "https://registry.yarnpkg.com/@0xproject/types/-/types-0.7.0.tgz#fad13925ee92ad4ee1980668a5cb2bed4dcaab8f"
- dependencies:
- "@types/node" "^8.0.53"
- bignumber.js "~4.1.0"
+"@0xproject/order-utils@^0.0.7":
+ version "0.0.7"
+ resolved "https://registry.yarnpkg.com/@0xproject/order-utils/-/order-utils-0.0.7.tgz#eaa465782ea5745bdad54e1a851533172d993b7c"
+ dependencies:
+ "@0xproject/assert" "^0.2.12"
+ "@0xproject/json-schemas" "^0.8.1"
+ "@0xproject/types" "^0.8.1"
+ "@0xproject/typescript-typings" "^0.4.1"
+ "@0xproject/utils" "^0.7.1"
+ "@0xproject/web3-wrapper" "^0.7.1"
+ "@types/node" "9.6.0"
+ bn.js "4.11.7"
+ ethereumjs-abi "0.6.5"
+ ethereumjs-util "5.1.5"
+ lodash "4.17.10"
"@0xproject/types@^0.5.0":
version "0.5.0"
@@ -80,11 +50,11 @@
dependencies:
bignumber.js "~4.1.0"
-"@0xproject/types@^0.6.3":
- version "0.6.3"
- resolved "https://registry.yarnpkg.com/@0xproject/types/-/types-0.6.3.tgz#0bc066967aad4151011b6e478bb707b1afb8504b"
+"@0xproject/types@^0.8.1":
+ version "0.8.1"
+ resolved "https://registry.yarnpkg.com/@0xproject/types/-/types-0.8.1.tgz#ba436a1054d2ac6362bb0668611af4f52402a54e"
dependencies:
- "@types/node" "^8.0.53"
+ "@types/node" "9.6.0"
bignumber.js "~4.1.0"
"@0xproject/typescript-typings@^0.0.3":
@@ -350,6 +320,10 @@
version "9.6.5"
resolved "https://registry.yarnpkg.com/@types/node/-/node-9.6.5.tgz#ee700810fdf49ac1c399fc5980b7559b3e5a381d"
+"@types/node@9.6.0":
+ version "9.6.0"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-9.6.0.tgz#d3480ee666df9784b1001a1872a2f6ccefb6c2d7"
+
"@types/node@^8.0.53":
version "8.10.8"
resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.8.tgz#794cba23cc9f8d9715f6543fa8827433b5f5cd3b"
@@ -438,7 +412,7 @@
"@types/glob" "*"
"@types/node" "*"
-"@types/semver@^5.5.0":
+"@types/semver@5.5.0", "@types/semver@^5.5.0":
version "5.5.0"
resolved "https://registry.yarnpkg.com/@types/semver/-/semver-5.5.0.tgz#146c2a29ee7d3bae4bf2fcb274636e264c813c45"
@@ -4068,7 +4042,7 @@ ethereum-common@^0.0.18:
version "0.0.18"
resolved "https://registry.yarnpkg.com/ethereum-common/-/ethereum-common-0.0.18.tgz#2fdc3576f232903358976eb39da783213ff9523f"
-ethereumjs-abi@^0.6.4, "ethereumjs-abi@git+https://github.com/ethereumjs/ethereumjs-abi.git":
+ethereumjs-abi@0.6.5, ethereumjs-abi@^0.6.4, "ethereumjs-abi@git+https://github.com/ethereumjs/ethereumjs-abi.git":
version "0.6.5"
resolved "git+https://github.com/ethereumjs/ethereumjs-abi.git#4ea2fdfed09e8f99117d9362d17c6b01b64a2bcf"
dependencies:
@@ -4117,17 +4091,7 @@ ethereumjs-tx@0xProject/ethereumjs-tx#fake-tx-include-signature-by-default, ethe
ethereum-common "^0.0.18"
ethereumjs-util "^5.0.0"
-ethereumjs-util@^4.0.1, ethereumjs-util@^4.4.0:
- version "4.5.0"
- resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-4.5.0.tgz#3e9428b317eebda3d7260d854fddda954b1f1bc6"
- dependencies:
- bn.js "^4.8.0"
- create-hash "^1.1.2"
- keccakjs "^0.2.0"
- rlp "^2.0.0"
- secp256k1 "^3.0.1"
-
-ethereumjs-util@^5.0.0, ethereumjs-util@^5.0.1, ethereumjs-util@^5.1.1, ethereumjs-util@^5.1.2, ethereumjs-util@^5.1.3, ethereumjs-util@^5.1.5:
+ethereumjs-util@5.1.5, ethereumjs-util@^5.0.0, ethereumjs-util@^5.0.1, ethereumjs-util@^5.1.1, ethereumjs-util@^5.1.2, ethereumjs-util@^5.1.3, ethereumjs-util@^5.1.5:
version "5.1.5"
resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-5.1.5.tgz#2f02575852627d45622426f25ee4a0b5f377f27a"
dependencies:
@@ -4139,6 +4103,16 @@ ethereumjs-util@^5.0.0, ethereumjs-util@^5.0.1, ethereumjs-util@^5.1.1, ethereum
safe-buffer "^5.1.1"
secp256k1 "^3.0.1"
+ethereumjs-util@^4.0.1, ethereumjs-util@^4.4.0:
+ version "4.5.0"
+ resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-4.5.0.tgz#3e9428b317eebda3d7260d854fddda954b1f1bc6"
+ dependencies:
+ bn.js "^4.8.0"
+ create-hash "^1.1.2"
+ keccakjs "^0.2.0"
+ rlp "^2.0.0"
+ secp256k1 "^3.0.1"
+
ethereumjs-vm@2.3.3:
version "2.3.3"
resolved "https://registry.yarnpkg.com/ethereumjs-vm/-/ethereumjs-vm-2.3.3.tgz#05719139e0c4a59e829022964a6048b17d2d84b0"
@@ -4183,7 +4157,7 @@ ethereumjs-wallet@~0.6.0:
utf8 "^2.1.1"
uuid "^2.0.1"
-ethers@0xproject/ethers.js#eip-838-reasons, ethers@^3.0.15:
+ethers@0xproject/ethers.js#eip-838-reasons, ethers@3.0.22:
version "3.0.18"
resolved "https://codeload.github.com/0xproject/ethers.js/tar.gz/b91342bd200d142af0165d6befddf783c8ae8447"
dependencies:
@@ -6353,7 +6327,7 @@ isobject@^3.0.0, isobject@^3.0.1:
version "3.0.1"
resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
-isomorphic-fetch@^2.1.1, isomorphic-fetch@^2.2.1:
+isomorphic-fetch@2.2.1, isomorphic-fetch@^2.1.1, isomorphic-fetch@^2.2.1:
version "2.2.1"
resolved "https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz#611ae1acf14f5e81f729507472819fe9733558a9"
dependencies:
@@ -6623,6 +6597,10 @@ jsonschema@*, jsonschema@^1.2.0:
version "1.2.4"
resolved "https://registry.yarnpkg.com/jsonschema/-/jsonschema-1.2.4.tgz#a46bac5d3506a254465bc548876e267c6d0d6464"
+jsonschema@1.2.2:
+ version "1.2.2"
+ resolved "https://registry.yarnpkg.com/jsonschema/-/jsonschema-1.2.2.tgz#83ab9c63d65bf4d596f91d81195e78772f6452bc"
+
jsprim@^1.2.2:
version "1.4.1"
resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
@@ -7191,7 +7169,7 @@ lodash.uniq@^4.5.0:
version "4.5.0"
resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
-lodash.values@^4.3.0:
+lodash.values@4.3.0, lodash.values@^4.3.0:
version "4.3.0"
resolved "https://registry.yarnpkg.com/lodash.values/-/lodash.values-4.3.0.tgz#a3a6c2b0ebecc5c2cba1c17e6e620fe81b53d347"
@@ -7201,6 +7179,10 @@ lodash.words@^3.0.0:
dependencies:
lodash._root "^3.0.0"
+lodash@4.17.10, lodash@^4.17.10:
+ version "4.17.10"
+ resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
+
lodash@4.17.2:
version "4.17.2"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.2.tgz#34a3055babe04ce42467b607d700072c7ff6bf42"
@@ -7217,10 +7199,6 @@ lodash@^4.13.1, lodash@^4.14.0, lodash@^4.17.2, lodash@^4.17.4, lodash@^4.17.5,
version "4.17.5"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511"
-lodash@^4.17.10:
- version "4.17.10"
- resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
-
lodash@~1.0.1:
version "1.0.2"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-1.0.2.tgz#8f57560c83b59fc270bd3d561b690043430e2551"