diff options
| author | Fabio Berger <me@fabioberger.com> | 2018-10-18 18:35:07 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2018-10-18 18:35:07 +0800 |
| commit | cdd650d0eb83153a992922c6ffff35b494f299d3 (patch) | |
| tree | fc12135e69ae74403a26408d2d7625e8a3fe334e /packages/order-utils | |
| parent | c333d093b585fa0250a6973f2d396eb3cf227334 (diff) | |
| parent | bd8ba14bf46cb901e14f0ee718ac01cdbc833e86 (diff) | |
| download | dexon-sol-tools-cdd650d0eb83153a992922c6ffff35b494f299d3.tar dexon-sol-tools-cdd650d0eb83153a992922c6ffff35b494f299d3.tar.gz dexon-sol-tools-cdd650d0eb83153a992922c6ffff35b494f299d3.tar.bz2 dexon-sol-tools-cdd650d0eb83153a992922c6ffff35b494f299d3.tar.lz dexon-sol-tools-cdd650d0eb83153a992922c6ffff35b494f299d3.tar.xz dexon-sol-tools-cdd650d0eb83153a992922c6ffff35b494f299d3.tar.zst dexon-sol-tools-cdd650d0eb83153a992922c6ffff35b494f299d3.zip | |
merge development
Diffstat (limited to 'packages/order-utils')
| -rw-r--r-- | packages/order-utils/CHANGELOG.json | 4 | ||||
| -rw-r--r-- | packages/order-utils/package.json | 2 | ||||
| -rw-r--r-- | packages/order-utils/src/asset_data_utils.ts | 4 | ||||
| -rw-r--r-- | packages/order-utils/src/index.ts | 2 |
4 files changed, 8 insertions, 4 deletions
diff --git a/packages/order-utils/CHANGELOG.json b/packages/order-utils/CHANGELOG.json index 5a0c0db47..9bf16ef2a 100644 --- a/packages/order-utils/CHANGELOG.json +++ b/packages/order-utils/CHANGELOG.json @@ -14,6 +14,10 @@ { "note": "Rename `ecSignOrderHashAsync` to `ecSignHashAsync` removing `SignerType` parameter.", "pr": 1102 + }, + { + "note": "Use `AssetData` union type for function return values.", + "pr": 1131 } ] }, diff --git a/packages/order-utils/package.json b/packages/order-utils/package.json index 50bc0f0a0..09eef849f 100644 --- a/packages/order-utils/package.json +++ b/packages/order-utils/package.json @@ -49,7 +49,7 @@ "shx": "^0.2.2", "sinon": "^4.0.0", "tslint": "5.11.0", - "typedoc": "0.12.0", + "typedoc": "0.13.0", "typescript": "3.0.1" }, "dependencies": { diff --git a/packages/order-utils/src/asset_data_utils.ts b/packages/order-utils/src/asset_data_utils.ts index 0c0b59548..12c11bce9 100644 --- a/packages/order-utils/src/asset_data_utils.ts +++ b/packages/order-utils/src/asset_data_utils.ts @@ -1,4 +1,4 @@ -import { AssetProxyId, ERC20AssetData, ERC721AssetData } from '@0xproject/types'; +import { AssetData, AssetProxyId, ERC20AssetData, ERC721AssetData } from '@0xproject/types'; import { BigNumber } from '@0xproject/utils'; import ethAbi = require('ethereumjs-abi'); import ethUtil = require('ethereumjs-util'); @@ -112,7 +112,7 @@ export const assetDataUtils = { * @param assetData Hex encoded assetData string to decode * @return Either a ERC20 or ERC721 assetData object */ - decodeAssetDataOrThrow(assetData: string): ERC20AssetData | ERC721AssetData { + decodeAssetDataOrThrow(assetData: string): AssetData { const assetProxyId = assetDataUtils.decodeAssetProxyId(assetData); switch (assetProxyId) { case AssetProxyId.ERC20: diff --git a/packages/order-utils/src/index.ts b/packages/order-utils/src/index.ts index dbb782b85..50b8a88a8 100644 --- a/packages/order-utils/src/index.ts +++ b/packages/order-utils/src/index.ts @@ -18,7 +18,6 @@ export { ExchangeTransferSimulator } from './exchange_transfer_simulator'; export { BalanceAndProxyAllowanceLazyStore } from './store/balance_and_proxy_allowance_lazy_store'; export { OrderFilledCancelledLazyStore } from './store/order_filled_cancelled_lazy_store'; -export { constants } from './constants'; export { eip712Utils } from './eip712_utils'; export { @@ -35,6 +34,7 @@ export { OrderRelevantState, OrderState, ECSignature, + AssetData, ERC20AssetData, ERC721AssetData, AssetProxyId, |