From 92b0efff5abaac8bea468a1b3f897d004ec9c542 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Thu, 24 May 2018 10:56:31 -0700
Subject: Migrate migrations to v2

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

(limited to 'packages/types')

diff --git a/packages/types/src/index.ts b/packages/types/src/index.ts
index 055c47e0a..7831f580e 100644
--- a/packages/types/src/index.ts
+++ b/packages/types/src/index.ts
@@ -282,22 +282,26 @@ export interface RawLogEntry {
 }
 
 export interface Order {
-    maker: string;
-    taker: string;
+    senderAddress: string;
+    makerAddress: string;
+    takerAddress: string;
     makerFee: BigNumber;
     takerFee: BigNumber;
-    makerTokenAmount: BigNumber;
-    takerTokenAmount: BigNumber;
-    makerTokenAddress: string;
-    takerTokenAddress: string;
+    makerAssetAmount: BigNumber;
+    takerAssetAmount: BigNumber;
+    makerAssetData: string;
+    takerAssetData: string;
     salt: BigNumber;
-    exchangeContractAddress: string;
-    feeRecipient: string;
-    expirationUnixTimestampSec: BigNumber;
+    feeRecipientAddress: string;
+    expirationTimeSeconds: BigNumber;
 }
 
-export interface SignedOrder extends Order {
-    ecSignature: ECSignature;
+export interface SignedOrder extends UnsignedOrder {
+    signature: string;
+}
+
+export interface UnsignedOrder extends Order {
+    exchangeAddress: string;
 }
 
 /**
@@ -349,10 +353,6 @@ export interface Artifact {
     };
 }
 
-export type OrderAddresses = [string, string, string, string, string];
-
-export type OrderValues = [BigNumber, BigNumber, BigNumber, BigNumber, BigNumber, BigNumber];
-
 export type DoneCallback = (err?: Error) => void;
 
 export interface OrderRelevantState {
-- 
cgit