AlphaX/qortal
1
0
Fork 0
forked from Qortal/qortal
Code Issues Pull Requests Projects Releases Wiki Activity

Limit to 10 untrimmed blocks per response, as they are larger than the trimmed ones.

Browse Source
This commit is contained in:
CalDescent 2021-06-02 09:10:25 +01:00
parent cffbd41f26
commit c63a7884cb
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/qortal/controller/Controller.java
View File

@ -1345,6 +1345,10 @@ public class Controller extends Thread {
BlockData blockData = repository.getBlockRepository().fromReference(parentSignature); BlockData blockData = repository.getBlockRepository().fromReference(parentSignature);
while (blockData != null && blocks.size() < numberRequested) { while (blockData != null && blocks.size() < numberRequested) {
// If we're dealing with untrimmed blocks, ensure we don't go above the untrimmedBlockLimitPerRequest
if (blockData.isTrimmed() == false && blocks.size() >= untrimmedBlockLimitPerRequest) {
break;
}
Block block = new Block(repository, blockData); Block block = new Block(repository, blockData);
blocks.add(block); blocks.add(block);
blockData = repository.getBlockRepository().fromReference(blockData.getSignature()); blockData = repository.getBlockRepository().fromReference(blockData.getSignature());

4
src/main/java/org/qortal/settings/Settings.java
View File

@ -141,6 +141,8 @@ public class Settings {
private int maxBlocksPerRequest = 100; private int maxBlocksPerRequest = 100;
/** Maximum number of blocks this node will serve in a single response */ /** Maximum number of blocks this node will serve in a single response */
private int maxBlocksPerResponse = 100; private int maxBlocksPerResponse = 100;
/** Maximum number of untrimmed blocks this node will serve in a single response */
private int maxUntrimmedBlocksPerResponse = 10;
// Which blockchains this node is running // Which blockchains this node is running
private String blockchainConfig = null; // use default from resources private String blockchainConfig = null; // use default from resources
@ -474,6 +476,8 @@ public class Settings {
public int getMaxBlocksPerResponse() { return this.maxBlocksPerResponse; } public int getMaxBlocksPerResponse() { return this.maxBlocksPerResponse; }
public int getMaxUntrimmedBlocksPerResponse() { return this.maxUntrimmedBlocksPerResponse; }
public boolean isAutoUpdateEnabled() { public boolean isAutoUpdateEnabled() {
return this.autoUpdateEnabled; return this.autoUpdateEnabled;
} }