Browse Source

Merge pull request #17 from PascalCoinDev/master

fixed testnet bug and set version to TESTNET 5.0
Pascal Coin 5 years ago
parent
commit
74a40f5b92
2 changed files with 9 additions and 3 deletions
  1. 8 2
      src/core/UBlockChain.pas
  2. 1 1
      src/core/UConst.pas

+ 8 - 2
src/core/UBlockChain.pas

@@ -2011,7 +2011,7 @@ begin
     TPCOperationsSignatureValidator.MultiThreadPreValidateSignatures(SafeBoxTransaction,OperationsHashTree,Nil);
     //
     for i := 0 to Count - 1 do begin
-      if (Operation[i].ProtocolVersion<>OperationBlock.protocol_version) then begin
+      if (Operation[i].ProtocolVersion>OperationBlock.protocol_version) then begin
         errors := 'Error executing operation invalid protocol at '+inttostr(i+1)+'/'+inttostr(Count)+': '+errors+' Op:'+Operation[i].ToString;
         exit;
       end;
@@ -2786,7 +2786,13 @@ begin
       LOpTypeWord := LOperation.OpType;
       if LOperation.ProtocolVersion >= CT_PROTOCOL_5 then
         LOpProtocol := LOperation.ProtocolVersion
-      else LOpProtocol := 0;
+      else begin
+        {$IFDEF TESTNET}
+        LOpProtocol := LOperation.ProtocolVersion
+        {$ELSE}
+        LOpProtocol := 0;
+        {$ENDIF}
+      end;
       // On V5 will save LOpProtocol when LOperation.ProtocolVersion >= V5
       // On V4 LOpProtocol was not saved (always 0): AStream.write(OpType, 4);
       AStream.Write(LOpTypeWord,2);

+ 1 - 1
src/core/UConst.pas

@@ -195,7 +195,7 @@ Const
   CT_OpSubtype_Data_Signer                = 103;
   CT_OpSubtype_Data_Receiver              = 104;
 
-  CT_ClientAppVersion : String = {$IFDEF PRODUCTION}'5.0'{$ELSE}{$IFDEF TESTNET}'TESTNET 5.Beta.4.1'{$ELSE}{$ENDIF}{$ENDIF};
+  CT_ClientAppVersion : String = {$IFDEF PRODUCTION}'5.0'{$ELSE}{$IFDEF TESTNET}'TESTNET 5.0'{$ELSE}{$ENDIF}{$ENDIF};
 
   CT_Discover_IPs = {$IFDEF PRODUCTION}'bpascal1.dynamic-dns.net;bpascal2.dynamic-dns.net;pascalcoin1.dynamic-dns.net;pascalcoin2.dynamic-dns.net;pascalcoin1.dns1.us;pascalcoin2.dns1.us;pascalcoin1.dns2.us;pascalcoin2.dns2.us'
                     {$ELSE}'pascaltestnet1.dynamic-dns.net;pascaltestnet2.dynamic-dns.net;pascaltestnet1.dns1.us;pascaltestnet2.dns1.us'{$ENDIF};