diff --git a/data-explorer/server/routes/ledgers.js b/data-explorer/server/routes/ledgers.js index 6a9a797e30a90fe97a0c58f29b0c8ac7062c8069..1173dbe9a2c9bf3deeb51a2f40e8156445524e9d 100644 --- a/data-explorer/server/routes/ledgers.js +++ b/data-explorer/server/routes/ledgers.js @@ -1372,21 +1372,13 @@ router.get('/:ledger/txs/hash/:tx_hash', function(req, res) { "timestamp": 1603438749987 }, "endpointSignatures": [{ - "digest": { - "value": "SMKmmXbUx8rnLz1Puz13zmLEoM8jN9bXWUM2DCCjJNmXtbdkiHQr46ogntVF38M49BCWo63KeAHdVTEvpWCVPj1qVH" - }, - "pubKey": { - "value": "7VeRLdGtSz1Y91gjLTqEdnkotzUfaAqdap3xw6fQ1yKHkvVq" - } + "digest": "SMKmmXbUx8rnLz1Puz13zmLEoM8jN9bXWUM2DCCjJNmXtbdkiHQr46ogntVF38M49BCWo63KeAHdVTEvpWCVPj1qVH", + "pubKey": "7VeRLdGtSz1Y91gjLTqEdnkotzUfaAqdap3xw6fQ1yKHkvVq", }], "transactionHash":"j5kz23qsWQiJy3WHwJRULXSnbaXp4UUA592sMYnk4vtzqL", "nodeSignatures": [{ - "digest": { - "value": "SMKmmXbUx8rnLz1Puz13zmLEoM8jN9bXWUM2DCCjJNmXtbdkiHQr46ogntVF38M49BCWo63KeAHdVTEvpWCVPj1qVH" - }, - "pubKey": { - "value": "7VeRLdGtSz1Y91gjLTqEdnkotzUfaAqdap3xw6fQ1yKHkvVq" - } + "digest":"SMKmmXbUx8rnLz1Puz13zmLEoM8jN9bXWUM2DCCjJNmXtbdkiHQr46ogntVF38M49BCWo63KeAHdVTEvpWCVPj1qVH", + "pubKey":"7VeRLdGtSz1Y91gjLTqEdnkotzUfaAqdap3xw6fQ1yKHkvVq" }] }, "blockHeight": 15, diff --git a/data-explorer/src/web/components/accountInfo/accountInfo.t.html b/data-explorer/src/web/components/accountInfo/accountInfo.t.html index 90deb5d052cb7df039a866e0b77cd50fe1399a10..e721d4e8b8c9f0c8b92f2ad8e09107fffda32452 100644 --- a/data-explorer/src/web/components/accountInfo/accountInfo.t.html +++ b/data-explorer/src/web/components/accountInfo/accountInfo.t.html @@ -23,7 +23,7 @@ 数据账户公钥 - {accountData && accountData.pubKey && accountData.pubKey.value || ''} + {accountData && accountData.pubKey && accountData.pubKey || ''} KV数量 diff --git a/data-explorer/src/web/components/eventInfo/eventInfo.js b/data-explorer/src/web/components/eventInfo/eventInfo.js index a73e3c58f4082a09a34867c729543da09c4512b2..37e41b96676837681842e0ae915980f769981c26 100644 --- a/data-explorer/src/web/components/eventInfo/eventInfo.js +++ b/data-explorer/src/web/components/eventInfo/eventInfo.js @@ -295,7 +295,7 @@ export default class EventInfo extends Component { {data.address && data.address.value && data.address.value || ''} 事件账户公钥: - {data.pubKey && data.pubKey.value && data.pubKey.value || ''} + {data.pubKey && data.pubKey && data.pubKey || ''}

事件列表

diff --git a/data-explorer/src/web/components/header/header.js b/data-explorer/src/web/components/header/header.js index 0d0eefe950948ac34a4e9792f9cdcbb1e3c8ac9b..8e603f87f2a9e84cb97167cd3f97abc654d199be 100644 --- a/data-explorer/src/web/components/header/header.js +++ b/data-explorer/src/web/components/header/header.js @@ -98,17 +98,17 @@ export default class Header extends Component { }, { title: '参与方地址', - dataIndex: 'address.value', + dataIndex: 'address', key:'address' }, { title: '参与方公钥', - dataIndex: 'pubKey.value', + dataIndex: 'pubKey', key:'pubKey' }, { title: '公钥算法', - dataIndex: 'pubKey.value', + dataIndex: 'pubKey', key:'algorithm', render: (text, record, index) => nj ` ${tranBase58(text)} diff --git a/data-explorer/src/web/components/transactionInfo/transactionInfo.js b/data-explorer/src/web/components/transactionInfo/transactionInfo.js index 58573aa5a1276b277346762ec89ecd83fead33a8..439b1c4d887a61a55ee9bddaef0144eee459b11c 100644 --- a/data-explorer/src/web/components/transactionInfo/transactionInfo.js +++ b/data-explorer/src/web/components/transactionInfo/transactionInfo.js @@ -162,8 +162,8 @@ export default class TransactionInfo extends Component { { data.endpointSignatures.map((item, key) => ( - - 签名: {item.digest && item.digest.value && item.digest.value || ''} + + 签名: {item.digest && item.digest && item.digest || ''} )) } @@ -175,8 +175,8 @@ export default class TransactionInfo extends Component { { data.nodeSignatures.map((item, key) => ( - - 签名: {item.digest && item.digest.value && item.digest.value || ''} + + 签名: {item.digest && item.digest && item.digest || ''} )) } @@ -273,11 +273,11 @@ export default class TransactionInfo extends Component { 参与方公钥算法: - {tranBase58(item.pubKey && item.pubKey.value && item.pubKey.value || '')} + {tranBase58(item.pubKey && item.pubKey && item.pubKey || '')} 参与方公钥数据: - {item.pubKey && item.pubKey.value && item.pubKey.value || ''} + {item.pubKey && item.pubKey && item.pubKey || ''} 节点状态: @@ -358,11 +358,11 @@ export default class TransactionInfo extends Component { 合约公钥算法: - {tranBase58(contractID.pubKey && contractID.pubKey.value && contractID.pubKey.value || '')} + {tranBase58(contractID.pubKey && contractID.pubKey && contractID.pubKey || '')} 合约公钥: - {contractID.pubKey && contractID.pubKey.value && contractID.pubKey.value || ''} + {contractID.pubKey && contractID.pubKey && contractID.pubKey || ''} {chainCode && ( 合约内容: @@ -398,11 +398,11 @@ export default class TransactionInfo extends Component { 账户公钥算法: - {tranBase58(accountID.pubKey && accountID.pubKey.value && accountID.pubKey.value || '')} + {tranBase58(accountID.pubKey && accountID.pubKey && accountID.pubKey || '')} 账户公钥: - {accountID.pubKey && accountID.pubKey.value && accountID.pubKey.value || ''} + {accountID.pubKey && accountID.pubKey && accountID.pubKey || ''} @@ -416,11 +416,11 @@ export default class TransactionInfo extends Component { 用户公钥算法: - {tranBase58(userID.pubKey && userID.pubKey.value && userID.pubKey.value || '')} + {tranBase58(userID.pubKey && userID.pubKey && userID.pubKey || '')} 用户公钥数据: - {userID.pubKey && userID.pubKey.value && userID.pubKey.value || ''} + {userID.pubKey && userID.pubKey && userID.pubKey || ''} @@ -460,11 +460,11 @@ export default class TransactionInfo extends Component { 参与方公钥算法: - {tranBase58(participantRegisterIdentity.pubKey && participantRegisterIdentity.pubKey.value && participantRegisterIdentity.pubKey.value || '')} + {tranBase58(participantRegisterIdentity.pubKey && participantRegisterIdentity.pubKey && participantRegisterIdentity.pubKey || '')} 参与方公钥数据: - {participantRegisterIdentity.pubKey && participantRegisterIdentity.pubKey.value && participantRegisterIdentity.pubKey.value || ''} + {participantRegisterIdentity.pubKey && participantRegisterIdentity.pubKey && participantRegisterIdentity.pubKey || ''} @@ -486,11 +486,11 @@ export default class TransactionInfo extends Component { 参与方公钥算法: - {tranBase58(participantID.pubKey && participantID.pubKey.value && participantID.pubKey.value || '')} + {tranBase58(participantID.pubKey && participantID.pubKey && participantID.pubKey || '')} 参与方公钥数据: - {participantID.pubKey && participantID.pubKey.value && participantID.pubKey.value || ''} + {participantID.pubKey && participantID.pubKey && participantID.pubKey || ''} { state && ( @@ -520,11 +520,11 @@ export default class TransactionInfo extends Component { 参与方公钥算法: - {tranBase58(stateUpdateIdentity.pubKey && stateUpdateIdentity.pubKey.value && stateUpdateIdentity.pubKey.value || '')} + {tranBase58(stateUpdateIdentity.pubKey && stateUpdateIdentity.pubKey && stateUpdateIdentity.pubKey || '')} 参与方公钥数据: - {stateUpdateIdentity.pubKey && stateUpdateIdentity.pubKey.value && stateUpdateIdentity.pubKey.value || ''} + {stateUpdateIdentity.pubKey && stateUpdateIdentity.pubKey && stateUpdateIdentity.pubKey || ''} @@ -538,7 +538,7 @@ export default class TransactionInfo extends Component { 事件账户公钥算法: - {eventAccountID.pubKey && eventAccountID.pubKey.value && tranBase58(eventAccountID.pubKey.value) || ''} + {eventAccountID.pubKey && eventAccountID.pubKey && tranBase58(eventAccountID.pubKey) || ''} diff --git a/data-explorer/src/web/pages/account/account.js b/data-explorer/src/web/pages/account/account.js index fa9e680e37536e8c9382d63cd1503f3a6b22df31..16ff4173282c8d2a75fc5831530164a879156211 100644 --- a/data-explorer/src/web/pages/account/account.js +++ b/data-explorer/src/web/pages/account/account.js @@ -170,7 +170,7 @@ export default class Account extends Component { width: '25%' }, { title: '账户公钥', - dataIndex: 'pubKey.value', + dataIndex: 'pubKey', key: 'pubKey', width: '25%', render: (text, record, index) => nj` @@ -185,7 +185,7 @@ export default class Account extends Component { <#if ${text}> ${text} <#else> - + `() diff --git a/data-explorer/src/web/pages/contract/contract.js b/data-explorer/src/web/pages/contract/contract.js index 00a4e2e4e5b0152a28ddd39613178c6cde34663c..59ef98551a10e487bf2c8bcdf73a09d3cc376cc6 100644 --- a/data-explorer/src/web/pages/contract/contract.js +++ b/data-explorer/src/web/pages/contract/contract.js @@ -126,7 +126,7 @@ export default class Contract extends Component { key:'address' }, { title: '合约公钥', - dataIndex: 'pubKey.value', + dataIndex: 'pubKey', key:'pubKey', render: (text, record, index) => nj ` ${text}
算法:${tranBase58(text)} diff --git a/data-explorer/src/web/pages/event/event.js b/data-explorer/src/web/pages/event/event.js index b8a5071198bd6098bba3647ec55152ffe7c84881..0bff2423e266cd00089cef088c9660e844ea390d 100644 --- a/data-explorer/src/web/pages/event/event.js +++ b/data-explorer/src/web/pages/event/event.js @@ -142,7 +142,7 @@ export default class Event extends Component { key: 'address', }, { title: '账户公钥', - dataIndex: 'pubKey.value', + dataIndex: 'pubKey', key: 'pubKey', render: (text, record, index) => nj` ${text}
算法:${tranBase58(text)} diff --git a/data-explorer/src/web/pages/search/search.t.html b/data-explorer/src/web/pages/search/search.t.html index e0d14db18ced2e84bab87fc5675ae307ccf3babe..768a3543b6148b9213b634c280ce2a3228d2d680 100644 --- a/data-explorer/src/web/pages/search/search.t.html +++ b/data-explorer/src/web/pages/search/search.t.html @@ -148,9 +148,9 @@ 合约地址: 合约公钥: - + 合约公钥算法: - +

@@ -161,9 +161,9 @@ 数据账户地址: 数据账户公钥: - + 数据账户公钥算法: - + 默克尔树根哈希

@@ -186,9 +186,9 @@ 用户地址: 用户公钥: - + 用户公钥算法: - +

@@ -244,9 +244,9 @@ 合约地址: 合约公钥: - + 合约公钥算法: - +

@@ -266,9 +266,9 @@ 数据账户地址: 数据账户公钥: - + 数据账户公钥算法: - +

@@ -304,9 +304,9 @@ 用户地址: 用户公钥: - + 用户公钥算法: - +

diff --git a/data-explorer/src/web/pages/user/user.js b/data-explorer/src/web/pages/user/user.js index 0a4a6df73ae6a02d57033d7e24aa75571aa71a51..79adfffff9ddc76c4fdab7ad65b6e316ff648a8a 100644 --- a/data-explorer/src/web/pages/user/user.js +++ b/data-explorer/src/web/pages/user/user.js @@ -117,7 +117,7 @@ export default class User extends Component { key:'address' },{ title: '用户公钥', - dataIndex: 'pubKey.value', + dataIndex: 'pubKey', key:'pubKey', render: (text, record, index) => nj ` ${text}
算法:${tranBase58(text)}