new changes
This commit is contained in:
parent
3ef7aad0de
commit
cfdb912165
@ -922,7 +922,7 @@ export class BlockchainBlockController {
|
|||||||
BlockchainBlockFetchQuery['Timestamp'] = moment
|
BlockchainBlockFetchQuery['Timestamp'] = moment
|
||||||
.utc(BlockchainBlockFetchQuery['Timestamp'])
|
.utc(BlockchainBlockFetchQuery['Timestamp'])
|
||||||
.utc()
|
.utc()
|
||||||
.format('MM-DD-YYYY, HH:MM:SS UTC');
|
.format('MM-DD-YYYY, HH:mm:ss UTC');
|
||||||
|
|
||||||
BlockchainBlockFetchQuery['hashstart'] = BlockchainBlockFetchQuery[
|
BlockchainBlockFetchQuery['hashstart'] = BlockchainBlockFetchQuery[
|
||||||
'Hash'
|
'Hash'
|
||||||
@ -1061,9 +1061,9 @@ export class BlockchainBlockController {
|
|||||||
'blockchain_block.total_difficulty_randomx - LAG(blockchain_block.total_difficulty_randomx) OVER (ORDER BY blockchain_block.total_difficulty_randomx) AS target_difficulty_randomx',
|
'blockchain_block.total_difficulty_randomx - LAG(blockchain_block.total_difficulty_randomx) OVER (ORDER BY blockchain_block.total_difficulty_randomx) AS target_difficulty_randomx',
|
||||||
'blockchain_block.Height',
|
'blockchain_block.Height',
|
||||||
'blockchain_block.EdgeBits',
|
'blockchain_block.EdgeBits',
|
||||||
'COUNT(DISTINCT(blockchain_input.block_id)) AS input_count',
|
'COUNT(DISTINCT(blockchain_input.data)) AS input_count',
|
||||||
'COUNT(DISTINCT(blockchain_kernel.block_id)) AS kernal_count',
|
'COUNT(DISTINCT(blockchain_kernel.excess_sig)) AS kernal_count',
|
||||||
'COUNT(DISTINCT(blockchain_output.block_id)) AS output_count',
|
'COUNT(DISTINCT(blockchain_output.commit)) AS output_count',
|
||||||
'blockchain_block.Proof As PoWAlgo',
|
'blockchain_block.Proof As PoWAlgo',
|
||||||
])
|
])
|
||||||
// .addSelect(
|
// .addSelect(
|
||||||
|
@ -2,6 +2,9 @@ import { getConnection, AdvancedConsoleLogger } from "typeorm";
|
|||||||
import { Global } from "../global";
|
import { Global } from "../global";
|
||||||
import { async } from '@angular/core/testing';
|
import { async } from '@angular/core/testing';
|
||||||
|
|
||||||
|
const { promisify } = require('util');
|
||||||
|
const exec = promisify(require('child_process').exec)
|
||||||
|
|
||||||
function convertMinsToHrmin (millseconds,insec) {
|
function convertMinsToHrmin (millseconds,insec) {
|
||||||
var seconds = Math.floor(millseconds / 1000);
|
var seconds = Math.floor(millseconds / 1000);
|
||||||
if(insec){
|
if(insec){
|
||||||
@ -246,6 +249,9 @@ const latestBlockDetails = async()=> {
|
|||||||
return(err_msg);
|
return(err_msg);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const space = await exec('du -sh /root/.epic/main/');
|
||||||
|
let disk_space = space.stdout.split('\t')[0];
|
||||||
|
|
||||||
let height = BlockchainLatestBlockQuery[0].height;
|
let height = BlockchainLatestBlockQuery[0].height;
|
||||||
var coin_existence;
|
var coin_existence;
|
||||||
// if (height > 12960) {
|
// if (height > 12960) {
|
||||||
@ -500,7 +506,8 @@ let currentReward = 16;
|
|||||||
cuckoohashrate,
|
cuckoohashrate,
|
||||||
progpowhashrate,
|
progpowhashrate,
|
||||||
randomxhashrate,
|
randomxhashrate,
|
||||||
totalFoundationReward
|
totalFoundationReward,
|
||||||
|
diskSpace:disk_space
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -638,4 +645,4 @@ export {network_hashrate};
|
|||||||
export {averageblockdifficulty};
|
export {averageblockdifficulty};
|
||||||
export {latestBlockDetails};
|
export {latestBlockDetails};
|
||||||
export {GetBlocktime};
|
export {GetBlocktime};
|
||||||
export {Details};
|
export {Details};
|
||||||
|
@ -2,4 +2,5 @@ export const environment = {
|
|||||||
production: true,
|
production: true,
|
||||||
domain: '/',
|
domain: '/',
|
||||||
apiUrl: '/epic_explorer/v1',
|
apiUrl: '/epic_explorer/v1',
|
||||||
|
EMAIL : 'contact@epic.tech'
|
||||||
};
|
};
|
||||||
|
@ -6,6 +6,7 @@ export const environment = {
|
|||||||
production: false,
|
production: false,
|
||||||
domain: 'https://explorer.epic.tech/',
|
domain: 'https://explorer.epic.tech/',
|
||||||
apiUrl: 'https://explorer.epic.tech/epic_explorer/v1',
|
apiUrl: 'https://explorer.epic.tech/epic_explorer/v1',
|
||||||
|
EMAIL : 'contact@epic.tech'
|
||||||
};
|
};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
Loading…
Reference in New Issue
Block a user