From 71973569284fea9d2dee2850c960fda65f97fc44 Mon Sep 17 00:00:00 2001 From: Brandon Millman Date: Wed, 29 Nov 2017 11:18:11 -0800 Subject: Add SignedOrder and TokenTradeInfo to public interface and fix a HttpClient comment --- packages/connect/CHANGELOG.md | 4 ++++ packages/connect/src/http_client.ts | 2 +- packages/connect/src/index.ts | 2 ++ packages/connect/src/types.ts | 2 ++ 4 files changed, 9 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/connect/CHANGELOG.md b/packages/connect/CHANGELOG.md index ec6727a12..c3435a0b8 100644 --- a/packages/connect/CHANGELOG.md +++ b/packages/connect/CHANGELOG.md @@ -1,5 +1,9 @@ # CHANGELOG +vx.x.x +------------------------ + * Add SignedOrder and TokenTradeInfo to the public interface + v0.1.0 - _November 22, 2017_ ------------------------ * Provide a HttpClient class for interacting with standard relayer api compliant HTTP urls diff --git a/packages/connect/src/http_client.ts b/packages/connect/src/http_client.ts index 3a9e11a7d..e30e03815 100644 --- a/packages/connect/src/http_client.ts +++ b/packages/connect/src/http_client.ts @@ -34,7 +34,7 @@ export class HttpClient implements Client { private apiEndpointUrl: string; /** * Instantiates a new HttpClient instance - * @param url The base url for making API calls + * @param url The relayer API base HTTP url you would like to interact with * @return An instance of HttpClient */ constructor(url: string) { diff --git a/packages/connect/src/index.ts b/packages/connect/src/index.ts index c9ebde510..8a63c41a5 100644 --- a/packages/connect/src/index.ts +++ b/packages/connect/src/index.ts @@ -6,6 +6,8 @@ export { OrderbookRequest, OrderbookResponse, OrdersRequest, + SignedOrder, TokenPairsItem, TokenPairsRequest, + TokenTradeInfo, } from './types'; diff --git a/packages/connect/src/types.ts b/packages/connect/src/types.ts index eb6df3ba9..bdbbab7c0 100644 --- a/packages/connect/src/types.ts +++ b/packages/connect/src/types.ts @@ -1,6 +1,8 @@ import {SignedOrder} from '0x.js'; import {BigNumber} from 'bignumber.js'; +export type SignedOrder = SignedOrder; + export interface Client { getTokenPairsAsync: (request?: TokenPairsRequest) => Promise; getOrdersAsync: (request?: OrdersRequest) => Promise; -- cgit v1.2.3 From 04fc16587b74f4c0b3d5eeaae42db6409f515754 Mon Sep 17 00:00:00 2001 From: Brandon Millman Date: Wed, 29 Nov 2017 12:14:37 -0800 Subject: Redeclare Order, SignedOrder, and ECSignature types in connect, remove 0x.js dependency --- packages/connect/CHANGELOG.md | 2 ++ packages/connect/package.json | 1 - packages/connect/src/http_client.ts | 2 +- packages/connect/src/index.ts | 2 ++ packages/connect/src/types.ts | 30 ++++++++++++++++++++-- .../src/utils/orderbook_channel_message_parsers.ts | 2 +- packages/connect/src/ws_orderbook_channel.ts | 2 +- 7 files changed, 35 insertions(+), 6 deletions(-) (limited to 'packages') diff --git a/packages/connect/CHANGELOG.md b/packages/connect/CHANGELOG.md index c3435a0b8..226463124 100644 --- a/packages/connect/CHANGELOG.md +++ b/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_ ------------------------ diff --git a/packages/connect/package.json b/packages/connect/package.json index 4048ab186..d8c598218 100644 --- a/packages/connect/package.json +++ b/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", diff --git a/packages/connect/src/http_client.ts b/packages/connect/src/http_client.ts index e30e03815..252c9e9dd 100644 --- a/packages/connect/src/http_client.ts +++ b/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'; diff --git a/packages/connect/src/index.ts b/packages/connect/src/index.ts index 8a63c41a5..aabf233fe 100644 --- a/packages/connect/src/index.ts +++ b/packages/connect/src/index.ts @@ -1,8 +1,10 @@ export {HttpClient} from './http_client'; export { Client, + ECSignature, FeesRequest, FeesResponse, + Order, OrderbookRequest, OrderbookResponse, OrdersRequest, diff --git a/packages/connect/src/types.ts b/packages/connect/src/types.ts index bdbbab7c0..71dd8dac2 100644 --- a/packages/connect/src/types.ts +++ b/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; diff --git a/packages/connect/src/utils/orderbook_channel_message_parsers.ts b/packages/connect/src/utils/orderbook_channel_message_parsers.ts index f3497db34..9cd160428 100644 --- a/packages/connect/src/utils/orderbook_channel_message_parsers.ts +++ b/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'; diff --git a/packages/connect/src/ws_orderbook_channel.ts b/packages/connect/src/ws_orderbook_channel.ts index f5badf624..d9cc1b4c5 100644 --- a/packages/connect/src/ws_orderbook_channel.ts +++ b/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'; -- cgit v1.2.3 From b6f2f98db6c0fdd6084578a36b7fff5cd919e9f8 Mon Sep 17 00:00:00 2001 From: Brandon Millman Date: Wed, 29 Nov 2017 12:36:28 -0800 Subject: Update CHANGELOG.md --- packages/connect/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/connect/CHANGELOG.md b/packages/connect/CHANGELOG.md index 226463124..b6a9eb6ea 100644 --- a/packages/connect/CHANGELOG.md +++ b/packages/connect/CHANGELOG.md @@ -1,6 +1,6 @@ # CHANGELOG -vx.x.x +v0.2.0 - _November 29, 2017_ ------------------------ * Add SignedOrder and TokenTradeInfo to the public interface * Add ECSignature and Order to the public interface -- cgit v1.2.3 From ab72656fdf476c2a79737b3f7b52ee918985f3e9 Mon Sep 17 00:00:00 2001 From: Brandon Millman Date: Wed, 29 Nov 2017 12:39:54 -0800 Subject: Publish - @0xproject/connect@0.2.0 - website@0.0.1 --- packages/connect/package.json | 2 +- packages/website/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/connect/package.json b/packages/connect/package.json index d8c598218..c46d00e7b 100644 --- a/packages/connect/package.json +++ b/packages/connect/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/connect", - "version": "0.1.2", + "version": "0.2.0", "description": "A javascript library for interacting with the standard relayer api", "keywords": [ "connect", diff --git a/packages/website/package.json b/packages/website/package.json index 8cde4b8e1..9444b5dbc 100644 --- a/packages/website/package.json +++ b/packages/website/package.json @@ -1,6 +1,6 @@ { "name": "website", - "version": "0.0.0", + "version": "0.0.1", "private": true, "description": "Website and 0x portal dapp", "scripts": { -- cgit v1.2.3