From 4d5fcf8985be9f06509ad0b3c05ead066b24bf5a Mon Sep 17 00:00:00 2001
From: Amir Bandeali <abandeali1@gmail.com>
Date: Fri, 30 Nov 2018 15:33:52 -0800
Subject: feat: Add MultiAsset types

---
 packages/types/src/index.ts | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'packages/types/src')

diff --git a/packages/types/src/index.ts b/packages/types/src/index.ts
index 4470dd501..846c030ee 100644
--- a/packages/types/src/index.ts
+++ b/packages/types/src/index.ts
@@ -155,6 +155,7 @@ export enum SignatureType {
 export enum AssetProxyId {
     ERC20 = '0xf47261b0',
     ERC721 = '0x02571792',
+    MultiAsset = '0x94cfcdd7',
 }
 
 export interface ERC20AssetData {
@@ -168,7 +169,13 @@ export interface ERC721AssetData {
     tokenId: BigNumber;
 }
 
-export type AssetData = ERC20AssetData | ERC721AssetData;
+export interface MultiAssetData {
+    assetProxyId: string;
+    amounts: BigNumber[];
+    nestedAssetData: string[];
+}
+
+export type AssetData = ERC20AssetData | ERC721AssetData | MultiAssetData;
 
 // TODO: DRY. These should be extracted from contract code.
 export enum RevertReason {
-- 
cgit v1.2.3


From df4f3d9eacd370b56913f6b85ab7aa705cbed8fe Mon Sep 17 00:00:00 2001
From: Amir Bandeali <abandeali1@gmail.com>
Date: Wed, 2 Jan 2019 14:07:17 -0800
Subject: feat: Add fields to OrderRelevantState and change AssetData to
 SingleAssetData

---
 packages/types/src/index.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'packages/types/src')

diff --git a/packages/types/src/index.ts b/packages/types/src/index.ts
index 846c030ee..2e8ce6629 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;
@@ -175,7 +177,7 @@ export interface MultiAssetData {
     nestedAssetData: string[];
 }
 
-export type AssetData = ERC20AssetData | ERC721AssetData | MultiAssetData;
+export type SingleAssetData = ERC20AssetData | ERC721AssetData;
 
 // TODO: DRY. These should be extracted from contract code.
 export enum RevertReason {
-- 
cgit v1.2.3


From 1dda10b4f34eb19b731e58c26f13ecc08e367bbe Mon Sep 17 00:00:00 2001
From: Amir Bandeali <abandeali1@gmail.com>
Date: Wed, 2 Jan 2019 16:52:15 -0800
Subject: Add recursive MultiAsset decoding, store first address in pipeline

---
 packages/types/src/index.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'packages/types/src')

diff --git a/packages/types/src/index.ts b/packages/types/src/index.ts
index 2e8ce6629..71fcbf9db 100644
--- a/packages/types/src/index.ts
+++ b/packages/types/src/index.ts
@@ -171,13 +171,19 @@ export interface ERC721AssetData {
     tokenId: BigNumber;
 }
 
+export type SingleAssetData = ERC20AssetData | ERC721AssetData;
+
 export interface MultiAssetData {
     assetProxyId: string;
     amounts: BigNumber[];
     nestedAssetData: string[];
 }
 
-export type SingleAssetData = ERC20AssetData | ERC721AssetData;
+export interface MultiAssetDataWithRecursiveDecoding {
+    assetProxyId: string;
+    amounts: BigNumber[];
+    nestedAssetData: SingleAssetData[];
+}
 
 // TODO: DRY. These should be extracted from contract code.
 export enum RevertReason {
-- 
cgit v1.2.3


From 70508f52a1dd6bfcc891f145c3a06f1e66c3cda5 Mon Sep 17 00:00:00 2001
From: Amir Bandeali <abandeali1@gmail.com>
Date: Wed, 2 Jan 2019 17:17:40 -0800
Subject: Update CHANGELOGs

---
 packages/types/src/index.ts | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'packages/types/src')

diff --git a/packages/types/src/index.ts b/packages/types/src/index.ts
index 71fcbf9db..472b56dc2 100644
--- a/packages/types/src/index.ts
+++ b/packages/types/src/index.ts
@@ -185,6 +185,8 @@ export interface MultiAssetDataWithRecursiveDecoding {
     nestedAssetData: SingleAssetData[];
 }
 
+export type AssetData = SingleAssetData | MultiAssetData | MultiAssetDataWithRecursiveDecoding;
+
 // TODO: DRY. These should be extracted from contract code.
 export enum RevertReason {
     OrderUnfillable = 'ORDER_UNFILLABLE',
-- 
cgit v1.2.3


From c850046ea0b302f61a5fd24f77bab19784a2adc0 Mon Sep 17 00:00:00 2001
From: Greg Hysen <greg.hysen@gmail.com>
Date: Wed, 19 Dec 2018 16:08:59 -0800
Subject: Dutch Auction Contract Wrapper

---
 packages/types/src/index.ts | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'packages/types/src')

diff --git a/packages/types/src/index.ts b/packages/types/src/index.ts
index 472b56dc2..49f788fb0 100644
--- a/packages/types/src/index.ts
+++ b/packages/types/src/index.ts
@@ -676,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;
+}
-- 
cgit v1.2.3