minor improvements

Author: IxiAngel

IxianDLT/DLTNode.csproj

@@ -29,7 +29,7 @@
     <PackageReference Include="BouncyCastle.Cryptography" Version="2.6.2" />
     <PackageReference Include="FluentCommandLineParser" Version="1.4.3" />
     <PackageReference Include="Open.Nat" Version="2.1.0" />
-    <PackageReference Include="RocksDB" Version="10.2.1.58549" />
+    <PackageReference Include="RocksDB" Version="10.4.2.62659" />
     <PackageReference Include="sqlite-net-pcl" Version="1.9.172" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
     <PackageReference Include="System.Diagnostics.PerformanceCounter" Version="9.0.9" />

IxianDLT/Meta/Config.cs

@@ -175,7 +175,7 @@ private static string outputHelp()
                 Console.WriteLine("   [--worker] [--threads 1] [--config ixian.cfg] [--maxLogSize 50] [--maxLogCount 10] [--logVerbosity 14]");
                 Console.WriteLine("   [--lastGoodBlock 110234] [--disableWebStart] [--onlyShowAddresses] [--walletPassword] [--blockStorage SQLite]");
                 Console.WriteLine("   [--maxTxPerBlock 19980] [--disableSetTitle] [--disableFastBlockLoading] [--checksumLock Ixian] [--verboseOutput]");
-                Console.WriteLine("   [--maxOutgoingConnections] [--maxIncomingMasterNodes] [--maxIncomingClientNodes] [--minActivityBlockHeight]");
+                Console.WriteLine("   [--maxOutgoingConnections] [--maxIncomingMasterNodes] [--maxIncomingClientNodes]");
                 Console.WriteLine("   [--forceSyncToBlock]");
                 Console.WriteLine("   [--genesis] [--netdump dumpfile] [--benchmark type] [--recover] [--verifyStorage] [--generateWallet]");
                 Console.WriteLine("   [--optimizeDBStorage] [--offline] [--disableChainReorg] [--chainReorgTest]");
@@ -209,7 +209,6 @@ private static string outputHelp()
                 Console.WriteLine("    --maxOutgoingConnections\t Max outgoing connections.");
                 Console.WriteLine("    --maxIncomingMasterNodes\t Max incoming masternode connections.");
                 Console.WriteLine("    --maxIncomingClientNodes\t Max incoming client connections.");
-                Console.WriteLine("    --minActivityBlockHeight\t Prune activity older than specified block height (30000 is default, 0 disables it).");
                 Console.WriteLine("    --forceSyncToBlock\t\t Force sync to specified block height.");
                 Console.WriteLine("    --networkType\t\t mainnet, testnet or regtest.");
                 Console.WriteLine("    --dataFolderPath\t\t location where to store block and transaction data.");
@@ -258,8 +257,8 @@ private static string outputHelp()
                 Console.WriteLine("    blockNotify\t\t\t Execute command when the block changes");
                 Console.WriteLine("    dataFolderPath\t\t location where to store block and transaction data.");
                 Console.WriteLine("    logFolderPath\t\t location where to store log files.");
-                Console.WriteLine("    activityFolderPath\t\t location where to store activity files.");
-                Console.WriteLine("    maxDatabaseCache\t\t max RAM in bytes to use for RocksDB Cache.");
+                Console.WriteLine("    activityFolderPath\t location where to store activity files.");
+                Console.WriteLine("    maxDatabaseCache\t max RAM in bytes to use for RocksDB Cache.");
 
                 return "";
             }
@@ -605,8 +604,6 @@ private static void processCliParmeters(string[] args)
 
                 cmd_parser.Setup<int>("maxIncomingClientNodes").Callback(value => maxIncomingClientNodes = value);
 
-                cmd_parser.Setup<int>("minActivityBlockHeight").Callback(value => CoreConfig.minActivityBlockHeight = value);
-
                 cmd_parser.Setup<long>("forceSyncToBlock").Callback(value => forceSyncToBlock = (ulong)value);
 
                 cmd_parser.Setup<long>("maxDatabaseCache").Callback(value => maxDatabaseCache = (ulong)value);

IxianDLT/Network/BlockProtocolMessages.cs

@@ -199,7 +199,6 @@ public static void handleGetRelevantBlockTransactions(byte[] data, RemoteEndpoin
                 }
             }
 
-
             public static void handleGetPIT2(byte[] data, RemoteEndpoint endpoint)
             {
                 MemoryStream ms = new MemoryStream(data);

IxianDLT/Transaction/TransactionPool.cs

@@ -2770,15 +2770,13 @@ public static void performCleanup()
 
         public static void processPendingTransactions()
         {
-            // TODO TODO this has to be refactored and moved to PendingTransactions
             ulong last_block_height = IxianHandler.getLastBlockHeight();
             lock (stateLock) // this lock must be here to prevent deadlocks TODO: improve this at some point
             {
                 lock (PendingTransactions.pendingTransactions)
                 {
                     long cur_time = Clock.getTimestamp();
-                    List<PendingTransaction> tmp_pending_transactions = new List<PendingTransaction>(PendingTransactions.pendingTransactions);
-                    int idx = 0;
+                    List<PendingTransaction> tmp_pending_transactions = new(PendingTransactions.pendingTransactions);
                     foreach (var entry in tmp_pending_transactions)
                     {
                         Transaction t = entry.transaction;
@@ -2791,8 +2789,10 @@ public static void processPendingTransactions()
                         }
 
                         // if transaction expired, remove it from pending transactions
-                        if (last_block_height > ConsensusConfig.getRedactedWindowSize() && t.blockHeight < last_block_height - ConsensusConfig.getRedactedWindowSize())
+                        if (last_block_height > ConsensusConfig.getRedactedWindowSize()
+                            && t.blockHeight < last_block_height - ConsensusConfig.getRedactedWindowSize())
                         {
+                            Logging.error("Error sending the transaction {0}, expired", t.getTxIdString());
                             Node.activityStorage.updateStatus(t.id, ActivityStatus.Error, 0);
                             PendingTransactions.pendingTransactions.RemoveAll(x => x.transaction.id.SequenceEqual(t.id));
                             continue;
@@ -2822,29 +2822,15 @@ public static void processPendingTransactions()
                             }
                         }
 
-                        if ((int)entry.confirmedNodeList.Count() > 3) // already received 3+ feedback
-                        {
-                            continue;
-                        }
-
-                        if (cur_time - tx_time > 40) // if the transaction is pending for over 40 seconds, resend
+                        if (cur_time - tx_time > 60) // if the transaction is pending for over 60 seconds, resend
                         {
+                            Logging.warn("Transaction {0} pending for a while, resending", t.getTxIdString());
                             CoreProtocolMessage.broadcastProtocolMessage(new char[] { 'M', 'H' }, ProtocolMessageCode.transactionData2, t.getBytes(true, true), null);
+
                             entry.addedTimestamp = cur_time;
                             entry.confirmedNodeList.Clear();
+                            entry.rejectedNodeList.Clear();
                         }
-
-                        if (entry.confirmedNodeList.Count() > 3) // already received 3+ feedback
-                        {
-                            continue;
-                        }
-
-                        if (cur_time - tx_time > 20) // if the transaction is pending for over 20 seconds, send inquiry
-                        {
-                            CoreProtocolMessage.broadcastGetTransaction(t.id, 0, null, false);
-                        }
-
-                        idx++;
                     }
                 }
             }