Merge pull request #6995 from alvasw/on_get_blocks_request_handling_c…

…reate_raw_block_list_once Create GetBlocksRequestHandler's reply list once
bisq-network · Jan 8, 2024 · 566ab53 · 566ab53
2 parents 172628f + 1e78902
commit 566ab53
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/core/src/main/java/bisq/core/dao/node/full/network/GetBlocksRequestHandler.java b/core/src/main/java/bisq/core/dao/node/full/network/GetBlocksRequestHandler.java
@@ -92,11 +92,10 @@ public GetBlocksRequestHandler(NetworkNode networkNode, DaoStateService daoState
     public void onGetBlocksRequest(GetBlocksRequest getBlocksRequest, Connection connection) {
         long ts = System.currentTimeMillis();
         // We limit number of blocks to 3000 which is about 3 weeks and about 5 MB on data
-        List<Block> blocks = daoStateService.getBlocksFromBlockHeight(getBlocksRequest.getFromBlockHeight());
-        List<RawBlock> rawBlocks = new LinkedList<>(blocks).stream()
+        List<RawBlock> rawBlocks = daoStateService.getBlocksFromBlockHeightStream(getBlocksRequest.getFromBlockHeight(), 3000)
                 .map(RawBlock::fromBlock)
-                .limit(3000)
-                .collect(Collectors.toList());
+                .collect(Collectors.toCollection(LinkedList::new));
+
         GetBlocksResponse getBlocksResponse = new GetBlocksResponse(rawBlocks, getBlocksRequest.getNonce());
         log.info("Received GetBlocksRequest from {} for blocks from height {}. " +
                         "Building GetBlocksResponse with {} blocks took {} ms.",

diff --git a/core/src/main/java/bisq/core/dao/state/DaoStateService.java b/core/src/main/java/bisq/core/dao/state/DaoStateService.java
@@ -349,12 +349,22 @@ public long getBlockTime(int height) {
     }
 
     public List<Block> getBlocksFromBlockHeight(int fromBlockHeight) {
+        return getBlocksFromBlockHeight(fromBlockHeight, Integer.MAX_VALUE);
+    }
+
+    public List<Block> getBlocksFromBlockHeight(int fromBlockHeight, int numMaxBlocks) {
+        return getBlocksFromBlockHeightStream(fromBlockHeight, numMaxBlocks)
+                .collect(Collectors.toCollection(LinkedList::new));
+    }
+
+    public Stream<Block> getBlocksFromBlockHeightStream(int fromBlockHeight, int numMaxBlocks) {
+        // We limit requests to numMaxBlocks blocks, to avoid performance issues and too
+        // large network data in case a node requests too far back in history.
         return getBlocks().stream()
                 .filter(block -> block.getHeight() >= fromBlockHeight)
-                .collect(Collectors.toList());
+                .limit(numMaxBlocks);
     }
 
-
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Genesis
     ///////////////////////////////////////////////////////////////////////////////////////////