EpicCash/epic_explorer
4
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

cuckoo adding problem fixed

Browse Source
This commit is contained in:
ChinTam 2019-08-04 06:10:13 +05:30
parent 2cce2ea443
commit 194fdfba82
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/controllers/BlockchainBlock.ts
View File

@ -635,6 +635,7 @@ export class BlockchainBlockController {
'Hash', 'Hash',
'Height', 'Height',
'Timestamp', 'Timestamp',
'(TotalDifficultyCuckaroo + TotalDifficultyCuckatoo) as TotalCuckoo',
'TotalDifficultyCuckaroo', 'TotalDifficultyCuckaroo',
'TotalDifficultyCuckatoo', 'TotalDifficultyCuckatoo',
'TotalDifficultyProgpow', 'TotalDifficultyProgpow',
@ -676,7 +677,8 @@ export class BlockchainBlockController {
// } else { // } else {
// BlockchainBlockFetchQuery['PoWAlgorithm'] = 'CuckAToo31'; // BlockchainBlockFetchQuery['PoWAlgorithm'] = 'CuckAToo31';
// } // }
BlockchainBlockFetchQuery['TotalCuckoo']=parseInt(BlockchainBlockFetchQuery.TotalDifficultyCuckaroo) +
parseInt(BlockchainBlockFetchQuery.TotalDifficultyCuckatoo);
if (BlockchainBlockFetchQuery.Height <= 1440) { if (BlockchainBlockFetchQuery.Height <= 1440) {
BlockchainBlockFetchQuery['BlockReward'] = 200; BlockchainBlockFetchQuery['BlockReward'] = 200;
} else if (BlockchainBlockFetchQuery.Height <= 2880) { } else if (BlockchainBlockFetchQuery.Height <= 2880) {
@ -854,6 +856,7 @@ export class BlockchainBlockController {
.select([ .select([
'blockchain_block.Hash', 'blockchain_block.Hash',
'blockchain_block.Timestamp', 'blockchain_block.Timestamp',
'(blockchain_block.TotalDifficultyCuckaroo + blockchain_block.TotalDifficultyCuckatoo) as TotalCuckoo',
'blockchain_block.TotalDifficultyCuckaroo', 'blockchain_block.TotalDifficultyCuckaroo',
'blockchain_block.TotalDifficultyCuckatoo', 'blockchain_block.TotalDifficultyCuckatoo',
'blockchain_block.TotalDifficultyProgpow', 'blockchain_block.TotalDifficultyProgpow',

2
src/app/view/block-view/block-detail/block-detail.component.html
View File

@ -69,7 +69,7 @@
</div> </div>
<div class="d-inline-block align-middle ml-2"> <div class="d-inline-block align-middle ml-2">
<span class="">{{'home.DIFFICULTY' | translate}}</span> <span class="">{{'home.DIFFICULTY' | translate}}</span>
<h6 class="view_txt">{{(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}}</h6> <h6 class="view_txt">{{(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}}</h6>
</div> </div>
</div> </div>
<div class="col-sm-6 col-md-4 mt-4 pt-2"> <div class="col-sm-6 col-md-4 mt-4 pt-2">

2
src/app/view/home/latestblocks/latestblocks.component.html
View File

@ -76,7 +76,7 @@
<!-- title="Cuckaroo : {{ hashvalue.target_difficulty_cuckaroo | number }}, Cuckatoo : {{ hashvalue.target_difficulty_cuckatoo | number }}, Progpow : {{ hashvalue.target_difficulty_progpow | number }}, Randomx : {{ hashvalue.target_difficulty_randomx | number }}" --> <!-- title="Cuckaroo : {{ hashvalue.target_difficulty_cuckaroo | number }}, Cuckatoo : {{ hashvalue.target_difficulty_cuckatoo | number }}, Progpow : {{ hashvalue.target_difficulty_progpow | number }}, Randomx : {{ hashvalue.target_difficulty_randomx | number }}" -->
<div class="block_div"> <div class="block_div">
<h6>Difficulty</h6><span <h6>Difficulty</h6><span
class="blck_value">{{(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}}</span> 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}}</span>
</div> </div>
</div> </div>
<div class="col-6 col-sm-6 col-md-3 tble_col"> <div class="col-6 col-sm-6 col-md-3 tble_col">