Merge pull request #246 from 0xProject/fix/signedOrderInConnect

Redeclare Order, SignedOrder, and ECSignature types in connect, remov…

packages/connect/CHANGELOG.md

@@ -3,6 +3,8 @@
 vx.x.x
 ------------------------
     * Add SignedOrder and TokenTradeInfo to the public interface
+    * Add ECSignature and Order to the public interface
+    * Remove dependency on 0x.js
 
 v0.1.0 - _November 22, 2017_
 ------------------------

packages/connect/package.json

@@ -36,7 +36,6 @@
   },
   "homepage": "https://github.com/0xProject/0x.js/packages/connect/README.md",
   "dependencies": {
-    "0x.js": "^0.27.1",
     "@0xproject/assert": "^0.0.6",
     "@0xproject/json-schemas": "^0.6.9",
     "bignumber.js": "~4.1.0",

packages/connect/src/http_client.ts

@@ -1,4 +1,3 @@
-import {SignedOrder} from '0x.js';
 import {assert} from '@0xproject/assert';
 import {schemas} from '@0xproject/json-schemas';
 import {BigNumber} from 'bignumber.js';
@@ -16,6 +15,7 @@ import {
     OrderbookRequest,
     OrderbookResponse,
     OrdersRequest,
+    SignedOrder,
     TokenPairsItem,
     TokenPairsRequest,
 } from './types';

packages/connect/src/index.ts

@@ -1,8 +1,10 @@
 export {HttpClient} from './http_client';
 export {
     Client,
+    ECSignature,
     FeesRequest,
     FeesResponse,
+    Order,
     OrderbookRequest,
     OrderbookResponse,
     OrdersRequest,

packages/connect/src/types.ts

@@ -1,7 +1,33 @@
-import {SignedOrder} from '0x.js';
 import {BigNumber} from 'bignumber.js';
 
-export type SignedOrder = SignedOrder;
+// TODO: Consolidate Order, SignedOrder and ECSignature into a shared package instead of duplicating them from 0x.js
+export interface Order {
+    maker: string;
+    taker: string;
+    makerFee: BigNumber;
+    takerFee: BigNumber;
+    makerTokenAmount: BigNumber;
+    takerTokenAmount: BigNumber;
+    makerTokenAddress: string;
+    takerTokenAddress: string;
+    salt: BigNumber;
+    exchangeContractAddress: string;
+    feeRecipient: string;
+    expirationUnixTimestampSec: BigNumber;
+}
+
+export interface SignedOrder extends Order {
+    ecSignature: ECSignature;
+}
+
+/**
+ * Elliptic Curve signature
+ */
+export interface ECSignature {
+    v: number;
+    r: string;
+    s: string;
+}
 
 export interface Client {
     getTokenPairsAsync: (request?: TokenPairsRequest) => Promise<TokenPairsItem[]>;

packages/connect/src/utils/orderbook_channel_message_parsers.ts

@@ -1,4 +1,3 @@
-import {SignedOrder} from '0x.js';
 import {assert} from '@0xproject/assert';
 import {schemas} from '@0xproject/json-schemas';
 import * as _ from 'lodash';
@@ -6,6 +5,7 @@ import * as _ from 'lodash';
 import {
     OrderbookChannelMessage,
     OrderbookChannelMessageTypes,
+    SignedOrder,
 } from '../types';
 
 import {typeConverters} from './type_converters';

packages/connect/src/ws_orderbook_channel.ts

@@ -1,4 +1,3 @@
-import {SignedOrder} from '0x.js';
 import {assert} from '@0xproject/assert';
 import {schemas} from '@0xproject/json-schemas';
 import * as _ from 'lodash';
@@ -9,6 +8,7 @@ import {
     OrderbookChannelHandler,
     OrderbookChannelMessageTypes,
     OrderbookChannelSubscriptionOpts,
+    SignedOrder,
     WebsocketClientEventType,
     WebsocketConnectionEventType,
 } from './types';