aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--packages/0x.js/src/index.ts2
-rw-r--r--packages/types/src/index.ts4
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 {