diff options
| author | Greg Hysen <greg.hysen@gmail.com> | 2019-01-08 05:08:44 +0800 |
|---|---|---|
| committer | Greg Hysen <greg.hysen@gmail.com> | 2019-01-08 07:50:48 +0800 |
| commit | 04db7f0fae02ef29795d0f65deb71e64b5552233 (patch) | |
| tree | 6ee5fc237d649116e02da241a3c2ebe3d5029dee /packages | |
| parent | e39ae0350b744227bca73001c90101f0b8613193 (diff) | |
| download | dexon-sol-tools-04db7f0fae02ef29795d0f65deb71e64b5552233.tar dexon-sol-tools-04db7f0fae02ef29795d0f65deb71e64b5552233.tar.gz dexon-sol-tools-04db7f0fae02ef29795d0f65deb71e64b5552233.tar.bz2 dexon-sol-tools-04db7f0fae02ef29795d0f65deb71e64b5552233.tar.lz dexon-sol-tools-04db7f0fae02ef29795d0f65deb71e64b5552233.tar.xz dexon-sol-tools-04db7f0fae02ef29795d0f65deb71e64b5552233.tar.zst dexon-sol-tools-04db7f0fae02ef29795d0f65deb71e64b5552233.zip | |
Fixed merge conflict from development
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/0x.js/src/index.ts | 1 | ||||
| -rw-r--r-- | packages/contract-wrappers/src/index.ts | 5 | ||||
| -rw-r--r-- | packages/contract-wrappers/src/types.ts | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/packages/0x.js/src/index.ts b/packages/0x.js/src/index.ts index 790e2a97e..006e4cf29 100644 --- a/packages/0x.js/src/index.ts +++ b/packages/0x.js/src/index.ts @@ -81,6 +81,7 @@ export { OrderStateInvalid, OrderState, AssetProxyId, + AssetData, SingleAssetData, ERC20AssetData, ERC721AssetData, diff --git a/packages/contract-wrappers/src/index.ts b/packages/contract-wrappers/src/index.ts index 853194d6f..69bbe3c91 100644 --- a/packages/contract-wrappers/src/index.ts +++ b/packages/contract-wrappers/src/index.ts @@ -60,9 +60,12 @@ export { export { AssetData, - DutchAuctionDetails, ERC20AssetData, ERC721AssetData, + SingleAssetData, + MultiAssetData, + MultiAssetDataWithRecursiveDecoding, + DutchAuctionDetails, Order, SignedOrder, AssetProxyId, diff --git a/packages/contract-wrappers/src/types.ts b/packages/contract-wrappers/src/types.ts index f23587c20..945ca88cd 100644 --- a/packages/contract-wrappers/src/types.ts +++ b/packages/contract-wrappers/src/types.ts @@ -9,13 +9,11 @@ import { WETH9Events, } from '@0x/abi-gen-wrappers'; import { ContractAddresses } from '@0x/contract-addresses'; -import { OrderState, SignedOrder } from '@0x/types'; +import { AssetData, OrderState, SignedOrder } from '@0x/types'; import { BigNumber } from '@0x/utils'; import { BlockParam, ContractEventArg, DecodedLogArgs, LogEntryEvent, LogWithDecodedArgs } from 'ethereum-types'; -import { AssetData } from '@0x/order-utils'; - export enum ExchangeWrapperError { AssetDataMismatch = 'ASSET_DATA_MISMATCH', } |