Merge pull request #360 from key3042064848-cpu/feature/thread-safe-nnoref

Firefly.md

@@ -0,0 +1,17 @@
+# Firefly(XDAGj-v0.8.4)
+
+
+
+## Firefly v0.8.4
+
+- Fix abnormally high generation of orphan blocks issues.
+
+
+
+### Notable changes in this release:
+
+-Implement thread safety for increasing or decreasing xxnoref to ensure normal block production.
+
+### Bug fixes:
+
+-Fixed an issue with inconsistent synchronization of orphan block statistics in a multi-threaded environment.

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>io.xdag</groupId>
     <artifactId>xdagj</artifactId>
-    <version>0.8.3</version>
+    <version>0.8.4</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

src/main/java/io/xdag/core/BlockchainImpl.java

@@ -555,7 +555,7 @@ public synchronized ImportResult tryToConnect(Block block) {
             } else {
                 saveBlock(block);
                 dealOrphan(block);
-                xdagStats.nnoref++;
+                incrementNnoref();
             }
             blockStore.saveXdagStatus(xdagStats);
 
@@ -605,7 +605,7 @@ public void rollTx(Block block) {
                         if ((txBlock.getInfo().flags & BI_REF) != 0) {
                             txBlock=getBlockByHash(link.getAddress(),false);
                             updateBlockFlag(txBlock, BI_REF, false);
-                            xdagStats.nnoref++;
+                            incrementNnoref();
                             blockStore.saveXdagStatus(xdagStats);
                         }
                         mBlockTx.remove(link.addressHash);
@@ -622,7 +622,7 @@ public void rollTx(Block block) {
                             if ((txBlock.getInfo().flags & BI_REF) == 0) continue;
                             txBlock=getBlockByHash(link.getAddress(),false);
                             updateBlockFlag(txBlock, BI_REF, false);
-                            xdagStats.nnoref++;
+                            incrementNnoref();
                             blockStore.saveXdagStatus(xdagStats);
                             log.debug("roll main txBlock :{} , txBlock :{} , mBlockTx size :{}", block.getHashLow(), link.addressHash, mBlockTx.size());
                             break;
@@ -1737,7 +1737,7 @@ public void removeOrphan(Bytes32 hashlow, OrphanRemoveActions action) {
 
                 orphanBlockStore.deleteFromQueue(b, isTxBlock(b), nonce, fee, address);
                 orphanBlockStore.deleteByKey(b.getHashLow().toArray(), isTxBlock(b), nonce, fee, address);
-                xdagStats.nnoref--;
+                decrementNnoref();
             }
             // Update this block's flag
             updateBlockFlag(b, BI_REF, true);
@@ -1991,6 +1991,7 @@ public void startCheckMain(long period) {
 
     public void checkState() {
         // Prohibit Non-mining nodes generate link blocks
+        xdagStats.setNnoref(orphanBlockStore.getOrphanSize());
         if (kernel.getConfig().getEnableGenerateBlock() &&
                 (kernel.getXdagState() == XdagState.SDST || XdagState.STST == kernel.getXdagState() || XdagState.SYNC == kernel.getXdagState())) {
             checkOrphan();
@@ -2271,6 +2272,13 @@ public List<Block> listMinedBlocks(int count) {
         return res;
     }
 
+    public synchronized void decrementNnoref() {
+            xdagStats.nnoref--;
+    }
+    public synchronized void incrementNnoref() {
+        xdagStats.nnoref++;
+    }
+
     enum OrphanRemoveActions {
         ORPHAN_REMOVE_NORMAL, ORPHAN_REMOVE_REUSE, ORPHAN_REMOVE_EXTRA
     }