Merge branch 'master' of https://github.com/AElfProject/aelf-block-explorer

Author: hzz780

config/config.js

@@ -18,7 +18,7 @@ const ADDRESS_INFO = {
 // ChainId: tDVY, Symbol: EDC (AElf developer support chain C)
 // ChainId: tDVZ, Symbol: EDD (AElf developer support chain D)
 const CHAINS_LINK = {
-  AELF: 'http://explorer-test.aelf.io',
+  AELF: 'https://explorer-test.aelf.io',
   tDVV: 'https://explorer-test-side01.aelf.io',
   tDVW: 'https://explorer-test-side02.aelf.io',
   tDVX: 'https://explorer-test-side03.aelf.io',

config/config.json

@@ -11,6 +11,28 @@
     "tokenConverter": "AElf.ContractNames.TokenConverter",
     "feeReceiverContract": "AElf.ContractNames.Token"
   },
+  "schemeIds": [
+    {
+      "type": "CitizenWelfare",
+      "schemeId": "f2e70e09c94616f91f6b084d9a2c025d2cb27aea1860cf3f467b496c647b163f"
+    },
+    {
+      "type": "BackupSubsidy",
+      "schemeId": "208d098067699730d220f1997d48c8b8d8881bb8507abfad1b07d9af8ba94bb0"
+    },
+    {
+      "type": "VotesWeight",
+      "schemeId": "9a7f406cf485dd91439c848dea23b5c03029aee63cd8077710ca05865f73ed99"
+    },
+    {
+      "type": "MinerBasic",
+      "schemeId": "58c0ee2b5eab330cafa5df680399a6374c7e86bbbcabeda0b70eb0a98a4f788a"
+    },
+    {
+      "type": "ReElection",
+      "schemeId": "291c0cc8fd51e02c02cb95c235f8d41a14793f8e8bf4810e3e44aaf89e7c3389"
+    }
+  ],
   "voteContractAddr": "xw6U3FRE5H8rU3z8vAgF9ivnWSkxULK5cibdZzMC9UWf7rPJf",
   "electionContractAddr": "2J9wWhuyz7Drkmtu9DTegM9rLmamjekmRkCAWz5YYPjm7akfbH",
   "profitContractAddr": "jDpXvpfC2qpriNFgZh68nRpJ5juN51ehcJNJwAcr5Z1UhfFTJ",

package.json

@@ -13,7 +13,7 @@
     "commit": "git-cz"
   },
   "dependencies": {
-    "aelf-sdk": "3.2.23",
+    "aelf-sdk": "3.2.24",
     "antd": "^3.24.2",
     "apisauce": "^0.16.0",
     "axios": "^0.18.0",
@@ -31,6 +31,7 @@
     "query-string": "^5.0.0",
     "react": "^16.5.1",
     "react-dom": "^16.5.1",
+    "react-if": "^3.4.3",
     "react-redux": "^7.1.1",
     "react-router": "^4.3.1",
     "react-router-dom": "^4.3.1",

scripts/queryConfigs.js

@@ -16,7 +16,8 @@ const result = {
 
 async function getConfig() {
     const {
-        CONTRACTS
+        CONTRACTS,
+        schemeIds
     } = config;
     const {
         ChainId,
@@ -35,6 +36,26 @@ async function getConfig() {
             result.SYMBOL = symbol;
         }
     }
+    if (result.electionContractAddr) {
+        const profit = await aelf.chain.contractAt(result.profitContractAddr, wallet);
+        const electionSchemeIds = (await profit.GetManagingSchemeIds.call({
+            manager: result.electionContractAddr
+        })).schemeIds;
+        const treasurySchemaIds = (await profit.GetManagingSchemeIds.call({
+            manager: result.dividends
+        })).schemeIds;
+        const schemes = [
+            treasurySchemaIds[1],
+            electionSchemeIds[0],
+            treasurySchemaIds[3],
+            treasurySchemaIds[2],
+            treasurySchemaIds[4]
+        ].map((v, i) => ({
+            type: schemeIds[i].type,
+            schemeId: v
+        }));
+        result.schemeIds = schemes;
+    }
     console.log(result);
     fs.writeFileSync(path.resolve('./config/config.json'), `${JSON.stringify(result, null, 2)}\n`);
 }

src/assets/less/common.less

@@ -35,6 +35,10 @@
   text-align: left;
 }
 
+.text-right {
+  text-align: right;
+}
+
 .bold-text {
   font-weight: bold;
 }

src/components/StatisticalData/index.js

@@ -65,25 +65,24 @@ export default class StatisticalData extends PureComponent {
   }
 
   renderList(arr) {
-    return arr.map(item => {
+    return arr.map((item, index) => {
       let number = item.num;
       if (item.id === 3) {
         number = (number / 100000000).toFixed(2);
       }
 
       return item.isCountdown ? (
         <Countdown
-          key={Math.random()}
+          key={index}
           title={item.title}
           value={item.num || 0}
           format="D day HH : mm : ss "
           onFinish={() => {
-            console.log('finished');
             this.handleFinish(item.id);
           }}
         />
       ) : (
-        <Statistic key={Math.random()} title={item.title} value={number} />
+        <Statistic key={index} title={item.title} value={isNaN(parseInt(number, 10)) ? 0 : number} />
       );
     });
   }

src/constants.js

@@ -8,9 +8,7 @@ import { Link } from 'react-router-dom';
 import { Icon } from 'antd';
 import dayjs from 'dayjs';
 import relativeTime from 'dayjs/plugin/relativeTime';
-import { isArray } from 'zrender/lib/core/util';
 
-import Button from './components/Button/Button';
 import { DEFAUTRPCSERVER, SYMBOL, CHAIN_ID, ADDRESS_INFO } from '../config/config';
 import { thousandsCommaWithDecimal } from '@utils/formater';