Merge development

5 files changed, 57 insertions, 43 deletions

diff --git a/contracts/exchange/CHANGELOG.json b/contracts/exchange/CHANGELOG.json
index e4c7aa986..7b640dafe 100644
--- a/contracts/exchange/CHANGELOG.json
+++ b/contracts/exchange/CHANGELOG.json
@@ -1,5 +1,32 @@
 [
     {
+        "version": "1.0.3",
+        "changes": [
+            {
+                "note": "Fake publish to enable pinning"
+            }
+        ],
+        "timestamp": 1549504360
+    },
+    {
+        "timestamp": 1549452781,
+        "version": "1.0.2",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1549373905,
+        "version": "1.0.1",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
         "version": "1.0.0",
         "changes": [
             {
diff --git a/contracts/exchange/CHANGELOG.md b/contracts/exchange/CHANGELOG.md
index 779eb68a7..7a30bfea9 100644
--- a/contracts/exchange/CHANGELOG.md
+++ b/contracts/exchange/CHANGELOG.md
@@ -5,24 +5,19 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
-## v2.2.3 - _January 17, 2019_
+## v1.0.3 - _February 7, 2019_
 
-    * Dependencies updated
+    * Fake publish to enable pinning
 
-## v2.2.2 - _January 15, 2019_
+## v1.0.2 - _February 6, 2019_
 
     * Dependencies updated
 
-## v2.2.1 - _January 11, 2019_
+## v1.0.1 - _February 5, 2019_
 
     * Dependencies updated
 
-## v2.2.0 - _January 9, 2019_
-
-    * Added LibAddressArray (#1383)
-    * Add validation and comments to MultiAssetProxy (#1455)
-    * Move OrderValidator to extensions (#1464)
+## v1.0.0 - _Invalid date_
 
-## v2.1.59 - _December 13, 2018_
-
-    * Dependencies updated
+    * Move Exchange contract out of contracts-protocol to new package (#1539)
+    * Move example contracts out of contracts-examples to new package (#1539)
diff --git a/contracts/exchange/package.json b/contracts/exchange/package.json
index 51a6cdf26..021ae219a 100644
--- a/contracts/exchange/package.json
+++ b/contracts/exchange/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-exchange",
-    "version": "1.0.0",
+    "version": "1.0.3",
     "engines": {
         "node": ">=6.12"
     },
@@ -46,11 +46,11 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/contracts/protocol/README.md",
     "devDependencies": {
-        "@0x/abi-gen": "^1.0.22",
-        "@0x/dev-utils": "^1.0.24",
-        "@0x/sol-compiler": "^2.0.2",
-        "@0x/tslint-config": "^2.0.2",
         "@0x/contracts-gen": "^1.0.0",
+        "@0x/abi-gen": "^2.0.1",
+        "@0x/dev-utils": "^2.0.1",
+        "@0x/sol-compiler": "^3.0.1",
+        "@0x/tslint-config": "^3.0.0",
         "@types/lodash": "4.14.104",
         "@types/node": "*",
         "chai": "^4.0.1",
@@ -66,19 +66,19 @@
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0x/base-contract": "^3.0.13",
-        "@0x/contracts-asset-proxy": "1.0.0",
-        "@0x/contracts-exchange-libs": "1.0.0",
-        "@0x/contracts-test-utils": "^2.0.1",
-        "@0x/contracts-erc20": "1.0.0",
-        "@0x/contracts-erc721": "1.0.0",
-        "@0x/contracts-utils": "3.0.0",
-        "@0x/order-utils": "^3.1.2",
-        "@0x/types": "^1.5.2",
-        "@0x/typescript-typings": "^3.0.8",
-        "@0x/utils": "^3.0.1",
-        "@0x/web3-wrapper": "^3.2.4",
-        "ethereum-types": "^1.1.6",
+        "@0x/base-contract": "^4.0.1",
+        "@0x/contracts-asset-proxy": "^1.0.3",
+        "@0x/contracts-erc20": "^1.0.3",
+        "@0x/contracts-erc721": "^1.0.3",
+        "@0x/contracts-exchange-libs": "^1.0.3",
+        "@0x/contracts-test-utils": "^3.0.2",
+        "@0x/contracts-utils": "^2.0.2",
+        "@0x/order-utils": "^6.0.0",
+        "@0x/types": "^2.0.1",
+        "@0x/typescript-typings": "^4.0.0",
+        "@0x/utils": "^4.0.2",
+        "@0x/web3-wrapper": "^4.0.1",
+        "ethereum-types": "^2.0.0",
         "ethereumjs-util": "^5.1.1",
         "lodash": "^4.17.5"
     },
diff --git a/contracts/exchange/test/transactions.ts b/contracts/exchange/test/transactions.ts
index 613953493..4f8c07579 100644
--- a/contracts/exchange/test/transactions.ts
+++ b/contracts/exchange/test/transactions.ts
@@ -8,14 +8,13 @@ import {
     OrderFactory,
     orderUtils,
     provider,
-    SignedTransaction,
     TransactionFactory,
     txDefaults,
     web3Wrapper,
 } from '@0x/contracts-test-utils';
 import { BlockchainLifecycle } from '@0x/dev-utils';
 import { assetDataUtils, generatePseudoRandomSalt } from '@0x/order-utils';
-import { OrderWithoutExchangeAddress, RevertReason, SignedOrder } from '@0x/types';
+import { OrderWithoutExchangeAddress, RevertReason, SignedOrder, SignedZeroExTransaction } from '@0x/types';
 import { BigNumber } from '@0x/utils';
 import * as chai from 'chai';
 import * as _ from 'lodash';
@@ -41,7 +40,7 @@ describe('Exchange transactions', () => {
 
     let erc20Balances: ERC20BalancesByOwner;
     let signedOrder: SignedOrder;
-    let signedTx: SignedTransaction;
+    let signedTx: SignedZeroExTransaction;
     let orderWithoutExchangeAddress: OrderWithoutExchangeAddress;
     let orderFactory: OrderFactory;
     let makerTransactionFactory: TransactionFactory;
diff --git a/contracts/exchange/test/utils/exchange_wrapper.ts b/contracts/exchange/test/utils/exchange_wrapper.ts
index 61176751f..535e3bcf2 100644
--- a/contracts/exchange/test/utils/exchange_wrapper.ts
+++ b/contracts/exchange/test/utils/exchange_wrapper.ts
@@ -1,12 +1,5 @@
-import {
-    FillResults,
-    formatters,
-    LogDecoder,
-    OrderInfo,
-    orderUtils,
-    SignedTransaction,
-} from '@0x/contracts-test-utils';
-import { SignedOrder } from '@0x/types';
+import { FillResults, formatters, LogDecoder, OrderInfo, orderUtils } from '@0x/contracts-test-utils';
+import { SignedOrder, SignedZeroExTransaction } from '@0x/types';
 import { AbiEncoder, BigNumber } from '@0x/utils';
 import { Web3Wrapper } from '@0x/web3-wrapper';
 import { MethodAbi, Provider, TransactionReceiptWithDecodedLogs } from 'ethereum-types';
@@ -204,7 +197,7 @@ export class ExchangeWrapper {
         return tx;
     }
     public async executeTransactionAsync(
-        signedTx: SignedTransaction,
+        signedTx: SignedZeroExTransaction,
         from: string,
     ): Promise<TransactionReceiptWithDecodedLogs> {
         const txHash = await this._exchange.executeTransaction.sendTransactionAsync(