Merge pull request #109 from Loopring/v2.0.0

V2.0.0

Author: hzbdesigner

docs/chinese.md

@@ -1,6 +1,6 @@
 {
   "name": "loopring.js",
-  "version": "1.0.8",
+  "version": "2.0.0",
   "description": "Loopring javascript library",
   "scripts": {
     "lint": "eslint . --fix",

docs/index.md

@@ -0,0 +1,32 @@
+import {
+    privateKeytoAddress,
+    publicKeytoAddress,
+    privateKeytoPublic,
+    createMnemonic,
+    fromMnemonic,
+    fromKeystore,
+    fromPrivateKey,
+    fromLedger,
+    fromTrezor,
+    fromMetaMask
+} from './ethereum/account';
+
+import { mnemonictoPrivatekey, isValidateMnemonic } from './ethereum/mnemonic';
+import { decryptKeystoreToPkey, pkeyToKeystore } from './ethereum/keystore';
+
+export default {
+    privateKeytoPublic,
+    publicKeytoAddress,
+    privateKeytoAddress,
+    createMnemonic,
+    isValidateMnemonic,
+    mnemonictoPrivatekey,
+    decryptKeystoreToPkey,
+    fromMnemonic,
+    fromKeystore,
+    fromPrivateKey,
+    fromLedger,
+    fromTrezor,
+    fromMetaMask,
+    pkeyToKeystore
+};

package.json

@@ -123,7 +123,7 @@ export function formatKey (mixed)
 
     if (typeof mixed === 'string')
     {
-        return mixed.startsWith('0x') ? mixed : mixed;
+        return mixed.startsWith('0x') ? mixed.slice(2) : mixed;
     }
     throw new Error('Unsupported type');
 }

src/WalletUtils.js

@@ -1,5 +1,5 @@
 import {keccak, hashPersonalMessage} from 'ethereumjs-util';
-import {toHex, toBig} from './formatter';
+import formatter, {toHex, toBig} from './formatter';
 
 /**
  * trim head space and tail space
@@ -30,5 +30,10 @@ export function calculateGas (gasPrice, gasLimit)
 }
 
 export default {
-    hashPersonalMessage
+    hashPersonalMessage,
+    ...formatter,
+    trim,
+    trimAll,
+    keccakHash,
+    calculateGas
 };

src/common/formatter.js

@@ -1,20 +1,36 @@
 import validator from './validator';
-import {addHexPrefix, clearHexPrefix, formatAddress, formatKey, toBuffer, toHex, toNumber} from '../common/formatter';
-import {decryptKeystoreToPkey, pkeyToKeystore} from './keystore';
-import {privateToAddress, privateToPublic, publicToAddress, sha3, hashPersonalMessage, ecsign} from 'ethereumjs-util';
-import {mnemonictoPrivatekey} from './mnemonic';
-import {generateMnemonic} from 'bip39';
-import {trimAll} from '../common/utils';
+import {
+    addHexPrefix,
+    clearHexPrefix,
+    formatAddress,
+    formatKey,
+    toBuffer,
+    toHex,
+    toNumber
+} from '../common/formatter';
+import { decryptKeystoreToPkey, pkeyToKeystore } from './keystore';
+import {
+    privateToAddress,
+    privateToPublic,
+    publicToAddress,
+    sha3,
+    hashPersonalMessage,
+    ecsign
+} from 'ethereumjs-util';
+import { mnemonictoPrivatekey } from './mnemonic';
+import { generateMnemonic } from 'bip39';
+import { trimAll } from '../common/utils';
 import HDKey from 'hdkey';
 import EthTransaction from 'ethereumjs-tx';
-import {getOrderHash} from '../relay/rpc/order';
+import { getOrderHash } from '../relay/rpc/order';
 import * as Trezor from './trezor';
 import * as Ledger from './ledger';
 import * as MetaMask from './metaMask';
 import Wallet from 'ethereumjs-wallet';
 
 const wallets = require('../config/wallets.json');
-const LoopringWallet = wallets.find(wallet => trimAll(wallet.name).toLowerCase() === 'loopringwallet');
+const LoopringWallet = wallets.find(
+    wallet => trimAll(wallet.name).toLowerCase() === 'loopringwallet');
 export const path = LoopringWallet.dpath;
 
 export function createWallet ()
@@ -73,8 +89,10 @@ export function getAddresses ({publicKey, chainCode, pageSize, pageNum})
 {
     const addresses = [];
     const hdk = new HDKey();
-    hdk.publicKey = publicKey instanceof Buffer ? publicKey : toBuffer(addHexPrefix(publicKey));
-    hdk.chainCode = chainCode instanceof Buffer ? chainCode : toBuffer(addHexPrefix(chainCode));
+    hdk.publicKey = publicKey instanceof Buffer ? publicKey : toBuffer(
+        addHexPrefix(publicKey));
+    hdk.chainCode = chainCode instanceof Buffer ? chainCode : toBuffer(
+        addHexPrefix(chainCode));
     for (let i = 0; i < pageSize; i++)
     {
         const dkey = hdk.derive(`m/${i + pageSize * pageNum}`);
@@ -144,6 +162,26 @@ export function fromKeystore (keystore, password)
     return fromPrivateKey(privateKey);
 }
 
+export async function fromLedger (dpath)
+{
+    const response = await Ledger.connect();
+    if (response.result)
+    {
+        return new LedgerAccount(response.result, dpath);
+    }
+    throw new Error(response.error.message);
+}
+
+export function fromTrezor (dpath)
+{
+    return new TrezorAccount(dpath);
+}
+
+export function fromMetaMask (web3)
+{
+    return new MetaMaskAccount(web3);
+}
+
 /**
  * @description generate mnemonic
  * @param strength
@@ -394,7 +432,8 @@ export class LedgerAccount extends Account
     async signOrder (order)
     {
         const hash = getOrderHash(order);
-        const result = await Ledger.signMessage(this.dpath, clearHexPrefix(toHex(hash)), this.ledger);
+        const result = await Ledger.signMessage(this.dpath,
+            clearHexPrefix(toHex(hash)), this.ledger);
         if (result.error)
         {
             throw new Error(result.error.message);
@@ -420,7 +459,8 @@ export class MetaMaskAccount extends Account
 
     getAddress ()
     {
-        if (this.web3 && this.web3.eth.accounts[0]) return this.web3.eth.accounts[0];
+        if (this.web3 &&
+      this.web3.eth.accounts[0]) return this.web3.eth.accounts[0];
         else throw new Error('Not found MetaMask');
     }
 
@@ -452,7 +492,8 @@ export class MetaMaskAccount extends Account
 
     async signEthereumTx (rawTx)
     {
-        const result = await MetaMask.signEthereumTx(this.web3, this.account, rawTx);
+        const result = await MetaMask.signEthereumTx(this.web3, this.account,
+            rawTx);
         if (!result.error)
         {
             return result.result;

src/common/utils.js

@@ -1,9 +1,20 @@
 import common from './common';
 import ethereum from './ethereum';
 import relay from './relay';
-
+import WalletUtils from './WalletUtils';
+import ContractUtils from './ethereum/contracts/Contracts';
+import EthRpcUtils from './ethereum/eth';
+import RelayRpcUitls from './relay/relay';
+import SocketUtils from './relay/socket';
+import Utils from './common/utils';
 export {
     common,
     ethereum,
-    relay
+    relay,
+    WalletUtils,
+    ContractUtils,
+    EthRpcUtils,
+    RelayRpcUitls,
+    SocketUtils,
+    Utils
 };

src/ethereum/account.js

@@ -1,7 +1,7 @@
-import account from './account';
-import market from './market';
-import order from './order';
-import ring from './ring';
+import * as account from './account';
+import * as market from './market';
+import * as order from './order';
+import * as ring from './ring';
 
 export default {
     account,