aboutsummaryrefslogtreecommitdiffstats
path: root/src/0x.js.ts
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2017-06-02 00:34:42 +0800
committerFabio Berger <me@fabioberger.com>2017-06-02 00:34:42 +0800
commit2aaf71e488665d53d373a17d112504a4439ab44b (patch)
tree5a41cf24e452a4fd11f174957c4a9c132c5f25d0 /src/0x.js.ts
parentde93bf1690b78a8745c392e22e01ace641fbbffe (diff)
parent520248e6787a04b2fcf45d7f185d85214a84bfd5 (diff)
downloaddexon-0x-contracts-2aaf71e488665d53d373a17d112504a4439ab44b.tar.gz
dexon-0x-contracts-2aaf71e488665d53d373a17d112504a4439ab44b.tar.zst
dexon-0x-contracts-2aaf71e488665d53d373a17d112504a4439ab44b.zip
Merge branch 'fillOrderAsync' into unavailableFilledCancelled
Diffstat (limited to 'src/0x.js.ts')
-rw-r--r--src/0x.js.ts4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/0x.js.ts b/src/0x.js.ts
index 42f645929..c799e63e9 100644
--- a/src/0x.js.ts
+++ b/src/0x.js.ts
@@ -103,9 +103,9 @@ export class ZeroEx {
}
constructor(web3: Web3) {
this.web3Wrapper = new Web3Wrapper(web3);
- this.exchange = new ExchangeWrapper(this.web3Wrapper);
- this.tokenRegistry = new TokenRegistryWrapper(this.web3Wrapper);
this.token = new TokenWrapper(this.web3Wrapper);
+ this.exchange = new ExchangeWrapper(this.web3Wrapper, this.token);
+ this.tokenRegistry = new TokenRegistryWrapper(this.web3Wrapper);
}
/**
* Sets a new provider for the web3 instance used by 0x.js