diff options
author | Fabio Berger <me@fabioberger.com> | 2018-10-18 18:36:41 +0800 |
---|---|---|
committer | Fabio Berger <me@fabioberger.com> | 2018-10-18 18:36:41 +0800 |
commit | 28863f9a6f8a28ddbfe588b9e4d03b1e31da6961 (patch) | |
tree | db9bd874838a30ba82eacab0d4255fe3067eff94 /packages/types | |
parent | 6ab6a9aa2b3511df60c078398168a84faf3e2385 (diff) | |
parent | cdd650d0eb83153a992922c6ffff35b494f299d3 (diff) | |
download | dexon-sol-tools-28863f9a6f8a28ddbfe588b9e4d03b1e31da6961.tar dexon-sol-tools-28863f9a6f8a28ddbfe588b9e4d03b1e31da6961.tar.gz dexon-sol-tools-28863f9a6f8a28ddbfe588b9e4d03b1e31da6961.tar.bz2 dexon-sol-tools-28863f9a6f8a28ddbfe588b9e4d03b1e31da6961.tar.lz dexon-sol-tools-28863f9a6f8a28ddbfe588b9e4d03b1e31da6961.tar.xz dexon-sol-tools-28863f9a6f8a28ddbfe588b9e4d03b1e31da6961.tar.zst dexon-sol-tools-28863f9a6f8a28ddbfe588b9e4d03b1e31da6961.zip |
merge dev-section-redesign
Diffstat (limited to 'packages/types')
-rw-r--r-- | packages/types/CHANGELOG.json | 4 | ||||
-rw-r--r-- | packages/types/src/index.ts | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/packages/types/CHANGELOG.json b/packages/types/CHANGELOG.json index 53e1f3716..106dc3281 100644 --- a/packages/types/CHANGELOG.json +++ b/packages/types/CHANGELOG.json @@ -9,6 +9,10 @@ { "note": "Added `ZeroExTransaction` type for Exchange executeTransaction", "pr": 1102 + }, + { + "note": "Add `AssetData` union type (`type AssetData = ERC20AssetData | ERC721AssetData`)", + "pr": 1131 } ] }, diff --git a/packages/types/src/index.ts b/packages/types/src/index.ts index d33048b61..3c9b6bbc5 100644 --- a/packages/types/src/index.ts +++ b/packages/types/src/index.ts @@ -168,6 +168,8 @@ export interface ERC721AssetData { tokenId: BigNumber; } +export type AssetData = ERC20AssetData | ERC721AssetData; + // TODO: DRY. These should be extracted from contract code. export enum RevertReason { OrderUnfillable = 'ORDER_UNFILLABLE', |