[Lightcone_V2.js] Update GrpcClientService which can be used in web apps now (#255)

* Update GrpcClientService which can be used in web apps now

* Run tslint on lightcone_v2.js

* Update lint command in lightcone_v2.js

* Fix import error in lightcone_v2.js

* Update grpcClientService.ts

* Update exchange.ts

* Remove proto_gen

Author: xiaowheat

packages/lightcone_v2.js/package.json

@@ -8,7 +8,7 @@
   "scripts": {
     "build:proto": "rimraf src/proto_gen && mkdir src/proto_gen && node src/lib/grpc/proto",
     "build": "npm run build:proto && rimraf dist && tsc",
-    "lint": "tslint --project tsconfig.json ./src/**/*.ts",
+    "lint": "tslint --project tsconfig.json ./src/**/*.ts  -e \"**/proto_gen/**\" --fix",
     "client": "node dist/grpc/grpcClient.js",
     "test": "mocha -r ts-node/register --project tsconfig.json test/*.ts"
   },
@@ -34,8 +34,9 @@
     "ethereumjs-util": "5.2.0",
     "ethereumjs-wallet": "0.6.0",
     "google-protobuf": "^3.9.0-rc.1",
-    "grpc": "^1.17.0",
-    "grpc-web": "^0.4.0",
+    "grpc": "^1.21.1",
+    "grpc-loader": "^2.0.1",
+    "grpc-web": "^1.0.4",
     "hdkey": "0.7.1",
     "nodeunit": "^0.11.3",
     "snarkjs": "0.1.11",

packages/lightcone_v2.js/src/grpc/grpcClient.ts

@@ -1,7 +1,13 @@
+// Disable gRPC node for now as the protoc command is different.
+/*
+import {credentials, Metadata, ServiceError} from 'grpc';
+import { DexServiceClient } from '../proto_gen/service_dex_grpc_pb';
+import { GetNextOrderIdReq } from '../proto_gen/service_dex_pb';
 import * as grpcWeb from 'grpc-web';
 import { DexServiceClient } from '..';
 import { GetNextOrderIdReq } from '..';
 import { UInt32Value } from "google-protobuf/google/protobuf/wrappers_pb";
+*/
 
 /* // https://github.com/grpc/grpc-node/issues/543#issuecomment-427487420
 const baseCred: ChannelCredentials = credentials.createSsl();
@@ -13,7 +19,6 @@ const authCred: CallCredentials = credentials.createFromMetadataGenerator((param
   callback(null, metadata);
 });
 const client: GreeterClient = new GreeterClient('localhost:50051', credentials.combineChannelCredentials(baseCred, authCred));
-*/
 
 // 18.179.197.168:5000 is temperate gRPC server we hosted on AWS.
 export const client: DexServiceClient = new DexServiceClient('localhost:8980', null, null);
@@ -29,3 +34,4 @@ async function example(): Promise<void> {
 }
 
 example().catch((err: Error) => console.log(err));
+*/

packages/lightcone_v2.js/src/grpc/grpcClientService.ts

@@ -1,13 +1,17 @@
 import {Empty} from 'google-protobuf/google/protobuf/empty_pb';
 import {StringValue, UInt32Value} from 'google-protobuf/google/protobuf/wrappers_pb';
+
+import * as grpcWeb from 'grpc-web';
+
+import {io} from '../model/types';
 import {Order} from '../proto_gen/data_order_pb';
-import {io} from "../model/types";
 import {
     OffchainWithdrawalRequest,
     OrderCancellationRequest
-} from '../proto_gen/data_requests_pb';
-import { DexServiceClient } from '..';
-import {Metadata} from "grpc";
+} from '../proto_gen/data_requests_pb.d';
+import {
+    CursorPaging
+} from '../proto_gen/data_types_pb';
 import {
     Account,
     CancelOrderRes,
@@ -29,19 +33,21 @@ import {
     OrderBook,
     SimpleOrderCancellationReq,
     SubmitOrderRes
-} from 'src/proto_gen/service_dex_pb';
+} from '../proto_gen/service_dex_pb';
+import { DexServiceClient } from '../proto_gen/Service_dexServiceClientPb';
 
 /**
  * gRPC GrpcClientService Service
  */
 class GrpcClientService {
-    private readonly client: DexServiceClient = new DexServiceClient('18.179.197.168:5000', null, null); // TODO: config
+    // TODO: use localhost for debug
+    private readonly client = new DexServiceClient('http://0.0.0.0:5000', null, null); // TODO: config
 
+    // Verfied
     public async getDexConfigurations(): Promise<DexConfigurations> {
-        const metadata = new Metadata();
         const empty: Empty = new Empty();
         return new Promise<DexConfigurations>((resolve: Function, reject: Function): void => {
-            this.client.getDexConfigurations(empty, metadata, (err: Error | null, res: DexConfigurations) => {
+            this.client.getDexConfigurations(empty, null, (err: grpcWeb.Error, res: DexConfigurations) => {
                 if (err) {
                     return reject(err);
                 }
@@ -51,12 +57,11 @@ class GrpcClientService {
     }
 
     public async getAccount(param: string): Promise<Account> {
-        const metadata = new Metadata();
         const address: StringValue = new StringValue();
         address.setValue(param);
 
         return new Promise<Account>((resolve: Function, reject: Function): void => {
-            this.client.getAccount(address, metadata, (err: Error | null, res: Account) => {
+            this.client.getAccount(address, null, (err: grpcWeb.Error, res: Account) => {
                 if (err) {
                     return reject(err);
                 }
@@ -66,12 +71,11 @@ class GrpcClientService {
     }
 
     public async getNonce(param: number): Promise<UInt32Value> {
-        const metadata = new Metadata();
         const accountId: UInt32Value = new UInt32Value();
         accountId.setValue(param);
 
         return new Promise<UInt32Value>((resolve: Function, reject: Function): void => {
-            this.client.getNonce(accountId, metadata, (err: Error | null, res: UInt32Value) => {
+            this.client.getNonce(accountId, null, (err: grpcWeb.Error, res: UInt32Value) => {
                 if (err) {
                     return reject(err);
                 }
@@ -81,9 +85,15 @@ class GrpcClientService {
     }
 
     public async getTokens(param: GetTokensReq): Promise<GetTokensRes> {
-        const metadata = new Metadata();
+        const req: GetTokensReq = new GetTokensReq();
+        req.setRequireMetadata(true);
+        req.setRequireInfo(true);
+        req.setRequirePrice(true);
+        req.setQuoteCurrencyForPrice('hello');
+        req.setTokensList(['LRC', 'ETH']);
+
         return new Promise<GetTokensRes>((resolve: Function, reject: Function): void => {
-            this.client.getTokens(param, metadata, (err: Error | null, res: GetTokensRes) => {
+            this.client.getTokens(req, null, (err: grpcWeb.Error, res: GetTokensRes) => {
                 if (err) {
                     return reject(err);
                 }
@@ -92,10 +102,13 @@ class GrpcClientService {
         });
     }
 
-    public async getNextOrderId(param: GetNextOrderIdReq): Promise<UInt32Value> {
-        const metadata = new Metadata();
+    public async getNextOrderId(accountId: number, tokenSellId: number): Promise<UInt32Value> {
+        const req: GetNextOrderIdReq = new GetNextOrderIdReq();
+        req.setAccountId(accountId);
+        req.setTokenSellId(tokenSellId);
+
         return new Promise<UInt32Value>((resolve: Function, reject: Function): void => {
-            this.client.getNextOrderId(param, metadata, (err: Error | null, res: UInt32Value) => {
+            this.client.getNextOrderId(req, null, (err: grpcWeb.Error, res: UInt32Value) => {
                 if (err) {
                     return reject(err);
                 }
@@ -105,9 +118,14 @@ class GrpcClientService {
     }
 
     public async getMarkets(param: GetMarketsReq): Promise<GetMarketsRes> {
-        const metadata = new Metadata();
+        const req: GetMarketsReq = new GetMarketsReq();
+        req.setRequireMetadata(true);
+        req.setRequireTicker(true);
+        req.setQueryLoopringTicker(true);
+        req.setMarketIdList([100]);
+
         return new Promise<GetMarketsRes>((resolve: Function, reject: Function): void => {
-            this.client.getMarkets(param, metadata, (err: Error | null, res: GetMarketsRes) => {
+            this.client.getMarkets(req, null, (err: grpcWeb.Error, res: GetMarketsRes) => {
                 if (err) {
                     return reject(err);
                 }
@@ -117,9 +135,12 @@ class GrpcClientService {
     }
 
     public async getMarketFills(param: GetMarketFillsReq): Promise<GetFillsRes> {
-        const metadata = new Metadata();
+        const req: GetMarketFillsReq = new GetMarketFillsReq();
+        req.setMarketId(100);
+        req.setNum(100);
+
         return new Promise<GetFillsRes>((resolve: Function, reject: Function): void => {
-            this.client.getMarketFills(param, metadata, (err: Error | null, res: GetFillsRes) => {
+            this.client.getMarketFills(req, null, (err: grpcWeb.Error, res: GetFillsRes) => {
                 if (err) {
                     return reject(err);
                 }
@@ -128,10 +149,18 @@ class GrpcClientService {
         });
     }
 
+    // FIXME: time out
     public async getUserFills(param: GetUserFillsReq): Promise<GetFillsRes> {
-        const metadata = new Metadata();
+        const req = new GetUserFillsReq();
+        req.setAccountId(100);
+        req.setOrderUuid(100);
+        const paging = new CursorPaging();
+        paging.setNum(100);
+        paging.setCursor(0);
+        req.setPaging(paging);
+
         return new Promise<GetFillsRes>((resolve: Function, reject: Function): void => {
-            this.client.getUserFills(param, metadata, (err: Error | null, res: GetFillsRes) => {
+            this.client.getUserFills(req, null, (err: grpcWeb.Error, res: GetFillsRes) => {
                 if (err) {
                     return reject(err);
                 }
@@ -140,10 +169,19 @@ class GrpcClientService {
         });
     }
 
+    // TODO: getUserTransactions and getUserTransfers are different
     public async getUserTransactions(param: GetUserTransactionsReq): Promise<GetUserTransactionsRes> {
-        const metadata = new Metadata();
+        const req = new GetUserTransactionsReq();
+        req.setAccountId(100);
+        req.setTokenId(100);
+        req.setTransactionType('TX_TYPE_DEPOSIT');
+        const paging = new CursorPaging();
+        paging.setNum(100);
+        paging.setCursor(0);
+        req.setPaging(paging);
+
         return new Promise<GetUserTransactionsRes>((resolve: Function, reject: Function): void => {
-            this.client.getUserTransfers(param, metadata, (err: Error | null, res: GetUserTransactionsRes) => {
+            this.client.getUserTransfers(req, null, (err: grpcWeb.Error, res: GetUserTransactionsRes) => {
                 if (err) {
                     return reject(err);
                 }
@@ -152,10 +190,15 @@ class GrpcClientService {
         });
     }
 
+    // FIXME: time out
     public async getOrderBook(param: GetOrderBookReq): Promise<OrderBook> {
-        const metadata = new Metadata();
+        const req = new GetOrderBookReq();
+        req.setMarketId(100);
+        req.setAggregationLevel(6);
+        req.setFiatSymbol('USD');
+
         return new Promise<OrderBook>((resolve: Function, reject: Function): void => {
-            this.client.getOrderBook(param, metadata, (err: Error | null, res: OrderBook) => {
+            this.client.getOrderBook(req, null, (err: grpcWeb.Error, res: OrderBook) => {
                 if (err) {
                     return reject(err);
                 }
@@ -164,10 +207,20 @@ class GrpcClientService {
         });
     }
 
+    // FIXME: time out
     public async getUserOrders(param: GetUserOrdersReq): Promise<GetUserOrdersRes> {
-        const metadata = new Metadata();
+        const req = new GetUserOrdersReq();
+        req.setAccountId(100);
+        req.setBaseTokenId('b3b79b8d-0c7e-4142-9694-eb7df51969de');
+        req.setQuoteTokenId('738156aa-9f51-4e1f-96dd-c02712ea7e7a');
+        const paging = new CursorPaging();
+        paging.setNum(100);
+        paging.setCursor(0);
+        req.setPaging(paging);
+        req.setStatusesList(['Hello', 'World']);
+
         return new Promise<GetUserOrdersRes>((resolve: Function, reject: Function): void => {
-            this.client.getUserOrders(param, metadata, (err: Error | null, res: GetUserOrdersRes) => {
+            this.client.getUserOrders(req, null, (err: grpcWeb.Error, res: GetUserOrdersRes) => {
                 if (err) {
                     return reject(err);
                 }
@@ -176,10 +229,10 @@ class GrpcClientService {
         });
     }
 
+    // TODO: not test in web
     public async submitOrder(param: Order): Promise<SubmitOrderRes> {
-        const metadata = new Metadata();
         return new Promise<SubmitOrderRes>((resolve: Function, reject: Function): void => {
-            this.client.submitOrder(param, metadata, (err: Error | null, res: SubmitOrderRes) => {
+            this.client.submitOrder(param, null, (err: grpcWeb.Error, res: SubmitOrderRes) => {
                 if (err) {
                     return reject(err);
                 }
@@ -188,11 +241,11 @@ class GrpcClientService {
         });
     }
 
+    // TODO: not test in web
     // Cancel orders by marking them obsoleted in database, not to be included in blocks.
     public async cancelOrder(param: SimpleOrderCancellationReq): Promise<CancelOrderRes> {
-        const metadata = new Metadata();
         return new Promise<CancelOrderRes>((resolve: Function, reject: Function): void => {
-            this.client.cancelOrder(param, metadata, (err: Error | null, res: CancelOrderRes) => {
+            this.client.cancelOrder(param, null, (err: grpcWeb.Error, res: CancelOrderRes) => {
                 if (err) {
                     return reject(err);
                 }
@@ -201,11 +254,11 @@ class GrpcClientService {
         });
     }
 
+    // TODO: not test in web
     // Submit an offchain order cancellation request, will make into blocks.
     public async submitOrderCancellation(param: OrderCancellationRequest): Promise<CancelOrderRes> {
-        const metadata = new Metadata();
         return new Promise<CancelOrderRes>((resolve: Function, reject: Function): void => {
-            this.client.submitOrderCancellation(param, metadata, (err: Error | null, res: CancelOrderRes) => {
+            this.client.submitOrderCancellation(param, null, (err: grpcWeb.Error, res: CancelOrderRes) => {
                 if (err) {
                     return reject(err);
                 }
@@ -214,11 +267,11 @@ class GrpcClientService {
         });
     }
 
+    // TODO: not test in web
     // Submit an offchain withdrawal request, will make into blocks.
     public async submitOffchainWithdrawal(param: OffchainWithdrawalRequest): Promise<OffchainWithdrawalalRes> {
-        const metadata = new Metadata();
         return new Promise<OffchainWithdrawalalRes>((resolve: Function, reject: Function): void => {
-            this.client.submitOffchainWithdrawal(param, metadata, (err: Error | null, res: OffchainWithdrawalalRes) => {
+            this.client.submitOffchainWithdrawal(param, null, (err: grpcWeb.Error, res: OffchainWithdrawalalRes) => {
                 if (err) {
                     return reject(err);
                 }
@@ -227,12 +280,6 @@ class GrpcClientService {
         });
     }
 
-    public socketExample() {
-        const socket = io.connect("localhost");  // TODO: config server ip
-        socket.on("news", (data: any) => alert(data));
-        socket.emit("news", "hello");
-    }
-
 }
 
 export const grpcClientService: GrpcClientService = new GrpcClientService();

packages/lightcone_v2.js/src/index.ts

@@ -1,5 +1,4 @@
-import { GetNextOrderIdReq } from './proto_gen/service_dex_pb';
-import { DexServiceClient } from './proto_gen/service_dex_grpc_pb';
+import { grpcClientService } from './grpc/grpcClientService';
 
 import common from './lib/wallet/common';
 import ethereum from './lib/wallet/ethereum';
@@ -14,8 +13,7 @@ import Utils from './lib/wallet/common/utils';
 
 
 export {
-    GetNextOrderIdReq,
-    DexServiceClient,
+    grpcClientService,
     common,
     ethereum,
     // WalletUtils,

packages/lightcone_v2.js/src/lib/grpc/proto.js

@@ -12,9 +12,16 @@ const PROTOC_GEN_TS_PATH = path.join(__dirname, '../../../node_modules/.bin/prot
 
 rimraf.sync(`${MODEL_DIR}/*`);
 
+shell.exec('grpc_tools_node_protoc '
+    + `--js_out="import_style=commonjs,binary:${MODEL_DIR}" `
+    + `--grpc-web_out="import_style=typescript,mode=grpcwebtext:${MODEL_DIR}" `
+    + `--proto_path ${PROTO_DIR} ${PROTO_DIR}/*.proto`);
+
+/*
 shell.exec('grpc_tools_node_protoc '
     + `--plugin="protoc-gen-ts=${PROTOC_GEN_TS_PATH}" `
     + `--grpc_out="${MODEL_DIR}" `
     + `--js_out="import_style=commonjs,binary:${MODEL_DIR}" `
     + `--ts_out="${MODEL_DIR}" `
     + `--proto_path ${PROTO_DIR} ${PROTO_DIR}/*.proto`);
+*/