Merge branch 'development' into feature/kovan-faucets/all-testnet-support

* development:
  Publish
  Update yarn.lock
  Update the CHANGELOG
  Fix the bug making it impossible to specify the custom ZRX address

1 files changed, 2 insertions, 0 deletions

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;