Fixed: block downloading

Author: xiphon

Units/PascalCoin/UBlockChain.pas

@@ -468,7 +468,7 @@ function TPCBank.AddNewBlockChainBlock(Operations: TPCOperationsComp; var newBlo
         maxAllowedTimestamp := maxAllowedTimestamp + CT_MaxSecondsFutureBlockTime;
         if Operations.OperationBlock.timestamp > maxAllowedTimestamp then begin
           errors := 'Invalid timestamp (Future time '+Inttostr(Operations.OperationBlock.timestamp)+'-'+inttostr(UnivDateTimeToUnix(DateTime2UnivDateTime(now)))+'='+
-             inttostr(Operations.OperationBlock.timestamp-UnivDateTimeToUnix(DateTime2UnivDateTime(now)))+' > '+inttostr(CT_MaxSecondsDifferenceOfNetworkNodes)+')';
+             inttostr(Operations.OperationBlock.timestamp-UnivDateTimeToUnix(DateTime2UnivDateTime(now)))+' > '+inttostr(CT_MaxSecondsFutureBlockTime)+')';
           exit;
         end;
       end else begin

Units/PascalCoin/ULog.pas

@@ -180,7 +180,7 @@ procedure TLog.NotifyNewLog(logtype: TLogType; Const sender, logtext: String);
       New(P);
       P^.Logtype := logtype;
       P^.Time := now;
-      P^.ThreadID :=TThread.CurrentThread.ThreadID;
+      P^.ThreadID := GetCurrentThreadId;
       P^.Sender := sender;
       P^.Logtext := logtext;
       FLogDataList.Add(P);

Units/PascalCoin/UNetProtocol.pas

@@ -2037,16 +2037,15 @@ procedure TNetConnection.DoProcess_GetBlocks_Response(HeaderData: TNetHeaderData
         end else begin
           // Receiving an unexpected operationblock
           TLog.NewLog(lterror,classname,'Received a distinct block, finalizing: '+TPCOperationsComp.OperationBlockToText(op.OperationBlock)+' (My block: '+TPCOperationsComp.OperationBlockToText(TNode.Node.Bank.LastOperationBlock)+')' );
-          FIsDownloadingBlocks := false;
           exit;
         end;
       end;
-      FIsDownloadingBlocks := false;
       if ((opcount>0) And (FRemoteOperationBlock.block>=TNode.Node.Bank.BlocksCount)) then begin
         Send_GetBlocks(TNode.Node.Bank.BlocksCount,1000,i);
       end;
       TNode.Node.NotifyBlocksChanged;
     Finally
+      FIsDownloadingBlocks := false;
       op.Free;
     End;
   Finally
@@ -3174,13 +3173,13 @@ procedure TThreadGetNewBlockChainFromClient.Execute;
             candidates.Add(nc);
           end;
         end;
+        TLog.NewLog(ltdebug, Classname, Format('Candidates: %d Downloading: %d', [candidates.Count, downloading]));
+
         if downloading or (candidates.Count = 0) then
         begin
           continue;
         end;
 
-        TLog.NewLog(ltdebug, Classname, Format('Candidates: %d', [candidates.Count]));
-
         connection := TNetConnection(candidates[Random(candidates.Count)]);
         if not connection.RefAdd then
         begin