aboutsummaryrefslogtreecommitdiffstats
path: root/yarn.lock
diff options
context:
space:
mode:
authorGreg Hysen <hysz@users.noreply.github.com>2018-05-22 05:29:56 +0800
committerGitHub <noreply@github.com>2018-05-22 05:29:56 +0800
commitd460c0e8b9c6f4081803fff4e2d2347be8cd5ce3 (patch)
tree596681d82624683e76cdd507e31c46ffad4df73b /yarn.lock
parent0fdf32cf6f0f1def41a1733687e977feb3a652f5 (diff)
parent11b6d290da18ea4690424a2a518413fb39a4a885 (diff)
downloaddexon-sol-tools-d460c0e8b9c6f4081803fff4e2d2347be8cd5ce3.tar
dexon-sol-tools-d460c0e8b9c6f4081803fff4e2d2347be8cd5ce3.tar.gz
dexon-sol-tools-d460c0e8b9c6f4081803fff4e2d2347be8cd5ce3.tar.bz2
dexon-sol-tools-d460c0e8b9c6f4081803fff4e2d2347be8cd5ce3.tar.lz
dexon-sol-tools-d460c0e8b9c6f4081803fff4e2d2347be8cd5ce3.tar.xz
dexon-sol-tools-d460c0e8b9c6f4081803fff4e2d2347be8cd5ce3.tar.zst
dexon-sol-tools-d460c0e8b9c6f4081803fff4e2d2347be8cd5ce3.zip
Merge pull request #572 from 0xProject/feature/contracts/atomicMatching
Atomic Order Matching
Diffstat (limited to 'yarn.lock')
-rw-r--r--yarn.lock30
1 files changed, 24 insertions, 6 deletions
diff --git a/yarn.lock b/yarn.lock
index 182a62491..6f1b7b931 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2513,7 +2513,15 @@ concat-map@0.0.1:
version "0.0.1"
resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-concat-stream@^1.4.10, concat-stream@^1.5.0, concat-stream@^1.5.1:
+concat-stream@^1.4.10, concat-stream@^1.5.0:
+ version "1.6.1"
+ resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.1.tgz#261b8f518301f1d834e36342b9fea095d2620a26"
+ dependencies:
+ inherits "^2.0.3"
+ readable-stream "^2.2.2"
+ typedarray "^0.0.6"
+
+concat-stream@^1.5.1:
version "1.6.2"
resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
dependencies:
@@ -10143,14 +10151,14 @@ semver-sort@0.0.4:
semver "^5.0.3"
semver-regex "^1.0.0"
-"semver@2 || 3 || 4 || 5", semver@5.5.0, semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0:
- version "5.5.0"
- resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
-
-semver@5.4.1, semver@~5.4.1:
+"semver@2 || 3 || 4 || 5", semver@5.4.1, semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@~5.4.1:
version "5.4.1"
resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e"
+semver@5.5.0, semver@^5.5.0:
+ version "5.5.0"
+ resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
+
semver@^4.1.0:
version "4.3.6"
resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da"
@@ -10485,6 +10493,16 @@ solc@^0.4.23:
semver "^5.3.0"
yargs "^4.7.1"
+solc@^0.4.24:
+ version "0.4.24"
+ resolved "https://registry.yarnpkg.com/solc/-/solc-0.4.24.tgz#354f14b269b38cbaa82a47d1ff151723502b954e"
+ dependencies:
+ fs-extra "^0.30.0"
+ memorystream "^0.3.1"
+ require-from-string "^1.1.0"
+ semver "^5.3.0"
+ yargs "^4.7.1"
+
solidity-parser-antlr@^0.2.8:
version "0.2.8"
resolved "https://registry.yarnpkg.com/solidity-parser-antlr/-/solidity-parser-antlr-0.2.8.tgz#8eb8547a88dfeaf6cf4c7811e3824084214244d4"