Merge pull request #47 from AElfProject/dev

Dev

Author: hzz780

.gitignore

@@ -9,4 +9,5 @@ test.js
 test.data.js
 app/view/
 app/public/assets/output/
-.DS_Store
+.DS_Store
+.vscode/

README.md

@@ -37,7 +37,7 @@ at first
 ### 1.Change config
 
 ```shell
-cp config/demo.config.default.js config/config.default.js 
+cp config/demo.config.default.js config/config.default.js
 // set your own config.keys
 
 cp config/demo.config.node.js config/config.node.js
@@ -98,4 +98,10 @@ sudo npm install --unsafe-perm=true --allow-root
 sh build.sh pro # or npm start
 ```
 
+### How to deal with int64
+
+Use Long.js
+
+https://www.npmjs.com/package/long
+
 # Docker[TODO]

app/controller/address.js

@@ -2,11 +2,11 @@
  * @file address.js
  * @author huangzongzhe
  */
+/* eslint-disable fecs-camelcase */
 'use strict';
 
 const Controller = require('../core/baseController.js');
 const {apiServerProvider} = require('../../config/config.node.js');
-const {getNodesInfo} = require('../utils/utils.js');
 
 class addressController extends Controller {
     // the structure of return data is almost the same as the getTokens API of aelf-block-api.
@@ -27,27 +27,45 @@ class addressController extends Controller {
                 required: false,
                 allowEmpty: true,
                 min: 0
+            },
+            contract_address: {
+                type: 'string',
+                required: false,
+                allowEmpty: true,
+                min: 0
             }
         };
 
         try {
             let {
                 address,
                 limit,
-                page
+                page,
+                contract_address
             } = ctx.request.query;
             let options = {
                 address,
                 limit: limit ? parseInt(limit, 0) : 0,
-                page: page ? parseInt(page, 0) : 0
+                page: page ? parseInt(page, 0) : 0,
+                contract_address: contract_address || ''
             };
 
             ctx.validate(keysRule, options);
 
-            const nodesInfo = (await ctx.curl(apiServerProvider
+            let nodesInfo = (await ctx.curl(
+                apiServerProvider
                 + `/api/address/tokens?address=${address}&nodes_info=1&limit=${limit}&page=${page}`, {
-                dataType: 'json'
-            })).data;
+                    dataType: 'json'
+                }
+            )).data;
+
+            if (contract_address) {
+                nodesInfo = [nodesInfo.find(item => {
+                    if (item.contract_address === contract_address) {
+                        return true;
+                    }
+                })];
+            }
 
             let result = [];
             if (nodesInfo.length) {

app/controller/proxy.js

@@ -14,6 +14,7 @@
 // 校验、组装参数。
 // 调用 Service 进行业务处理，必要时处理转换 Service 的返回结果，让它适应用户的需求。
 // 通过 HTTP 将结果响应给用户。
+/* eslint-disable fecs-camelcase */
 'use strict';
 
 const Controller = require('../core/baseController.js');

app/router.js

@@ -6,6 +6,9 @@
 module.exports = app => {
     const {router, controller} = app;
     router.get('/', controller.home.index);
+
+    router.get('/test', controller.test.test);
+
     router.get('/transactiondetail', controller.home.transactionDetail);
 
     router.get('/wallet/api/proxy', controller.proxy.getProxy);

app/service/address.js

@@ -3,65 +3,116 @@
  * @author huangzongzhe
  * 2018.12
  */
+/* eslint-disable fecs-camelcase */
+
 const Service = require('../core/baseService');
-const {nodesHttpProviderSelect} = require('../utils/utils');
+const protoDecode = require('../utils/protoDecode');
+const Long = require('long');
+// const {nodesHttpProviderSelect} = require('../utils/utils');
 
-const GETBALANCETIMEOUT = 1000;
+// const GETBALANCETIMEOUT = 1000;
 
 class ProxyService extends Service {
 
+    // use Long.js to deal with Balance.
     async getTokens(options, nodesInfo) {
         const getTokensBalance = () => new Promise((resolve, reject) => {
             const ctx = this.ctx;
 
-            let tokensInfo = {};
             let tokensInfoArray = [];
             const nodesInfoLength = nodesInfo.length;
             tokensInfoArray.length = nodesInfoLength;
             let nodesInfoCount = 0;
 
-            nodesInfo.map((item, index) => {
-                const contract_address = item.contract_address;
-                const url = nodesHttpProviderSelect(item.api_domain, item.api_ip)
-                    + '/api/address/balance?'
-                    + `address=${options.address}`
-                    + `&contract_address=${contract_address}`;
-
-                let tokenInfo = {};
-
-                ctx.curl(url, {
-                    dataType: 'json',
-                    timeout: GETBALANCETIMEOUT
-                }).then(resut => {
-                    tokenInfo = resut.data;
-                    tokenInfo.error = 0;
-
-                }).catch(error => {
-                    let message = error.message;
-                    // Don not expose IP.
-                    message = message.split(',')[0];
-                    tokenInfo.msg = message;
-                    tokenInfo.error = 1;
-
-                }).finally(() => {
-                    tokenInfo.token_name = item.token_name;
-                    tokenInfo.chain_id = item.chain_id;
-                    tokenInfo.symbol = item.symbol;
-                    tokenInfo.name = item.name;
-                    tokenInfo.address = options.address;
-                    tokenInfo.contract_address = contract_address;
-
-                    tokenInfo.income = tokenInfo.income || 0;
-                    tokenInfo.expenditure = tokenInfo.expenditure || 0;
-                    tokenInfo.balance = tokenInfo.balance || 0;
-
+            const getBalance = (contractInstance, item, index) => {
+                contractInstance.GetBalance.call({
+                    symbol: item.symbol,
+                    owner: options.address
+                }, (err, result) => {
+                    let tokenInfo = {
+                        token_name: item.token_name,
+                        chain_id: item.chain_id,
+                        symbol: item.symbol,
+                        name: item.name,
+                        address: options.address,
+                        contract_address: item.contract_address,
+                        balance: {
+                            low: 0,
+                            high: 0,
+                            unsigned: true
+                        }
+                    };
+                    if (!err) {
+                        tokenInfo.balance = new Long(result.balance || '0');
+                    }
                     tokensInfoArray[index] = tokenInfo;
                     nodesInfoCount++;
 
                     if (nodesInfoCount === nodesInfoLength) {
                         resolve(tokensInfoArray);
                     }
                 });
+            };
+
+            nodesInfo.map((item, index) => {
+                // 1.看插件是否初始化了实例，如果初始化了，使用。
+                // 2.如果没有初始化，初始化实例，并使用。
+                const aelfContractInstances = ctx.app.aelf.contractInstances;
+                const {
+                    contract_address,
+                    chain_id
+                } = item;
+                if (aelfContractInstances[contract_address + chain_id]) {
+                    getBalance(aelfContractInstances[contract_address + chain_id], item, index);
+                }
+                else {
+                    ctx.app.aelf.initContractInstance(item).then(contractInstance => {
+                        getBalance(contractInstance, item, index);
+                    });
+                }
+
+                // Backup 方案, 不走rpc，走 aelf-block-api
+                // const contract_address = item.contract_address;
+                // const url = nodesHttpProviderSelect(item.api_domain, item.api_ip)
+                //     + '/api/address/balance?'
+                //     + `address=${options.address}`
+                //     + `&contract_address=${contract_address}`;
+
+                // let tokenInfo = {};
+
+                // ctx.curl(url, {
+                //     dataType: 'json',
+                //     timeout: GETBALANCETIMEOUT
+                // }).then(resut => {
+                //     tokenInfo = resut.data;
+                //     tokenInfo.error = 0;
+
+                // }).catch(error => {
+                //     let message = error.message;
+                //     // Don not expose IP.
+                //     message = message.split(',')[0];
+                //     tokenInfo.msg = message;
+                //     tokenInfo.error = 1;
+
+                // }).finally(() => {
+                //     tokenInfo.token_name = item.token_name;
+                //     tokenInfo.chain_id = item.chain_id;
+                //     tokenInfo.symbol = item.symbol;
+                //     tokenInfo.name = item.name;
+                //     tokenInfo.address = options.address;
+                //     tokenInfo.contract_address = contract_address;
+
+                //     tokenInfo.income = tokenInfo.income || 0;
+                //     tokenInfo.expenditure = tokenInfo.expenditure || 0;
+                //     tokenInfo.balance = tokenInfo.balance || 0;
+
+                //     tokensInfoArray[index] = tokenInfo;
+                //     nodesInfoCount++;
+
+                //     if (nodesInfoCount === nodesInfoLength) {
+                //         resolve(tokensInfoArray);
+                //     }
+                // });
             });
         });
 
@@ -72,4 +123,4 @@ class ProxyService extends Service {
 
 }
 
-module.exports = ProxyService;
+module.exports = ProxyService;

app/utils/protoDecode.js

@@ -0,0 +1,17 @@
+/**
+ * @file protoDecode.js
+ * @author huangzongzhe
+ * useless now
+ */
+
+const proto = require('aelf-sdk').pbjs;
+const stringToBuffer = require('./stringToBuffer');
+
+function protoToInt64(protoValue) {
+    const reader = new proto.Reader(stringToBuffer(protoValue));
+    return reader.uint64();
+}
+
+module.exports = {
+    protoToInt64
+};

app/utils/stringToBuffer.js

@@ -0,0 +1,16 @@
+/**
+ * @file stringToBuffer.js
+ * @author huangzongzhe
+ * useless now
+ */
+
+module.exports = function (input) {
+    let resultArray = [];
+    if (typeof input !== 'string' || input.length % 2 !== 0) {
+        throw Error('invalid input');
+    }
+    for (let i = 0, length = input.length; i < length; i += 2) {
+        resultArray.push('0x' + input.slice(i, i + 2));
+    }
+    return Buffer.from(resultArray);
+};

app/web/js/langConfig/en-US.js

@@ -4,7 +4,7 @@
  *  intl 英文词库
  */
 
-const en_US = {
+export default {
     'aelf.': ' ',
     'aelf.WalletDetail': 'WalletDetail',
     'aelf.TransactionList': 'Transaction List',
@@ -48,7 +48,7 @@ const en_US = {
     'aelf.Becareful08': 'Please write them down carefully and keep them in a secure location！',
     'aelf.Becareful09': 'Please DO NOT use screen capture!',
     'aelf.Becareful010': 'If anyone obtains your Mnemonic, they WILL obtain your digital assets!',
-    'aelf.Confirm Mnemonic ': 'Confirm Mnemonic',
+    'aelf.ConfirmMnemonic ': 'Confirm Mnemonic',
     'aelf.hint01': 'Mnemonic is not in the right sequence, please rearrange!',
     'aelf.hint02': 'To confirm your backup, please click on the Mnemonic in order.',
     'aelf.Copy Private Key': 'Copy Private Key',
@@ -67,8 +67,7 @@ const en_US = {
     'aelf.Old password': 'Old password',
     'aelf.Forget your password': 'Forget your password? Importing mnemonic or private key can be reset.',
     'aelf.Immediately import': 'Immediately import',
-    'aelf.hint03': 'In this wallet, there is no Mnemonic when import Private Key. But we can get '
-    + 'Private Key when we import Mnemonic.',
+    'aelf.hint03': 'In this wallet, there is no Mnemonic when import Private Key. But we can get Private Key when we import Mnemonic.',
     'aelf.Import': 'Import',
     'aelf.System Setting': 'System Setting',
     'aelf.Network': 'Network',
@@ -88,20 +87,10 @@ const en_US = {
     'aelf.HelpTitle04': 'What is the AElf Wallet?',
     'aelf.HelpTitle05': 'How to change the password?',
     'aelf.HelpTitle06': 'What if I forget my password?',
-    'aelf.mnemonicCon01': 'The Mnemonics is equivalent to the bank card + '
-    + 'password of a traditional financial institution. '
-    + 'Please keep it in a safe place. A Mnemonics is another manifestation of a plaintext private'
-    + ' key that is designed to help users remember'
-    + ' complex private keys (64-bit hashes). Mnemonicss are generally composed of 12, 15, 18, and 21 words. These'
-    + ' words are taken from a fixed vocabulary. The order of generation '
-    + 'is also based on a certain algorithm. The Mnemonics is an unencrypted private '
-    + 'key. When people get your Mnemonics, you can take away your assets with little effort.',
+    'aelf.mnemonicCon01': 'The Mnemonics is equivalent to the bank card + password of a traditional financial institution. Please keep it in a safe place. A Mnemonics is another manifestation of a plaintext private key that is designed to help users remember complex private keys (64-bit hashes). Mnemonicss are generally composed of 12, 15, 18, and 21 words. These words are taken from a fixed vocabulary. The order of generation is also based on a certain algorithm. The Mnemonics is an unencrypted private key. When people get your Mnemonics, you can take away your assets with little effort.',
     'aelf.mnemonicCon02': 'Therefore, users must pay attention to three points when backing up the Mnemonics:',
-    'aelf.mnemonicCon03': '1. Use physical media as much as possible. For example, write Mnemonicss on paper. '
-    + 'Do not use screenshots or photos on networked devices as much as possible to prevent hackers from stealing.',
-    'aelf.mnemonicCon04': '2. Verify that the backup Mnemonics is correct multiple times.'
-    + ' Once you have misread a letter or word, it will bring great suffering to the sub'
-    + 'sequent retrieval of the correct Mnemonics.',
+    'aelf.mnemonicCon03': '1. Use physical media as much as possible. For example, write Mnemonicss on paper. Do not use screenshots or photos on networked devices as much as possible to prevent hackers from stealing.',
+    'aelf.mnemonicCon04': '2. Verify that the backup Mnemonics is correct multiple times. Once you have misread a letter or word, it will bring great suffering to the subsequent retrieval of the correct Mnemonics.',
     'aelf.mnemonicCon05': '3. Keep the Mnemonics after the backup in a safe place, and do a good job of anti-theft and anti-lost measures.',
     'aefl.keystoreCon01': 'The Keystore file is a file format (JSON) for storing the private key. It uses user-defined password encryption to protect the wallet to a certain extent, and the degree of protection depends on the password strength of the wallet. If the password is similar to 123456, it is extremely unsafe.',
     'aefl.keystoreCon02': 'So users must pay attention to three points when backing up Keystore:',
@@ -149,5 +138,3 @@ const en_US = {
     'aelf.The passwords confirmed error.': 'The passwords confirmed error.',
     'aelf.The passwords is not strong.': 'The passwords is not strong.'
 };
-
-export default en_US;