updated SignerPowMiner

IxiAngel · IxiAngel · commit c08b2b14abb6 · 2025-11-01T12:30:36.000+01:00
diff --git a/IxianDLT/API/APIServer.cs b/IxianDLT/API/APIServer.cs
@@ -807,7 +807,7 @@ public JsonResponse onStatus(Dictionary<string, object> parameters)
                     networkArray.Add("Signer Bits", Crypto.hashToString(BitConverter.GetBytes(Node.blockChain.getRequiredSignerBits())));
                     networkArray.Add("Signer Hashrate", Node.signerPowMiner.lastHashRate);
 
-                    var tmpSolution = Node.signerPowMiner.lastSignerPowSolution;
+                    var tmpSolution = Node.signerPowMiner.GetSolutions(0).LastOrDefault();
                     Dictionary<string, object> signerPowSolution = new Dictionary<string, object>();
                     if (tmpSolution != null)
                     {
@@ -819,7 +819,7 @@ public JsonResponse onStatus(Dictionary<string, object> parameters)
                     }
                     networkArray.Add("Signer Last PoW Solution", signerPowSolution);
 
-                    tmpSolution = PresenceList.getPowSolution();
+                    tmpSolution = Node.signerPowMiner.GetBestSolution(0);
                     signerPowSolution = new Dictionary<string, object>();
                     if (tmpSolution != null)
                     {
diff --git a/IxianDLT/Block/BlockProcessor.cs b/IxianDLT/Block/BlockProcessor.cs
@@ -2159,7 +2159,7 @@ public bool acceptLocalNewBlock()
                     {
                         if (Node.isMasterNode() && localNewBlock.blockNum > 7)
                         {
-                            BlockSignature signature_data = localNewBlock.applySignature(PresenceList.getPowSolution()); // applySignature() will return signature_data, if signature was applied and null, if signature was already present from before
+                            BlockSignature signature_data = localNewBlock.applySignature(Node.signerPowMiner.GetBestSolution(localNewBlock.blockNum)); // applySignature() will return signature_data, if signature was applied and null, if signature was already present from before
                             if (signature_data != null) 
                             {
                                 foreach (var sig in localNewBlock.signatures)
@@ -2172,6 +2172,7 @@ public bool acceptLocalNewBlock()
                                     SignatureProtocolMessages.broadcastBlockSignature(sig, localNewBlock.blockNum, localNewBlock.blockChecksum, null, null);
                                 }
                                 BlockProtocolMessages.broadcastNewBlock(localNewBlock, null, null);
+                                applyUpdatedSolutionSignature();
                             }
                         }
                     }
@@ -3200,7 +3201,7 @@ public void generateNewBlock(int block_version)
 
                     removeBlockBlacklist(localNewBlock);
 
-                    BlockSignature signature_data = localNewBlock.applySignature(PresenceList.getPowSolution());
+                    BlockSignature signature_data = localNewBlock.applySignature(Node.signerPowMiner.GetBestSolution(localNewBlock.blockNum));
                     if (signature_data != null)
                     {
                         InventoryCache.Instance.setProcessedFlag(InventoryItemTypes.blockSignature, InventoryItemSignature.getHash(signature_data.recipientPubKeyOrAddress.addressNoChecksum, localNewBlock.blockChecksum));
@@ -4070,7 +4071,7 @@ public void applyUpdatedSolutionSignature()
                 for (uint i = 0; i < 5; i++)
                 {
                     Block b = Node.blockChain.getBlock(lastBlockHeight - i);
-                    BlockSignature blockSig = b.applySignature(PresenceList.getPowSolution());
+                    BlockSignature blockSig = b.applySignature(Node.signerPowMiner.GetBestSolution(b.blockNum));
                     if (blockSig != null)
                     {
                         InventoryCache.Instance.setProcessedFlag(InventoryItemTypes.blockSignature, InventoryItemSignature.getHash(blockSig.recipientPubKeyOrAddress.addressNoChecksum, b.blockChecksum));
diff --git a/IxianDLT/Block/BlockSync.cs b/IxianDLT/Block/BlockSync.cs
@@ -1130,7 +1130,7 @@ private void stopSyncStartBlockProcessing()
 
             Node.blockProcessor.firstBlockAfterSync = true;
             Node.blockProcessor.resumeOperation();
-            Node.signerPowMiner.start(Config.cpuThreads > 2 ? (int)Config.cpuThreads / 2 : 1);
+            Node.signerPowMiner.Start(Config.cpuThreads > 2 ? (int)Config.cpuThreads / 2 : 1);
 
             lock (pendingBlocks)
             {
diff --git a/IxianDLT/Meta/Node.cs b/IxianDLT/Meta/Node.cs
@@ -377,8 +377,11 @@ public void start(bool verboseConsoleOutput)
 
             UpdateVerify.start();
 
+            signerPowMiner = new SignerPowMiner();
+            //signerPowMiner.test();
+
             // Generate presence list
-            PresenceList.init(IxianHandler.publicIP, Config.serverPort, node_type, CoreConfig.serverKeepAliveInterval);
+            PresenceList.init(IxianHandler.publicIP, Config.serverPort, node_type, CoreConfig.serverKeepAliveInterval, signerPowMiner);
 
             activityStorage = new ActivityStorage(Config.activityFolderPath, 32 << 20, 0);
             activityStorage.prepareStorage(true);
@@ -416,9 +419,7 @@ public void start(bool verboseConsoleOutput)
             }
 
             miner = new Miner();
-            signerPowMiner = new SignerPowMiner();
             //Node.blockProcessor.resumeOperation();
-            //signerPowMiner.test();
 
             // Start the network queue
             NetworkQueue.start();
@@ -449,7 +450,7 @@ public void start(bool verboseConsoleOutput)
                 PresenceList.myPresenceType = 'M';
                 IxianHandler.enableNetworkServer = true;
                 blockProcessor.resumeOperation();
-                signerPowMiner.start(Config.cpuThreads > 2 ? (int)Config.cpuThreads / 2 : 1);
+                signerPowMiner.Start(Config.cpuThreads > 2 ? (int)Config.cpuThreads / 2 : 1);
                 serverStarted = true;
                 if (!isMasterNode())
                 {
@@ -668,7 +669,7 @@ static public void stop()
 
             if(signerPowMiner != null)
             {
-                signerPowMiner.stop();
+                signerPowMiner.Stop();
                 signerPowMiner = null;
             }
 
@@ -762,10 +763,10 @@ static public bool checkMasternodeBalance()
         public static void doPostSyncOperations()
         {
             if (postSyncOperationsDone
-                || Node.blockSync == null
-                || Node.blockSync.synchronizing
-                || !Node.blockProcessor.operating
-                || NetworkClientManager.getConnectedClients().Count() == 0)
+                || blockSync == null
+                || blockSync.synchronizing
+                || !blockProcessor.operating
+                || (NetworkClientManager.getConnectedClients().Count() == 0 && NetworkServer.getConnectedClients().Count() == 0))
             {
                 return;
             }
@@ -775,7 +776,9 @@ public static void doPostSyncOperations()
                 return;
             }
 
-            if (signerPowMiner.lastSignerPowSolution == null)
+            signerPowMiner.pause = false;
+
+            if (signerPowMiner.GetBestSolution(0) == null)
             {
                 return;
             }
@@ -793,7 +796,7 @@ public static void doPostSyncOperations()
                 if (blockNum + 5 >= IxianHandler.getHighestKnownNetworkBlockHeight())
                 {
                     Block b = blockChain.getBlock(blockNum);
-                    BlockSignature blockSig = b.applySignature(PresenceList.getPowSolution());
+                    BlockSignature blockSig = b.applySignature(signerPowMiner.GetBestSolution(b.blockNum));
                     if (blockSig != null)
                     {
                         InventoryCache.Instance.setProcessedFlag(InventoryItemTypes.blockSignature, InventoryItemSignature.getHash(blockSig.recipientPubKeyOrAddress.addressNoChecksum, b.blockChecksum));
@@ -1275,18 +1278,6 @@ public override long getTimeSinceLastBlock()
             return blockChain.getTimeSinceLastBlock();
         }
 
-        public override void onSignerSolutionFound()
-        {
-            if (Clock.getNetworkTimestamp() - blockChain.getLastBlock().timestamp > CoreConfig.blockSignaturePlCheckTimeout)
-            {
-                blockProcessor.applyUpdatedSolutionSignature();
-            }
-
-            blockProcessor.acceptLocalNewBlock();
-
-            PresenceList.forceSendKeepAlive = true;
-        }
-
         private ulong estimateDBBlockCacheSize(ulong totalRAM)
         {
             const ulong MB = 1024 * 1024;
diff --git a/IxianDLT/Tests/BenchmarkNode.cs b/IxianDLT/Tests/BenchmarkNode.cs
@@ -211,10 +211,5 @@ public override byte[] getBlockHash(ulong blockNum)
         {
             throw new NotImplementedException();
         }
-
-        public override void onSignerSolutionFound()
-        {
-            throw new NotImplementedException();
-        }
     }
 }
diff --git a/UnitTests/DummyIxianNode.cs b/UnitTests/DummyIxianNode.cs
@@ -95,10 +95,5 @@ public override void shutdown()
         {
             throw new NotImplementedException();
         }
-
-        public override void onSignerSolutionFound()
-        {
-            throw new NotImplementedException();
-        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -807,7 +807,7 @@ public JsonResponse onStatus(Dictionary<string, object> parameters)`
`807`	`807`	`networkArray.Add("Signer Bits", Crypto.hashToString(BitConverter.GetBytes(Node.blockChain.getRequiredSignerBits())));`
`808`	`808`	`networkArray.Add("Signer Hashrate", Node.signerPowMiner.lastHashRate);`
`809`	`809`
`810`		`- var tmpSolution = Node.signerPowMiner.lastSignerPowSolution;`
	`810`	`+ var tmpSolution = Node.signerPowMiner.GetSolutions(0).LastOrDefault();`
`811`	`811`	`Dictionary<string, object> signerPowSolution = new Dictionary<string, object>();`
`812`	`812`	`if (tmpSolution != null)`
`813`	`813`	`{`
`@@ -819,7 +819,7 @@ public JsonResponse onStatus(Dictionary<string, object> parameters)`
`819`	`819`	`}`
`820`	`820`	`networkArray.Add("Signer Last PoW Solution", signerPowSolution);`
`821`	`821`
`822`		`- tmpSolution = PresenceList.getPowSolution();`
	`822`	`+ tmpSolution = Node.signerPowMiner.GetBestSolution(0);`
`823`	`823`	`signerPowSolution = new Dictionary<string, object>();`
`824`	`824`	`if (tmpSolution != null)`
`825`	`825`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2159,7 +2159,7 @@ public bool acceptLocalNewBlock()`
`2159`	`2159`	`{`
`2160`	`2160`	`if (Node.isMasterNode() && localNewBlock.blockNum > 7)`
`2161`	`2161`	`{`
`2162`		`- BlockSignature signature_data = localNewBlock.applySignature(PresenceList.getPowSolution()); // applySignature() will return signature_data, if signature was applied and null, if signature was already present from before`
	`2162`	`+ BlockSignature signature_data = localNewBlock.applySignature(Node.signerPowMiner.GetBestSolution(localNewBlock.blockNum)); // applySignature() will return signature_data, if signature was applied and null, if signature was already present from before`
`2163`	`2163`	`if (signature_data != null)`
`2164`	`2164`	`{`
`2165`	`2165`	`foreach (var sig in localNewBlock.signatures)`
`@@ -2172,6 +2172,7 @@ public bool acceptLocalNewBlock()`
`2172`	`2172`	`SignatureProtocolMessages.broadcastBlockSignature(sig, localNewBlock.blockNum, localNewBlock.blockChecksum, null, null);`
`2173`	`2173`	`}`
`2174`	`2174`	`BlockProtocolMessages.broadcastNewBlock(localNewBlock, null, null);`
	`2175`	`+ applyUpdatedSolutionSignature();`
`2175`	`2176`	`}`
`2176`	`2177`	`}`
`2177`	`2178`	`}`
`@@ -3200,7 +3201,7 @@ public void generateNewBlock(int block_version)`
`3200`	`3201`
`3201`	`3202`	`removeBlockBlacklist(localNewBlock);`
`3202`	`3203`
`3203`		`- BlockSignature signature_data = localNewBlock.applySignature(PresenceList.getPowSolution());`
	`3204`	`+ BlockSignature signature_data = localNewBlock.applySignature(Node.signerPowMiner.GetBestSolution(localNewBlock.blockNum));`
`3204`	`3205`	`if (signature_data != null)`
`3205`	`3206`	`{`
`3206`	`3207`	`InventoryCache.Instance.setProcessedFlag(InventoryItemTypes.blockSignature, InventoryItemSignature.getHash(signature_data.recipientPubKeyOrAddress.addressNoChecksum, localNewBlock.blockChecksum));`
`@@ -4070,7 +4071,7 @@ public void applyUpdatedSolutionSignature()`
`4070`	`4071`	`for (uint i = 0; i < 5; i++)`
`4071`	`4072`	`{`
`4072`	`4073`	`Block b = Node.blockChain.getBlock(lastBlockHeight - i);`
`4073`		`- BlockSignature blockSig = b.applySignature(PresenceList.getPowSolution());`
	`4074`	`+ BlockSignature blockSig = b.applySignature(Node.signerPowMiner.GetBestSolution(b.blockNum));`
`4074`	`4075`	`if (blockSig != null)`
`4075`	`4076`	`{`
`4076`	`4077`	`InventoryCache.Instance.setProcessedFlag(InventoryItemTypes.blockSignature, InventoryItemSignature.getHash(blockSig.recipientPubKeyOrAddress.addressNoChecksum, b.blockChecksum));`
Original file line number	Diff line number	Diff line change
`@@ -1130,7 +1130,7 @@ private void stopSyncStartBlockProcessing()`
`1130`	`1130`
`1131`	`1131`	`Node.blockProcessor.firstBlockAfterSync = true;`
`1132`	`1132`	`Node.blockProcessor.resumeOperation();`
`1133`		`- Node.signerPowMiner.start(Config.cpuThreads > 2 ? (int)Config.cpuThreads / 2 : 1);`
	`1133`	`+ Node.signerPowMiner.Start(Config.cpuThreads > 2 ? (int)Config.cpuThreads / 2 : 1);`
`1134`	`1134`
`1135`	`1135`	`lock (pendingBlocks)`
`1136`	`1136`	`{`
Original file line number	Diff line number	Diff line change
`@@ -211,10 +211,5 @@ public override byte[] getBlockHash(ulong blockNum)`
`211`	`211`	`{`
`212`	`212`	`throw new NotImplementedException();`
`213`	`213`	`}`
`214`		`-`
`215`		`- public override void onSignerSolutionFound()`
`216`		`- {`
`217`		`- throw new NotImplementedException();`
`218`		`- }`
`219`	`214`	`}`
`220`	`215`	`}`
Original file line number	Diff line number	Diff line change
`@@ -95,10 +95,5 @@ public override void shutdown()`
`95`	`95`	`{`
`96`	`96`	`throw new NotImplementedException();`
`97`	`97`	`}`
`98`		`-`
`99`		`- public override void onSignerSolutionFound()`
`100`		`- {`
`101`		`- throw new NotImplementedException();`
`102`		`- }`
`103`	`98`	`}`
`104`	`99`	`}`