Merge development

packages/types/CHANGELOG.json

@@ -1,12 +1,30 @@
 [
+    {
+        "timestamp": 1549452781,
+        "version": "2.0.1",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
     {
         "version": "2.0.0",
         "changes": [
             {
                 "note": "Upgrade the bignumber.js to v8.0.2",
                 "pr": 1517
+            },
+            {
+                "note": "Update `ZeroExTransaction` type and add `SignedZeroExTransaction` type",
+                "pr": 1576
+            },
+            {
+                "note": "Add `EIP712DomainWithDefaultSchema` type",
+                "pr": 1576
             }
-        ]
+        ],
+        "timestamp": 1549373905
     },
     {
         "timestamp": 1547561734,

packages/types/CHANGELOG.md

@@ -5,6 +5,16 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v2.0.1 - _February 6, 2019_
+
+    * Dependencies updated
+
+## v2.0.0 - _February 5, 2019_
+
+    * Upgrade the bignumber.js to v8.0.2 (#1517)
+    * Update `ZeroExTransaction` type and add `SignedZeroExTransaction` type (#1576)
+    * Add `EIP712DomainWithDefaultSchema` type (#1576)
+
 ## v1.5.2 - _January 15, 2019_
 
     * Dependencies updated

packages/types/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/types",
-    "version": "1.5.2",
+    "version": "2.0.1",
     "engines": {
         "node": ">=6.12"
     },
@@ -23,7 +23,7 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/types/README.md",
     "devDependencies": {
-        "@0x/tslint-config": "^2.0.2",
+        "@0x/tslint-config": "^3.0.0",
         "make-promises-safe": "^1.1.0",
         "shx": "^0.2.2",
         "tslint": "5.11.0",
@@ -32,7 +32,7 @@
     "dependencies": {
         "@types/node": "*",
         "bignumber.js": "~8.0.2",
-        "ethereum-types": "^1.1.6"
+        "ethereum-types": "^2.0.0"
     },
     "publishConfig": {
         "access": "public"

packages/types/src/index.ts

@@ -45,11 +45,16 @@ export interface SignedOrder extends Order {
  * ZeroExTransaction for use with 0x Exchange executeTransaction
  */
 export interface ZeroExTransaction {
+    verifyingContractAddress: string;
     salt: BigNumber;
     signerAddress: string;
     data: string;
 }
 
+export interface SignedZeroExTransaction extends ZeroExTransaction {
+    signature: string;
+}
+
 /**
  * Elliptic Curve signature
  */
@@ -686,22 +691,32 @@ export interface DutchAuctionDetails {
     currentTimeSeconds: BigNumber;
 }
 
+export interface PackageJSONConfig {
+    postpublish?: {
+        assets?: string[];
+        docOmitExports?: string[];
+        dockerHubRepo?: string;
+    };
+    'abis:comment'?: string;
+    abis?: string;
+    ignoreDependencyVersions?: string;
+    ignoreDependencyVersionsForPackage?: string;
+}
+
 export interface PackageJSON {
     private?: boolean;
     version: string;
     name: string;
     main?: string;
     scripts?: { [command: string]: string };
-    config?: {
-        postpublish?: {
-            assets?: string[];
-            docOmitExports?: string[];
-            dockerHubRepo?: string;
-        };
-        'abis:comment'?: string;
-        abis?: string;
-    };
+    config?: PackageJSONConfig;
     dependencies?: { [dependencyName: string]: string };
     devDependencies?: { [dependencyName: string]: string };
     workspaces?: string[];
 }
+
+export interface EIP712DomainWithDefaultSchema {
+    name?: string;
+    version?: string;
+    verifyingContractAddress: string;
+}