diff --git a/server/routes/ledgers.js b/server/routes/ledgers.js index aa3ce2548c624282d1dfce2319b06ca28f42b67c..34ef9b7762bb5519d2a757a56d8943457ea41f40 100644 --- a/server/routes/ledgers.js +++ b/server/routes/ledgers.js @@ -1307,16 +1307,14 @@ router.get('/*/txs/*', function(req, res) { }, "endpointSignatures": [{ "digest": { - "algorithm": "ED25519", - "rawDigest": "emhhbmdzYW4=" + "value": "41EAKo3Kx9K3Q7gf2Lj93SBisqdk5UzVMmnZYSZ8wnjJsqWuDcntspYTw8pCT4Ur4agTwkwEWH3Vqiih6ECW2jYMf" }, "pubKey": { "value": "S76SHyu8p164" } }, { "digest": { - "algorithm": "ED25519", - "rawDigest": "bGlzaQ==" + "value": "41EAKo3Kx9K3Q7gf2Lj93SBisqdk5UzVMmnZYSZ8wnjJsqWuDcntspYTw8pCT4Ur4agTwkwEWH3Vqiih6ECW2jYMf" }, "pubKey": { "value": "S76SHz1gLqEL" @@ -1328,16 +1326,14 @@ router.get('/*/txs/*', function(req, res) { }, "nodeSignatures": [{ "digest": { - "algorithm": "ED25519", - "rawDigest": "d2FuZ3d1" + "value": "41EAKo3Kx9K3Q7gf2Lj93SBisqdk5UzVMmnZYSZ8wnjJsqWuDcntspYTw8pCT4Ur4agTwkwEWH3Vqiih6ECW2jYMf" }, "pubKey": { "value": "S76SHz8DsfNc" } }, { "digest": { - "algorithm": "ED25519", - "rawDigest": "emhhb2xpdQ==" + "value": "41EAKo3Kx9K3Q7gf2Lj93SBisqdk5UzVMmnZYSZ8wnjJsqWuDcntspYTw8pCT4Ur4agTwkwEWH3Vqiih6ECW2jYMf" }, "pubKey": { "value": "S76SHzEmQVWt" @@ -1368,8 +1364,7 @@ router.get('/*/txs/*', function(req, res) { }, { "addressSignature": { "digest": { - "algorithm": "ED25519", - "rawDigest": "d2FuZ3d1" + "value": "41EAKo3Kx9K3Q7gf2Lj93SBisqdk5UzVMmnZYSZ8wnjJsqWuDcntspYTw8pCT4Ur4agTwkwEWH3Vqiih6ECW2jYMf" }, "pubKey": { "value": "6gtyw9HjZbi" @@ -1395,8 +1390,7 @@ router.get('/*/txs/*', function(req, res) { }, "addressSignature": { "digest": { - "algorithm": "ED25519", - "rawDigest": "emhhb2xpdQ==" + "value": "41EAKo3Kx9K3Q7gf2Lj93SBisqdk5UzVMmnZYSZ8wnjJsqWuDcntspYTw8pCT4Ur4agTwkwEWH3Vqiih6ECW2jYMf" }, "pubKey": { "value": "6gtyw9HjZbi" @@ -1432,16 +1426,14 @@ router.get('/*/txs/*', function(req, res) { }, "endpointSignatures": [{ "digest": { - "algorithm": "ED25519", - "rawDigest": "emhhbmdzYW4=" + "value": "41EAKo3Kx9K3Q7gf2Lj93SBisqdk5UzVMmnZYSZ8wnjJsqWuDcntspYTw8pCT4Ur4agTwkwEWH3Vqiih6ECW2jYMf" }, "pubKey": { "value": "S76SHyu8p164" } }, { "digest": { - "algorithm": "ED25519", - "rawDigest": "bGlzaQ==" + "value": "41EAKo3Kx9K3Q7gf2Lj93SBisqdk5UzVMmnZYSZ8wnjJsqWuDcntspYTw8pCT4Ur4agTwkwEWH3Vqiih6ECW2jYMf" }, "pubKey": { "value": "S76SHz1gLqEL" @@ -1453,16 +1445,14 @@ router.get('/*/txs/*', function(req, res) { }, "nodeSignatures": [{ "digest": { - "algorithm": "ED25519", - "rawDigest": "d2FuZ3d1" + "value": "41EAKo3Kx9K3Q7gf2Lj93SBisqdk5UzVMmnZYSZ8wnjJsqWuDcntspYTw8pCT4Ur4agTwkwEWH3Vqiih6ECW2jYMf" }, "pubKey": { "value": "S76SHz8DsfNc" } }, { "digest": { - "algorithm": "ED25519", - "rawDigest": "emhhb2xpdQ==" + "value": "41EAKo3Kx9K3Q7gf2Lj93SBisqdk5UzVMmnZYSZ8wnjJsqWuDcntspYTw8pCT4Ur4agTwkwEWH3Vqiih6ECW2jYMf" }, "pubKey": { "value": "S76SHzEmQVWt" @@ -1493,8 +1483,7 @@ router.get('/*/txs/*', function(req, res) { }, { "addressSignature": { "digest": { - "algorithm": "ED25519", - "rawDigest": "d2FuZ3d1" + "value": "41EAKo3Kx9K3Q7gf2Lj93SBisqdk5UzVMmnZYSZ8wnjJsqWuDcntspYTw8pCT4Ur4agTwkwEWH3Vqiih6ECW2jYMf" }, "pubKey": { "value": "6gtyw9HjZbi" @@ -1520,8 +1509,7 @@ router.get('/*/txs/*', function(req, res) { }, "addressSignature": { "digest": { - "algorithm": "ED25519", - "rawDigest": "emhhb2xpdQ==" + "value": "41EAKo3Kx9K3Q7gf2Lj93SBisqdk5UzVMmnZYSZ8wnjJsqWuDcntspYTw8pCT4Ur4agTwkwEWH3Vqiih6ECW2jYMf" }, "pubKey": { "value": "6gtyw9HjZbi" diff --git a/src/pages/history/history.t.html b/src/pages/history/history.t.html index eb89d08f904e6237d0d16ba2ac12811d7b8c84c4..5ad481e8965b39d14e05fccd8dae3667e455639d 100644 --- a/src/pages/history/history.t.html +++ b/src/pages/history/history.t.html @@ -534,11 +534,11 @@ 签名算法 : - {@item['digest']['algorithm']} + {store.digests[@index]} 签名数据 : - {@item['digest']['rawDigest'] || ''} + {@item['digest']['value'] || ''} 公钥算法 : @@ -573,11 +573,11 @@ 签名算法 : - {@item['digest']['algorithm'] || ''} + {store.digestsNode[@index] || ''} 签名数据 : - {@item['digest']['rawDigest'] || ''} + {@item['digest']['value'] || ''} 公钥算法 : @@ -662,13 +662,13 @@ 签名算法 : - {store.contracts.addressSignature.digest.algorithm || ''} + {store.contracts.addressSignature.digest['algotithm'] || ''} 签名数据 : - {store.contracts.addressSignature.digest.rawDigest || ''} + {store.contracts.addressSignature.digest.value || ''} @@ -761,11 +761,11 @@ 签名算法 : - {store.accounts.addressSignature.digest.algorithm || ''} + {store.accounts.addressSignature.digest['algotithm'] || ''} 签名数据 : - {store.accounts.addressSignature.digest.rawDigest || ''} + {store.accounts.addressSignature.digest.value || ''} 签名公钥算法 : @@ -805,16 +805,16 @@ {store.users.userID.pubKey.value || ''} - <#if {{store.users.addressSignature.digest.algorithm}}> + <#if {{store.users.addressSignature.digest['algotithm']}}> 签名算法 : - {store.users.addressSignature.digest.algorithm || ''} + {store.users.addressSignature.digest['algotithm'] || ''} - <#if {{store.users.addressSignature.digest.rawDigest}}> + <#if {{store.users.addressSignature.digest.value}}> 签名数据 : - {store.users.addressSignature.digest.rawDigest || ''} + {store.users.addressSignature.digest.value || ''} <#if {{store.pubF}}> diff --git a/src/stores/HistoryStore.js b/src/stores/HistoryStore.js index d05dd6246ecd1b0bf39c06fb1bd9d106e2088527..c426bf91511cf06e45819665e6b756ce3f15df83 100644 --- a/src/stores/HistoryStore.js +++ b/src/stores/HistoryStore.js @@ -265,15 +265,19 @@ export default class HistoryStore { let response = result && result.data ? result.data : {}; this.pubKeys = []; this.digests = []; + this.pubKeysNode = []; + this.digestsNode = []; this.showHistoryState = 3; this.transactionData = {...response}; let arr = this.transactionData.endpointSignatures ? [...this.transactionData.endpointSignatures] : []; arr.length != 0 && arr.map((item, key) => { this.pubKeys.push(tranBase58(item['pubKey']['value'])); + this.digests.push(tranBase58(item['digest']['value'])); }); let arr1 = this.transactionData.nodeSignatures ? [...this.transactionData.nodeSignatures] : []; arr1.length != 0 && arr1.map((item, key) => { this.pubKeysNode.push(tranBase58(item['pubKey']['value'])); + this.digestsNode.push(tranBase58(item['digest']['value'])); }); let arr2 = this.transactionData.transactionContent && this.transactionData.transactionContent.operations ? this.transactionData.transactionContent.operations : []; arr2.length != 0 && arr2.map((item, key) => { @@ -281,12 +285,23 @@ export default class HistoryStore { this.writes = {...item}; } else if (item.contractID && JSON.stringify(item.contractID) != '{}') { this.contracts = {...item}; + this.contracts.addressSignature.digest['algotithm'] = tranBase58(this.contracts.addressSignature.digest['value']); + this.pubA = tranBase58(this.contracts.addressSignature.pubKey.value) || ''; + this.pubE = tranBase58(this.contracts.contractID.pubKey.value) || ''; } else if (item.args && item.args != '') { this.events = {...item}; + // this.events.addressSignature.digest['algotithms'] = tranBase58(this.events.addressSignature.digest['value']); } else if (item.accountID && JSON.stringify(item.accountID) != '{}') { this.accounts = {...item}; + this.accounts.addressSignature.digest['algotithm'] = tranBase58(this.accounts.addressSignature.digest['value']); + this.pubB = tranBase58(this.accounts.accountID.pubKey.value) || ''; + this.pubC = tranBase58(this.accounts.addressSignature.pubKey.value) || ''; } else if (item.userID && JSON.stringify(item.userID) != '{}') { this.users = {...item}; + this.users.addressSignature.digest['algotithm'] = tranBase58(this.users.addressSignature.digest['value']); + this.pubD = tranBase58(this.users.userID.pubKey.value) || ''; + this.pubF = tranBase58(this.users.addressSignature.pubKey.value) || ''; + } else { } @@ -299,12 +314,6 @@ export default class HistoryStore { }); this.mapShow(this.writes.writeSet); - this.pubA = tranBase58(this.contracts.addressSignature.pubKey.value) || ''; - this.pubB = tranBase58(this.accounts.accountID.pubKey.value) || ''; - this.pubC = tranBase58(this.accounts.addressSignature.pubKey.value) || ''; - this.pubD = tranBase58(this.users.userID.pubKey.value) || ''; - this.pubE = tranBase58(this.contracts.contractID.pubKey.value) || ''; - this.pubF = tranBase58(this.users.addressSignature.pubKey.value) || ''; } @autobind