diff options
| author | Amir Bandeali <abandeali1@gmail.com> | 2019-01-03 06:07:17 +0800 |
|---|---|---|
| committer | Amir Bandeali <abandeali1@gmail.com> | 2019-01-08 02:31:11 +0800 |
| commit | df4f3d9eacd370b56913f6b85ab7aa705cbed8fe (patch) | |
| tree | 0a91c1fbf503df7006444b50290898584aa6c2bd | |
| parent | de4916ccb811e6324692e1b7fccec0940ef0c44f (diff) | |
| download | dexon-sol-tools-df4f3d9eacd370b56913f6b85ab7aa705cbed8fe.tar dexon-sol-tools-df4f3d9eacd370b56913f6b85ab7aa705cbed8fe.tar.gz dexon-sol-tools-df4f3d9eacd370b56913f6b85ab7aa705cbed8fe.tar.bz2 dexon-sol-tools-df4f3d9eacd370b56913f6b85ab7aa705cbed8fe.tar.lz dexon-sol-tools-df4f3d9eacd370b56913f6b85ab7aa705cbed8fe.tar.xz dexon-sol-tools-df4f3d9eacd370b56913f6b85ab7aa705cbed8fe.tar.zst dexon-sol-tools-df4f3d9eacd370b56913f6b85ab7aa705cbed8fe.zip | |
feat: Add fields to OrderRelevantState and change AssetData to SingleAssetData
| -rw-r--r-- | packages/0x.js/src/index.ts | 2 | ||||
| -rw-r--r-- | packages/types/src/index.ts | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/packages/0x.js/src/index.ts b/packages/0x.js/src/index.ts index 0ccb0f768..375843741 100644 --- a/packages/0x.js/src/index.ts +++ b/packages/0x.js/src/index.ts @@ -79,7 +79,7 @@ export { OrderStateInvalid, OrderState, AssetProxyId, - AssetData, + SingleAssetData, ERC20AssetData, ERC721AssetData, MultiAssetData, diff --git a/packages/types/src/index.ts b/packages/types/src/index.ts index 846c030ee..2e8ce6629 100644 --- a/packages/types/src/index.ts +++ b/packages/types/src/index.ts @@ -110,7 +110,9 @@ export type DoneCallback = (err?: Error) => void; export interface OrderRelevantState { makerBalance: BigNumber; + makerIndividualBalances: ObjectMap<BigNumber>; makerProxyAllowance: BigNumber; + makerIndividualProxyAllowances: ObjectMap<BigNumber>; makerFeeBalance: BigNumber; makerFeeProxyAllowance: BigNumber; filledTakerAssetAmount: BigNumber; @@ -175,7 +177,7 @@ export interface MultiAssetData { nestedAssetData: string[]; } -export type AssetData = ERC20AssetData | ERC721AssetData | MultiAssetData; +export type SingleAssetData = ERC20AssetData | ERC721AssetData; // TODO: DRY. These should be extracted from contract code. export enum RevertReason { |