From edfbede704356bf497953d772c3e7158fa1f8af4 Mon Sep 17 00:00:00 2001 From: Mononaut Date: Sun, 26 Mar 2023 09:05:41 +0900 Subject: [PATCH] Don't send back difficulty adjustment info --- backend/src/api/websocket-handler.ts | 9 ++++++--- backend/src/mempool.interfaces.ts | 2 ++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/backend/src/api/websocket-handler.ts b/backend/src/api/websocket-handler.ts index c89179ce7..7dbd48c46 100644 --- a/backend/src/api/websocket-handler.ts +++ b/backend/src/api/websocket-handler.ts @@ -211,6 +211,7 @@ class WebsocketHandler { if (!_blocks) { _blocks = blocks.getBlocks().slice(-config.MEMPOOL.INITIAL_BLOCKS_AMOUNT); } + const da = difficultyAdjustment.getDifficultyAdjustment(); return { 'mempoolInfo': memPool.getMempoolInfo(), 'vBytesPerSecond': memPool.getVBytesPerSecond(), @@ -220,7 +221,7 @@ class WebsocketHandler { 'transactions': memPool.getLatestTransactions(), 'backendInfo': backendInfo.getBackendInfo(), 'loadingIndicators': loadingIndicators.getLoadingIndicators(), - 'da': difficultyAdjustment.getDifficultyAdjustment(), + 'da': da?.previousTime ? da : undefined, 'fees': feeApi.getRecommendedFee(), ...this.extraInitProperties }; @@ -278,7 +279,9 @@ class WebsocketHandler { response['mempoolInfo'] = mempoolInfo; response['vBytesPerSecond'] = vBytesPerSecond; response['transactions'] = newTransactions.slice(0, 6).map((tx) => Common.stripTransaction(tx)); - response['da'] = da; + if (da?.previousTime) { + response['da'] = da; + } response['fees'] = recommendedFees; } @@ -505,7 +508,7 @@ class WebsocketHandler { const response = { 'block': block, 'mempoolInfo': memPool.getMempoolInfo(), - 'da': da, + 'da': da?.previousTime ? da : undefined, 'fees': fees, }; diff --git a/backend/src/mempool.interfaces.ts b/backend/src/mempool.interfaces.ts index 9961632c3..28c1e21b5 100644 --- a/backend/src/mempool.interfaces.ts +++ b/backend/src/mempool.interfaces.ts @@ -309,9 +309,11 @@ export interface IDifficultyAdjustment { remainingBlocks: number; remainingTime: number; previousRetarget: number; + previousTime: number; nextRetargetHeight: number; timeAvg: number; timeOffset: number; + expectedBlocks: number; } export interface IndexedDifficultyAdjustment {