aboutsummaryrefslogtreecommitdiffstats
path: root/packages/0x.js/src/contract_wrappers
diff options
context:
space:
mode:
authorBrandon Millman <brandon.millman@gmail.com>2018-03-20 00:56:46 +0800
committerBrandon Millman <brandon.millman@gmail.com>2018-03-20 00:56:46 +0800
commit11bac66046e10cd152d328f03f97e04c10d9a40c (patch)
tree926741e9383264f5c121dc8f046adfabde699eec /packages/0x.js/src/contract_wrappers
parente4ea6e1ec3693b2106b1ba28869277488ebca6d3 (diff)
parent2a438419ab3bc32dba43918cf2eb480439ef81de (diff)
downloaddexon-sol-tools-11bac66046e10cd152d328f03f97e04c10d9a40c.tar
dexon-sol-tools-11bac66046e10cd152d328f03f97e04c10d9a40c.tar.gz
dexon-sol-tools-11bac66046e10cd152d328f03f97e04c10d9a40c.tar.bz2
dexon-sol-tools-11bac66046e10cd152d328f03f97e04c10d9a40c.tar.lz
dexon-sol-tools-11bac66046e10cd152d328f03f97e04c10d9a40c.tar.xz
dexon-sol-tools-11bac66046e10cd152d328f03f97e04c10d9a40c.tar.zst
dexon-sol-tools-11bac66046e10cd152d328f03f97e04c10d9a40c.zip
Merge branch 'development' into feature/sra-report/collection-tests
* development: (26 commits) Change title Add Blake and Zach to About page Re-size Jacob and Tom's images Manually publish 0x.js back to a working state Publish Publish Fix 0x.js assets Remove assets from connect and _bundles from packages that don't generate the folder Publish Fix packages that aren't working as expected Make new packages default to public on publish Add new public packages to top-level README Update top-level package.json Fix incorrect new versions Fix path to assets Publish Updated CHANGELOGS Fix quotation marks Add a complex test for ast visitor Move opcodes to constants ...
Diffstat (limited to 'packages/0x.js/src/contract_wrappers')
-rw-r--r--packages/0x.js/src/contract_wrappers/exchange_wrapper.ts12
1 files changed, 8 insertions, 4 deletions
diff --git a/packages/0x.js/src/contract_wrappers/exchange_wrapper.ts b/packages/0x.js/src/contract_wrappers/exchange_wrapper.ts
index 20b46c6bc..6414985e6 100644
--- a/packages/0x.js/src/contract_wrappers/exchange_wrapper.ts
+++ b/packages/0x.js/src/contract_wrappers/exchange_wrapper.ts
@@ -1,5 +1,12 @@
import { schemas } from '@0xproject/json-schemas';
-import { BlockParamLiteral, DecodedLogArgs, LogWithDecodedArgs } from '@0xproject/types';
+import {
+ BlockParamLiteral,
+ DecodedLogArgs,
+ ECSignature,
+ LogWithDecodedArgs,
+ Order,
+ SignedOrder,
+} from '@0xproject/types';
import { AbiDecoder, BigNumber } from '@0xproject/utils';
import { Web3Wrapper } from '@0xproject/web3-wrapper';
import * as _ from 'lodash';
@@ -8,19 +15,16 @@ import * as Web3 from 'web3';
import { artifacts } from '../artifacts';
import {
BlockRange,
- ECSignature,
EventCallback,
ExchangeContractErrCodes,
ExchangeContractErrs,
IndexedFilterValues,
MethodOpts,
- Order,
OrderAddresses,
OrderCancellationRequest,
OrderFillRequest,
OrderTransactionOpts,
OrderValues,
- SignedOrder,
ValidateOrderFillableOpts,
} from '../types';
import { assert } from '../utils/assert';