aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeonid Logvinov <logvinov.leon@gmail.com>2017-07-08 06:05:04 +0800
committerFabio Berger <me@fabioberger.com>2017-07-11 15:30:14 +0800
commit15f68f9b5476993e7bbcdc09f325e4c3834e4b02 (patch)
treeaefdb8b45c556102a9c15efeb701493ea2a6bcae
parentdce13796acad479d2e5f1002c7d56f02d766c5ef (diff)
downloaddexon-sol-tools-15f68f9b5476993e7bbcdc09f325e4c3834e4b02.tar
dexon-sol-tools-15f68f9b5476993e7bbcdc09f325e4c3834e4b02.tar.gz
dexon-sol-tools-15f68f9b5476993e7bbcdc09f325e4c3834e4b02.tar.bz2
dexon-sol-tools-15f68f9b5476993e7bbcdc09f325e4c3834e4b02.tar.lz
dexon-sol-tools-15f68f9b5476993e7bbcdc09f325e4c3834e4b02.tar.xz
dexon-sol-tools-15f68f9b5476993e7bbcdc09f325e4c3834e4b02.tar.zst
dexon-sol-tools-15f68f9b5476993e7bbcdc09f325e4c3834e4b02.zip
Revert "Rename ZRX to ZRX_TOKEN_CONTRACT"
This reverts commit 6f0b8a185b6fcf58b7427fb907599dbc82c10eaf.
-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, 2 insertions, 28 deletions
diff --git a/src/artifacts/exchange/Exchange_v1.json b/src/artifacts/exchange/Exchange_v1.json
index dfebfc338..af36e870d 100644
--- a/src/artifacts/exchange/Exchange_v1.json
+++ b/src/artifacts/exchange/Exchange_v1.json
@@ -116,32 +116,6 @@
"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 9bedb1b3c..f66e91534 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_TOKEN_CONTRACT.call();
+ const ZRXtokenAddress = await exchangeInstance.ZRX.call();
return ZRXtokenAddress;
}
}
diff --git a/src/types.ts b/src/types.ts
index 2887e83ff..35dfd74d7 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_TOKEN_CONTRACT: {
+ ZRX: {
call: () => Promise<string>;
};
getUnavailableValueT: {