Merge branch 'release_v4.8.0' of github.com:tronprotocol/java-tron into event-22

Author: zeusoo001

consensus/src/main/java/org/tron/consensus/dpos/DposService.java

@@ -1,5 +1,6 @@
 package org.tron.consensus.dpos;
 
+import static org.tron.core.config.Parameter.ChainConstant.BLOCK_PRODUCED_INTERVAL;
 import static org.tron.core.config.Parameter.ChainConstant.MAX_ACTIVE_WITNESS_NUM;
 import static org.tron.core.config.Parameter.ChainConstant.SOLIDIFIED_THRESHOLD;
 
@@ -116,6 +117,12 @@ public boolean validBlock(BlockCapsule blockCapsule) {
     }
     ByteString witnessAddress = blockCapsule.getWitnessAddress();
     long timeStamp = blockCapsule.getTimeStamp();
+    if (timeStamp % BLOCK_PRODUCED_INTERVAL != 0
+      && consensusDelegate.getDynamicPropertiesStore().allowConsensusLogicOptimization()) {
+      logger.warn("ValidBlock failed: witness: {}, timeStamp: {}",
+        ByteArray.toHexString(witnessAddress.toByteArray()), timeStamp);
+      return false;
+    }
     long bSlot = dposSlot.getAbSlot(timeStamp);
     long hSlot = dposSlot.getAbSlot(consensusDelegate.getLatestBlockHeaderTimestamp());
     if (bSlot <= hSlot) {

framework/src/main/java/org/tron/core/net/TronNetDelegate.java

@@ -156,6 +156,10 @@ public BlockId getKhaosDbHeadBlockId() {
     return chainBaseManager.getKhaosDbHead().getBlockId();
   }
 
+  public long getSolidifiedBlockNum() {
+    return chainBaseManager.getDynamicPropertiesStore().getLatestSolidifiedBlockNum();
+  }
+
   public BlockId getSolidBlockId() {
     return chainBaseManager.getSolidBlockId();
   }

framework/src/main/java/org/tron/core/net/service/adv/AdvService.java

@@ -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) {

framework/src/test/java/org/tron/core/consensus/DposServiceTest.java

@@ -0,0 +1,47 @@
+package org.tron.core.consensus;
+
+import static org.mockito.Mockito.mock;
+
+import java.lang.reflect.Field;
+import org.junit.Assert;
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.tron.consensus.ConsensusDelegate;
+import org.tron.consensus.dpos.DposService;
+import org.tron.core.capsule.BlockCapsule;
+import org.tron.core.store.DynamicPropertiesStore;
+import org.tron.protos.Protocol;
+
+public class DposServiceTest {
+  DposService service = new DposService();
+
+  @Test
+  public void test() throws Exception {
+    long headTime = 1724036757000L;
+
+    ConsensusDelegate consensusDelegate = mock(ConsensusDelegate.class);
+    Field field = service.getClass().getDeclaredField("consensusDelegate");
+    field.setAccessible(true);
+    field.set(service, consensusDelegate);
+
+    DynamicPropertiesStore store = mock(DynamicPropertiesStore.class);
+    Mockito.when(consensusDelegate.getDynamicPropertiesStore()).thenReturn(store);
+
+    Mockito.when(consensusDelegate.getLatestBlockHeaderNumber()).thenReturn(0L);
+    boolean f = service.validBlock(null);
+    Assert.assertTrue(f);
+
+    Protocol.BlockHeader.raw raw = Protocol.BlockHeader.raw.newBuilder()
+        .setTimestamp(headTime + 3001).build();
+    Protocol.BlockHeader header = Protocol.BlockHeader.newBuilder().setRawData(raw).build();
+    Protocol.Block block = Protocol.Block.newBuilder().setBlockHeader(header).build();
+
+    Mockito.when(consensusDelegate.getLatestBlockHeaderNumber()).thenReturn(100L);
+    Mockito.when(store.allowConsensusLogicOptimization()).thenReturn(true);
+
+    Mockito.when(consensusDelegate.getLatestBlockHeaderTimestamp()).thenReturn(headTime + 3000);
+    f = service.validBlock(new BlockCapsule(block));
+    Assert.assertTrue(!f);
+
+  }
+}

framework/src/test/java/org/tron/core/net/services/AdvServiceTest.java

@@ -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);