From 2ee1f197d1dffa873c8edd75173d41350f1592ff Mon Sep 17 00:00:00 2001
From: softsimon <softsimon@protonmail.com>
Date: Wed, 1 Jun 2022 00:03:25 +0400
Subject: [PATCH 1/2] Send fee info with init data

---
 backend/src/api/websocket-handler.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/backend/src/api/websocket-handler.ts b/backend/src/api/websocket-handler.ts
index 36e68ebf1..c305a4ae1 100644
--- a/backend/src/api/websocket-handler.ts
+++ b/backend/src/api/websocket-handler.ts
@@ -200,6 +200,7 @@ class WebsocketHandler {
       'backendInfo': backendInfo.getBackendInfo(),
       'loadingIndicators': loadingIndicators.getLoadingIndicators(),
       'da': difficultyAdjustment.getDifficultyAdjustment(),
+      'fees': feeApi.getRecommendedFee(),
       ...this.extraInitProperties
     };
   }
@@ -403,6 +404,9 @@ class WebsocketHandler {
       block.extras.matchRate = matchRate;
     }
 
+    const da = difficultyAdjustment.getDifficultyAdjustment();
+    const fees = feeApi.getRecommendedFee();
+
     this.wss.clients.forEach((client) => {
       if (client.readyState !== WebSocket.OPEN) {
         return;
@@ -415,8 +419,8 @@ class WebsocketHandler {
       const response = {
         'block': block,
         'mempoolInfo': memPool.getMempoolInfo(),
-        'da': difficultyAdjustment.getDifficultyAdjustment(),
-        'fees': feeApi.getRecommendedFee(),
+        'da': da,
+        'fees': fees,
       };
 
       if (mBlocks && client['want-mempool-blocks']) {

From d860344be406cba7824341fba3a48420fdb336f8 Mon Sep 17 00:00:00 2001
From: nymkappa <vialjoris@hotmail.com>
Date: Wed, 1 Jun 2022 10:06:18 +0200
Subject: [PATCH 2/2] Re-add hash field in the mysql block query

---
 backend/src/repositories/BlocksRepository.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/backend/src/repositories/BlocksRepository.ts b/backend/src/repositories/BlocksRepository.ts
index 1d5843d6e..4900e3bba 100644
--- a/backend/src/repositories/BlocksRepository.ts
+++ b/backend/src/repositories/BlocksRepository.ts
@@ -307,6 +307,7 @@ class BlocksRepository {
     try {
       const [rows]: any[] = await DB.query(`SELECT
         height,
+        hash,
         hash as id,
         UNIX_TIMESTAMP(blocks.blockTimestamp) as blockTimestamp,
         size,