PIP-0032: atomic swap bug fixes

src/core/UAccounts.pas

@@ -1417,16 +1417,19 @@ end;
 class function TAccountComp.IsAccountForSaleOrSwapAcceptingTransactions(const account: TAccount; const APayload : TRawBytes): Boolean;
 var errors : String;
 begin
+  Result := false;
   if Not IsAccountForSaleOrSwap(account.accountInfo) then
-    exit(false);
+    exit;
 
   if (account.accountInfo.state in [as_ForSale, as_ForAtomicAccountSwap]) then
     if NOT IsValidAccountKey(account.accountInfo.new_publicKey,errors) then
-      exit(false);
+      exit;
 
    if (account.accountInfo.state in [as_ForAtomicAccountSwap, as_ForAtomicCoinSwap]) then
      if NOT IsValidHashLockKey(account, APayload) then
-       exit(false);
+       exit;
+
+  Result := true;
 end;
 
 class function TAccountComp.IsAccountLocked(const AccountInfo: TAccountInfo; blocks_count: Cardinal): Boolean;

src/core/UBlockChain.pas

@@ -209,9 +209,8 @@ Type
   { TPCOperation }
 
   TPCOperation = Class
-  Private
   Protected
-    FCurrentProtocol : Word;
+    FProtocolVersion : Word;
     FPrevious_Signer_updated_block: Cardinal;
     FPrevious_Destination_updated_block : Cardinal;
     FPrevious_Seller_updated_block : Cardinal;
@@ -219,7 +218,7 @@ Type
     FUsedPubkeyForSignature : TECDSA_Public;
     FBufferedSha256 : TRawBytes;
     FBufferedRipeMD160 : TRawBytes; // OPID is a RipeMD160 of the GetBufferForOpHash(True) value, 20 bytes length
-    procedure InitializeData; virtual;
+    procedure InitializeData(AProtocolVersion : Word); virtual;
     function SaveOpToStream(Stream: TStream; SaveExtendedData : Boolean): Boolean; virtual; abstract;
     function LoadOpFromStream(Stream: TStream; LoadExtendedData : Boolean): Boolean; virtual; abstract;
     procedure FillOperationResume(Block : Cardinal; getInfoForAllAccounts : Boolean; Affected_account_number : Cardinal; var OperationResume : TOperationResume); virtual;
@@ -229,8 +228,9 @@ Type
     function IsValidECDSASignature(const PubKey: TECDSA_Public; current_protocol : Word; const Signature: TECDSA_SIG): Boolean;
     procedure CopyUsedPubkeySignatureFrom(SourceOperation : TPCOperation); virtual;
   public
-    constructor Create(ACurrentProtocol : Word); virtual;
+    constructor Create(AProtocolVersion : Word); virtual;
     destructor Destroy; override;
+    property ProtocolVersion : Word read FProtocolVersion;
     function GetBufferForOpHash(UseProtocolV2 : Boolean): TRawBytes; virtual;
     function DoOperation(AccountPreviousUpdatedBlock : TAccountPreviousBlockInfo; AccountTransaction : TPCSafeBoxTransaction; var errors: String): Boolean; virtual; abstract;
     procedure AffectedAccounts(list : TList<Cardinal>); virtual; abstract;
@@ -2426,7 +2426,7 @@ begin
       msCopy := TMemoryStream.Create;
       try
         P^.Op := TPCOperation( op.NewInstance );
-        P^.Op.InitializeData;
+        P^.Op.InitializeData(op.ProtocolVersion);
         op.SaveOpToStream(msCopy,true);
         msCopy.Position := 0;
         P^.Op.LoadOpFromStream(msCopy, true);
@@ -2871,14 +2871,13 @@ end;
 
 { TPCOperation }
 
-constructor TPCOperation.Create(ACurrentProtocol: word);
+constructor TPCOperation.Create(AProtocolVersion : Word);
 begin
-  FCurrentProtocol := ACurrentProtocol;
   FHasValidSignature := False;
   FBufferedSha256:=Nil;
   FBufferedRipeMD160:=Nil;
   FUsedPubkeyForSignature := CT_TECDSA_Public_Nul;
-  InitializeData;
+  InitializeData(AProtocolVersion);
 end;
 
 destructor TPCOperation.Destroy;
@@ -3055,8 +3054,9 @@ begin
   Result := TCrypto.ToHexaString(operationHash);
 end;
 
-procedure TPCOperation.InitializeData;
+procedure TPCOperation.InitializeData(AProtocolVersion : Word);
 begin
+  FProtocolVersion := AProtocolVersion;
   FPrevious_Signer_updated_block := 0;
   FPrevious_Destination_updated_block := 0;
   FPrevious_Seller_updated_block := 0;

src/core/UOpTransaction.pas

@@ -79,7 +79,7 @@ Type
   private
     FData : TOpTransactionData;
   protected
-    procedure InitializeData; override;
+    procedure InitializeData(AProtocolVersion : Word); override;
     function SaveOpToStream(Stream: TStream; SaveExtendedData : Boolean): Boolean; override;
     function LoadOpFromStream(Stream: TStream; LoadExtendedData : Boolean): Boolean; override;
     procedure FillOperationResume(Block : Cardinal; getInfoForAllAccounts : Boolean; Affected_account_number : Cardinal; var OperationResume : TOperationResume); override;
@@ -112,7 +112,7 @@ Type
   private
     FData : TOpChangeKeyData;
   protected
-    procedure InitializeData; override;
+    procedure InitializeData(AProtocolVersion : Word); override;
     function SaveOpToStream(Stream: TStream; SaveExtendedData : Boolean): Boolean; override;
     function LoadOpFromStream(Stream: TStream; LoadExtendedData : Boolean): Boolean; override;
     procedure FillOperationResume(Block : Cardinal; getInfoForAllAccounts : Boolean; Affected_account_number : Cardinal; var OperationResume : TOperationResume); override;
@@ -151,7 +151,7 @@ Type
   private
     FData : TOpRecoverFoundsData;
   protected
-    procedure InitializeData; override;
+    procedure InitializeData(AProtocolVersion : Word); override;
     function SaveOpToStream(Stream: TStream; SaveExtendedData : Boolean): Boolean; override;
     function LoadOpFromStream(Stream: TStream; LoadExtendedData : Boolean): Boolean; override;
     procedure FillOperationResume(Block : Cardinal; getInfoForAllAccounts : Boolean; Affected_account_number : Cardinal; var OperationResume : TOperationResume); override;
@@ -222,7 +222,7 @@ Type
   private
     FData : TOpListAccountData;
   protected
-    procedure InitializeData; override;
+    procedure InitializeData(AProtocolVersion : Word); override;
     function SaveOpToStream(Stream: TStream; SaveExtendedData : Boolean): Boolean; override;
     function LoadOpFromStream(Stream: TStream; LoadExtendedData : Boolean): Boolean; override;
     procedure FillOperationResume(Block : Cardinal; getInfoForAllAccounts : Boolean; Affected_account_number : Cardinal; var OperationResume : TOperationResume); override;
@@ -263,7 +263,7 @@ Type
 
   TOpBuyAccount = Class(TOpTransaction)
   protected
-    procedure InitializeData; override;
+    procedure InitializeData(AProtocolVersion : Word); override;
   public
     class function OpType : Byte; override;
     Constructor CreateBuy(ACurrentProtocol : Word; account_number, n_operation, account_to_buy, account_to_pay: Cardinal; price, amount, fee : UInt64; new_public_key:TAccountKey; key:TECPrivateKey; payload: TRawBytes);
@@ -275,7 +275,7 @@ Type
   private
     FData : TOpChangeAccountInfoData;
   protected
-    procedure InitializeData; override;
+    procedure InitializeData(AProtocolVersion : Word); override;
     function SaveOpToStream(Stream: TStream; SaveExtendedData : Boolean): Boolean; override;
     function LoadOpFromStream(Stream: TStream; LoadExtendedData : Boolean): Boolean; override;
     procedure FillOperationResume(Block : Cardinal; getInfoForAllAccounts : Boolean; Affected_account_number : Cardinal; var OperationResume : TOperationResume); override;
@@ -325,7 +325,7 @@ Type
   private
     FData : TOpDataData;
   protected
-    procedure InitializeData; override;
+    procedure InitializeData(AProtocolVersion : Word); override;
     function SaveOpToStream(Stream: TStream; SaveExtendedData : Boolean): Boolean; override;
     function LoadOpFromStream(Stream: TStream; LoadExtendedData : Boolean): Boolean; override;
     procedure FillOperationResume(Block : Cardinal; getInfoForAllAccounts : Boolean; Affected_account_number : Cardinal; var OperationResume : TOperationResume); override;
@@ -375,9 +375,9 @@ End;
 
 { TOpChangeAccountInfo }
 
-procedure TOpChangeAccountInfo.InitializeData;
+procedure TOpChangeAccountInfo.InitializeData(AProtocolVersion : Word);
 begin
-  inherited InitializeData;
+  inherited InitializeData(AProtocolVersion);
   FData := CT_TOpChangeAccountInfoData_NUL;
 end;
 
@@ -1432,9 +1432,9 @@ begin
   end;
 end;
 
-procedure TOpChangeKey.InitializeData;
+procedure TOpChangeKey.InitializeData(AProtocolVersion : Word);
 begin
-  inherited;
+  inherited(AProtocolVersion);
   FData := CT_TOpChangeKeyData_NUL;
 end;
 
@@ -1993,7 +1993,7 @@ begin
     FData.new_public_key := TAccountComp.RawString2Accountkey(raw);
     Stream.Read(FData.locked_until_block,Sizeof(FData.locked_until_block));
     // VERSION 5: read the new account state and hash-lock
-    if FCurrentProtocol >= CT_PROTOCOL_5 then begin
+    if FProtocolVersion >= CT_PROTOCOL_5 then begin
       if Stream.Read(w, 2) < 0 then exit;  // the new account state to set
       if Not (w in [Integer(as_ForSale),Integer(as_ForAtomicAccountSwap),Integer(as_ForAtomicCoinSwap)]) then begin
         // Invalid value readed
@@ -2094,7 +2094,7 @@ begin
     TStreamOp.WriteAnsiString(Stream,TAccountComp.AccountKey2RawString(FData.new_public_key));
     Stream.Write(FData.locked_until_block,Sizeof(FData.locked_until_block));
     // VERSION 5: write the new account state and hash-lock
-    if FCurrentProtocol >= CT_PROTOCOL_5 then begin
+    if FProtocolVersion >= CT_PROTOCOL_5 then begin
       w := Word(FData.account_state);
       Stream.Write(w, 2);  // the new account state to set
       TStreamOp.WriteAnsiString(Stream, FData.hash_lock); // the hash-lock if any
@@ -2342,9 +2342,9 @@ end;
 
 { TOpData }
 
-procedure TOpData.InitializeData;
+procedure TOpData.InitializeData(AProtocolVersion : Word);
 begin
-  inherited InitializeData;
+  inherited InitializeData(AProtocolVersion);
   FData := CT_TOpDataData_NUL;
 end;