From ccf021b8bf34aa7c0714f29f9153a5a11ce682a2 Mon Sep 17 00:00:00 2001 From: fragosti Date: Fri, 12 Oct 2018 14:52:42 -0700 Subject: feat: use new AssetData type from types package --- packages/order-utils/src/asset_data_utils.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages/order-utils/src') 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: -- cgit v1.2.3 From 8ba65346d410c5e5a636b1c8626bfdf611b800e9 Mon Sep 17 00:00:00 2001 From: fragosti Date: Tue, 16 Oct 2018 17:00:53 -0700 Subject: feat: export AssetData from order-utils --- packages/order-utils/src/index.ts | 1 + 1 file changed, 1 insertion(+) (limited to 'packages/order-utils/src') diff --git a/packages/order-utils/src/index.ts b/packages/order-utils/src/index.ts index dbb782b85..a356a1d44 100644 --- a/packages/order-utils/src/index.ts +++ b/packages/order-utils/src/index.ts @@ -35,6 +35,7 @@ export { OrderRelevantState, OrderState, ECSignature, + AssetData, ERC20AssetData, ERC721AssetData, AssetProxyId, -- cgit v1.2.3 From 02cf99fa367f8058447a0a05b1d148afb68ab85c Mon Sep 17 00:00:00 2001 From: Jacob Evans Date: Thu, 18 Oct 2018 11:07:00 +1100 Subject: fix(order-utils): remove constants export --- packages/order-utils/src/index.ts | 1 - 1 file changed, 1 deletion(-) (limited to 'packages/order-utils/src') diff --git a/packages/order-utils/src/index.ts b/packages/order-utils/src/index.ts index a356a1d44..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 { -- cgit v1.2.3