xdc-0.6.6g

- optimized TransactionPool.performCleanup() - optimized TransactionPool.processPendingTransactions() - moved call to TransactionPool.performCleanup() to BlockProcessor.applyAcceptedBlock() - improved sync
ProjectIxian · Jan 6, 2020 · d647ab1 · d647ab1
1 parent d6a4336
commit d647ab1
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/IxianDLT/Block/BlockProcessor.cs b/IxianDLT/Block/BlockProcessor.cs
@@ -1752,6 +1752,12 @@ public bool applyAcceptedBlock(Block b, bool ws_snapshot = false)
             // Update wallet state public keys
             updateWalletStatePublicKeys(b.blockNum, ws_snapshot);
 
+            if(ws_snapshot == false)
+            {
+                // Cleanup transaction pool
+                TransactionPool.performCleanup();
+            }
+
             return true;
         }
 

diff --git a/IxianDLT/Block/BlockSync.cs b/IxianDLT/Block/BlockSync.cs
@@ -514,7 +514,7 @@ private void rollForward()
                             return;
                         }
 
-                        if (!Node.blockProcessor.verifyBlockSignatures(b) && Node.blockChain.Count > 16)
+                        if (!b.fromLocalStorage && !Node.blockProcessor.verifyBlockSignatures(b) && Node.blockChain.Count > 16)
                         {
                             Logging.warn(String.Format("Block #{0} {1} doesn't have the required consensus. Discarding and requesting a new one.", b.blockNum, Crypto.hashToString(b.blockChecksum)));
                             pendingBlocks.RemoveAll(x => x.blockNum == b.blockNum);

diff --git a/IxianDLT/Meta/Config.cs b/IxianDLT/Meta/Config.cs
@@ -67,7 +67,7 @@ public static string dataFolderBlocks
             public static string externalIp = "";
 
             // Read-only values
-            public static readonly string version = "xdc-0.6.6f"; // DLT Node version
+            public static readonly string version = "xdc-0.6.6g"; // DLT Node version
             public static readonly int checkVersionSeconds = 6 * 60 * 60; // 6 hours
 
             public static readonly ulong maxBlocksPerDatabase = 1000; // number of blocks to store in a single database file

diff --git a/IxianDLT/Meta/Node.cs b/IxianDLT/Meta/Node.cs
@@ -747,9 +747,6 @@ private static void performMaintenance()
 
                 TransactionPool.processPendingTransactions();
 
-                // Cleanup transaction pool
-                TransactionPool.performCleanup();
-
                 // Cleanup the presence list
                 PresenceList.performCleanup();
             }

diff --git a/IxianDLT/Transaction/TransactionPool.cs b/IxianDLT/Transaction/TransactionPool.cs
@@ -2289,7 +2289,7 @@ public static void performCleanup()
                             }
                         }
 
-                        Block block = Node.blockChain.getBlock(blocknum);
+                        Block block = Node.blockChain.getBlock(blocknum, false, false);
 
                         if (block == null || block.powField != null)
                         {
@@ -2356,7 +2356,7 @@ public static void processPendingTransactions()
                         {
                             ulong pow_block_num = BitConverter.ToUInt64(t.data, 0);
 
-                            Block tmpBlock = Node.blockChain.getBlock(pow_block_num);
+                            Block tmpBlock = Node.blockChain.getBlock(pow_block_num, false, false);
                             if (tmpBlock == null || tmpBlock.powField != null)
                             {
                                 ActivityStorage.updateStatus(Encoding.UTF8.GetBytes(t.id), ActivityStatus.Error, 0);