From 492e0ae34546e0020c2c6a694ce60feef5ebf695 Mon Sep 17 00:00:00 2001 From: Amir Bandeali Date: Sun, 2 Dec 2018 14:43:33 -0800 Subject: feat: Export MultiAssetData in types --- packages/0x.js/src/index.ts | 1 + 1 file changed, 1 insertion(+) (limited to 'packages/0x.js/src/index.ts') diff --git a/packages/0x.js/src/index.ts b/packages/0x.js/src/index.ts index 2df360b96..0ccb0f768 100644 --- a/packages/0x.js/src/index.ts +++ b/packages/0x.js/src/index.ts @@ -82,6 +82,7 @@ export { AssetData, ERC20AssetData, ERC721AssetData, + MultiAssetData, SignatureType, OrderRelevantState, Stats, -- cgit v1.2.3 From df4f3d9eacd370b56913f6b85ab7aa705cbed8fe Mon Sep 17 00:00:00 2001 From: Amir Bandeali Date: Wed, 2 Jan 2019 14:07:17 -0800 Subject: feat: Add fields to OrderRelevantState and change AssetData to SingleAssetData --- packages/0x.js/src/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/0x.js/src/index.ts') diff --git a/packages/0x.js/src/index.ts b/packages/0x.js/src/index.ts index 0ccb0f768..375843741 100644 --- a/packages/0x.js/src/index.ts +++ b/packages/0x.js/src/index.ts @@ -79,7 +79,7 @@ export { OrderStateInvalid, OrderState, AssetProxyId, - AssetData, + SingleAssetData, ERC20AssetData, ERC721AssetData, MultiAssetData, -- cgit v1.2.3 From 1dda10b4f34eb19b731e58c26f13ecc08e367bbe Mon Sep 17 00:00:00 2001 From: Amir Bandeali Date: Wed, 2 Jan 2019 16:52:15 -0800 Subject: Add recursive MultiAsset decoding, store first address in pipeline --- packages/0x.js/src/index.ts | 1 + 1 file changed, 1 insertion(+) (limited to 'packages/0x.js/src/index.ts') diff --git a/packages/0x.js/src/index.ts b/packages/0x.js/src/index.ts index 375843741..01742f1b9 100644 --- a/packages/0x.js/src/index.ts +++ b/packages/0x.js/src/index.ts @@ -83,6 +83,7 @@ export { ERC20AssetData, ERC721AssetData, MultiAssetData, + MultiAssetDataWithRecursiveDecoding, SignatureType, OrderRelevantState, Stats, -- cgit v1.2.3 From 70508f52a1dd6bfcc891f145c3a06f1e66c3cda5 Mon Sep 17 00:00:00 2001 From: Amir Bandeali Date: Wed, 2 Jan 2019 17:17:40 -0800 Subject: Update CHANGELOGs --- packages/0x.js/src/index.ts | 2 ++ 1 file changed, 2 insertions(+) (limited to 'packages/0x.js/src/index.ts') diff --git a/packages/0x.js/src/index.ts b/packages/0x.js/src/index.ts index 01742f1b9..c8978466d 100644 --- a/packages/0x.js/src/index.ts +++ b/packages/0x.js/src/index.ts @@ -71,6 +71,7 @@ export { AbiDecoder } from '@0x/utils'; export { BigNumber } from '@0x/utils'; export { + AssetData, ExchangeContractErrs, Order, SignedOrder, @@ -85,6 +86,7 @@ export { MultiAssetData, MultiAssetDataWithRecursiveDecoding, SignatureType, + ObjectMap, OrderRelevantState, Stats, } from '@0x/types'; -- cgit v1.2.3 From d7f9e3f0a0a82f70d8fdca67abf7f8a4f09e9ec8 Mon Sep 17 00:00:00 2001 From: Amir Bandeali Date: Thu, 3 Jan 2019 11:19:10 -0800 Subject: Do not export AssetData in 0x.js --- packages/0x.js/src/index.ts | 1 - 1 file changed, 1 deletion(-) (limited to 'packages/0x.js/src/index.ts') diff --git a/packages/0x.js/src/index.ts b/packages/0x.js/src/index.ts index c8978466d..d21df0c01 100644 --- a/packages/0x.js/src/index.ts +++ b/packages/0x.js/src/index.ts @@ -71,7 +71,6 @@ export { AbiDecoder } from '@0x/utils'; export { BigNumber } from '@0x/utils'; export { - AssetData, ExchangeContractErrs, Order, SignedOrder, -- cgit v1.2.3 From ff0093460d50a2078f18192d6dcc75c76d72730c Mon Sep 17 00:00:00 2001 From: Greg Hysen Date: Sun, 23 Dec 2018 15:39:02 -0800 Subject: Export dutch auction wrapper in 0x.js --- packages/0x.js/src/index.ts | 1 + 1 file changed, 1 insertion(+) (limited to 'packages/0x.js/src/index.ts') diff --git a/packages/0x.js/src/index.ts b/packages/0x.js/src/index.ts index d21df0c01..ae9f4b771 100644 --- a/packages/0x.js/src/index.ts +++ b/packages/0x.js/src/index.ts @@ -4,6 +4,7 @@ export { assetDataUtils, signatureUtils, generatePseudoRandomSalt, orderHashUtil export { ContractWrappers, + DutchAuctionWrapper, ERC20TokenWrapper, ERC721TokenWrapper, EtherTokenWrapper, -- cgit v1.2.3 From edb989fbf381201752309a1e2aa5dcf6837b67d0 Mon Sep 17 00:00:00 2001 From: Greg Hysen Date: Sun, 23 Dec 2018 16:04:09 -0800 Subject: export dutch auction wrapper types from 0x.js --- packages/0x.js/src/index.ts | 2 ++ 1 file changed, 2 insertions(+) (limited to 'packages/0x.js/src/index.ts') diff --git a/packages/0x.js/src/index.ts b/packages/0x.js/src/index.ts index ae9f4b771..790e2a97e 100644 --- a/packages/0x.js/src/index.ts +++ b/packages/0x.js/src/index.ts @@ -28,6 +28,7 @@ export { OrderAndTraderInfo, TraderInfo, ValidateOrderFillableOpts, + DutchAuctionData, } from '@0x/contract-wrappers'; export { @@ -89,6 +90,7 @@ export { ObjectMap, OrderRelevantState, Stats, + DutchAuctionDetails, } from '@0x/types'; export { -- cgit v1.2.3 From 04db7f0fae02ef29795d0f65deb71e64b5552233 Mon Sep 17 00:00:00 2001 From: Greg Hysen Date: Mon, 7 Jan 2019 13:08:44 -0800 Subject: Fixed merge conflict from development --- packages/0x.js/src/index.ts | 1 + 1 file changed, 1 insertion(+) (limited to 'packages/0x.js/src/index.ts') diff --git a/packages/0x.js/src/index.ts b/packages/0x.js/src/index.ts index 790e2a97e..006e4cf29 100644 --- a/packages/0x.js/src/index.ts +++ b/packages/0x.js/src/index.ts @@ -81,6 +81,7 @@ export { OrderStateInvalid, OrderState, AssetProxyId, + AssetData, SingleAssetData, ERC20AssetData, ERC721AssetData, -- cgit v1.2.3