[Lightcone_v2.js] Update method to create account (#297)

* inprogress

* fix bug && try-catch

Author: iwbrhwfy

packages/lightcone_v2.js/src/lib/wallet/config/index.ts

@@ -1,4 +1,4 @@
-import settings from './settings'
+import settings from './settings';
 
 const data = require('./data');
 const config = data.configs;
@@ -7,8 +7,8 @@ const txs = config.txs;
 const projects = data.projects;
 
 function requestWhiteList() {
-    const url = "//raw.githubusercontent.com/Loopring/mock-relay-data/master/whiteList.json";
-    return fetch(url, {method: 'GET'}).then((res) => res.json())
+    const url = '//raw.githubusercontent.com/Loopring/mock-relay-data/master/whiteList.json';
+    return fetch(url, {method: 'GET'}).then((res) => res.json());
 }
 
 async function isinWhiteList(address) {
@@ -18,96 +18,111 @@ async function isinWhiteList(address) {
     });
 }
 
+function initTokenConfig() {
+    const tokens = [];
+    tokens.push({
+                    'symbol': 'LRC',
+                    'digits': 18,
+                    'address': '0x4FF214811F164dAB1889c83b1fe2c8c27d3dB615',
+                    'precision': 6,
+                });
+    settings.setTokensConfig(tokens);
+}
+
 function getChainId() {
-    return config.chainId
+    return config.chainId;
 }
 
 function getTokenBySymbol(symbol) {
     if (!symbol) {
-        return {}
+        return {};
     }
-    return getTokens().find(token => token.symbol.toLowerCase() === symbol.toLowerCase()) || {}
+    return getTokens().find(token => token.symbol.toLowerCase() === symbol.toLowerCase()) || {};
 }
 
 function getTokenByAddress(address) {
     if (!address) {
-        return {}
+        return {};
     }
-    return getTokens().find(token => token.address.toLowerCase() === address.toLowerCase())
+    return getTokens().find(token => token.address.toLowerCase() === address.toLowerCase());
 }
 
 function getCustomTokens() {
-    return getTokens().filter(token => token.custom)
+    return getTokens().filter(token => token.custom);
 }
 
 function getTokens() {
-    return settings.getTokensConfig()
+    return settings.getTokensConfig();
 }
 
 function getMarketByPair(pair) {
     if (pair) {
         const pairArr = pair.split('-');
         if (pairArr && pairArr.length === 2) {
-            return getMarketBySymbol(pairArr[0], pairArr[1])
+            return getMarketBySymbol(pairArr[0], pairArr[1]);
         }
     }
 }
 
 function getProjectByName(name) {
     if (!name) {
-        return {}
+        return {};
     }
-    return projects.find(project => project.name.toLowerCase() === name.toLowerCase())
+    return projects.find(project => project.name.toLowerCase() === name.toLowerCase());
 }
 
 function getProjectById(id) {
     if (!id) {
-        return {}
+        return {};
     }
-    return projects.find(project => project.projectId === id)
+    return projects.find(project => project.projectId === id);
 }
 
 function getProjectByLrx(lrx) {
     if (!lrx) {
-        return {}
+        return {};
     }
-    return projects.find(project => project.lrx.toLowerCase() === lrx.toLowerCase())
+    return projects.find(project => project.lrx.toLowerCase() === lrx.toLowerCase());
 }
 
 function getSupportedMarketsTokenR() {
-    return settings.getMarketR()
+    return settings.getMarketR();
 }
 
 function isSupportedMarket(market) {
-    if (!market) return false;
+    if (!market) {
+        return false;
+    }
     const pair = market.split('-');
-    if (pair.length !== 2) return false;
+    if (pair.length !== 2) {
+        return false;
+    }
     return getMarkets().find(m => {
-        return (m.tokenx === pair[0].toUpperCase() && m.tokeny === pair[1].toUpperCase()) || (m.tokenx === pair[1].toUpperCase() && m.tokeny === pair[0].toUpperCase())
-    })
+        return (m.tokenx === pair[0].toUpperCase() && m.tokeny === pair[1].toUpperCase()) || (m.tokenx === pair[1].toUpperCase() && m.tokeny === pair[0].toUpperCase());
+    });
 }
 
 function getMarketBySymbol(tokenx, tokeny) {
     if (tokenx && tokeny) {
         return getMarkets().find(market => {
-                return (market.tokenx === tokenx && market.tokeny === tokeny) || (market.tokenx === tokeny && market.tokeny === tokenx)
-            }
+                                     return (market.tokenx === tokenx && market.tokeny === tokeny) || (market.tokenx === tokeny && market.tokeny === tokenx);
+                                 }
         ) || {
-            "pricePrecision": 8
-        }
+            'pricePrecision': 8
+        };
     } else {
         return {
-            "pricePrecision": 8
-        }
+            'pricePrecision': 8
+        };
     }
 }
 
 function getMarketsByTokenR(token) {
-    return getMarkets().filter(item => item.tokeny === token)
+    return getMarkets().filter(item => item.tokeny === token);
 }
 
 function getMarketsByTokenL(token) {
-    return getMarkets().filter(item => item.tokenx === token)
+    return getMarkets().filter(item => item.tokenx === token);
 }
 
 function getTokenSupportedMarket(token) {
@@ -117,51 +132,54 @@ function getTokenSupportedMarket(token) {
         if (supportedToken.includes(token)) {
             const markets = getMarketsByTokenR(token);
             if (markets) {
-                foundMarket = markets[0].tokenx + "-" + markets[0].tokeny
+                foundMarket = markets[0].tokenx + '-' + markets[0].tokeny;
             }
         } else {
             const tokenR = supportedToken.find((x, i) => {
-                const market = token + "-" + x;
+                const market = token + '-' + x;
                 if (isSupportedMarket(market)) {
-                    return true
+                    return true;
                 }
             });
-            if (tokenR) foundMarket = token + "-" + tokenR
+            if (tokenR) {
+                foundMarket = token + '-' + tokenR;
+            }
         }
     }
-    return foundMarket
+    return foundMarket;
 }
 
 function getTokenSupportedMarkets(token) {
     const leftMarket = getMarketsByTokenL(token);
     const rightMarket = getMarketsByTokenR(token);
-    return [...leftMarket, ...rightMarket]
+    return [...leftMarket, ...rightMarket];
 }
 
 function getMarkets() {
-    return settings.getMarketPairs()
+    return settings.getMarketPairs();
 }
 
 function getGasLimitByType(type) {
     if (type) {
-        return txs.find(tx => type === tx.type)
+        return txs.find(tx => type === tx.type);
     }
 
 }
 
 function getWalletAddress() {
-    return config.walletAddress
+    return config.walletAddress;
 }
 
 function getDelegateAddress() {
     return config.delegateAddress;
 }
 
 function getWallets() {
-    return data.wallets
+    return data.wallets;
 }
 
 export default {
+    initTokenConfig,
     getTokenBySymbol,
     getTokenByAddress,
     getTokens,

packages/lightcone_v2.js/src/proto_src/service_dex.proto

@@ -34,12 +34,14 @@ import "data_types.proto";
 message DexConfigurations {
     uint64 dex_id = 1;
     string dex_address = 2;
-    string deposit_fee_eth = 3; // FDS
-    string onchain_withdrawal_fee_eth = 4; // FDS
-    types.TokenID offchain_withdrawal_fee_token_id = 5; // 前端无需设计展示，以withdraw token为准
-    string offchain_withdrawal_fee_amount = 6; // FDS
-    string order_cancellation_fee_eth = 7; // FDS
-    bool in_maintainance = 8;
+    string account_creation_fee_eth = 3; // FDS
+    string account_update_fee_eth = 4; // FDS
+    string deposit_fee_eth = 5; // FDS
+    string onchain_withdrawal_fee_eth = 6; // FDS
+    types.TokenID offchain_withdrawal_fee_token_id = 7; // 前端无需设计展示，以withdraw token为准
+    string offchain_withdrawal_fee_amount = 8; // FDS
+    string order_cancellation_fee_eth = 9; // FDS
+    bool in_maintainance = 10;
 }
 
 message TokenInfo {