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

Merge branch 'master' of https://gitlab.com/epic-tech/explorer2.epic.tech-angular8

Browse Source
This commit is contained in:
SuriyaR 2019-08-08 12:21:04 +05:30
commit 27cf734fec
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
server/controllers/BlockchainBlock.ts
View File

@ -1139,9 +1139,11 @@ export class BlockchainBlockController {
var alog_type = TotalDifficultyNBlockRequestData.Type; var alog_type = TotalDifficultyNBlockRequestData.Type;
var Difftype = TotalDifficultyNBlockRequestData.Difftype; var Difftype = TotalDifficultyNBlockRequestData.Difftype;
if (TotalDifficultyNBlockRequestData.Interval && TotalDifficultyNBlockRequestData.Interval != '1 day') { if (TotalDifficultyNBlockRequestData.Interval && TotalDifficultyNBlockRequestData.Interval != '1 day') {
var dateFormat = 'YYYY-MM-DD'; var dateFormat = 'YYYY-MM-DD HH:mm:ss';
var tickFormat = '%m-%d';
}else{ }else{
var dateFormat = 'HH:mm'; var dateFormat = 'YYYY-MM-DD HH:mm:ss';
var tickFormat = '%H-%M';
} }
if(Difftype == "target"){ if(Difftype == "target"){
var TotalDifficultyNBlockQuery = await getConnection() var TotalDifficultyNBlockQuery = await getConnection()
@ -1233,7 +1235,8 @@ export class BlockchainBlockController {
// DifficultyProgpow: DifficultyProgpow, // DifficultyProgpow: DifficultyProgpow,
Maxrange: Maxrange, Maxrange: Maxrange,
Minrange: (Minrange * 0.2), Minrange: (Minrange * 0.2),
TargetDifficulty: TargetDifficulty TargetDifficulty: TargetDifficulty,
tickFormat: tickFormat
}, },
}); });
} catch (error) { } catch (error) {

4
server/socket/block.ts
View File

@ -198,11 +198,11 @@ export async function universalGetLatestBlockDetails(socket) {
TotalCuckoo, TotalCuckoo,
age : dateTimeDurationString, age : dateTimeDurationString,
input_count: BlockchainLatestBlockQuery[0].input_count, input_count: BlockchainLatestBlockQuery[0].input_count,
kernal_count: BlockchainLatestBlockQuery[0].kernal_count, kernel_count: BlockchainLatestBlockQuery[0].kernel_count,
output_count: BlockchainLatestBlockQuery[0].output_count, output_count: BlockchainLatestBlockQuery[0].output_count,
proof: BlockchainLatestBlockQuery[0].proof, proof: BlockchainLatestBlockQuery[0].proof,
hasharray: hasharray, hasharray: hasharray,
Difficulty: Difficulty, // Difficulty: Difficulty,
hashstart:BlockchainLatestBlockQuery[0].hash.slice(0, 2), hashstart:BlockchainLatestBlockQuery[0].hash.slice(0, 2),
hashend:BlockchainLatestBlockQuery[0].hash.slice(62,64), hashend:BlockchainLatestBlockQuery[0].hash.slice(62,64),
TotalDifficultyCuckaroo: TotalDifficultyCuckaroo: