Merge pull request #1589 from 0xProject/feat/lock-contract-deps

Lock dep versions in contracts packages (again)

10 files changed, 136 insertions, 93 deletions

diff --git a/.circleci/config.yml b/.circleci/config.yml
index f6e028ea0..38fb2624a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -16,7 +16,7 @@ jobs:
                   command: sudo npm install --global yarn@1.9.4
             - run:
                   name: yarn
-                  command: yarn --frozen-lockfile --ignore-engines install
+                  command: yarn --frozen-lockfile --ignore-engines install || yarn --frozen-lockfile --ignore-engines install
             - setup_remote_docker
             - run: yarn build:ci:no_website
             - run: yarn build:ts
diff --git a/contracts/asset-proxy/package.json b/contracts/asset-proxy/package.json
index 51d26b0ac..e6e250b19 100644
--- a/contracts/asset-proxy/package.json
+++ b/contracts/asset-proxy/package.json
@@ -67,10 +67,10 @@
     },
     "dependencies": {
         "@0x/base-contract": "^4.0.1",
-        "@0x/contracts-erc20": "^1.0.3",
-        "@0x/contracts-erc721": "^1.0.3",
         "@0x/contracts-test-utils": "^3.0.2",
-        "@0x/contracts-utils": "^2.0.2",
+        "@0x/contracts-erc20": "1.0.2",
+        "@0x/contracts-erc721": "1.0.2",
+        "@0x/contracts-utils": "2.0.1",
         "@0x/order-utils": "^6.0.0",
         "@0x/types": "^2.0.1",
         "@0x/typescript-typings": "^4.0.0",
diff --git a/contracts/erc20/package.json b/contracts/erc20/package.json
index b3517a8c0..d44020db7 100644
--- a/contracts/erc20/package.json
+++ b/contracts/erc20/package.json
@@ -68,8 +68,8 @@
     },
     "dependencies": {
         "@0x/base-contract": "^4.0.1",
-        "@0x/contracts-exchange-libs": "^1.0.3",
-        "@0x/contracts-utils": "^2.0.2",
+        "@0x/contracts-exchange-libs": "1.0.2",
+        "@0x/contracts-utils": "2.0.1",
         "@0x/types": "^2.0.1",
         "@0x/typescript-typings": "^4.0.0",
         "@0x/utils": "^4.0.2",
diff --git a/contracts/erc721/package.json b/contracts/erc721/package.json
index a8cf7016f..ba0762f30 100644
--- a/contracts/erc721/package.json
+++ b/contracts/erc721/package.json
@@ -68,7 +68,7 @@
     },
     "dependencies": {
         "@0x/base-contract": "^4.0.1",
-        "@0x/contracts-utils": "^2.0.2",
+        "@0x/contracts-utils": "2.0.1",
         "@0x/types": "^2.0.1",
         "@0x/typescript-typings": "^4.0.0",
         "@0x/utils": "^4.0.2",
diff --git a/contracts/exchange-forwarder/package.json b/contracts/exchange-forwarder/package.json
index 1ed3bee3a..e71409c82 100644
--- a/contracts/exchange-forwarder/package.json
+++ b/contracts/exchange-forwarder/package.json
@@ -69,12 +69,12 @@
     },
     "dependencies": {
         "@0x/base-contract": "^4.0.1",
-        "@0x/contracts-asset-proxy": "^1.0.3",
-        "@0x/contracts-erc20": "^1.0.3",
-        "@0x/contracts-erc721": "^1.0.3",
-        "@0x/contracts-exchange": "^1.0.3",
-        "@0x/contracts-exchange-libs": "^1.0.3",
-        "@0x/contracts-utils": "^2.0.2",
+        "@0x/contracts-asset-proxy": "1.0.2",
+        "@0x/contracts-erc20": "1.0.2",
+        "@0x/contracts-erc721": "1.0.2",
+        "@0x/contracts-exchange": "1.0.2",
+        "@0x/contracts-exchange-libs": "1.0.2",
+        "@0x/contracts-utils": "2.0.1",
         "@0x/order-utils": "^6.0.0",
         "@0x/types": "^2.0.1",
         "@0x/typescript-typings": "^4.0.0",
diff --git a/contracts/exchange-libs/package.json b/contracts/exchange-libs/package.json
index 2b7a1c404..ebe3e8195 100644
--- a/contracts/exchange-libs/package.json
+++ b/contracts/exchange-libs/package.json
@@ -68,7 +68,7 @@
     },
     "dependencies": {
         "@0x/base-contract": "^4.0.1",
-        "@0x/contracts-utils": "^2.0.2",
+        "@0x/contracts-utils": "2.0.1",
         "@0x/order-utils": "^6.0.0",
         "@0x/types": "^2.0.1",
         "@0x/typescript-typings": "^4.0.0",
diff --git a/contracts/exchange/package.json b/contracts/exchange/package.json
index 6c3781b54..43ceeeebd 100644
--- a/contracts/exchange/package.json
+++ b/contracts/exchange/package.json
@@ -48,6 +48,7 @@
     "devDependencies": {
         "@0x/contracts-gen": "^1.0.0",
         "@0x/abi-gen": "^2.0.1",
+        "@0x/contracts-test-utils": "^3.0.2",
         "@0x/dev-utils": "^2.0.1",
         "@0x/sol-compiler": "^3.0.1",
         "@0x/tslint-config": "^3.0.0",
@@ -67,12 +68,11 @@
     },
     "dependencies": {
         "@0x/base-contract": "^4.0.1",
-        "@0x/contracts-asset-proxy": "^1.0.3",
-        "@0x/contracts-erc20": "^1.0.3",
-        "@0x/contracts-erc721": "^1.0.3",
-        "@0x/contracts-exchange-libs": "^1.0.3",
-        "@0x/contracts-test-utils": "^3.0.2",
-        "@0x/contracts-utils": "^2.0.2",
+        "@0x/contracts-asset-proxy": "1.0.2",
+        "@0x/contracts-erc20": "1.0.2",
+        "@0x/contracts-erc721": "1.0.2",
+        "@0x/contracts-exchange-libs": "1.0.2",
+        "@0x/contracts-utils": "2.0.1",
         "@0x/order-utils": "^6.0.0",
         "@0x/types": "^2.0.1",
         "@0x/typescript-typings": "^4.0.0",
diff --git a/contracts/extensions/package.json b/contracts/extensions/package.json
index 118926eb5..335abaa80 100644
--- a/contracts/extensions/package.json
+++ b/contracts/extensions/package.json
@@ -69,12 +69,12 @@
     },
     "dependencies": {
         "@0x/base-contract": "^4.0.1",
-        "@0x/contracts-asset-proxy": "^1.0.3",
-        "@0x/contracts-erc20": "^1.0.3",
-        "@0x/contracts-erc721": "^1.0.3",
-        "@0x/contracts-exchange": "^1.0.3",
-        "@0x/contracts-exchange-libs": "^1.0.3",
-        "@0x/contracts-utils": "^2.0.2",
+        "@0x/contracts-asset-proxy": "1.0.2",
+        "@0x/contracts-erc20": "1.0.2",
+        "@0x/contracts-erc721": "1.0.2",
+        "@0x/contracts-exchange": "1.0.2",
+        "@0x/contracts-exchange-libs": "1.0.2",
+        "@0x/contracts-utils": "2.0.1",
         "@0x/order-utils": "^6.0.0",
         "@0x/types": "^2.0.1",
         "@0x/typescript-typings": "^4.0.0",
diff --git a/contracts/multisig/package.json b/contracts/multisig/package.json
index ce29122c4..49326ad7d 100644
--- a/contracts/multisig/package.json
+++ b/contracts/multisig/package.json
@@ -68,8 +68,8 @@
     },
     "dependencies": {
         "@0x/base-contract": "^4.0.1",
-        "@0x/contracts-asset-proxy": "^1.0.3",
-        "@0x/contracts-erc20": "^1.0.3",
+        "@0x/contracts-asset-proxy": "1.0.2",
+        "@0x/contracts-erc20": "1.0.2",
         "@0x/types": "^2.0.1",
         "@0x/typescript-typings": "^4.0.0",
         "@0x/utils": "^4.0.2",
diff --git a/yarn.lock b/yarn.lock
index 6a305e857..ab5d22492 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -472,64 +472,120 @@
     npmlog "^4.1.2"
     write-file-atomic "^2.3.0"
 
-"@0x/sol-resolver@^1.2.3":
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/@0x/sol-resolver/-/sol-resolver-1.2.3.tgz#d45d18a6bdeb212abf791b1cbbeac1bb780a94d0"
-  integrity sha512-suWsEPba/XP7DBHWdQ1t14uQ9GCuvUq2lnoxXyPmrdV5pWDVr/j2qVdd16ZNdaI+BkOCwpfR1C40Yu7WtwQk5g==
-  dependencies:
-    "@0x/types" "^1.5.2"
-    "@0x/typescript-typings" "^3.0.8"
+"@0x/contracts-asset-proxy@1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@0x/contracts-asset-proxy/-/contracts-asset-proxy-1.0.2.tgz#48a432a52a019ee632e50456f2687c85a5b57535"
+  dependencies:
+    "@0x/base-contract" "^4.0.1"
+    "@0x/contracts-erc20" "^1.0.2"
+    "@0x/contracts-erc721" "^1.0.2"
+    "@0x/contracts-test-utils" "^3.0.1"
+    "@0x/contracts-utils" "^2.0.1"
+    "@0x/order-utils" "^5.0.0"
+    "@0x/types" "^2.0.1"
+    "@0x/typescript-typings" "^4.0.0"
+    "@0x/utils" "^4.0.2"
+    "@0x/web3-wrapper" "^4.0.1"
+    ethereum-types "^2.0.0"
     lodash "^4.17.5"
 
-"@0x/tslint-config@^2.0.2":
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@0x/tslint-config/-/tslint-config-2.0.2.tgz#a202f2cb943c6e5feab7446f3a004de874fb8b94"
-  integrity sha512-acYC+VYv5CQwoD5PKB7TjkesBZpX4ia6xpIT6mntzE3ro3NAO+KWVs0tnVM0T/k9+BiLLGyNGiqL6oEmF63LuQ==
-  dependencies:
+"@0x/contracts-erc20@1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@0x/contracts-erc20/-/contracts-erc20-1.0.2.tgz#67cfefd4458b262d575bb1b07f63bc3dfed4daeb"
+  dependencies:
+    "@0x/base-contract" "^4.0.1"
+    "@0x/contracts-exchange-libs" "^1.0.2"
+    "@0x/contracts-utils" "^2.0.1"
+    "@0x/types" "^2.0.1"
+    "@0x/typescript-typings" "^4.0.0"
+    "@0x/utils" "^4.0.2"
+    "@0x/web3-wrapper" "^4.0.1"
+    ethereum-types "^2.0.0"
     lodash "^4.17.5"
-    tslint "5.11.0"
-    tslint-eslint-rules "5.4.0"
-    tslint-react "^3.2.0"
-    tsutils "3.0.0"
 
-"@0x/types@^1.5.2":
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/@0x/types/-/types-1.5.2.tgz#19c99ff796664fc256facb10e704aa6541912551"
-  integrity sha512-73Q5k55SHgSrt3SUwbiySBgrNEJG5WWriTjgjUzcCSYGMLawC1X/wV1cfMsP8kCqH8jWcIiPdUoGXutXjC8jQg==
-  dependencies:
-    "@types/node" "*"
-    bignumber.js "~4.1.0"
-    ethereum-types "^1.1.6"
+"@0x/contracts-erc721@1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@0x/contracts-erc721/-/contracts-erc721-1.0.2.tgz#e7309ae57de266bb9c4947de50ba16a89203ad08"
+  dependencies:
+    "@0x/base-contract" "^4.0.1"
+    "@0x/contracts-utils" "^2.0.1"
+    "@0x/types" "^2.0.1"
+    "@0x/typescript-typings" "^4.0.0"
+    "@0x/utils" "^4.0.2"
+    "@0x/web3-wrapper" "^4.0.1"
+    ethereum-types "^2.0.0"
+    lodash "^4.17.5"
 
-"@0x/typescript-typings@^3.0.8":
-  version "3.0.8"
-  resolved "https://registry.yarnpkg.com/@0x/typescript-typings/-/typescript-typings-3.0.8.tgz#85689e477c1cb5e5bd3eeee0dd1e73e9c2f1db83"
-  integrity sha512-WVH/Cy5/XE+fXuiriraw77pkNJc+GCUsoWLD+EMJDeBzJih/XNogZcTn1f1JApmJUX1ag05rNQ5ISQikp17YUw==
-  dependencies:
-    "@types/bn.js" "^4.11.0"
-    "@types/react" "*"
-    bignumber.js "~4.1.0"
-    ethereum-types "^1.1.6"
-    popper.js "1.14.3"
+"@0x/contracts-exchange-libs@1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@0x/contracts-exchange-libs/-/contracts-exchange-libs-1.0.2.tgz#0682c01cdb3e36100bda0ffbdf9badb5b8a01fc4"
+  dependencies:
+    "@0x/base-contract" "^4.0.1"
+    "@0x/contracts-utils" "^2.0.1"
+    "@0x/order-utils" "^5.0.0"
+    "@0x/types" "^2.0.1"
+    "@0x/typescript-typings" "^4.0.0"
+    "@0x/utils" "^4.0.2"
+    "@0x/web3-wrapper" "^4.0.1"
+    ethereum-types "^2.0.0"
+    lodash "^4.17.5"
 
-"@0x/utils@^3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@0x/utils/-/utils-3.0.1.tgz#20ada4a98f001c0a6656d45ae56e111b73ef8803"
-  integrity sha512-WlOmu1aZG7/a+5z1ehmoMNCgDc2s5bdVz/hD1mywSCHeJ0CqEaElTL4zXYoMxqV/wFMmwKTlQfGKwW1xKMjI4Q==
-  dependencies:
-    "@0x/types" "^1.5.2"
-    "@0x/typescript-typings" "^3.0.8"
+"@0x/contracts-exchange@1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@0x/contracts-exchange/-/contracts-exchange-1.0.2.tgz#4c02378b26a7bf6324e16a41f2851c43fed82c63"
+  dependencies:
+    "@0x/base-contract" "^4.0.1"
+    "@0x/contracts-asset-proxy" "^1.0.2"
+    "@0x/contracts-erc20" "^1.0.2"
+    "@0x/contracts-erc721" "^1.0.2"
+    "@0x/contracts-exchange-libs" "^1.0.2"
+    "@0x/contracts-test-utils" "^3.0.1"
+    "@0x/contracts-utils" "^2.0.1"
+    "@0x/order-utils" "^5.0.0"
+    "@0x/types" "^2.0.1"
+    "@0x/typescript-typings" "^4.0.0"
+    "@0x/utils" "^4.0.2"
+    "@0x/web3-wrapper" "^4.0.1"
+    ethereum-types "^2.0.0"
+    ethereumjs-util "^5.1.1"
+    lodash "^4.17.5"
+
+"@0x/contracts-utils@2.0.1":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@0x/contracts-utils/-/contracts-utils-2.0.1.tgz#32e298ab5e6edb045c37294063ff928b629db0a4"
+  dependencies:
+    "@0x/base-contract" "^4.0.1"
+    "@0x/order-utils" "^5.0.0"
+    "@0x/types" "^2.0.1"
+    "@0x/typescript-typings" "^4.0.0"
+    "@0x/utils" "^4.0.2"
+    "@0x/web3-wrapper" "^4.0.1"
+    bn.js "^4.11.8"
+    ethereum-types "^2.0.0"
+    ethereumjs-util "^5.1.1"
+    lodash "^4.17.5"
+
+"@0x/order-utils@^5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@0x/order-utils/-/order-utils-5.0.0.tgz#7f43e0310ace31738895881501c8dda9c3a3aefa"
+  dependencies:
+    "@0x/abi-gen-wrappers" "^3.0.1"
+    "@0x/assert" "^2.0.1"
+    "@0x/base-contract" "^4.0.1"
+    "@0x/contract-addresses" "^2.2.1"
+    "@0x/contract-artifacts" "^1.3.0"
+    "@0x/json-schemas" "^3.0.1"
+    "@0x/types" "^2.0.1"
+    "@0x/typescript-typings" "^4.0.0"
+    "@0x/utils" "^4.0.2"
+    "@0x/web3-wrapper" "^4.0.1"
     "@types/node" "*"
-    abortcontroller-polyfill "^1.1.9"
-    bignumber.js "~4.1.0"
-    chalk "^2.4.1"
-    detect-node "2.0.3"
-    ethereum-types "^1.1.6"
+    bn.js "^4.11.8"
+    ethereum-types "^2.0.0"
+    ethereumjs-abi "0.6.5"
     ethereumjs-util "^5.1.1"
     ethers "~4.0.4"
-    isomorphic-fetch "^2.2.1"
-    js-sha3 "^0.7.0"
-    lodash "^4.17.5"
+    lodash "^4.17.11"
 
 "@0xproject/npm-cli-login@^0.0.11":
   version "0.0.11"
@@ -1548,7 +1604,6 @@
 "@types/prettier@^1.15.2":
   version "1.15.2"
   resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-1.15.2.tgz#91594ea7cb6f3b1f7ea69f32621246654c7cc231"
-  integrity sha512-XIB0ZCaFZmWUHAa9dBqP5UKXXHwuukmVlP+XcyU94dui2k+l2lG+CHAbt2ffenHPUqoIs5Beh8Pdf2YEq/CZ7A==
 
 "@types/prop-types@*":
   version "15.5.5"
@@ -6349,14 +6404,6 @@ ethereum-common@^0.0.18:
   version "0.0.18"
   resolved "https://registry.yarnpkg.com/ethereum-common/-/ethereum-common-0.0.18.tgz#2fdc3576f232903358976eb39da783213ff9523f"
 
-ethereum-types@^1.1.6:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/ethereum-types/-/ethereum-types-1.1.6.tgz#14437dbf401de361e70dac6358e5f2915ad3c35d"
-  integrity sha512-/1ixUyyg0f3Gor+U+3Kc3o9AvS8V5hNVHS9qeNXlooqVee+FIpv5kq+SOgMpKSNSVKp4wBJSjrzp0ShjbKo3bA==
-  dependencies:
-    "@types/node" "*"
-    bignumber.js "~4.1.0"
-
 ethereumjs-abi@0.6.5:
   version "0.6.5"
   resolved "https://registry.yarnpkg.com/ethereumjs-abi/-/ethereumjs-abi-0.6.5.tgz#5a637ef16ab43473fa72a29ad90871405b3f5241"
@@ -7866,7 +7913,6 @@ got@^6.7.1:
 graceful-fs@4.1.15, graceful-fs@^3.0.0, graceful-fs@^4.0.0, graceful-fs@^4.1.10, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@~1.2.0:
   version "4.1.15"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
-  integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==
 
 "graceful-readlink@>= 1.0.0":
   version "1.0.1"
@@ -9142,7 +9188,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.2.1, isomorphic-fetch@^2.1.1, isomorphic-fetch@^2.2.1:
+isomorphic-fetch@2.2.1, isomorphic-fetch@^2.1.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz#611ae1acf14f5e81f729507472819fe9733558a9"
   dependencies:
@@ -12869,7 +12915,6 @@ prettier@^1.14.3, prettier@^1.15.3:
 prettier@^1.16.3:
   version "1.16.3"
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.16.3.tgz#8c62168453badef702f34b45b6ee899574a6a65d"
-  integrity sha512-kn/GU6SMRYPxUakNXhpP0EedT/KmaPzr0H5lIsDogrykbaxOpOfAFfk5XA7DZrJyMAv1wlMV3CPcZruGXVVUZw==
 
 pretty-bytes@^1.0.4:
   version "1.0.4"
@@ -13473,8 +13518,8 @@ react-highlight@0xproject/react-highlight#react-peer-deps:
   dependencies:
     highlight.js "^9.11.0"
     highlightjs-solidity "^1.0.5"
-    react "^16.5.2"
-    react-dom "^16.5.2"
+    react "^16.4.2"
+    react-dom "^16.4.2"
 
 react-hot-loader@^4.3.3:
   version "4.3.4"
@@ -14990,7 +15035,6 @@ smart-buffer@^4.0.1:
 snake-case@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/snake-case/-/snake-case-2.1.0.tgz#41bdb1b73f30ec66a04d4e2cad1b76387d4d6d9f"
-  integrity sha1-Qb2xtz8w7GagTU4srRt2OH1NbZ8=
   dependencies:
     no-case "^2.2.0"
 
@@ -16128,7 +16172,6 @@ to-regex@^3.0.1, to-regex@^3.0.2:
 to-snake-case@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/to-snake-case/-/to-snake-case-1.0.0.tgz#ce746913897946019a87e62edfaeaea4c608ab8c"
-  integrity sha1-znRpE4l5RgGah+Yu366upMYIq4w=
   dependencies:
     to-space-case "^1.0.0"