[Lightcone_V2.js] Make lightcone_v2.js to be imported in react web app (#243)

* Point DexService to aws hosted service

* Make lightcone_v2.js to import in react web app

* Update grpcClient.ts

* [Lightcone_V2.js] Migrate Lightcone v2 Javascript to Typescript (#244)

* Migrate lightcone v2 js to typescript (Step 1)

* Solve typesript errors in walletAccount.ts

* Resolve all errors during migration from Javascript to Typescript.

* Move tests to typescript in lightcone_v2.js

* Add resolveJsonModule to true. Update index.js which is the entrypoint of the package.

* Add GetNextOrderIdReq to test importing grpc . Reenable test/grpc.ts

* Update grpcClient

Author: xiaowheat

packages/lightcone_v2.js/README.md

@@ -1,5 +1,9 @@
 # Javascript library for Lightcone 2.0
 
-1. `npm install` to install dependencies
-2. `npm run build:proto` to generate models from protobuffer
-3. `npm run build` to build the project
+* `npm install` to install dependencies
+* `npm run build:proto` to generate models from protobuffer
+* `npm run build` to build the project
+* `npm run test` to run tests
+
+# Entrypoint of library
+`src/index.ts`

packages/lightcone_v2.js/globals.d.ts

@@ -8,8 +8,9 @@ declare module 'snarkjs';
 declare var web3: any;
 declare var artifacts: any;
 declare var contract: any;
-declare var before: any;
-declare var beforeEach: any;
-declare var describe: any;
-declare var it: any;
+// FIXME: conflicts to node_modules/@types/mocha/index.d.ts
+// declare var before: any;
+// declare var beforeEach: any;
+// declare var describe: any;
+// declare var it: any;
 declare var assert: any;

packages/lightcone_v2.js/index.js

@@ -6,11 +6,11 @@
     "test": "test"
   },
   "scripts": {
-    "build:proto": "rimraf proto_gen && mkdir proto_gen && node lib/grpc/proto",
+    "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",
-    "client": "node dist/src/grpc/grpcClient.js",
-    "test": "mocha"
+    "client": "node dist/grpc/grpcClient.js",
+    "test": "mocha -r ts-node/register --project tsconfig.json test/*.ts"
   },
   "keywords": [
     "ethereum",
@@ -21,34 +21,39 @@
     "type": "git",
     "url": "[email protected]:Loopring/loopr-app-sdk.git"
   },
-  "main": "index.js",
+  "main": "dist/index.js",
   "license": "ISC",
   "dependencies": {
     "async-validator": "1.8.2",
+    "bignumber.js": "^9.0.0",
     "bip39": "2.5.0",
     "blake-hash": "^1.1.0",
     "bn.js": "^4.11.8",
     "ethereumjs-abi": "0.6.5",
     "ethereumjs-tx": "1.3.3",
     "ethereumjs-util": "5.2.0",
     "ethereumjs-wallet": "0.6.0",
-    "grpc": "^1.17.0",
-    "google-protobuf": "^3.6.1",
+    "google-protobuf": "^3.9.0-rc.1",
+    "grpc": "^1.21.1",
     "hdkey": "0.7.1",
     "nodeunit": "^0.11.3",
     "snarkjs": "0.1.11",
     "socket.io-client": "2.0.4",
-    "web3": "^1.0.0-beta.36"
+    "web3": "^1.0.0-beta.36",
+    "whatwg-fetch": "^3.0.0"
   },
   "devDependencies": {
+    "@types/chai": "^4.1.7",
     "@types/google-protobuf": "^3.2.7",
-    "ts-node": "^7.0.1",
+    "@types/mocha": "^5.2.7",
+    "@types/pluralize": "0.0.29",
     "grpc-tools": "^1.6.6",
     "grpc_tools_node_protoc_ts": "^2.5.1",
     "mocha": "^5.2.0",
     "protobufjs": "^6.8.8",
     "rimraf": "^2.6.2",
     "shelljs": "^0.8.3",
+    "ts-node": "^7.0.1",
     "tslint": "^5.12.0",
     "tslint-microsoft-contrib": "^6.2.0",
     "types-bn": "0.0.1",

packages/lightcone_v2.js/lib/wallet/config/data.js

@@ -1,6 +1,6 @@
 import {credentials, Metadata, ServiceError} from 'grpc';
-import { DexServiceClient } from '../../proto_gen/service_dex_grpc_pb';
-import { GetNextOrderIdReq } from '../../proto_gen/service_dex_pb';
+import { DexServiceClient } from '../proto_gen/service_dex_grpc_pb';
+import { GetNextOrderIdReq } from '../proto_gen/service_dex_pb';
 import { UInt32Value } from "google-protobuf/google/protobuf/wrappers_pb";
 
 /* // https://github.com/grpc/grpc-node/issues/543#issuecomment-427487420
@@ -14,21 +14,14 @@ const authCred: CallCredentials = credentials.createFromMetadataGenerator((param
 });
 const client: GreeterClient = new GreeterClient('localhost:50051', credentials.combineChannelCredentials(baseCred, authCred));
 */
-const client: DexServiceClient = new DexServiceClient('localhost:8980', credentials.createInsecure());
 
-let argv: string = 'world';
-if (process.argv.length >= 3) {
-    argv = process.argv[2];
-}
+// 18.179.197.168:5000 is temperate gRPC server we hosted on AWS.
+export const client: DexServiceClient = new DexServiceClient('18.179.197.168:5000', credentials.createInsecure());
 
 const param: GetNextOrderIdReq = new GetNextOrderIdReq();
 param.setAccountId(1);
 param.setTokenSellId(1);
 
-const metadata: Metadata = new Metadata();
-metadata.add('foo', 'bar1');
-metadata.add('foo', 'bar2');
-
 async function example(): Promise<void> {
     client.getNextOrderId(param, (err: ServiceError | null, res: UInt32Value) => {
         console.log(res.getValue())

packages/lightcone_v2.js/package.json

@@ -1,13 +1,13 @@
 import {Empty} from 'google-protobuf/google/protobuf/empty_pb';
 import {StringValue, UInt32Value} from 'google-protobuf/google/protobuf/wrappers_pb';
 import {credentials, Metadata, ServiceError} from 'grpc';
-import {Order} from 'proto_gen/data_order_pb';
+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 '../../proto_gen/service_dex_grpc_pb';
+} from '../proto_gen/data_requests_pb';
+import { DexServiceClient } from '../proto_gen/service_dex_grpc_pb';
 import {
     Account,
     CancelOrderRes,
@@ -29,14 +29,13 @@ import {
     OrderBook,
     SimpleOrderCancellationReq,
     SubmitOrderRes
-} from 'proto_gen/service_dex_pb';
+} from 'src/proto_gen/service_dex_pb';
 
 /**
  * gRPC GrpcClientService Service
  */
 class GrpcClientService {
-
-    private readonly client: DexServiceClient = new DexServiceClient('127.0.0.1:59480', credentials.createInsecure()); // TODO: config
+    private readonly client: DexServiceClient = new DexServiceClient('18.179.197.168:5000', credentials.createInsecure()); // TODO: config
 
     public async getDexConfigurations(metadata: Metadata = new Metadata()): Promise<DexConfigurations> {
         const empty: Empty = new Empty();

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

@@ -0,0 +1,25 @@
+import { GetNextOrderIdReq } from './proto_gen/service_dex_pb';
+import { DexServiceClient } from './proto_gen/service_dex_grpc_pb';
+
+import common from './lib/wallet/common';
+import ethereum from './lib/wallet/ethereum';
+// Looks like we don't need WalletUtils
+// It also causes an error
+// "export 'default' (reexported as 'WalletUtils') 
+// was not found in './WalletUtils'
+// import WalletUtils from './WalletUtils';
+import ContractUtils from './lib/wallet/ethereum/contracts/Contracts';
+import EthRpcUtils from './lib/wallet/ethereum/eth';
+import Utils from './lib/wallet/common/utils';
+
+
+export {
+    GetNextOrderIdReq,
+    DexServiceClient,
+    common,
+    ethereum,
+    // WalletUtils,
+    ContractUtils,
+    EthRpcUtils,
+    Utils
+};

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

@@ -1,3 +1,5 @@
+// proto.js is to generate proto_gen, not used in any typescript.
+
 const path = require('path');
 const shell = require('shelljs');
 const rimraf = require('rimraf');
@@ -6,7 +8,7 @@ process.env.PATH += (path.delimiter + path.join(process.cwd(), 'node_modules', '
 
 const PROTO_DIR = path.join(__dirname, '../../proto_src');
 const MODEL_DIR = path.join(__dirname, '../../proto_gen');
-const PROTOC_GEN_TS_PATH = path.join(__dirname, '../../node_modules/.bin/protoc-gen-ts');
+const PROTOC_GEN_TS_PATH = path.join(__dirname, '../../../node_modules/.bin/protoc-gen-ts');
 
 rimraf.sync(`${MODEL_DIR}/*`);
 

packages/lightcone_v2.js/src/index.ts

@@ -1,5 +1,4 @@
-const bn128 = require("snarkjs").bn128;
-const bigInt = require("snarkjs").bigInt;
+import { bn128, bigInt } from 'snarkjs'
 
 exports.addPoint = addPoint;
 exports.mulPointEscalar = mulPointEscalar;