crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Add fields to OrderRelevantState and change AssetData to SingleAssetData

Browse Source
This commit is contained in:
Amir Bandeali 2019-01-02 14:07:17 -08:00
parent de4916ccb8
commit df4f3d9eac
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/0x.js/src/index.ts
View File

@ -79,7 +79,7 @@ export {
OrderStateInvalid, OrderStateInvalid,
OrderState, OrderState,
AssetProxyId, AssetProxyId,
AssetData, SingleAssetData,
ERC20AssetData, ERC20AssetData,
ERC721AssetData, ERC721AssetData,
MultiAssetData, MultiAssetData,

4
packages/types/src/index.ts
View File

@ -110,7 +110,9 @@ export type DoneCallback = (err?: Error) => void;
export interface OrderRelevantState { export interface OrderRelevantState {
makerBalance: BigNumber; makerBalance: BigNumber;
makerIndividualBalances: ObjectMap<BigNumber>;
makerProxyAllowance: BigNumber; makerProxyAllowance: BigNumber;
makerIndividualProxyAllowances: ObjectMap<BigNumber>;
makerFeeBalance: BigNumber; makerFeeBalance: BigNumber;
makerFeeProxyAllowance: BigNumber; makerFeeProxyAllowance: BigNumber;
filledTakerAssetAmount: BigNumber; filledTakerAssetAmount: BigNumber;
@ -175,7 +177,7 @@ export interface MultiAssetData {
nestedAssetData: string[]; nestedAssetData: string[];
} }
export type AssetData = ERC20AssetData | ERC721AssetData | MultiAssetData; export type SingleAssetData = ERC20AssetData | ERC721AssetData;
// TODO: DRY. These should be extracted from contract code. // TODO: DRY. These should be extracted from contract code.
export enum RevertReason { export enum RevertReason {