aboutsummaryrefslogtreecommitdiffstats
path: root/packages/0x.js/src
diff options
context:
space:
mode:
authorLeonid Logvinov <logvinov.leon@gmail.com>2018-01-24 22:17:56 +0800
committerLeonid Logvinov <logvinov.leon@gmail.com>2018-01-24 22:17:56 +0800
commit36bfe62a8f7badd8a27c650e1d42ba3d258bf871 (patch)
treeb8456f39f660377a12ec9db5dfa1960b0710859f /packages/0x.js/src
parent8a858501f2b633f47cec9576b25e6f99911bbc09 (diff)
downloaddexon-sol-tools-36bfe62a8f7badd8a27c650e1d42ba3d258bf871.tar
dexon-sol-tools-36bfe62a8f7badd8a27c650e1d42ba3d258bf871.tar.gz
dexon-sol-tools-36bfe62a8f7badd8a27c650e1d42ba3d258bf871.tar.bz2
dexon-sol-tools-36bfe62a8f7badd8a27c650e1d42ba3d258bf871.tar.lz
dexon-sol-tools-36bfe62a8f7badd8a27c650e1d42ba3d258bf871.tar.xz
dexon-sol-tools-36bfe62a8f7badd8a27c650e1d42ba3d258bf871.tar.zst
dexon-sol-tools-36bfe62a8f7badd8a27c650e1d42ba3d258bf871.zip
Fix the bug making it impossible to specify the custom ZRX address
Diffstat (limited to 'packages/0x.js/src')
-rw-r--r--packages/0x.js/src/0x.ts1
-rw-r--r--packages/0x.js/src/contract_wrappers/exchange_wrapper.ts2
-rw-r--r--packages/0x.js/src/types.ts2
3 files changed, 5 insertions, 0 deletions
diff --git a/packages/0x.js/src/0x.ts b/packages/0x.js/src/0x.ts
index e1b0ef08e..503a937c4 100644
--- a/packages/0x.js/src/0x.ts
+++ b/packages/0x.js/src/0x.ts
@@ -191,6 +191,7 @@ export class ZeroEx {
this._abiDecoder,
this.token,
config.exchangeContractAddress,
+ config.zrxContractAddress,
);
this.tokenRegistry = new TokenRegistryWrapper(
this._web3Wrapper,
diff --git a/packages/0x.js/src/contract_wrappers/exchange_wrapper.ts b/packages/0x.js/src/contract_wrappers/exchange_wrapper.ts
index be88cdb20..2b6117729 100644
--- a/packages/0x.js/src/contract_wrappers/exchange_wrapper.ts
+++ b/packages/0x.js/src/contract_wrappers/exchange_wrapper.ts
@@ -87,11 +87,13 @@ export class ExchangeWrapper extends ContractWrapper {
abiDecoder: AbiDecoder,
tokenWrapper: TokenWrapper,
contractAddressIfExists?: string,
+ zrxContractAddressIfExists?: string,
) {
super(web3Wrapper, networkId, abiDecoder);
this._tokenWrapper = tokenWrapper;
this._orderValidationUtils = new OrderValidationUtils(this);
this._contractAddressIfExists = contractAddressIfExists;
+ this._zrxContractAddressIfExists = zrxContractAddressIfExists;
}
/**
* Returns the unavailable takerAmount of an order. Unavailable amount is defined as the total
diff --git a/packages/0x.js/src/types.ts b/packages/0x.js/src/types.ts
index 2decd92ba..3c93910e9 100644
--- a/packages/0x.js/src/types.ts
+++ b/packages/0x.js/src/types.ts
@@ -290,6 +290,7 @@ export interface OrderStateWatcherConfig {
* networkId: The id of the underlying ethereum network your provider is connected to. (1-mainnet, 42-kovan, 50-testrpc)
* gasPrice: Gas price to use with every transaction
* exchangeContractAddress: The address of an exchange contract to use
+ * zrxContractAddress: The address of the ZRX contract to use
* tokenRegistryContractAddress: The address of a token registry contract to use
* tokenTransferProxyContractAddress: The address of the token transfer proxy contract to use
* orderWatcherConfig: All the configs related to the orderWatcher
@@ -298,6 +299,7 @@ export interface ZeroExConfig {
networkId: number;
gasPrice?: BigNumber;
exchangeContractAddress?: string;
+ zrxContractAddress?: string;
tokenRegistryContractAddress?: string;
tokenTransferProxyContractAddress?: string;
orderWatcherConfig?: OrderStateWatcherConfig;