New PascalCoinMiner version

Allows visual Hashing/second rate when algo is RandomHash (due to slow hash/rate)

src/pascalcoin_miner.pp

@@ -58,7 +58,7 @@ type
   end;
 
 Const
-  CT_MINER_VERSION = {$IFDEF PRODUCTION}'0.7'{$ELSE}{$IFDEF TESTNET}'0.7 TESTNET'{$ELSE}ERROR{$ENDIF}{$ENDIF};
+  CT_MINER_VERSION = {$IFDEF PRODUCTION}'4.TEST'{$ELSE}{$IFDEF TESTNET}'4.TEST.0 TESTNET'{$ELSE}ERROR{$ENDIF}{$ENDIF};
   CT_Line_DeviceStatus = 3;
   CT_Line_ConnectionStatus = 4;
   CT_Line_MinerValues = 7;
@@ -271,16 +271,15 @@ var
   end;
 
   Procedure DoWaitAndLog;
-  var
-    LTickCount : TTickCount;
-    LGlobalStats, LMinerStats : TMinerStats;
+  Var tc : TTickCount;
+    gs,ms : TMinerStats;
     hrReal,hrHashing, glhrHashing, glhrReal : Real;
     i : Integer;
     devt : TCustomMinerDeviceThread;
-    LStr : String;
-    LKeyPressed : Char;
+    s : String;
+    kpressed : Char;
   Begin
-    LTickCount := TPlatform.GetTickCount;
+    tc := TPlatform.GetTickCount;
     repeat
       If FPoolMinerThread.PoolMinerClient.Connected then begin
         for i:=0 to FDeviceThreads.Count-1 do begin
@@ -289,36 +288,53 @@ var
       end;
       while (Not Terminated) do begin
         sleep(100);
-        If TPlatform.GetElapsedMilliseconds(LTickCount)>1000 then begin
-          LTickCount := GetTickCount64;
+        If TPlatform.GetElapsedMilliseconds(tc)>1000 then begin
+          tc := TPlatform.GetTickCount;
           For i:=0 to FDeviceThreads.Count-1 do begin
             devt := TCustomMinerDeviceThread(FDeviceThreads[i]);
-            LMinerStats := devt.DeviceStats;
-            if LMinerStats.WorkingMillisecondsHashing>0 then
-              hrHashing := LMinerStats.RoundsCount / (LMinerStats.WorkingMillisecondsHashing / 1000)
-            else
-              hrHashing := 0;
-            LGlobalStats := devt.GlobalDeviceStats;
-            If LMinerStats.RoundsCount>0 then begin
-              LStr := FormatDateTime('hh:nn:ss',now)+Format(' Miner:"%s" at %0.2f H/s - Rounds: %d Found: %d',[devt.MinerValuesForWork.payload_start,hrHashing, LGlobalStats.RoundsCount, LGlobalStats.WinsCount]);
-              If (LGlobalStats.Invalids>0) then LStr := LStr +' '+inttostr(LGlobalStats.Invalids)+' ERRORS!';
-              WriteLine(CT_Line_MiningStatus+i,LStr);
+            ms := devt.DeviceStats;
+            if ((devt.MinerValuesForWork.version>=CT_PROTOCOL_4) AND (CT_ACTIVATE_RANDOMHASH_V4)) then begin
+              if ms.WorkingMillisecondsHashing>0 then hrHashing := (((ms.RoundsCount / (ms.WorkingMillisecondsHashing/1000))))
+              else hrHashing := 0;
+              gs := devt.GlobalDeviceStats;
+              If ms.RoundsCount>0 then begin
+                s := FormatDateTime('hh:nn:ss',now)+Format(' Miner:"%s" at %0.1f H/s - Rounds: %0.2f K Found: %d',[devt.MinerValuesForWork.payload_start,hrHashing, gs.RoundsCount/1000, gs.WinsCount]);
+                If (gs.Invalids>0) then s := s +' '+inttostr(gs.Invalids)+' ERRORS!';
+                WriteLine(CT_Line_MiningStatus+i,s);
+              end else begin
+                If gs.RoundsCount>0 then begin
+                  s := FormatDateTime('hh:nn:ss',now)+Format(' Miner:"%s" **NOT MINING** - Rounds: %0.2f K Found: %d',[devt.MinerValuesForWork.payload_start,gs.RoundsCount/1000, gs.WinsCount]);
+                  If (gs.Invalids>0) then s := s +' '+inttostr(gs.Invalids)+' ERRORS!';
+                end else begin
+                  s := FormatDateTime('hh:nn:ss',now)+' Not mining...';
+                end;
+                WriteLine(CT_Line_MiningStatus+i,s);
+              end;
             end else begin
-              If LGlobalStats.RoundsCount>0 then begin
-                LStr := FormatDateTime('hh:nn:ss',now)+Format(' Miner:"%s" **NOT MINING** - Rounds: %d Found: %d',[devt.MinerValuesForWork.payload_start,LGlobalStats.RoundsCount, LGlobalStats.WinsCount]);
-                If (LGlobalStats.Invalids>0) then LStr := LStr +' '+inttostr(LGlobalStats.Invalids)+' ERRORS!';
+              if ms.WorkingMillisecondsHashing>0 then hrHashing := (((ms.RoundsCount DIV Int64(ms.WorkingMillisecondsHashing)))/(1000))
+              else hrHashing := 0;
+              gs := devt.GlobalDeviceStats;
+              If ms.RoundsCount>0 then begin
+                s := FormatDateTime('hh:nn:ss',now)+Format(' Miner:"%s" at %0.2f MH/s - Rounds: %0.2f G Found: %d',[devt.MinerValuesForWork.payload_start,hrHashing, gs.RoundsCount/1000000000, gs.WinsCount]);
+                If (gs.Invalids>0) then s := s +' '+inttostr(gs.Invalids)+' ERRORS!';
+                WriteLine(CT_Line_MiningStatus+i,s);
               end else begin
-                LStr := FormatDateTime('hh:nn:ss',now)+' Not mining...';
+                If gs.RoundsCount>0 then begin
+                  s := FormatDateTime('hh:nn:ss',now)+Format(' Miner:"%s" **NOT MINING** - Rounds: %0.2f G Found: %d',[devt.MinerValuesForWork.payload_start,gs.RoundsCount/1000000000, gs.WinsCount]);
+                  If (gs.Invalids>0) then s := s +' '+inttostr(gs.Invalids)+' ERRORS!';
+                end else begin
+                  s := FormatDateTime('hh:nn:ss',now)+' Not mining...';
+                end;
+                WriteLine(CT_Line_MiningStatus+i,s);
               end;
-              WriteLine(CT_Line_MiningStatus+i,LStr);
             end;
           end;
-          WriteLine(CT_Line_LastFound+FDeviceThreads.Count-1,'MY VALID BLOCKS FOUND: '+IntToStr(LGlobalStats.WinsCount) +' Working time: '+IntToStr(Trunc(now - FAppStartTime))+'d '+FormatDateTime('hh:nn:ss',Now-FAppStartTime) );
+          WriteLine(CT_Line_LastFound+FDeviceThreads.Count-1,'MY VALID BLOCKS FOUND: '+IntToStr(gs.WinsCount) +' Working time: '+IntToStr(Trunc(now - FAppStartTime))+'d '+FormatDateTime('hh:nn:ss',Now-FAppStartTime) );
         end;
         If KeyPressed then begin
-          LKeyPressed := ReadKey;
-          If LKeyPressed in ['c','C','q','Q'] then begin
-            TLog.NewLog(ltinfo,ClassName,'Finalizing by keypressing '+LKeyPressed);
+          kpressed := ReadKey;
+          If kpressed in ['c','C','q','Q'] then begin
+            TLog.NewLog(ltinfo,ClassName,'Finalizing by keypressing '+kpressed);
             WriteLine(CT_Line_Logs+FDeviceThreads.Count+CT_MaxLogs,'Finalizing...');
             terminate;
           end;