diff options
| author | Fabio Berger <me@fabioberger.com> | 2017-05-30 18:36:28 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2017-05-30 18:36:28 +0800 |
| commit | 02d7f808ab0a38e145c619b360738dc976898d54 (patch) | |
| tree | 658094383e06e2b4df944486f7caeb54550007ea /src/0x.js.ts | |
| parent | 4d63a4d02a68974df75c9cae85d43c0ba628c740 (diff) | |
| parent | 73ae3df172b1fdb7e6a3f5cbb866b09fb5f9d032 (diff) | |
| download | dexon-0x-contracts-02d7f808ab0a38e145c619b360738dc976898d54.tar.gz dexon-0x-contracts-02d7f808ab0a38e145c619b360738dc976898d54.tar.zst dexon-0x-contracts-02d7f808ab0a38e145c619b360738dc976898d54.zip | |
Merge branch 'master' into tokenRegistry
# Conflicts:
# src/0x.js.ts
Diffstat (limited to 'src/0x.js.ts')
| -rw-r--r-- | src/0x.js.ts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/0x.js.ts b/src/0x.js.ts index 7e48bc0a5..f3da005f8 100644 --- a/src/0x.js.ts +++ b/src/0x.js.ts @@ -18,9 +18,9 @@ import {SolidityTypes, ECSignature, ZeroExError} from './types'; const MAX_DIGITS_IN_UNSIGNED_256_INT = 78; export class ZeroEx { - public web3Wrapper: Web3Wrapper; public exchange: ExchangeWrapper; public tokenRegistry: TokenRegistryWrapper; + private web3Wrapper: Web3Wrapper; /** * Computes the orderHash given the order parameters and returns it as a hex encoded string. */ |