[Lightcone2.js] modify exchange for issue: https://github.com/Loopring/lightcone2/issues/345 (#285)

* modify

* Update comments in MetaMask

* Add @types/ethereumjs-abi, and fix an bug when importing ethereumjs-abi in Typescript

* Add error handling in createAccount in lightcone_v2.js/src/sign/exchange.ts

* Switch using Async/Await, rather than using a Promise in another Promise.

Author: iwbrhwfy

packages/lightcone_v2.js/package.json

@@ -24,12 +24,13 @@
   "main": "dist/index.js",
   "license": "ISC",
   "dependencies": {
+    "@types/ethereumjs-abi": "^0.6.3",
     "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-abi": "0.6.7",
     "ethereumjs-tx": "1.3.3",
     "ethereumjs-util": "5.2.0",
     "ethereumjs-wallet": "0.6.0",
@@ -38,11 +39,11 @@
     "grpc-loader": "^2.0.1",
     "grpc-web": "^1.0.4",
     "hdkey": "0.7.1",
+    "isomorphic-fetch": "2.2.1",
     "nodeunit": "^0.11.3",
     "snarkjs": "0.1.11",
     "socket.io-client": "2.0.4",
-    "web3": "^1.0.0-beta.36",
-    "whatwg-fetch": "^3.0.0"
+    "web3": "^1.0.0-beta.36"
   },
   "devDependencies": {
     "@types/chai": "^4.1.7",

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

@@ -1,4 +1,5 @@
-import {methodID, rawDecode, rawEncode} from 'ethereumjs-abi';
+// Using import {*} from 'ethereumjs-abi'; failed to import ethereumjs-abi
+var abi = require('ethereumjs-abi')
 import {addHexPrefix, clearHexPrefix, toBuffer, toHex} from '../../common/formatter';
 import BN from 'bn.js';
 
@@ -19,7 +20,7 @@ export default class AbiFunction {
         this.outputTypes = outputs.map(({type}) => type);
         this.outputs = outputs;
         this.constant = constant;
-        this.methodAbiHash = toHex(methodID(name, this.inputTypes));
+        this.methodAbiHash = toHex(abi.methodID(name, this.inputTypes));
     }
 
     /**
@@ -29,7 +30,7 @@ export default class AbiFunction {
      */
     encodeInputs(inputs) {
         const abiInputs = this.parseInputs(inputs);
-        return this.methodAbiHash + clearHexPrefix(toHex(rawEncode(this.inputTypes, abiInputs)));
+        return this.methodAbiHash + clearHexPrefix(toHex(abi.rawEncode(this.inputTypes, abiInputs)));
     }
 
     /**
@@ -38,7 +39,7 @@ export default class AbiFunction {
      * @returns {*}
      */
     decodeOutputs(outputs) {
-        return this.parseOutputs(rawDecode(this.outputTypes, toBuffer(outputs)));
+        return this.parseOutputs(abi.rawDecode(this.outputTypes, toBuffer(outputs)));
     }
 
     /**
@@ -47,7 +48,7 @@ export default class AbiFunction {
      * @returns {*}
      */
     decodeEncodedInputs(encoded) {
-        return this.parseOutputs(rawDecode(this.inputTypes, toBuffer(addHexPrefix(encoded))));
+        return this.parseOutputs(abi.rawDecode(this.inputTypes, toBuffer(addHexPrefix(encoded))));
     }
 
     parseInputs(inputs = {}) {

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

@@ -1,15 +1,11 @@
 import validator from '../common/validator'
 import request from '../common/request'
 
-// FIXME: abi is not included in the project.
-// import {generateAbiData} from './abi';
-import {configs} from "../config/data";
-import {toBuffer} from "../common/formatter";
-import {rawDecode} from 'ethereumjs-abi'
 import {sha3} from 'ethereumjs-util'
 
 // HACK: What is the host in wallet/ethereum?
-const host = 'host';
+// const host = 'localhost:8545';
+const host = 'http://localhost:8545';
 
 export async function getTransactionCount(address, tag) {
     try {

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

@@ -200,7 +200,7 @@ export class WalletAccount {
 // Hack: We don't need this one?
 export class KeyAccount extends WalletAccount {
 
-    privateKey: any
+    privateKey: any;
 
     /**
      * @property

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

@@ -36,8 +36,8 @@ export class Exchange {
     private readonly accounts: Map<WalletAccount, DexAccount>;
 
     public constructor() {
-        this.exchangeID = 0;  // TODO: config
-        this.exchangeAddr = '0x'; // TODO: config
+        this.exchangeID = 2;  // TODO: config
+        this.exchangeAddr = '0x3d88d9C4adC342cEff41855CF540844268390BE6'; // TODO: config
         this.walletAccountID = 0; // TODO: config
         this.accounts = new Map<WalletAccount, DexAccount>();
     }
@@ -47,7 +47,6 @@ export class Exchange {
         for (let i = 0; i < length; i++) {
             res[i] = value.testn(i) ? 1 : 0;
         }
-
         return res;
     }
 
@@ -99,42 +98,52 @@ export class Exchange {
 
     public flattenList = (l: any[]) => {
         return [].concat.apply([], l);
-    }
+    };
 
+    // JavaScript: Promises and Why Async/Await Wins the Battle
+    // https://hackernoon.com/javascript-promises-and-why-async-await-wins-the-battle-4fc9d15d509f
+    // ES7 async error handling: do it right or die
+    // https://medium.com/@giovannipinto/async-error-handling-forced-to-do-it-right-2817cf9e8b43
     public async createAccount(wallet: WalletAccount, gasPrice: number) {
-        // TODO: need to check if gasPrice is a reasonable value
-        if (this.accounts.get(wallet) == null) {
-            const keyPair = generateKeyPair();
-            console.log(keyPair)
-            this.createOrUpdateAccount(keyPair.publicKeyX, keyPair.publicKeyY, gasPrice).then((rawTx: Transaction) => {
-                    const signedTx = wallet.signEthereumTx(rawTx);
-                    wallet.sendTransaction(new Eth(''), signedTx).then(() => { // TODO: config
-                        grpcClientService.getAccount(wallet.getAddress()).then((account: Account) => {
-                            const dexAccount = new DexAccount();
-                            dexAccount.nonce = 0;
-                            dexAccount.owner = wallet.getAddress();
-                            dexAccount.accountID = account.getAccountId().getValue();
-                            dexAccount.publicKeyX = keyPair.publicKeyX;
-                            dexAccount.publicKeyY = keyPair.publicKeyY;
-                            dexAccount.secretKey = keyPair.secretKey;
-                            this.accounts.set(wallet, dexAccount);
-                            this.currentDexAccount = dexAccount;
-                            this.currentWalletAccount = wallet;
-                        });
+        try {
+            // TODO: need to check if gasPrice is a reasonable value
+            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);
+
+                // 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
+                    grpcClientService.getAccount(wallet.getAddress()).then((account: Account) => {
+                        const dexAccount = new DexAccount();
+                        dexAccount.nonce = 0;
+                        dexAccount.owner = wallet.getAddress();
+                        dexAccount.accountID = account.getAccountId().getValue();
+                        dexAccount.publicKeyX = keyPair.publicKeyX;
+                        dexAccount.publicKeyY = keyPair.publicKeyY;
+                        dexAccount.secretKey = keyPair.secretKey;
+                        this.accounts.set(wallet, dexAccount);
+                        this.currentDexAccount = dexAccount;
                     });
-                }
-            );
+                });
+            }
+        } catch(err) {
+            console.error('Failed to create.', err);
+            throw err;
         }
     }
 
     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')
         const data = ethereum.abi.Contracts.ExchangeContract.encodeInputs('createOrUpdateAccount', {
-            pubKeyX: publicX,
-            pubKeyY: publicY
+            pubKeyX: fm.toBN(publicX),
+            pubKeyY: fm.toBN(publicY)
         });
-
+        console.log('End encode input of createOrUpdateAccount')
         return new Transaction({
             to: this.exchangeAddr,
             value: '0x0',
@@ -259,9 +268,9 @@ export class Exchange {
         order.rebateBips = (order.rebateBips !== undefined) ? order.rebateBips : 0;
         order.walletAccountID = (order.walletAccountID !== undefined) ? order.walletAccountID : this.walletAccountID;
 
-        assert(order.maxFeeBips < 64, 'maxFeeBips >= 64');
-        assert(order.feeBips < 64, 'feeBips >= 64');
-        assert(order.rebateBips < 64, 'rebateBips >= 64');
+        // assert(order.maxFeeBips < 64, 'maxFeeBips >= 64');
+        // assert(order.feeBips < 64, 'feeBips >= 64');
+        // assert(order.rebateBips < 64, 'rebateBips >= 64');
 
         // Sign the order
         this.signOrder(order);

packages/lightcone_v2.js/src/wallet/metaMask.ts

@@ -6,7 +6,6 @@ import {MetaMaskAccount} from '../lib/wallet/ethereum/walletAccount';
 import { fromMetaMask } from '../lib/wallet/WalletUtils';
 import {exchange} from '../sign/exchange';
 
-// TODO: implement callback to integrate MetaMask
 export class MetaMask {
 
     public web3: Web3;
@@ -15,10 +14,10 @@ export class MetaMask {
     public account: MetaMaskAccount;
 
     public constructor() {
-        this.web3 = new Web3(Web3.givenProvider || 'http://localhost:8545'); // TODO: replace for ruby
+        this.web3 = new Web3('http://localhost:8545'); // TODO: replace for ruby
         this.account = fromMetaMask(this.web3);
         this.address = this.account.getAddress();
-        this.ethNode = new Eth(''); // TODO: config
+        this.ethNode = new Eth('http://localhost:8545'); // TODO: config
     }
 
     public async createOrUpdateAccount(publicX: string, publicY: string, gasPrice: number) {
@@ -45,6 +44,3 @@ export class MetaMask {
         });
     }
 }
-
-// Avoid to use metaMask because MetaMask is not ready when the website is loaded.
-// export const metaMask: MetaMask = new MetaMask();

packages/lightcone_v2.js/test/exchange.ts

@@ -0,0 +1,12 @@
+const BN = require("bn.js");
+
+describe("generate key_pair test", function () {
+    this.timeout(100000);
+    before( async () => {
+    });
+
+    it("send tx using metamask", async () => {
+        let bn = new BN(20);
+        console.log(bn.toString(16))
+    });
+});

packages/lightcone_v2.js/test/sign.ts

@@ -1,12 +1,16 @@
-const BN = require("bn.js");
+import {exchange} from "../src";
+import {KeyAccount} from "../src/lib/wallet/ethereum/walletAccount";
+
 
 describe("generate key_pair test", function () {
     this.timeout(100000);
-    before( async () => {
+    before(async () => {
     });
 
     it("send tx using metamask", async () => {
-        let bn = new BN(20);
-        console.log(bn.toString(16))
+        let keyAccount = new KeyAccount('ffd9b73fa766fe3a69d139c2cc39dfbb171d680222f07196a2c7b088e4139d75');
+        exchange.createAccount(keyAccount, 100000).then(() => {
+            console.log()
+        });
     });
 });