Merge branch 'development' into feature/instant/tell-amount-available

4 files changed, 24 insertions, 1 deletions

diff --git a/packages/contract-addresses/CHANGELOG.json b/packages/contract-addresses/CHANGELOG.json
index 21ffaf510..36684d443 100644
--- a/packages/contract-addresses/CHANGELOG.json
+++ b/packages/contract-addresses/CHANGELOG.json
@@ -1,5 +1,15 @@
 [
     {
+        "version": "2.1.0",
+        "changes": [
+            {
+                "note": "Added testnet entries for Dutch Auction contract (kovan,rinkeby,ropsten)",
+                "pr": 1465
+            }
+        ],
+        "timestamp": 1547040760
+    },
+    {
         "version": "2.0.0",
         "changes": [
             {
diff --git a/packages/contract-addresses/CHANGELOG.md b/packages/contract-addresses/CHANGELOG.md
index c006c3b22..d7f2ff7ea 100644
--- a/packages/contract-addresses/CHANGELOG.md
+++ b/packages/contract-addresses/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v2.1.0 - _January 9, 2019_
+
+    * Added testnet entries for Dutch Auction contract (kovan,rinkeby,ropsten) (#1465)
+
 ## v2.0.0 - _November 28, 2018_
 
     * Redeployed Rinkeby with testnet Exchange artifact (#1318)
diff --git a/packages/contract-addresses/package.json b/packages/contract-addresses/package.json
index c75ae6efa..c5a133ddf 100644
--- a/packages/contract-addresses/package.json
+++ b/packages/contract-addresses/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0x/contract-addresses",
-    "version": "2.0.0",
+    "version": "2.1.0",
     "engines": {
         "node": ">=6.12"
     },
diff --git a/packages/contract-addresses/src/index.ts b/packages/contract-addresses/src/index.ts
index 7989631e3..d181a1bec 100644
--- a/packages/contract-addresses/src/index.ts
+++ b/packages/contract-addresses/src/index.ts
@@ -9,6 +9,7 @@ export interface ContractAddresses {
     assetProxyOwner: string;
     forwarder: string;
     orderValidator: string;
+    dutchAuction: string;
 }
 
 export enum NetworkId {
@@ -19,6 +20,8 @@ export enum NetworkId {
     Ganache = 50,
 }
 
+const NULL_ADDRESS = '0x0000000000000000000000000000000000000000';
+
 const networkToAddresses: { [networkId: number]: ContractAddresses } = {
     1: {
         erc20Proxy: '0x2240dab907db71e64d3e0dba4800c83b5c502d4e',
@@ -29,6 +32,8 @@ const networkToAddresses: { [networkId: number]: ContractAddresses } = {
         assetProxyOwner: '0x17992e4ffb22730138e4b62aaa6367fa9d3699a6',
         forwarder: '0x5468a1dc173652ee28d249c271fa9933144746b1',
         orderValidator: '0x9463e518dea6810309563c81d5266c1b1d149138',
+        // @todo hysz/dekz: Add mainnet address once deployed.
+        dutchAuction: NULL_ADDRESS,
     },
     3: {
         erc20Proxy: '0xb1408f4c245a23c31b98d2c626777d4c0d766caa',
@@ -39,6 +44,7 @@ const networkToAddresses: { [networkId: number]: ContractAddresses } = {
         assetProxyOwner: '0xf5fa5b5fed2727a0e44ac67f6772e97977aa358b',
         forwarder: '0x2240dab907db71e64d3e0dba4800c83b5c502d4e',
         orderValidator: '0x90431a90516ab49af23a0530e04e8c7836e7122f',
+        dutchAuction: '0x2df6b59309f35ada230ec7d61d7d97355017a1df',
     },
     4: {
         exchange: '0xbce0b5f6eb618c565c3e5f5cd69652bbc279f44e',
@@ -49,6 +55,7 @@ const networkToAddresses: { [networkId: number]: ContractAddresses } = {
         assetProxyOwner: '0xe1703da878afcebff5b7624a826902af475b9c03',
         forwarder: '0x2d40589abbdee84961f3a7656b9af7adb0ee5ab4',
         orderValidator: '0x0c5173a51e26b29d6126c686756fb9fbef71f762',
+        dutchAuction: '0xdd7bd6437e67c422879364740ab5855fe3dc41f7',
     },
     42: {
         erc20Proxy: '0xf1ec01d6236d3cd881a0bf0130ea25fe4234003e',
@@ -59,6 +66,7 @@ const networkToAddresses: { [networkId: number]: ContractAddresses } = {
         assetProxyOwner: '0x2c824d2882baa668e0d5202b1e7f2922278703f8',
         forwarder: '0x17992e4ffb22730138e4b62aaa6367fa9d3699a6',
         orderValidator: '0xb389da3d204b412df2f75c6afb3d0a7ce0bc283d',
+        dutchAuction: '0xe11667fb51f34c5367f40d7e379327ce32ee7150',
     },
     // NetworkId 50 represents our Ganache snapshot generated from migrations.
     50: {
@@ -70,6 +78,7 @@ const networkToAddresses: { [networkId: number]: ContractAddresses } = {
         assetProxyOwner: '0x34d402f14d58e001d8efbe6585051bf9706aa064',
         forwarder: '0xb69e673309512a9d726f87304c6984054f87a93b',
         orderValidator: '0xe86bb98fcf9bff3512c74589b78fb168200cc546',
+        dutchAuction: '0xdc688d29394a3f1e6f1e5100862776691afaf3d2',
     },
 };