diff --git a/server/controllers/BlockchainBlock.ts b/server/controllers/BlockchainBlock.ts index a0a7b64..de2cfa4 100644 --- a/server/controllers/BlockchainBlock.ts +++ b/server/controllers/BlockchainBlock.ts @@ -635,6 +635,7 @@ export class BlockchainBlockController { 'Hash', 'Height', 'Timestamp', + '(TotalDifficultyCuckaroo + TotalDifficultyCuckatoo) as TotalCuckoo', 'TotalDifficultyCuckaroo', 'TotalDifficultyCuckatoo', 'TotalDifficultyProgpow', @@ -676,7 +677,8 @@ export class BlockchainBlockController { // } else { // BlockchainBlockFetchQuery['PoWAlgorithm'] = 'CuckAToo31'; // } - + BlockchainBlockFetchQuery['TotalCuckoo']=parseInt(BlockchainBlockFetchQuery.TotalDifficultyCuckaroo) + + parseInt(BlockchainBlockFetchQuery.TotalDifficultyCuckatoo); if (BlockchainBlockFetchQuery.Height <= 1440) { BlockchainBlockFetchQuery['BlockReward'] = 200; } else if (BlockchainBlockFetchQuery.Height <= 2880) { @@ -854,6 +856,7 @@ export class BlockchainBlockController { .select([ 'blockchain_block.Hash', 'blockchain_block.Timestamp', + '(blockchain_block.TotalDifficultyCuckaroo + blockchain_block.TotalDifficultyCuckatoo) as TotalCuckoo', 'blockchain_block.TotalDifficultyCuckaroo', 'blockchain_block.TotalDifficultyCuckatoo', 'blockchain_block.TotalDifficultyProgpow', diff --git a/src/app/view/block-view/block-detail/block-detail.component.html b/src/app/view/block-view/block-detail/block-detail.component.html index 064c87c..ec33b42 100644 --- a/src/app/view/block-view/block-detail/block-detail.component.html +++ b/src/app/view/block-view/block-detail/block-detail.component.html @@ -69,7 +69,7 @@
{{'home.DIFFICULTY' | translate}} -
{{(hashdata.BlockchainBlockFetchQuery.Proof == 'Cuckoo') ? ((hashdata.BlockchainBlockFetchQuery.TotalDifficultyCuckatoo + hashdata.BlockchainBlockFetchQuery.TotalDifficultyCuckaroo) | number) : (hashdata.BlockchainBlockFetchQuery.Proof == 'RandomX') ? (hashdata.BlockchainBlockFetchQuery.TotalDifficultyRandomx | number) : (hashdata.BlockchainBlockFetchQuery.Proof == 'ProgPow') ? (hashdata.BlockchainBlockFetchQuery.TotalDifficultyProgpow | number) : 0}}
+
{{(hashdata.BlockchainBlockFetchQuery.Proof == 'Cuckoo') ? (hashdata.BlockchainBlockFetchQuery.TotalCuckoo | number) : (hashdata.BlockchainBlockFetchQuery.Proof == 'RandomX') ? (hashdata.BlockchainBlockFetchQuery.TotalDifficultyRandomx | number) : (hashdata.BlockchainBlockFetchQuery.Proof == 'ProgPow') ? (hashdata.BlockchainBlockFetchQuery.TotalDifficultyProgpow | number) : 0}}
diff --git a/src/app/view/home/latestblocks/latestblocks.component.html b/src/app/view/home/latestblocks/latestblocks.component.html index fbf9d7c..174ee1c 100644 --- a/src/app/view/home/latestblocks/latestblocks.component.html +++ b/src/app/view/home/latestblocks/latestblocks.component.html @@ -76,7 +76,7 @@
Difficulty
{{(hashvalue.powalgo == 'Cuckoo') ? (((hashvalue.blockchain_block_total_difficulty_cuckaroo | number) + (hashvalue.blockchain_block_total_difficulty_cuckatoo | number )) | number) : (hashvalue.powalgo == 'RandomX') ? (hashvalue.blockchain_block_total_difficulty_randomx | number) : (hashvalue.powalgo == 'ProgPow') ? (hashvalue.blockchain_block_total_difficulty_progpow | number) : 0}} + class="blck_value">{{(hashvalue.powalgo == 'Cuckoo') ? (hashvalue.totalcuckoo | number) : (hashvalue.powalgo == 'RandomX') ? (hashvalue.blockchain_block_total_difficulty_randomx | number) : (hashvalue.powalgo == 'ProgPow') ? (hashvalue.blockchain_block_total_difficulty_progpow | number) : 0}}