diff options
author | Steve Klebanoff <steve.klebanoff@gmail.com> | 2019-01-10 00:54:55 +0800 |
---|---|---|
committer | Steve Klebanoff <steve.klebanoff@gmail.com> | 2019-01-10 00:54:55 +0800 |
commit | fb3605026ef63ef6897010a52bf3f4c116cdf271 (patch) | |
tree | af3887e5f785e049daeaf795e0f3e4a9ad370d93 /packages/types | |
parent | 76dde294f10bb3d5c1074cd6599668bcb1cdd8ec (diff) | |
parent | 5b8c9122a292f6558c45440b053ceae52d36d495 (diff) | |
download | dexon-sol-tools-fb3605026ef63ef6897010a52bf3f4c116cdf271.tar dexon-sol-tools-fb3605026ef63ef6897010a52bf3f4c116cdf271.tar.gz dexon-sol-tools-fb3605026ef63ef6897010a52bf3f4c116cdf271.tar.bz2 dexon-sol-tools-fb3605026ef63ef6897010a52bf3f4c116cdf271.tar.lz dexon-sol-tools-fb3605026ef63ef6897010a52bf3f4c116cdf271.tar.xz dexon-sol-tools-fb3605026ef63ef6897010a52bf3f4c116cdf271.tar.zst dexon-sol-tools-fb3605026ef63ef6897010a52bf3f4c116cdf271.zip |
Merge branch 'development' into feature/instant/tell-amount-available
Diffstat (limited to 'packages/types')
-rw-r--r-- | packages/types/CHANGELOG.json | 14 | ||||
-rw-r--r-- | packages/types/CHANGELOG.md | 5 | ||||
-rw-r--r-- | packages/types/package.json | 2 | ||||
-rw-r--r-- | packages/types/src/index.ts | 28 |
4 files changed, 47 insertions, 2 deletions
diff --git a/packages/types/CHANGELOG.json b/packages/types/CHANGELOG.json index f1cd2f18e..754cd29dc 100644 --- a/packages/types/CHANGELOG.json +++ b/packages/types/CHANGELOG.json @@ -1,5 +1,15 @@ [ { + "version": "1.5.0", + "changes": [ + { + "note": "Added types for Dutch Auction contract", + "pr": 1465 + } + ], + "timestamp": 1547040760 + }, + { "version": "1.4.1", "changes": [ { @@ -18,6 +28,10 @@ { "note": "Add RevertReasons for DutchAuction contract", "pr": 1225 + }, + { + "note": "Add MultiAsset types", + "pr": 1363 } ], "timestamp": 1544570656 diff --git a/packages/types/CHANGELOG.md b/packages/types/CHANGELOG.md index 5170eb4db..a1745cf94 100644 --- a/packages/types/CHANGELOG.md +++ b/packages/types/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v1.5.0 - _January 9, 2019_ + + * Added types for Dutch Auction contract (#1465) + ## v1.4.1 - _December 13, 2018_ * Dependencies updated @@ -13,6 +17,7 @@ CHANGELOG * Add `LengthMismatch` and `LengthGreaterThan3Required` revert reasons (#1224) * Add RevertReasons for DutchAuction contract (#1225) + * Add MultiAsset types (#1363) ## v1.3.0 - _November 21, 2018_ diff --git a/packages/types/package.json b/packages/types/package.json index 3c4bb6fe6..75c3b7c63 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@0x/types", - "version": "1.4.1", + "version": "1.5.0", "engines": { "node": ">=6.12" }, diff --git a/packages/types/src/index.ts b/packages/types/src/index.ts index 4470dd501..49f788fb0 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; @@ -155,6 +157,7 @@ export enum SignatureType { export enum AssetProxyId { ERC20 = '0xf47261b0', ERC721 = '0x02571792', + MultiAsset = '0x94cfcdd7', } export interface ERC20AssetData { @@ -168,7 +171,21 @@ export interface ERC721AssetData { tokenId: BigNumber; } -export type AssetData = ERC20AssetData | ERC721AssetData; +export type SingleAssetData = ERC20AssetData | ERC721AssetData; + +export interface MultiAssetData { + assetProxyId: string; + amounts: BigNumber[]; + nestedAssetData: string[]; +} + +export interface MultiAssetDataWithRecursiveDecoding { + assetProxyId: string; + amounts: BigNumber[]; + nestedAssetData: SingleAssetData[]; +} + +export type AssetData = SingleAssetData | MultiAssetData | MultiAssetDataWithRecursiveDecoding; // TODO: DRY. These should be extracted from contract code. export enum RevertReason { @@ -659,3 +676,12 @@ export interface SimpleEvmOutput { export interface SimpleEvmBytecodeOutput { object: string; } + +export interface DutchAuctionDetails { + beginTimeSeconds: BigNumber; + endTimeSeconds: BigNumber; + beginAmount: BigNumber; + endAmount: BigNumber; + currentAmount: BigNumber; + currentTimeSeconds: BigNumber; +} |