aboutsummaryrefslogtreecommitdiffstats
path: root/packages/0x.js/src/0x.ts
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2018-03-18 21:01:18 +0800
committerFabio Berger <me@fabioberger.com>2018-03-18 21:01:18 +0800
commit4948551703fb3cb9f8470d9f4a61a9a5473e5afa (patch)
tree2e7d4d2e9c98cb6bebf7bdd17444d4b351220018 /packages/0x.js/src/0x.ts
parentd7bf003d511321ec6cb8814cb1549c46b4efba86 (diff)
parentd4c1b3b0bd26e730ce6687469cdf7283877543e1 (diff)
downloaddexon-sol-tools-4948551703fb3cb9f8470d9f4a61a9a5473e5afa.tar
dexon-sol-tools-4948551703fb3cb9f8470d9f4a61a9a5473e5afa.tar.gz
dexon-sol-tools-4948551703fb3cb9f8470d9f4a61a9a5473e5afa.tar.bz2
dexon-sol-tools-4948551703fb3cb9f8470d9f4a61a9a5473e5afa.tar.lz
dexon-sol-tools-4948551703fb3cb9f8470d9f4a61a9a5473e5afa.tar.xz
dexon-sol-tools-4948551703fb3cb9f8470d9f4a61a9a5473e5afa.tar.zst
dexon-sol-tools-4948551703fb3cb9f8470d9f4a61a9a5473e5afa.zip
merge development
Diffstat (limited to 'packages/0x.js/src/0x.ts')
-rw-r--r--packages/0x.js/src/0x.ts4
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/0x.js/src/0x.ts b/packages/0x.js/src/0x.ts
index 22a5fee10..09da4b046 100644
--- a/packages/0x.js/src/0x.ts
+++ b/packages/0x.js/src/0x.ts
@@ -1,5 +1,5 @@
import { schemas, SchemaValidator } from '@0xproject/json-schemas';
-import { TransactionReceiptWithDecodedLogs } from '@0xproject/types';
+import { ECSignature, Order, SignedOrder, TransactionReceiptWithDecodedLogs } from '@0xproject/types';
import { AbiDecoder, BigNumber, intervalUtils } from '@0xproject/utils';
import { Web3Wrapper } from '@0xproject/web3-wrapper';
import * as ethUtil from 'ethereumjs-util';
@@ -15,7 +15,7 @@ import { OrderStateWatcher } from './order_watcher/order_state_watcher';
import { zeroExConfigSchema } from './schemas/zero_ex_config_schema';
import { zeroExPrivateNetworkConfigSchema } from './schemas/zero_ex_private_network_config_schema';
import { zeroExPublicNetworkConfigSchema } from './schemas/zero_ex_public_network_config_schema';
-import { ECSignature, Order, SignedOrder, Web3Provider, ZeroExConfig, ZeroExError } from './types';
+import { Web3Provider, ZeroExConfig, ZeroExError } from './types';
import { assert } from './utils/assert';
import { constants } from './utils/constants';
import { decorators } from './utils/decorators';