Fixed FastPropagation bug caused by V4 to V5 upgrade

src/core/UBlockChain.pas

@@ -278,7 +278,8 @@ Type
     function GetOpID : TRawBytes; // OPID is RipeMD160 hash of the operation
     //
     function GetOperationStreamData : TBytes;
-    class function GetOperationFromStreamData(ACurrentProtocol: word; StreamData : TBytes) : TPCOperation;
+    function GetOperationStreamData_OLD_V4_Version : TBytes; // deprecated
+    class function GetOperationFromStreamData(AUseV5EncodeStyle : Boolean; ACurrentProtocol: word; StreamData : TBytes) : TPCOperation;
     //
     function IsValidSignatureBasedOnCurrentSafeboxState(ASafeBoxTransaction : TPCSafeBoxTransaction) : Boolean; virtual; abstract;
   End;
@@ -2972,27 +2973,47 @@ begin
   end else Raise Exception.Create('ERROR DEV 20170426-1'); // This should never happen, if good coded
 end;
 
-class function TPCOperation.GetOperationFromStreamData(ACurrentProtocol: word; StreamData : TBytes): TPCOperation;
+class function TPCOperation.GetOperationFromStreamData(AUseV5EncodeStyle : Boolean; ACurrentProtocol: word; StreamData : TBytes): TPCOperation;
   // Loads an TPCOperation saved using "GetOperationStreamData"
-  // 1 byte for OpType
+  // For compatiblity will allow V4..V5 encode stype
+  // Old V4: 1 byte for OpType
+  // New V5: 2 bytes for OpType and 2 bytes for ProtocolVersion
   // N bytes for Operation specific data (saved at SaveOpToStream)
+  //
+  // NOTE:
+  // AFTER V5 activation, all nodes must use new AUseV5EcnodeStyle = TRUE
 Var stream : TStream;
   b : Byte;
   j: Integer;
   OpClass: TPCOperationClass;
   auxOp: TPCOperation;
+  LOpType, LOperationProtocolVersion : Word;
 begin
   Result := Nil;
   stream := TMemoryStream.Create;
   Try
     stream.WriteBuffer(StreamData[0],Length(StreamData)); // Fixed bug 4.0.0
     stream.Position := 0;
-    stream.Read(b,1);
-    j := TPCOperationsComp.IndexOfOperationClassByOpType(b);
+
+    if (AUseV5EncodeStyle) then begin
+      // 2 bytes (UInt16) for OpType
+      // 2 bytes (UInt16) for ProtocolVersion
+      Stream.Read(LOpType,2);
+      Stream.Read(LOperationProtocolVersion,2);
+      if (LOperationProtocolVersion<=0) or (LOperationProtocolVersion>CT_BUILD_PROTOCOL) then Exit;
+    end else begin
+      // 1 bytes (UInt8) for OpType
+      // Fixed ProtocolVersion = 4
+      stream.Read(b,1);
+      LOpType := b;
+      LOperationProtocolVersion:=ACurrentProtocol;
+    end;
+
+    j := TPCOperationsComp.IndexOfOperationClassByOpType(LOpType);
     if j >= 0 then
       OpClass := _OperationsClass[j]
     else Exit;
-    auxOp := OpClass.Create(ACurrentProtocol);
+    auxOp := OpClass.Create(LOperationProtocolVersion);
     if auxOp.LoadOpFromStream(stream,False) then Result := auxOp
     else auxOp.Free;
   Finally
@@ -3000,10 +3021,14 @@ begin
   End;
 end;
 
-function TPCOperation.GetOperationStreamData: TBytes;
+function TPCOperation.GetOperationStreamData_OLD_V4_Version: TBytes;
   // OperationStreamData fills an array of bytes with info needed to store an operation
   // 1 byte for OpType
   // N bytes for Operation specific data (saved at SaveOpToStream)
+
+  //
+  // THIS FUNCTION IS DEPRECATED, Usable only for V4 to V5 upgrade process
+  //
 var stream : TStream;
   b : Byte;
 begin
@@ -3020,6 +3045,31 @@ begin
   End;
 end;
 
+function TPCOperation.GetOperationStreamData: TBytes;
+  // OperationStreamData fills an array of bytes with info needed to store an operation
+  // 2 bytes for OpType
+  // 2 bytes for ProtocolVersion
+  // N bytes for Operation specific data (saved at SaveOpToStream)
+var stream : TStream;
+  LOpType, LOperationProtocolVersion : Word;
+begin
+  stream := TMemoryStream.Create;
+  Try
+    LOpType := Self.OpType;
+    LOperationProtocolVersion := Self.ProtocolVersion;
+
+    Stream.Write(LOpType,2);
+    Stream.Write(LOperationProtocolVersion,2);
+
+    SaveOpToStream(stream,False);
+    SetLength(Result,stream.Size);
+    stream.Position := 0;
+    stream.ReadBuffer(Result[0],stream.Size); // Fixed bug 4.0.0
+  Finally
+    stream.Free;
+  End;
+end;
+
 function TPCOperation.GetOpID: TRawBytes;
 begin
   Result := RipeMD160;

src/core/UNetProtocol.pas

@@ -399,9 +399,9 @@ Type
     Procedure DoProcess_Message(HeaderData : TNetHeaderData; DataBuffer: TStream);
     Procedure DoProcess_GetBlocks_Request(HeaderData : TNetHeaderData; DataBuffer: TStream);
     Procedure DoProcess_GetBlocks_Response(HeaderData : TNetHeaderData; DataBuffer: TStream);
-    Procedure DoProcess_GetBlockchainOperations_Request(HeaderData : TNetHeaderData; DataBuffer: TStream);
+    Procedure DoProcess_GetBlockchainOperations_Request(AHeaderData : TNetHeaderData; DataBuffer: TStream);
     Procedure DoProcess_GetOperationsBlock_Request(HeaderData : TNetHeaderData; DataBuffer: TStream);
-    Procedure DoProcess_NewBlock(HeaderData : TNetHeaderData; DataBuffer: TStream);
+    Procedure DoProcess_NewBlock(AHeaderData : TNetHeaderData; DataBuffer: TStream);
     Procedure DoProcess_AddOperations(HeaderData : TNetHeaderData; DataBuffer: TStream);
     Procedure DoProcess_GetSafeBox_Request(HeaderData : TNetHeaderData; DataBuffer: TStream);
     Procedure DoProcess_GetPendingOperations_Request(HeaderData : TNetHeaderData; DataBuffer: TStream);
@@ -2719,7 +2719,7 @@ begin
   end;
 end;
 
-procedure TNetConnection.DoProcess_GetBlockchainOperations_Request(HeaderData: TNetHeaderData; DataBuffer: TStream);
+procedure TNetConnection.DoProcess_GetBlockchainOperations_Request(AHeaderData: TNetHeaderData; DataBuffer: TStream);
   {
   As described on PIP-0015 this will return Operations stored in a specified Block of the Blockchain
   Input:
@@ -2761,7 +2761,7 @@ begin
   DoDisconnect := true;
   outputBuffer := TMemoryStream.Create;
   try
-    if HeaderData.header_type<>ntp_request then begin
+    if AHeaderData.header_type<>ntp_request then begin
       errors := 'Not request';
       Exit;
     end;
@@ -2784,7 +2784,11 @@ begin
         opc := GetBlock(bufferOperationsBlock, cBlock);
         if Assigned(opc) then begin
           if (cBlockOpIndex<opc.Count) then begin
-            opsdata := opc.Operation[cBlockOpIndex].GetOperationStreamData;
+            if AHeaderData.protocol.protocol_available >= 11 then begin
+              opsdata := opc.Operation[cBlockOpIndex].GetOperationStreamData;
+            end else begin
+              opsdata := opc.Operation[cBlockOpIndex].GetOperationStreamData_OLD_V4_Version;
+            end;
             c := Length(opsdata);
             outputBuffer.Write(c,SizeOf(c));
             outputBuffer.WriteBuffer(opsdata[0],Length(opsdata)); // Fixed bug 4.0.0
@@ -2803,7 +2807,7 @@ begin
       DoDisconnect := False;
       // Send back
       outputBuffer.Position := 0;
-      Send(ntp_response,HeaderData.operation,0,HeaderData.request_id,outputBuffer);
+      Send(ntp_response,AHeaderData.operation,0,AHeaderData.request_id,outputBuffer);
     Finally
       opindexdata.Free;
       for i := 0 to bufferOperationsBlock.Count-1 do begin
@@ -2814,7 +2818,7 @@ begin
   finally
     outputBuffer.Free;
     if DoDisconnect then begin
-      DisconnectInvalidClient(false,errors+' > '+TNetData.HeaderDataToText(HeaderData)+' BuffSize: '+inttostr(DataBuffer.Size));
+      DisconnectInvalidClient(false,errors+' > '+TNetData.HeaderDataToText(AHeaderData)+' BuffSize: '+inttostr(DataBuffer.Size));
     end;
   end;
 end;
@@ -3672,11 +3676,12 @@ begin
   end;
 end;
 
-procedure TNetConnection.DoProcess_NewBlock(HeaderData: TNetHeaderData; DataBuffer: TStream);
+procedure TNetConnection.DoProcess_NewBlock(AHeaderData: TNetHeaderData; DataBuffer: TStream);
 Type
   TNewFastPropagationBlockOperation = Record
     opReference : TOpReference;
     opStreamData : TBytes;
+    opStreamDataUsingV5EncodeStyle : Boolean;
   end;
   TNewFastPropagationBlockOperationsArray = Array of TNewFastPropagationBlockOperation;
 
@@ -3690,7 +3695,7 @@ var operationsComp : TPCOperationsComp;
     i,iNodeOpReference : Integer;
     sendStream, receiveStream : TStream;
     block_op_ref : UInt64;
-    headerData : TNetHeaderData;
+    LHeaderData : TNetHeaderData;
     auxOp : TPCOperation;
     tc : TTickCount;
     original_OperationBlock : TOperationBlock;
@@ -3710,6 +3715,7 @@ var operationsComp : TPCOperationsComp;
       for i := 0 to Integer(Integer(oprefcount)-1) do begin
         if DataBuffer.Read(nfpboarr[i].opReference,SizeOf(TOpReference))<>SizeOf(TOpReference) then Exit;
         SetLength(nfpboarr[i].opStreamData,0);
+        nfpboarr[i].opStreamDataUsingV5EncodeStyle:=False;
       end;
     end;
     DoDisconnect := False;
@@ -3726,6 +3732,7 @@ var operationsComp : TPCOperationsComp;
             iNodeOpReference := LLockedMempool.OperationsHashTree.IndexOfOpReference(nfpboarr[i].opReference);
             if iNodeOpReference>=0 then begin
               nfpboarr[i].opStreamData := LLockedMempool.OperationsHashTree.GetOperation(iNodeOpReference).GetOperationStreamData;
+              nfpboarr[i].opStreamDataUsingV5EncodeStyle:=True; // Flag to indicate that opStreamData is saved in V5 format
             end else begin
               inc(notFoundOpReferencesCount);
             end;
@@ -3756,12 +3763,12 @@ var operationsComp : TPCOperationsComp;
           end;
         end;
         // Send & wait
-        if Not DoSendAndWaitForResponse(CT_NetOp_GetBlockchainOperations,TNetData.NetData.NewRequestId,sendStream,receiveStream,5000,headerData) then begin
+        if Not DoSendAndWaitForResponse(CT_NetOp_GetBlockchainOperations,TNetData.NetData.NewRequestId,sendStream,receiveStream,5000,LHeaderData) then begin
           TLog.NewLog(ltdebug,ClassName,Format('Not received Pending operations (%d of %d) in Fast propagation block %d',[notFoundOpReferencesCount,oprefcount,operationsComp.OperationBlock.block]));
           Exit;
         end;
         DoDisconnect := True; // If bad received data... then DoDisconnect
-        if (headerData.is_error) then Exit;
+        if (LHeaderData.is_error) then Exit;
         receiveStream.Position := 0;
         receiveStream.Read(c,SizeOf(c));
         if (c<>notFoundOpReferencesCount) then Exit; // Error!
@@ -3773,6 +3780,7 @@ var operationsComp : TPCOperationsComp;
             if receiveStream.Size - receiveStream.Position < c then Exit; // Not enough received data
             SetLength(nfpboarr[i].opStreamData,c);
             receiveStream.ReadBuffer(nfpboarr[i].opStreamData[0],c); // Fixed bug 4.0.0
+            nfpboarr[i].opStreamDataUsingV5EncodeStyle := (LHeaderData.protocol.protocol_available>=11)
           end;
         end;
         DoDisconnect := False;
@@ -3783,7 +3791,7 @@ var operationsComp : TPCOperationsComp;
     end;
     // Now we have nfpboarr with full data
     for i := 0 to High(nfpboarr) do begin
-      auxOp := TPCOperation.GetOperationFromStreamData(original_OperationBlock.protocol_version,  nfpboarr[i].opStreamData );
+      auxOp := TPCOperation.GetOperationFromStreamData( (nfpboarr[i].opStreamDataUsingV5EncodeStyle), original_OperationBlock.protocol_version , nfpboarr[i].opStreamData );
       if not Assigned(auxOp) then begin
         errors := Format('Op index not available (%d/%d) OpReference:%d size:%d',[i,High(nfpboarr),nfpboarr[i].opReference,Length(nfpboarr[i].opStreamData)]);
         Exit;
@@ -3823,7 +3831,7 @@ begin
   errors := '';
   DoDisconnect := true;
   try
-    if HeaderData.header_type<>ntp_autosend then begin
+    if AHeaderData.header_type<>ntp_autosend then begin
       errors := 'Not autosend';
       exit;
     end;
@@ -3879,7 +3887,7 @@ begin
     end;
   finally
     if DoDisconnect then begin
-      DisconnectInvalidClient(false,errors+' > '+TNetData.HeaderDataToText(HeaderData)+' BuffSize: '+inttostr(DataBuffer.Size));
+      DisconnectInvalidClient(false,errors+' > '+TNetData.HeaderDataToText(AHeaderData)+' BuffSize: '+inttostr(DataBuffer.Size));
     end;
   end;
 end;