aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLeonid Logvinov <logvinov.leon@gmail.com>2017-07-08 05:33:13 +0800
committerFabio Berger <me@fabioberger.com>2017-07-11 15:30:14 +0800
commitc21c3220560a88584fa67befadcb17f42517deb1 (patch)
tree01fa1caf5819bf046af3064288a8382beb66c087 /src
parent15fe8afd1ec7f9ecc6fecd28a2caf752e4bc6ccb (diff)
downloaddexon-0x-contracts-c21c3220560a88584fa67befadcb17f42517deb1.tar.gz
dexon-0x-contracts-c21c3220560a88584fa67befadcb17f42517deb1.tar.zst
dexon-0x-contracts-c21c3220560a88584fa67befadcb17f42517deb1.zip
Rename ZRX to ZRX_TOKEN_CONTRACT
Diffstat (limited to 'src')
-rw-r--r--src/artifacts/exchange/Exchange_v1.json26
-rw-r--r--src/contract_wrappers/exchange_wrapper.ts2
-rw-r--r--src/types.ts2
3 files changed, 28 insertions, 2 deletions
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
@@ -116,6 +116,32 @@
"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: {