diff options
| author | Brandon Millman <brandon.millman@gmail.com> | 2018-01-25 09:13:16 +0800 |
|---|---|---|
| committer | Brandon Millman <brandon.millman@gmail.com> | 2018-01-25 09:13:16 +0800 |
| commit | 3f0ec89f11fe405711c6b7509d6043339b8b4258 (patch) | |
| tree | a6b5dea7d16d7ad2a02e2d0015c96c9e07ca2d84 /packages/0x.js/src/0x.ts | |
| parent | d3aa4f2bc7f2341a98c4aa6018c0d2ede221a3ed (diff) | |
| parent | f58f0ddb67555c3f0c7252ea3e003824984c48ad (diff) | |
| download | dexon-sol-tools-3f0ec89f11fe405711c6b7509d6043339b8b4258.tar dexon-sol-tools-3f0ec89f11fe405711c6b7509d6043339b8b4258.tar.gz dexon-sol-tools-3f0ec89f11fe405711c6b7509d6043339b8b4258.tar.bz2 dexon-sol-tools-3f0ec89f11fe405711c6b7509d6043339b8b4258.tar.lz dexon-sol-tools-3f0ec89f11fe405711c6b7509d6043339b8b4258.tar.xz dexon-sol-tools-3f0ec89f11fe405711c6b7509d6043339b8b4258.tar.zst dexon-sol-tools-3f0ec89f11fe405711c6b7509d6043339b8b4258.zip | |
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
Diffstat (limited to 'packages/0x.js/src/0x.ts')
| -rw-r--r-- | packages/0x.js/src/0x.ts | 1 |
1 files changed, 1 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, |