Merge pull request #321 from Junze888/develop

Bug fix: All nodes temporarily close tx pool when syncing.
XDagger · Jun 28, 2024 · e71c7e2 · e71c7e2
2 parents cf3cbcb + 3e52b62
commit e71c7e2
Show file tree

Hide file tree

Showing 2 changed files with 5 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,8 +435,9 @@ public synchronized ImportResult tryToConnect(Block block) {
 //                result = ImportResult.IMPORTED_EXTRA;
             } else {
                 saveBlock(block);
-                // prohibited non-mining node set Tx pool
-                if (kernel.getConfig().getEnableGenerateBlock()) {
+                // 1. prohibited non-mining node set Tx pool,
+                // 2. all nodes temporarily close tx pool when syncing.
+                if (kernel.getConfig().getEnableGenerateBlock() && kernel.getPow() != null) {
                     orphanBlockStore.addOrphan(block);
                 }
                 xdagStats.nnoref++;

diff --git a/src/test/java/io/xdag/core/ExtraBlockTest.java b/src/test/java/io/xdag/core/ExtraBlockTest.java
@@ -29,6 +29,7 @@
 import io.xdag.Wallet;
 import io.xdag.config.Config;
 import io.xdag.config.DevnetConfig;
+import io.xdag.consensus.XdagPow;
 import io.xdag.crypto.SampleKeys;
 import io.xdag.crypto.Sign;
 import io.xdag.db.BlockStore;
@@ -102,6 +103,7 @@ public void setUp() throws Exception {
         kernel.setBlockStore(blockStore);
         kernel.setOrphanBlockStore(orphanBlockStore);
         kernel.setWallet(wallet);
+        kernel.setPow(new XdagPow(kernel));
     }
 
     @Test