[Lightcone2.js]update account ready && statement termination (#288)

* update account ready

* [Lightcone_V2.js] Remove tslint.json in packages/lightcone_v2.js/Dockerfile

Author: iwbrhwfy

packages/lightcone_v2.js/Dockerfile

@@ -17,7 +17,6 @@ protoc-gen-grpc-web-1.0.4-linux-x86_64 -o /usr/local/bin/protoc-gen-grpc-web &&
   chmod +x /usr/local/bin/protoc-gen-grpc-web
 
 # Add files
-ADD tslint.json ./tslint.json
 ADD tsconfig.json ./tsconfig.json
 ADD globals.d.ts ./globals.d.ts
 ADD package.json ./package.json

packages/lightcone_v2.js/src/lib/wallet/common/schemas.ts

@@ -99,6 +99,6 @@ let basicSchemas = {
         required: true,
         enum: [1, 2, 3, 4]
     }
-}
+};
 
 export default basicSchemas

packages/lightcone_v2.js/src/lib/wallet/ethereum/contracts/AbiFunction.ts

@@ -1,17 +1,17 @@
 // Using import {*} from 'ethereumjs-abi'; failed to import ethereumjs-abi
-var abi = require('ethereumjs-abi')
+var abi = require('ethereumjs-abi');
 import {addHexPrefix, clearHexPrefix, toBuffer, toHex} from '../../common/formatter';
 import BN from 'bn.js';
 
 export default class AbiFunction {
 
-    name: string
-    inputTypes: string[]
-    inputs: any[]
-    outputTypes: string[]
-    outputs: any[]
-    constant: string
-    methodAbiHash: string
+    name: string;
+    inputTypes: string[];
+    inputs: any[];
+    outputTypes: string[];
+    outputs: any[];
+    constant: string;
+    methodAbiHash: string;
 
     constructor({inputs, name, outputs, constant}) {
         this.name = name;

packages/lightcone_v2.js/src/lib/wallet/ethereum/contracts/Contract.ts

@@ -1,10 +1,10 @@
 import AbiFunction from './AbiFunction';
 import {toHex} from '../../common/formatter';
-var ethereumjs_abi = require('ethereumjs-abi')
+var ethereumjs_abi = require('ethereumjs-abi');
 
 export default class Contract {
 
-    abiFunctions: any
+    abiFunctions: any;
 
     constructor(abi) {
         const funAbi = abi.filter(({type}) => type === 'function');

packages/lightcone_v2.js/src/lib/wallet/ethereum/eth.ts

@@ -5,7 +5,7 @@ import code from '../common/code';
 
 export default class Eth {
 
-    host: string
+    host: string;
 
     constructor(host) {
         this.host = host;

packages/lightcone_v2.js/src/lib/wallet/ethereum/token.ts

@@ -6,22 +6,22 @@ import Transaction from './transaction';
 import request from '../common/request';
 import {toBuffer} from "../common/formatter";
 
-var ethereumjs_abi = require('ethereumjs-abi')
+var ethereumjs_abi = require('ethereumjs-abi');
 
 // HACK: What is the host in wallet/token?
 const host = 'host';
 
 export default class Token {
 
-    address: string
-    symbol: string
-    name: string
-    digits: number
-    unit: number
-    website: string
-    allowance: number
-    precision: number
-    minTradeValue: number
+    address: string;
+    symbol: string;
+    name: string;
+    digits: number;
+    unit: number;
+    website: string;
+    allowance: number;
+    precision: number;
+    minTradeValue: number;
 
     constructor(input) {
         validator.validate({value: input, type: 'BASIC_TOKEN'});

packages/lightcone_v2.js/src/lib/wallet/ethereum/transaction.ts

@@ -10,8 +10,8 @@ const host = 'host';
 
 export default class Transaction {
 
-    raw: string
-    signed: string
+    raw: string;
+    signed: string;
 
     constructor(rawTx) {
         validator.validate({value: rawTx, type: 'BASIC_TX'});

packages/lightcone_v2.js/src/lib/wallet/ethereum/utils.ts

@@ -226,7 +226,7 @@ export function addParticipant({feeRecipient, signer, to, gasPrice, gasLimit, no
 
 export function isValidEthAddress(address) {
     try {
-        validator.validate({value: address, type: "ADDRESS"})
+        validator.validate({value: address, type: "ADDRESS"});
         return true
     } catch (e) {
         return false

packages/lightcone_v2.js/src/sign/exchange.ts

@@ -110,12 +110,12 @@ export class Exchange {
             if (this.accounts.get(wallet) == null) {
                 const keyPair = generateKeyPair();
                 this.currentWalletAccount = wallet;
-                let rawTx: Transaction = await this.createOrUpdateAccount(keyPair.publicKeyX, keyPair.publicKeyY, gasPrice)
-                const signedTx = wallet.signEthereumTx(rawTx);
+                let rawTx: Transaction = await this.createOrUpdateAccount(keyPair.publicKeyX, keyPair.publicKeyY, gasPrice);
+                const signedTx = wallet.signEthereumTx(rawTx.raw);
 
                 // TODO: Let's avoid using Promises. Change this part to await.
                 // At least, avoid using a Promise in another Promise.
-                wallet.sendTransaction(new Eth('localhost:8545'), signedTx).then(() => { // TODO: config
+                wallet.sendTransaction(new Eth('http://localhost:8545'), signedTx).then(() => { // TODO: config
                     grpcClientService.getAccount(wallet.getAddress()).then((account: Account) => {
                         const dexAccount = new DexAccount();
                         dexAccount.nonce = 0;
@@ -138,12 +138,12 @@ export class Exchange {
     public async createOrUpdateAccount(publicX: string, publicY: string, gasPrice: number) {
         // FIXME: ethereum.abi.Contracts.ExchangeContract.encodeInputs returns error
         // Unhandled Rejection (TypeError): name.startsWith is not a function
-        console.log('Start encode input of createOrUpdateAccount')
+        console.log('Start encode input of createOrUpdateAccount');
         const data = ethereum.abi.Contracts.ExchangeContract.encodeInputs('createOrUpdateAccount', {
             pubKeyX: fm.toBN(publicX),
             pubKeyY: fm.toBN(publicY)
         });
-        console.log('End encode input of createOrUpdateAccount')
+        console.log('End encode input of createOrUpdateAccount');
         return new Transaction({
             to: this.exchangeAddr,
             value: '0x0',