Merge pull request #320 from Junze888/develop

Fix the endless Link Bug cause by non-mining nodes in the mainnet.
XDagger · Jun 27, 2024 · cf3cbcb · cf3cbcb
2 parents 550f523 + c412d99
commit cf3cbcb
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/main/java/io/xdag/core/BlockchainImpl.java b/src/main/java/io/xdag/core/BlockchainImpl.java
@@ -435,7 +435,10 @@ public synchronized ImportResult tryToConnect(Block block) {
 //                result = ImportResult.IMPORTED_EXTRA;
             } else {
                 saveBlock(block);
-                orphanBlockStore.addOrphan(block);
+                // prohibited non-mining node set Tx pool
+                if (kernel.getConfig().getEnableGenerateBlock()) {
+                    orphanBlockStore.addOrphan(block);
+                }
                 xdagStats.nnoref++;
             }
             blockStore.saveXdagStatus(xdagStats);
@@ -1543,7 +1546,9 @@ public void startCheckMain(long period) {
     }
 
     public void checkState() {
-        if (kernel.getXdagState() == XdagState.SDST || XdagState.STST == kernel.getXdagState() || XdagState.SYNC == kernel.getXdagState()) {
+        // Prohibit Non-mining nodes generate link blocks
+        if (kernel.getConfig().getEnableGenerateBlock() &&
+                (kernel.getXdagState() == XdagState.SDST || XdagState.STST == kernel.getXdagState() || XdagState.SYNC == kernel.getXdagState())) {
             checkOrphan();
         }
         checkMain();