Merge pull request #1954 from 0xProject/fix/updateRemainingV2Addresses

Update remaining V2.1 contract address changes

packages/abi-gen/package.json

@@ -78,7 +78,6 @@
         "@0x/sol-compiler": "^3.1.9",
         "@0x/subproviders": "^4.1.1",
         "@0x/tslint-config": "^3.0.1",
-        "@0x/utils": "^4.3.3",
         "@0x/web3-wrapper": "^6.0.7",
         "@types/glob": "5.0.35",
         "@types/handlebars": "^4.0.36",

packages/contract-addresses/CHANGELOG.json

@@ -1,4 +1,12 @@
 [
+    {
+        "version": "3.0.1",
+        "changes": [
+            {
+                "note": "Update remaining Mainnet V2.1 contract addresses"
+            }
+        ]
+    },
     {
         "version": "3.0.0",
         "changes": [

packages/contract-addresses/src/index.ts

@@ -29,53 +29,53 @@ const networkToAddresses: { [networkId: number]: ContractAddresses } = {
         exchange: '0x080bf510fcbf18b91105470639e9561022937712',
         erc20Proxy: '0x95e6f48254609a6ee006f7d493c8e5fb97094cef',
         erc721Proxy: '0xefc70a1b18c432bdc64b596838b4d138f6bc6cad',
-        forwarder: '0xdc4587cb17d2a1829512e2cfec621f8066290e6a',
+        forwarder: '0x76481caa104b5f6bccb540dae4cefaf1c398ebea',
         orderValidator: '0xa09329c6003c9a5402102e226417738ee22cf1f2',
         zrxToken: '0xe41d2489571d322189246dafa5ebde1f4699f498',
         etherToken: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
         assetProxyOwner: '0xdffe798c7172dd6deb32baee68af322e8f495ce0',
-        dutchAuction: NULL_ADDRESS,
-        coordinatorRegistry: NULL_ADDRESS,
-        coordinator: NULL_ADDRESS,
+        dutchAuction: '0xa3856622276a64fee0f17f67329fac24368d4aae',
+        coordinatorRegistry: '0x45797531b873fd5e519477a070a955764c1a5b07',
+        coordinator: '0xa14857e8930acd9a882d33ec20559beb5479c8a6',
     },
     3: {
         erc20Proxy: '0xb1408f4c245a23c31b98d2c626777d4c0d766caa',
         erc721Proxy: '0xe654aac058bfbf9f83fcaee7793311dd82f6ddb4',
         zrxToken: '0xff67881f8d12f372d91baae9752eb3631ff0ed00',
         etherToken: '0xc778417e063141139fce010982780140aa0cd5ab',
-        exchange: '0x4530c0483a1633c7a1c97d2c53721caff2caaaaf',
+        exchange: '0xbff9493f92a3df4b0429b6d00743b3cfb4c85831',
         assetProxyOwner: '0xf5fa5b5fed2727a0e44ac67f6772e97977aa358b',
-        forwarder: '0x2240dab907db71e64d3e0dba4800c83b5c502d4e',
+        forwarder: '0x1ebdc9758e85c1c6a85af06cc96cf89000a31913',
         orderValidator: '0x90431a90516ab49af23a0530e04e8c7836e7122f',
-        dutchAuction: '0x2df6b59309f35ada230ec7d61d7d97355017a1df',
+        dutchAuction: '0xe5f862f7811af180990025b6259b02feb0a0b8dc',
         coordinatorRegistry: '0x403cc23e88c17c4652fb904784d1af640a6722d9',
-        coordinator: '0x25aae5b981ce6683cc5aeea1855d927e0b59066f',
+        coordinator: '0x2ba02e03ee0029311e0f43715307870a3e701b53',
     },
     4: {
-        exchange: '0xbce0b5f6eb618c565c3e5f5cd69652bbc279f44e',
+        exchange: '0xbff9493f92a3df4b0429b6d00743b3cfb4c85831',
         erc20Proxy: '0x2f5ae4f6106e89b4147651688a92256885c5f410',
         erc721Proxy: '0x7656d773e11ff7383a14dcf09a9c50990481cd10',
         zrxToken: '0x8080c7e4b81ecf23aa6f877cfbfd9b0c228c6ffa',
         etherToken: '0xc778417e063141139fce010982780140aa0cd5ab',
         assetProxyOwner: '0xe1703da878afcebff5b7624a826902af475b9c03',
-        forwarder: '0x2d40589abbdee84961f3a7656b9af7adb0ee5ab4',
+        forwarder: '0x1ebdc9758e85c1c6a85af06cc96cf89000a31913',
         orderValidator: '0x0c5173a51e26b29d6126c686756fb9fbef71f762',
-        dutchAuction: '0xdd7bd6437e67c422879364740ab5855fe3dc41f7',
+        dutchAuction: '0xe5f862f7811af180990025b6259b02feb0a0b8dc',
         coordinatorRegistry: '0x1084b6a398e47907bae43fec3ff4b677db6e4fee',
-        coordinator: '0x25aae5b981ce6683cc5aeea1855d927e0b59066f',
+        coordinator: '0x2ba02e03ee0029311e0f43715307870a3e701b53',
     },
     42: {
         erc20Proxy: '0xf1ec01d6236d3cd881a0bf0130ea25fe4234003e',
         erc721Proxy: '0x2a9127c745688a165106c11cd4d647d2220af821',
         zrxToken: '0x2002d3812f58e35f0ea1ffbf80a75a38c32175fa',
         etherToken: '0xd0a1e359811322d97991e03f863a0c30c2cf029c',
-        exchange: '0x35dd2932454449b14cee11a94d3674a936d5d7b2',
+        exchange: '0x30589010550762d2f0d06f650d8e8b6ade6dbf4b',
         assetProxyOwner: '0x2c824d2882baa668e0d5202b1e7f2922278703f8',
-        forwarder: '0x17992e4ffb22730138e4b62aaa6367fa9d3699a6',
+        forwarder: '0x1ebdc9758e85c1c6a85af06cc96cf89000a31913',
         orderValidator: '0xb389da3d204b412df2f75c6afb3d0a7ce0bc283d',
-        dutchAuction: '0xe11667fb51f34c5367f40d7e379327ce32ee7150',
+        dutchAuction: '0xe5f862f7811af180990025b6259b02feb0a0b8dc',
         coordinatorRegistry: '0x09fb99968c016a3ff537bf58fb3d9fe55a7975d5',
-        coordinator: '0x25aae5b981ce6683cc5aeea1855d927e0b59066f',
+        coordinator: '0x2ba02e03ee0029311e0f43715307870a3e701b53',
     },
     // NetworkId 50 represents our Ganache snapshot generated from migrations.
     50: {

packages/react-docs/package.json

@@ -28,7 +28,7 @@
         "@0x/dev-utils": "^2.2.4",
         "@0x/tslint-config": "^3.0.1",
         "@types/compare-versions": "^3.0.0",
-        "@types/styled-components": "4.0.0",
+        "@types/styled-components": "4.1.1",
         "make-promises-safe": "^1.1.0",
         "shx": "^0.2.2",
         "tslint": "5.11.0",

packages/react-shared/package.json

@@ -44,7 +44,7 @@
         "@types/react-dom": "*",
         "@types/react-router-dom": "^4.0.4",
         "@types/react-scroll": "1.5.3",
-        "@types/styled-components": "4.0.0",
+        "@types/styled-components": "4.1.1",
         "@types/valid-url": "^1.0.2",
         "basscss": "^8.0.3",
         "change-case": "^3.0.2",

python-packages/contract_addresses/src/zero_ex/contract_addresses/__init__.py

@@ -66,52 +66,52 @@ class NetworkId(Enum):
 
 NETWORK_TO_ADDRESSES: Dict[NetworkId, ContractAddresses] = {
     NetworkId.MAINNET: ContractAddresses(  # nosec
-        erc20_proxy="0x2240dab907db71e64d3e0dba4800c83b5c502d4e",
-        erc721_proxy="0x208e41fb445f1bb1b6780d58356e81405f3e6127",
+        erc20_proxy="0x95e6f48254609a6ee006f7d493c8e5fb97094cef",
+        erc721_proxy="0xefc70a1b18c432bdc64b596838b4d138f6bc6cad",
         zrx_token="0xe41d2489571d322189246dafa5ebde1f4699f498",
         ether_token="0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-        exchange="0x4f833a24e1f95d70f028921e27040ca56e09ab0b",
-        asset_proxy_owner="0x17992e4ffb22730138e4b62aaa6367fa9d3699a6",
-        forwarder="0x5468a1dc173652ee28d249c271fa9933144746b1",
-        order_validator="0x9463e518dea6810309563c81d5266c1b1d149138",
+        exchange="0x080bf510fcbf18b91105470639e9561022937712",
+        asset_proxy_owner="0xdffe798c7172dd6deb32baee68af322e8f495ce0",
+        forwarder="0x76481caa104b5f6bccb540dae4cefaf1c398ebea",
+        order_validator="0xa09329c6003c9a5402102e226417738ee22cf1f2",
         coordinator_registry="0x45797531b873fd5e519477a070a955764c1a5b07",
-        coordinator="0x25aae5b981ce6683cc5aeea1855d927e0b59066f",
+        coordinator="0xa14857e8930acd9a882d33ec20559beb5479c8a6",
     ),
     NetworkId.ROPSTEN: ContractAddresses(  # nosec
         erc20_proxy="0xb1408f4c245a23c31b98d2c626777d4c0d766caa",
         erc721_proxy="0xe654aac058bfbf9f83fcaee7793311dd82f6ddb4",
         zrx_token="0xff67881f8d12f372d91baae9752eb3631ff0ed00",
         ether_token="0xc778417e063141139fce010982780140aa0cd5ab",
-        exchange="0x4530c0483a1633c7a1c97d2c53721caff2caaaaf",
+        exchange="0xbff9493f92a3df4b0429b6d00743b3cfb4c85831",
         asset_proxy_owner="0xf5fa5b5fed2727a0e44ac67f6772e97977aa358b",
-        forwarder="0x2240dab907db71e64d3e0dba4800c83b5c502d4e",
+        forwarder="0x1ebdc9758e85c1c6a85af06cc96cf89000a31913",
         order_validator="0x90431a90516ab49af23a0530e04e8c7836e7122f",
         coordinator_registry="0x403cc23e88c17c4652fb904784d1af640a6722d9",
-        coordinator="0x25aae5b981ce6683cc5aeea1855d927e0b59066f",
+        coordinator="0x2ba02e03ee0029311e0f43715307870a3e701b53",
     ),
     NetworkId.RINKEBY: ContractAddresses(  # nosec
-        exchange="0xbce0b5f6eb618c565c3e5f5cd69652bbc279f44e",
+        exchange="0xbff9493f92a3df4b0429b6d00743b3cfb4c85831",
         erc20_proxy="0x2f5ae4f6106e89b4147651688a92256885c5f410",
         erc721_proxy="0x7656d773e11ff7383a14dcf09a9c50990481cd10",
         zrx_token="0x8080c7e4b81ecf23aa6f877cfbfd9b0c228c6ffa",
         ether_token="0xc778417e063141139fce010982780140aa0cd5ab",
         asset_proxy_owner="0xe1703da878afcebff5b7624a826902af475b9c03",
-        forwarder="0x2d40589abbdee84961f3a7656b9af7adb0ee5ab4",
+        forwarder="0x1ebdc9758e85c1c6a85af06cc96cf89000a31913",
         order_validator="0x0c5173a51e26b29d6126c686756fb9fbef71f762",
         coordinator_registry="0x1084b6a398e47907bae43fec3ff4b677db6e4fee",
-        coordinator="0x25aae5b981ce6683cc5aeea1855d927e0b59066f",
+        coordinator="0x2ba02e03ee0029311e0f43715307870a3e701b53",
     ),
     NetworkId.KOVAN: ContractAddresses(  # nosec
         erc20_proxy="0xf1ec01d6236d3cd881a0bf0130ea25fe4234003e",
         erc721_proxy="0x2a9127c745688a165106c11cd4d647d2220af821",
         zrx_token="0x2002d3812f58e35f0ea1ffbf80a75a38c32175fa",
         ether_token="0xd0a1e359811322d97991e03f863a0c30c2cf029c",
-        exchange="0x35dd2932454449b14cee11a94d3674a936d5d7b2",
+        exchange="0x30589010550762d2f0d06f650d8e8b6ade6dbf4b",
         asset_proxy_owner="0x2c824d2882baa668e0d5202b1e7f2922278703f8",
-        forwarder="0x17992e4ffb22730138e4b62aaa6367fa9d3699a6",
+        forwarder="0x1ebdc9758e85c1c6a85af06cc96cf89000a31913",
         order_validator="0xb389da3d204b412df2f75c6afb3d0a7ce0bc283d",
         coordinator_registry="0x09fb99968c016a3ff537bf58fb3d9fe55a7975d5",
-        coordinator="0x25aae5b981ce6683cc5aeea1855d927e0b59066f",
+        coordinator="0x2ba02e03ee0029311e0f43715307870a3e701b53",
     ),
     NetworkId.GANACHE: ContractAddresses(  # nosec
         exchange="0x48bacb9266a570d521063ef5dd96e61686dbe788",

yarn.lock

@@ -478,6 +478,13 @@
   dependencies:
     "@0x/base-contract" "^4.0.3"
 
+"@0x/abi-gen-wrappers@^4.1.0", "@0x/abi-gen-wrappers@^4.2.0":
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/@0x/abi-gen-wrappers/-/abi-gen-wrappers-4.3.0.tgz#b36616b129f44072474a7d5739299e4b1068e3d4"
+  integrity sha512-KnpoHbbqfidECl4hTGOvBaCj1N3LASHcdNO38yOMo1eO4B0H+kuyDVFjN3nbNt7lnXTPJ+DdaQpoDVQwySdEDQ==
+  dependencies:
+    "@0x/base-contract" "^5.1.0"
+
 "@0x/[email protected]":
   version "6.1.4"
   resolved "https://registry.yarnpkg.com/@0x/asset-buyer/-/asset-buyer-6.1.4.tgz#ea863b860fbae6f633846bdcf23cacbb345aefd1"
@@ -506,6 +513,13 @@
     ethers "~4.0.4"
     lodash "^4.17.11"
 
+"@0x/contract-addresses@^2.2.1", "@0x/contract-addresses@^2.3.0", "@0x/contract-addresses@^2.3.1":
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/@0x/contract-addresses/-/contract-addresses-2.3.3.tgz#8cf009e7668c2fccca416177c85f3f6612c724c6"
+  integrity sha512-0sPrFfwICq4E9Mar3xMFBSrTCckP2AR0t+3daNfaUmh+Z5yteP6gdnTbuYVjgyEGlvC71K0ohhsqd4IzXN7O5Q==
+  dependencies:
+    lodash "^4.17.11"
+
 "@0x/contract-artifacts@^1.3.0", "@0x/contract-artifacts@^1.4.0", "@0x/contract-artifacts@^1.5.0":
   version "1.5.1"
   resolved "https://registry.npmjs.org/@0x/contract-artifacts/-/contract-artifacts-1.5.1.tgz#6fba56a1d3e2d5d897a75fcfa432e49e2ebb17a7"
@@ -8071,10 +8085,22 @@ got@^6.7.1:
     unzip-response "^2.0.1"
     url-parse-lax "^1.0.0"
 
-[email protected], 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:
+graceful-fs@^3.0.0:
+  version "3.0.11"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-3.0.11.tgz#7613c778a1afea62f25c630a086d7f3acbbdd818"
+  integrity sha1-dhPHeKGv6mLyXGMKCG1/Osu92Bg=
+  dependencies:
+    natives "^1.1.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:
   version "4.1.15"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
 
+graceful-fs@~1.2.0:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-1.2.3.tgz#15a4806a57547cb2d2dbf27f42e89a8c3451b364"
+  integrity sha1-FaSAaldUfLLS2/J/QuiajDRRs2Q=
+
 "graceful-readlink@>= 1.0.0":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
@@ -11533,6 +11559,11 @@ nanomatch@^1.2.9:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
+natives@^1.1.0:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/natives/-/natives-1.1.6.tgz#a603b4a498ab77173612b9ea1acdec4d980f00bb"
+  integrity sha512-6+TDFewD4yxY14ptjKaS63GVdtKiES1pTPyxn9Jb0rBqPMZ7VcCiooEhPNsr+mqHtMGxa/5c/HhcC4uPEUw/nA==
+
 natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"