diff options
Diffstat (limited to 'packages/types')
-rw-r--r-- | packages/types/package.json | 2 | ||||
-rw-r--r-- | packages/types/src/index.ts | 20 |
2 files changed, 8 insertions, 14 deletions
diff --git a/packages/types/package.json b/packages/types/package.json index 95b7721d3..fd2073db3 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -8,7 +8,7 @@ "main": "lib/index.js", "types": "lib/index.d.ts", "scripts": { - "watch": "tsc -w", + "watch_without_deps": "tsc -w", "build": "tsc && copyfiles -u 2 './lib/monorepo_scripts/**/*' ./scripts", "clean": "shx rm -rf lib scripts", "lint": "tslint --project .", diff --git a/packages/types/src/index.ts b/packages/types/src/index.ts index 5a4d23a9e..a5da947e1 100644 --- a/packages/types/src/index.ts +++ b/packages/types/src/index.ts @@ -1,5 +1,5 @@ import { BigNumber } from 'bignumber.js'; -import { ContractAbi, DecodedLogArgs, LogEntry, LogWithDecodedArgs, TransactionReceipt } from 'ethereum-types'; +import { ContractAbi } from 'ethereum-types'; // HACK: Rather then extending from OrderWithoutExchangeAddress // we don't, because our docs don't expand inherited types, and it's unnecessarily @@ -103,10 +103,9 @@ export interface OrderRelevantState { makerProxyAllowance: BigNumber; makerFeeBalance: BigNumber; makerFeeProxyAllowance: BigNumber; - filledTakerTokenAmount: BigNumber; - cancelledTakerTokenAmount: BigNumber; - remainingFillableMakerTokenAmount: BigNumber; - remainingFillableTakerTokenAmount: BigNumber; + filledTakerAssetAmount: BigNumber; + remainingFillableMakerAssetAmount: BigNumber; + remainingFillableTakerAssetAmount: BigNumber; } export interface OrderStateValid { @@ -157,19 +156,14 @@ export enum AssetProxyId { ERC721, } -export interface ERC20ProxyData { +export interface ERC20AssetData { assetProxyId: AssetProxyId; tokenAddress: string; } -export interface ERC721ProxyData { +export interface ERC721AssetData { assetProxyId: AssetProxyId; tokenAddress: string; tokenId: BigNumber; -} - -export interface ProxyData { - assetProxyId: AssetProxyId; - tokenAddress?: string; - data?: any; + receiverData: string; } |