From c21c3220560a88584fa67befadcb17f42517deb1 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Fri, 7 Jul 2017 14:33:13 -0700
Subject: Rename ZRX to ZRX_TOKEN_CONTRACT

---
 src/artifacts/exchange/Exchange_v1.json   | 26 ++++++++++++++++++++++++++
 src/contract_wrappers/exchange_wrapper.ts |  2 +-
 src/types.ts                              |  2 +-
 3 files changed, 28 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/artifacts/exchange/Exchange_v1.json b/src/artifacts/exchange/Exchange_v1.json
index 4b7321970..ed5f08b72 100644
--- a/src/artifacts/exchange/Exchange_v1.json
+++ b/src/artifacts/exchange/Exchange_v1.json
@@ -115,6 +115,32 @@
       "payable": false,
       "type": "function"
     },
+    {
+      "constant": true,
+      "inputs": [],
+      "name": "ZRX_TOKEN_CONTRACT",
+      "outputs": [
+        {
+          "name": "",
+          "type": "address"
+        }
+      ],
+      "payable": false,
+      "type": "function"
+    },
+    {
+      "constant": true,
+      "inputs": [],
+      "name": "PROXY_CONTRACT",
+      "outputs": [
+        {
+          "name": "",
+          "type": "address"
+        }
+      ],
+      "payable": false,
+      "type": "function"
+    },
     {
       "constant": false,
       "inputs": [
diff --git a/src/contract_wrappers/exchange_wrapper.ts b/src/contract_wrappers/exchange_wrapper.ts
index fa4b5904b..a06471bba 100644
--- a/src/contract_wrappers/exchange_wrapper.ts
+++ b/src/contract_wrappers/exchange_wrapper.ts
@@ -800,7 +800,7 @@ export class ExchangeWrapper extends ContractWrapper {
     }
     private async _getZRXTokenAddressAsync(exchangeContractAddress: string): Promise<string> {
         const exchangeInstance = await this._getExchangeContractAsync(exchangeContractAddress);
-        const ZRXtokenAddress = await exchangeInstance.ZRX.call();
+        const ZRXtokenAddress = await exchangeInstance.ZRX_TOKEN_CONTRACT.call();
         return ZRXtokenAddress;
     }
 }
diff --git a/src/types.ts b/src/types.ts
index 66881e170..dfb4d12c5 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -61,7 +61,7 @@ export interface ExchangeContract extends ContractInstance {
     LogFill: CreateContractEvent;
     LogCancel: CreateContractEvent;
     LogError: CreateContractEvent;
-    ZRX: {
+    ZRX_TOKEN_CONTRACT: {
         call: () => Promise<string>;
     };
     getUnavailableValueT: {
-- 
cgit v1.2.3