Merge branch 'feature/jira-557-events-search' into 'release/1.4.0'

Feature/jira 557 events search

See merge request jd-blockchain/explorer!2

data-explorer/server/routes/ledgers.js

@@ -15,171 +15,188 @@ router.get('/:ledgerHash/settings', function(req, res) {
 
   Object.assign(ret, resultData,{
     "data": {
-        "consensusProtocol": 1,
-        "consensusSettings": {
-            "commitBlockSettings": {
-                "maxDelayMilliSecondsPerBlock": 500,
-                "txSizePerBlock": 15
-            },
-            "nodes": [{
-                "address": "LdeP1fLeUnmrQHr4ryGmoQ4ubzAvcrgayUK8U",
-                "id": 0,
-                "networkAddress": {
-                    "host": "127.0.0.1",
-                    "port": 8910,
-                    "secure": false
-                },
-                "pubKey": {
-                    "value": "7VeRBxpPoCzAS6AavVoe1HGpJsz68kcZEYzN1fkg3GgASvkb"
-                }
-            }, {
-                "address": "LdeP2xKyNFeYhgzDGn5Vq2dndCUNCeLYLyh1k",
-                "id": 1,
-                "networkAddress": {
-                    "host": "127.0.0.1",
-                    "port": 8920,
-                    "secure": false
-                },
-                "pubKey": {
-                    "value": "7VeRJ9PiL7sCGKc56uckEwvKZnxqk9VfMedanGoKtM4CQ3yM"
-                }
-            }, {
-                "address": "LdeNrvP3Q4NDjjeidcaqKGz3cWotf4qmTZmeK",
-                "id": 2,
-                "networkAddress": {
-                    "host": "127.0.0.1",
-                    "port": 8930,
-                    "secure": false
-                },
-                "pubKey": {
-                    "value": "7VeRG8n49ocQYEvievU971e7uJMhRPTkLS3qJr4NJBahysYY"
-                }
-            }, {
-                "address": "LdeNisAU3fBAtEfTrdH7fXSYidAbAmBZBeP5c",
-                "id": 3,
-                "networkAddress": {
-                    "host": "127.0.0.1",
-                    "port": 8940,
-                    "secure": false
-                },
-                "pubKey": {
-                    "value": "7VeRFzWif8yGXa8GRYri7jFLevqryxZTJ6m9NiEUSfUNqKy8"
-                }
-            }],
-            "systemConfigs": [{
-                "name": "system.bft",
-                "value": "true"
-            }, {
-                "name": "system.communication.defaultkeys",
-                "value": "true"
-            }, {
-                "name": "system.communication.inQueueSize",
-                "value": "500000"
-            }, {
-                "name": "system.communication.outQueueSize",
-                "value": "500000"
-            }, {
-                "name": "system.communication.useMACs",
-                "value": "1"
-            }, {
-                "name": "system.communication.useSenderThread",
-                "value": "true"
-            }, {
-                "name": "system.communication.useSignatures",
-                "value": "0"
-            }, {
-                "name": "system.debug",
-                "value": "0"
-            }, {
-                "name": "system.servers.num",
-                "value": "4"
-            }, {
-                "name": "system.shutdownhook",
-                "value": "true"
-            }, {
-                "name": "system.totalordermulticast.checkpoint_period",
-                "value": "1000"
-            }, {
-                "name": "system.totalordermulticast.checkpoint_to_disk",
-                "value": "false"
-            }, {
-                "name": "system.totalordermulticast.global_checkpoint_period",
-                "value": "120000"
-            }, {
-                "name": "system.totalordermulticast.highMark",
-                "value": "10000"
-            }, {
-                "name": "system.totalordermulticast.log",
-                "value": "true"
-            }, {
-                "name": "system.totalordermulticast.log_parallel",
-                "value": "false"
-            }, {
-                "name": "system.totalordermulticast.log_to_disk",
-                "value": "false"
-            }, {
-                "name": "system.totalordermulticast.maxbatchsize",
-                "value": "400"
-            }, {
-                "name": "system.totalordermulticast.nonces",
-                "value": "10"
-            }, {
-                "name": "system.totalordermulticast.revival_highMark",
-                "value": "10"
-            }, {
-                "name": "system.totalordermulticast.state_transfer",
-                "value": "true"
-            }, {
-                "name": "system.totalordermulticast.sync_ckp",
-                "value": "false"
-            }, {
-                "name": "system.totalordermulticast.sync_log",
-                "value": "false"
-            }, {
-                "name": "system.totalordermulticast.timeout",
-                "value": "2000"
-            }, {
-                "name": "system.totalordermulticast.timeout_highMark",
-                "value": "200"
-            }, {
-                "name": "system.totalordermulticast.verifyTimestamps",
-                "value": "false"
-            }, {
-                "name": "system.ttp.id",
-                "value": "7002"
-            }]
-        },
-        "cryptoSetting": {
-            "autoVerifyHash": true,
-            "hashAlgorithm": 8216
-        },
-        "ledgerStructureVersion": 0,
-        "participantNodes": [{
-            "address": "LdeP1fLeUnmrQHr4ryGmoQ4ubzAvcrgayUK8U",
-            "id": 0,
-            "name": "jd.com",
-            "pubKey": "7VeRBxpPoCzAS6AavVoe1HGpJsz68kcZEYzN1fkg3GgASvkb"
+      "consensusProtocol": "com.jd.blockchain.consensus.bftsmart.BftsmartConsensusProvider",
+      "consensusSettings": {
+        "nodes": [{
+          "address": "LdeNxy22cbRuohUTWWcdsx7dq7fawh7yAVwJR",
+          "id": 0,
+          "networkAddress": {
+            "host": "127.0.0.1",
+            "port": 10080,
+            "secure": false
+          },
+          "pubKey": "7VeRJtmGhWZJKmjxHaKVdSUxSrYwumCHvdR4dKdWu8xpmcwZ"
+        }, {
+          "address": "LdeNjeSZfY2stPYiSwaW6ScpdvSJvJa9VQmhb",
+          "id": 1,
+          "networkAddress": {
+            "host": "127.0.0.1",
+            "port": 10082,
+            "secure": false
+          },
+          "pubKey": "7VeRLj8MzLLhXfPsZd2giUJNhKu6oxs5Ucm1o6DJBPLt7TVR"
+        }, {
+          "address": "LdeNgyuxXGUwEFCuuPL1wb5RJroqhJdTsyCTW",
+          "id": 2,
+          "networkAddress": {
+            "host": "127.0.0.1",
+            "port": 10084,
+            "secure": false
+          },
+          "pubKey": "7VeRLuzSAiKBNDhYB7AaYfvfgTjVTUCaXHLdJ2BWZSLn8po4"
+        }, {
+          "address": "LdeNkSbfPR5BhfoTdnDBzJ9DZ8kMmGxrKj2Ug",
+          "id": 3,
+          "networkAddress": {
+            "host": "127.0.0.1",
+            "port": 10086,
+            "secure": false
+          },
+          "pubKey": "7VeRHTYKbj1Ua6To2zjozUL8xpwrbiTqgWPJmaCzfVN7ioPr"
+        }],
+        "systemConfigs": [{
+          "name": "system.bft",
+          "value": "true"
+        }, {
+          "name": "system.communication.defaultkeys",
+          "value": "true"
+        }, {
+          "name": "system.communication.inQueueSize",
+          "value": "500000"
+        }, {
+          "name": "system.communication.outQueueSize",
+          "value": "500000"
+        }, {
+          "name": "system.communication.useMACs",
+          "value": "1"
+        }, {
+          "name": "system.communication.useSenderThread",
+          "value": "true"
+        }, {
+          "name": "system.communication.useSignatures",
+          "value": "0"
+        }, {
+          "name": "system.debug",
+          "value": "0"
+        }, {
+          "name": "system.initial.view",
+          "value": "0,1,2,3"
+        }, {
+          "name": "system.servers.f",
+          "value": "1"
+        }, {
+          "name": "system.servers.num",
+          "value": "4"
+        }, {
+          "name": "system.shutdownhook",
+          "value": "true"
         }, {
-            "address": "LdeP2xKyNFeYhgzDGn5Vq2dndCUNCeLYLyh1k",
-            "id": 1,
-            "name": "at.com",
-            "pubKey": "7VeRJ9PiL7sCGKc56uckEwvKZnxqk9VfMedanGoKtM4CQ3yM"
+          "name": "system.totalordermulticast.checkpoint_period",
+          "value": "1000"
         }, {
-            "address": "LdeNrvP3Q4NDjjeidcaqKGz3cWotf4qmTZmeK",
-            "id": 2,
-            "name": "bt.com",
-            "pubKey": "7VeRG8n49ocQYEvievU971e7uJMhRPTkLS3qJr4NJBahysYY"
+          "name": "system.totalordermulticast.checkpoint_to_disk",
+          "value": "false"
         }, {
-            "address": "LdeNisAU3fBAtEfTrdH7fXSYidAbAmBZBeP5c",
-            "id": 3,
-            "name": "xt.com",
-            "pubKey": "7VeRFzWif8yGXa8GRYri7jFLevqryxZTJ6m9NiEUSfUNqKy8"
+          "name": "system.totalordermulticast.global_checkpoint_period",
+          "value": "120000"
+        }, {
+          "name": "system.totalordermulticast.highMark",
+          "value": "10000"
+        }, {
+          "name": "system.totalordermulticast.log",
+          "value": "true"
+        }, {
+          "name": "system.totalordermulticast.log_parallel",
+          "value": "false"
+        }, {
+          "name": "system.totalordermulticast.log_to_disk",
+          "value": "false"
+        }, {
+          "name": "system.totalordermulticast.maxbatchsize",
+          "value": "2000"
+        }, {
+          "name": "system.totalordermulticast.nonces",
+          "value": "10"
+        }, {
+          "name": "system.totalordermulticast.revival_highMark",
+          "value": "10"
+        }, {
+          "name": "system.totalordermulticast.state_transfer",
+          "value": "true"
+        }, {
+          "name": "system.totalordermulticast.sync_ckp",
+          "value": "false"
+        }, {
+          "name": "system.totalordermulticast.sync_log",
+          "value": "false"
+        }, {
+          "name": "system.totalordermulticast.timeout",
+          "value": "60000"
+        }, {
+          "name": "system.totalordermulticast.timeout_highMark",
+          "value": "200"
+        }, {
+          "name": "system.totalordermulticast.verifyTimestamps",
+          "value": "false"
+        }, {
+          "name": "system.ttp.id",
+          "value": "7002"
         }],
-        // "participantsHash": {
-        //     "value": "j5vDDASBGRAynVmopq2q4obNPZmbJMwGnDWsHnSgz9nuS9"
-        // },
-        "participantsHash": "j5vDDASBGRAynVmopq2q4obNPZmbJMwGnDWsHnSgz9nuS9",
-        "seed": "932dfe23-fe23232f-283f32fa-dd32aa76-8322ca2f-56236cda-7136b322-cb323ffe"
+        "viewId": 0
+      },
+      "cryptoSetting": {
+        "autoVerifyHash": false,
+        "hashAlgorithm": 8216,
+        "supportedProviders": [{
+          "algorithms": [{
+            "code": -32230,
+            "name": "AES"
+          }, null, null, null, null, null, null],
+          "name": "com.jd.blockchain.crypto.service.classic.ClassicCryptoService"
+        }, {
+          "algorithms": [null, {
+            "code": 8195,
+            "name": "SM3"
+          }, null],
+          "name": "com.jd.blockchain.crypto.service.sm.SMCryptoService"
+        }]
+      },
+      "ledgerStructureVersion": 0,
+      "participantNodes": [{
+        "address": {
+          "value": "LdeNkSbfPR5BhfoTdnDBzJ9DZ8kMmGxrKj2Ug"
+        },
+        "id": 3,
+        "name": "3",
+        "participantNodeState": "CONSENSUS",
+        "pubKey": "7VeRHTYKbj1Ua6To2zjozUL8xpwrbiTqgWPJmaCzfVN7ioPr"
+      }, {
+        "address": {
+          "value": "LdeNxy22cbRuohUTWWcdsx7dq7fawh7yAVwJR"
+        },
+        "id": 0,
+        "name": "0",
+        "participantNodeState": "CONSENSUS",
+        "pubKey": "7VeRJtmGhWZJKmjxHaKVdSUxSrYwumCHvdR4dKdWu8xpmcwZ"
+      }, {
+        "address": {
+          "value": "LdeNgyuxXGUwEFCuuPL1wb5RJroqhJdTsyCTW"
+        },
+        "id": 2,
+        "name": "2",
+        "participantNodeState": "CONSENSUS",
+        "pubKey": "7VeRLuzSAiKBNDhYB7AaYfvfgTjVTUCaXHLdJ2BWZSLn8po4"
+      }, {
+        "address": {
+          "value": "LdeNjeSZfY2stPYiSwaW6ScpdvSJvJa9VQmhb"
+        },
+        "id": 1,
+        "name": "1",
+        "participantNodeState": "CONSENSUS",
+        "pubKey": "7VeRLj8MzLLhXfPsZd2giUJNhKu6oxs5Ucm1o6DJBPLt7TVR"
+      }],
+      "participantsHash": "j5pWhURErZQe3t2dwBq6W29MoYXvzFtHiQpeFLqAVdkNZ6",
+      "seed": "de9ae189-c938934b-f7483ec3-4b990aea-da183d91-425ba5f1-6baaff15-47a33564"
     },
     "success": true
   });
@@ -1262,12 +1279,26 @@ router.get('/:ledger/accounts/address/:address', function(req, res) {
 
   Object.assign(ret, resultData,{
     "data": {
-      "address": {
-        "value": "5Sm4gWXrNpDWW9Boi4xZCzZMHboRvEDm29Fa"
+      "address":
+      
+      { "value": "LdeP2fggAK1icRgsSjPHrtbLawsK947Kr5Wnx" }
+      ,
+      "headerRootHash": "j5qaaqyBqyb14LKbu3qMrqcv5UFnuYNKGBebE6X5LXKCKs",
+      "iD": {
+      "address":
+      
+      { "value": "LdeP2fggAK1icRgsSjPHrtbLawsK947Kr5Wnx" }
+      ,
+      "pubKey": "7VeR8t8kECBTJ9hCPwZonEvQYVD74Ko4wQR5soSVdS122pdV"
       },
-      "rootHash": "6GiAH2PBRLnoE724ia83bKVijkKsNuNU5danA4AAi5qMM",
-      "pubKey": "mavweXqvKGUAJzSxE9S15pV7c7qe9bgUn5R1HwpqmXVTUs"
+      "dataset":
+      
+      { "readonly": false, "rootHash": "j5uJfAqLw1ptaZYJyKVZm37zZybboqxMPpS6Mv59rNd4xF", "updated": false, "dataCount": 0 }
+      ,
+      "dataRootHash": "j5uJfAqLw1ptaZYJyKVZm37zZybboqxMPpS6Mv59rNd4xF",
+      "pubKey": "7VeR8t8kECBTJ9hCPwZonEvQYVD74Ko4wQR5soSVdS122pdV"
     },
+    "success": true
   });
 
   res.send(ret);

data-explorer/src/web/components/accountInfo/accountInfo.t.html

@@ -2,30 +2,44 @@
   <h3>数据详情</h3>
   <div class="{styles.info}">
     <fj-Row class="{styles.gl}">
-      <fj-Col l=1  s=4  xs=12>数据账户根哈希
+      <fj-Col l=1  s=4  xs=12>头根哈希
       </fj-Col>
       <fj-Col l=5  s=8  xs=12>
-        <#if {{accountData && accountData.rootHash && accountData.rootHash}}>
-          {accountData.rootHash}
+        <#if {{accountData && accountData.headerRootHash && accountData.headerRootHash}}>
+          {accountData.headerRootHash}
           <#elseif {{accountData && accountData.address && accountData.address.value}}>
-            <AccountRootHash  address={accountData.address.value}/>
+            <AccountRootHash  address={accountData.address.value} hash="header"/>
           </#elseif>
           <#else>
             ''
           </#else>
         </#if>
       </fj-Col>
-       <fj-Col l=1  s=4  xs=12>数据账户地址
+      <fj-Col l=1  s=4  xs=12>数据根哈希
+      </fj-Col>
+      <fj-Col l=5  s=8  xs=12>
+        <#if {{accountData && accountData.dataRootHash && accountData.dataRootHash}}>
+          {accountData.dataRootHash}
+          <#elseif {{accountData && accountData.address && accountData.address.value}}>
+            <AccountRootHash  address={accountData.address.value} hash="data"/>
+          </#elseif>
+          <#else>
+            ''
+          </#else>
+        </#if>
+      </fj-Col>
+      <fj-Col l=1  s=4  xs=12>数据账户地址
       </fj-Col>
       <fj-Col l=5  s=8  xs=12>{accountData && accountData.address && accountData.address.value || ''}
       </fj-Col>
-    </fj-Row>
-    <fj-Row class="{styles.gl}">
       <fj-Col l=1  s=4  xs=12>数据账户公钥
       </fj-Col>
       <fj-Col l=5  s=8  xs=12>{accountData && accountData.pubKey && accountData.pubKey || ''}
       </fj-Col>
-       <fj-Col l=1  s=4  xs=12>KV数量
+    </fj-Row>
+    <fj-Row class="{styles.gl}">
+      
+      <fj-Col l=1  s=4  xs=12>KV数量
       </fj-Col>
       <fj-Col l=5  s=8  xs=12><KvCount address={accountData.address.value} key={accountData.address.value} />
       </fj-Col>

data-explorer/src/web/components/accountRootHash/accountRootHash.js

@@ -16,13 +16,19 @@ export default class AccountRootHash extends Component {
 
   @observable roothash='-';
   componentDidMount() {
-    const { store: { account, common },address } = this.props;
+    const { store: { account, common },address, hash } = this.props;
     let ledger =this.props.store.common.getDefaultLedger();
     let param={ledger:ledger,address:address};
     Promise.all([
       account.getAccountInfo(param),
     ]).then((success) => {
-     this.roothash=success[0].rootHash.value||'-';
+      console.log(success)
+      if (hash == 'data') {
+        this.roothash=success[0].dataRootHash||'-';
+      } else {
+        this.roothash=success[0].headerRootHash||'-';
+      }
+    //  this.roothash=success[0].rootHash.value||'-';
     });
   }
   render() {

data-explorer/src/web/components/header/header.js

@@ -87,7 +87,7 @@ export default class Header extends Component {
   // 交易列表
   @computed get tableColumns() {
     return [{
-      title: '参与方序号',
+      title: '参与方ID',
       dataIndex: 'id',
       key:'id'
     },
@@ -98,7 +98,7 @@ export default class Header extends Component {
     },
     {
       title: '参与方地址',
-      dataIndex: 'address',
+      dataIndex: 'address.value',
       key:'address'
     },
     {

data-explorer/src/web/pages/account/account.js

@@ -176,20 +176,21 @@ export default class Account extends Component {
       render: (text, record, index) => nj`
        ${text}<br/>算法：${tranBase58(text)}
       `()
-    }, {
-      title: '默克尔树根哈希',
-      dataIndex: 'rootHash',
-      key: 'rootHash',
-      width: '25%',
-      render: (text, record, index) => nj`
-        <#if ${text}>
-          ${text}
-          <#else>
-            <AccountRootHash address=${record.address}/>
-          </#else>
-        </#if>
-      `()
-    },
+    }, 
+    // {
+    //   title: '默克尔树根哈希',
+    //   dataIndex: 'rootHash',
+    //   key: 'rootHash',
+    //   width: '25%',
+    //   render: (text, record, index) => nj`
+    //     <#if ${text}>
+    //       ${text}
+    //       <#else>
+    //         <AccountRootHash address=${record.address}/>
+    //       </#else>
+    //     </#if>
+    //   `()
+    // },
     {
       title: 'KV',
       dataIndex: 'address.value',

data-explorer/src/web/pages/contract/contract.js

@@ -131,19 +131,21 @@ export default class Contract extends Component {
       render: (text, record, index) => nj `
       ${text}<br/>算法：${tranBase58(text)}
       `()
-    }, {
-      title: '合约根哈希',
-      dataIndex: 'rootHash',
-      key:'rootHash',
-      render: (text, record, index) => nj `
-        <#if ${text}>
-          ${text}
-          <#else>
-            <ContractsRootHash address=${record.address.value}/>
-          </#else>
-        </#if>
-      `()
-    },{
+    }, 
+    // {
+    //   title: '合约根哈希',
+    //   dataIndex: 'rootHash',
+    //   key:'rootHash',
+    //   render: (text, record, index) => nj `
+    //     <#if ${text}>
+    //       ${text}
+    //       <#else>
+    //         <ContractsRootHash address=${record.address.value}/>
+    //       </#else>
+    //     </#if>
+    //   `()
+    // },
+    {
       title: '操作',
       dataIndex: 'address.value',
       key:'chainCode',