Skip to content

feat(net): discard block inventory below the solidified block #6184

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 14, 2025
Merged

feat(net): discard block inventory below the solidified block #6184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
930362b
feat(net): discard block inventory below the solidified block
zeusoo001 Aug 14, 2024
941959a
Merge branch 'develop' of github.com:tronprotocol/java-tron into disc…
zeusoo001 Feb 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions framework/src/main/java/org/tron/core/net/TronNetDelegate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,10 @@ public BlockId getKhaosDbHeadBlockId() {
return chainBaseManager.getKhaosDbHead().getBlockId();
}

public long getSolidifiedBlockNum() {
return chainBaseManager.getDynamicPropertiesStore().getLatestSolidifiedBlockNum();
}

public BlockId getSolidBlockId() {
return chainBaseManager.getSolidBlockId();
}
Expand Down
12 changes: 10 additions & 2 deletions framework/src/main/java/org/tron/core/net/service/adv/AdvService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,16 @@ public boolean addInv(Item item) {
if (item.getType().equals(InventoryType.TRX) && trxCache.getIfPresent(item) != null) {
return false;
}
if (item.getType().equals(InventoryType.BLOCK) && blockCache.getIfPresent(item) != null) {
return false;

if (item.getType().equals(InventoryType.BLOCK)) {
if (blockCache.getIfPresent(item) != null) {
return false;
}

long solidNum = tronNetDelegate.getSolidifiedBlockNum();
if (new BlockId(item.getHash()).getNum() <= solidNum) {
return false;
}
}

synchronized (this) {
Expand Down
7 changes: 7 additions & 0 deletions framework/src/test/java/org/tron/core/net/services/AdvServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,17 @@ private void testAddInv() {

Item itemBlock = new Item(Sha256Hash.ZERO_HASH, InventoryType.BLOCK);
flag = service.addInv(itemBlock);
Assert.assertFalse(flag);

BlockCapsule.BlockId blockId = new BlockCapsule.BlockId(Sha256Hash.ZERO_HASH, 1000L);
itemBlock = new Item(blockId, InventoryType.BLOCK);
flag = service.addInv(itemBlock);
Assert.assertTrue(flag);
flag = service.addInv(itemBlock);
Assert.assertFalse(flag);

blockId = new BlockCapsule.BlockId(Sha256Hash.ZERO_HASH, 10000L);
itemBlock = new Item(blockId, InventoryType.BLOCK);
service.addInvToCache(itemBlock);
flag = service.addInv(itemBlock);
Assert.assertFalse(flag);
Expand Down
Loading