From 2dcb52aeb5ba7755d33a0bfe4b05f74ee585a146 Mon Sep 17 00:00:00 2001 From: "raja.blaze" Date: Wed, 28 Aug 2019 11:20:16 +0530 Subject: [PATCH] Updated --- server/controllers/BlockchainBlock.ts | 70 +++++++++++++------------- server/controllers/BlockchainKernel.ts | 4 +- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/server/controllers/BlockchainBlock.ts b/server/controllers/BlockchainBlock.ts index a8fd855..825e404 100644 --- a/server/controllers/BlockchainBlock.ts +++ b/server/controllers/BlockchainBlock.ts @@ -394,41 +394,41 @@ export class BlockchainBlockController { this.BlockPieChart, ); - /** - * @swagger - * /epic_explorer/v1/blockchain_block/hashrate: - * get: - * tags: - * - name: BLOCKCHAIN_BLOCK | BLOCKCHAIN_BLOCK CONTROLLER - * description: To get Hash Rate of AR29 abd AT31 - * summary: To get Hash Rate of AR29 abd AT31 - * consumes: - * - application/json - * produces: - * - application/json - * parameters: - * - name: FromDate - * description: Enter the From date - * in: query - * type: string - * - name: ToDate - * description: Enter the To date - * in: query - * type: string - * - name: Interval - * description: Try to give Intevals such as 1 week/ 15 days/ 30 days/ 60 days/ 3 months - * in: query - * type: string - * responses: - * 200: - * description: Hash Rate of AR29 abd AT31 fetched successfully - */ - this.router.get( - `${this.path}/hashrate`, - validationMiddleware(TotalDifficultyNBlockDto, true), - redisMiddleware(process.env.REDIS_EXPIRY), - this.HashRate, - ); + // /** + // * @swagger + // * /epic_explorer/v1/blockchain_block/hashrate: + // * get: + // * tags: + // * - name: BLOCKCHAIN_BLOCK | BLOCKCHAIN_BLOCK CONTROLLER + // * description: To get Hash Rate of AR29 abd AT31 + // * summary: To get Hash Rate of AR29 abd AT31 + // * consumes: + // * - application/json + // * produces: + // * - application/json + // * parameters: + // * - name: FromDate + // * description: Enter the From date + // * in: query + // * type: string + // * - name: ToDate + // * description: Enter the To date + // * in: query + // * type: string + // * - name: Interval + // * description: Try to give Intevals such as 1 week/ 15 days/ 30 days/ 60 days/ 3 months + // * in: query + // * type: string + // * responses: + // * 200: + // * description: Hash Rate of AR29 abd AT31 fetched successfully + // */ + // this.router.get( + // `${this.path}/hashrate`, + // validationMiddleware(TotalDifficultyNBlockDto, true), + // redisMiddleware(process.env.REDIS_EXPIRY), + // this.HashRate, + // ); /** * @swagger diff --git a/server/controllers/BlockchainKernel.ts b/server/controllers/BlockchainKernel.ts index 9c02987..5f4c7ff 100644 --- a/server/controllers/BlockchainKernel.ts +++ b/server/controllers/BlockchainKernel.ts @@ -720,7 +720,7 @@ sum(bk.block_id_count) AS kernal_count, \ LEFT JOIN (select block_id, count(block_id) as block_id_count from blockchain_input group by block_id) as bi \ ON blockchain_block.hash = \ bi.block_id \ -LEFT JOIN (select block_id, count(block_id) as block_id_count from blockchain_kernel group by block_id) as bk \ +LEFT JOIN (select block_id, count(block_id) as block_id_count from blockchain_kernel where features != 'Coinbase' group by block_id) as bk \ ON blockchain_block.hash = \ bk.block_id \ LEFT JOIN (select block_id, count(block_id) as block_id_count from blockchain_output group by block_id) as bo \ @@ -858,7 +858,7 @@ sum(bk.block_id_count) AS kernal_count, \ LEFT JOIN (select block_id, count(block_id) as block_id_count from blockchain_input group by block_id) as bi \ ON blockchain_block.hash = \ bi.block_id \ -LEFT JOIN (select block_id, count(block_id) as block_id_count from blockchain_kernel group by block_id) as bk \ +LEFT JOIN (select block_id, count(block_id) as block_id_count from blockchain_kernel where features != 'Coinbase' group by block_id) as bk \ ON blockchain_block.hash = \ bk.block_id \ LEFT JOIN (select block_id, count(block_id) as block_id_count from blockchain_output group by block_id) as bo \