提交 3d50a649 编写于 作者: J jinlong12

458

上级 d36612f4
......@@ -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,
......
......@@ -23,7 +23,7 @@
<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.value || ''}
<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-Col>
......
......@@ -295,7 +295,7 @@ export default class EventInfo extends Component {
<Col span = {10} xs = {24} sm = {16} lg = {10}>{data.address && data.address.value && data.address.value || ''}</Col>
<Col span = {2} xs = {24} sm = {8} lg = {2}>事件账户公钥:</Col>
<Col span = {10} xs = {24} sm = {16} lg = {10}>{data.pubKey && data.pubKey.value && data.pubKey.value || ''}</Col>
<Col span = {10} xs = {24} sm = {16} lg = {10}>{data.pubKey && data.pubKey && data.pubKey || ''}</Col>
</Row>
<h3>事件列表</h3>
......
......@@ -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)}
......
......@@ -162,8 +162,8 @@ export default class TransactionInfo extends Component {
<BlockCollapse title = "终端签名列表">
{
data.endpointSignatures.map((item, key) => (
<BlockCollapseSmall title = {`公钥: ${item.pubKey && item.pubKey.value && item.pubKey.value || ''}`}>
签名: {item.digest && item.digest.value && item.digest.value || ''}
<BlockCollapseSmall title = {`公钥: ${item.pubKey && item.pubKey && item.pubKey || ''}`}>
签名: {item.digest && item.digest && item.digest || ''}
</BlockCollapseSmall>
))
}
......@@ -175,8 +175,8 @@ export default class TransactionInfo extends Component {
<BlockCollapse title = "节点签名列表">
{
data.nodeSignatures.map((item, key) => (
<BlockCollapseSmall title = {`公钥: ${item.pubKey && item.pubKey.value && item.pubKey.value || ''}`}>
签名: {item.digest && item.digest.value && item.digest.value || ''}
<BlockCollapseSmall title = {`公钥: ${item.pubKey && item.pubKey && item.pubKey || ''}`}>
签名: {item.digest && item.digest && item.digest || ''}
</BlockCollapseSmall>
))
}
......@@ -273,11 +273,11 @@ export default class TransactionInfo extends Component {
</tr>
<tr>
<td>参与方公钥算法:</td>
<td>{tranBase58(item.pubKey && item.pubKey.value && item.pubKey.value || '')}</td>
<td>{tranBase58(item.pubKey && item.pubKey && item.pubKey || '')}</td>
</tr>
<tr>
<td>参与方公钥数据:</td>
<td>{item.pubKey && item.pubKey.value && item.pubKey.value || ''}</td>
<td>{item.pubKey && item.pubKey && item.pubKey || ''}</td>
</tr>
<tr>
<td>节点状态:</td>
......@@ -358,11 +358,11 @@ export default class TransactionInfo extends Component {
</tr>
<tr>
<td>合约公钥算法:</td>
<td>{tranBase58(contractID.pubKey && contractID.pubKey.value && contractID.pubKey.value || '')}</td>
<td>{tranBase58(contractID.pubKey && contractID.pubKey && contractID.pubKey || '')}</td>
</tr>
<tr>
<td>合约公钥:</td>
<td>{contractID.pubKey && contractID.pubKey.value && contractID.pubKey.value || ''}</td>
<td>{contractID.pubKey && contractID.pubKey && contractID.pubKey || ''}</td>
</tr>
{chainCode && (<tr>
<td>合约内容:</td>
......@@ -398,11 +398,11 @@ export default class TransactionInfo extends Component {
</tr>
<tr>
<td>账户公钥算法:</td>
<td>{tranBase58(accountID.pubKey && accountID.pubKey.value && accountID.pubKey.value || '')}</td>
<td>{tranBase58(accountID.pubKey && accountID.pubKey && accountID.pubKey || '')}</td>
</tr>
<tr>
<td>账户公钥:</td>
<td>{accountID.pubKey && accountID.pubKey.value && accountID.pubKey.value || ''}</td>
<td>{accountID.pubKey && accountID.pubKey && accountID.pubKey || ''}</td>
</tr>
</table>
</BlockCollapsePanel>
......@@ -416,11 +416,11 @@ export default class TransactionInfo extends Component {
</tr>
<tr>
<td>用户公钥算法:</td>
<td>{tranBase58(userID.pubKey && userID.pubKey.value && userID.pubKey.value || '')}</td>
<td>{tranBase58(userID.pubKey && userID.pubKey && userID.pubKey || '')}</td>
</tr>
<tr>
<td>用户公钥数据:</td>
<td>{userID.pubKey && userID.pubKey.value && userID.pubKey.value || ''}</td>
<td>{userID.pubKey && userID.pubKey && userID.pubKey || ''}</td>
</tr>
</table>
</BlockCollapsePanel>
......@@ -460,11 +460,11 @@ export default class TransactionInfo extends Component {
</tr>
<tr>
<td>参与方公钥算法:</td>
<td>{tranBase58(participantRegisterIdentity.pubKey && participantRegisterIdentity.pubKey.value && participantRegisterIdentity.pubKey.value || '')}</td>
<td>{tranBase58(participantRegisterIdentity.pubKey && participantRegisterIdentity.pubKey && participantRegisterIdentity.pubKey || '')}</td>
</tr>
<tr>
<td>参与方公钥数据:</td>
<td>{participantRegisterIdentity.pubKey && participantRegisterIdentity.pubKey.value && participantRegisterIdentity.pubKey.value || ''}</td>
<td>{participantRegisterIdentity.pubKey && participantRegisterIdentity.pubKey && participantRegisterIdentity.pubKey || ''}</td>
</tr>
</table>
</BlockCollapsePanel>
......@@ -486,11 +486,11 @@ export default class TransactionInfo extends Component {
</tr>
<tr>
<td>参与方公钥算法:</td>
<td>{tranBase58(participantID.pubKey && participantID.pubKey.value && participantID.pubKey.value || '')}</td>
<td>{tranBase58(participantID.pubKey && participantID.pubKey && participantID.pubKey || '')}</td>
</tr>
<tr>
<td>参与方公钥数据:</td>
<td>{participantID.pubKey && participantID.pubKey.value && participantID.pubKey.value || ''}</td>
<td>{participantID.pubKey && participantID.pubKey && participantID.pubKey || ''}</td>
</tr>
{
state && (
......@@ -520,11 +520,11 @@ export default class TransactionInfo extends Component {
</tr>
<tr>
<td>参与方公钥算法:</td>
<td>{tranBase58(stateUpdateIdentity.pubKey && stateUpdateIdentity.pubKey.value && stateUpdateIdentity.pubKey.value || '')}</td>
<td>{tranBase58(stateUpdateIdentity.pubKey && stateUpdateIdentity.pubKey && stateUpdateIdentity.pubKey || '')}</td>
</tr>
<tr>
<td>参与方公钥数据:</td>
<td>{stateUpdateIdentity.pubKey && stateUpdateIdentity.pubKey.value && stateUpdateIdentity.pubKey.value || ''}</td>
<td>{stateUpdateIdentity.pubKey && stateUpdateIdentity.pubKey && stateUpdateIdentity.pubKey || ''}</td>
</tr>
</table>
</BlockCollapsePanel>
......@@ -538,7 +538,7 @@ export default class TransactionInfo extends Component {
</tr>
<tr>
<td>事件账户公钥算法:</td>
<td>{eventAccountID.pubKey && eventAccountID.pubKey.value && tranBase58(eventAccountID.pubKey.value) || ''}</td>
<td>{eventAccountID.pubKey && eventAccountID.pubKey && tranBase58(eventAccountID.pubKey) || ''}</td>
</tr>
</table>
</BlockCollapsePanel>
......
......@@ -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>
<AccountRootHash address=${record.address.value}/>
<AccountRootHash address=${record.address}/>
</#else>
</#if>
`()
......
......@@ -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}<br/>算法:${tranBase58(text)}
......
......@@ -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}<br/>算法:${tranBase58(text)}
......
......@@ -148,9 +148,9 @@
<span>合约地址:</span>
<span :dangerouslySetInnerHTML="{__html: highLIght(address.value)}"></span>
<span>合约公钥:</span>
<span :dangerouslySetInnerHTML="{__html: highLIght(pubKey.value) }"></span>
<span :dangerouslySetInnerHTML="{__html: highLIght(pubKey) }"></span>
<span>合约公钥算法:</span>
<span :dangerouslySetInnerHTML="{__html: tranBase58(pubKey.value) }"></span>
<span :dangerouslySetInnerHTML="{__html: tranBase58(pubKey) }"></span>
</p>
</article>
</#each>
......@@ -161,9 +161,9 @@
<span>数据账户地址:</span>
<span :dangerouslySetInnerHTML="{__html: highLIght(address.value)}"></span>
<span>数据账户公钥:</span>
<span :dangerouslySetInnerHTML="{__html: highLIght(pubKey.value)}"></span>
<span :dangerouslySetInnerHTML="{__html: highLIght(pubKey)}"></span>
<span>数据账户公钥算法:</span>
<span :dangerouslySetInnerHTML="{__html: tranBase58(pubKey.value)}"></span>
<span :dangerouslySetInnerHTML="{__html: tranBase58(pubKey)}"></span>
<span>默克尔树根哈希</span>
<span><AccountRootHash address={address.value}/></span>
</p>
......@@ -186,9 +186,9 @@
<span>用户地址:</span>
<span :dangerouslySetInnerHTML="{__html: highLIght(address.value)}"></span>
<span>用户公钥:</span>
<span :dangerouslySetInnerHTML="{__html: highLIght(pubKey.value)}"></span>
<span :dangerouslySetInnerHTML="{__html: highLIght(pubKey)}"></span>
<span>用户公钥算法:</span>
<span :dangerouslySetInnerHTML="{__html: tranBase58(pubKey.value)}"></span>
<span :dangerouslySetInnerHTML="{__html: tranBase58(pubKey)}"></span>
</p>
</article>
</#each>
......@@ -244,9 +244,9 @@
<span>合约地址:</span>
<span :dangerouslySetInnerHTML="{__html: highLIght(address.value)}"></span>
<span>合约公钥:</span>
<span :dangerouslySetInnerHTML="{__html: highLIght(pubKey.value) }"></span>
<span :dangerouslySetInnerHTML="{__html: highLIght(pubKey) }"></span>
<span>合约公钥算法:</span>
<span :dangerouslySetInnerHTML="{__html: tranBase58(pubKey.value) }"></span>
<span :dangerouslySetInnerHTML="{__html: tranBase58(pubKey) }"></span>
</p>
</article>
</#each>
......@@ -266,9 +266,9 @@
<span>数据账户地址:</span>
<span :dangerouslySetInnerHTML="{__html: highLIght(address.value)}"></span>
<span>数据账户公钥:</span>
<span :dangerouslySetInnerHTML="{__html: highLIght(pubKey.value)}"></span>
<span :dangerouslySetInnerHTML="{__html: highLIght(pubKey)}"></span>
<span>数据账户公钥算法:</span>
<span :dangerouslySetInnerHTML="{__html: tranBase58(pubKey.value)}"></span>
<span :dangerouslySetInnerHTML="{__html: tranBase58(pubKey)}"></span>
</p>
</article>
</#each>
......@@ -304,9 +304,9 @@
<span>用户地址:</span>
<span :dangerouslySetInnerHTML="{__html: highLIght(address.value)}"></span>
<span>用户公钥:</span>
<span :dangerouslySetInnerHTML="{__html: highLIght(pubKey.value)}"></span>
<span :dangerouslySetInnerHTML="{__html: highLIght(pubKey)}"></span>
<span>用户公钥算法:</span>
<span :dangerouslySetInnerHTML="{__html: tranBase58(pubKey.value)}"></span>
<span :dangerouslySetInnerHTML="{__html: tranBase58(pubKey)}"></span>
</p>
</article>
</#each>
......
......@@ -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}<br>算法:${tranBase58(text)}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册