TList to TList<T> - Core

In order to allow Delphi ARC architecture, TList is deprecated and will use TList<T>

src/core/UAccountKeyStorage.pas

@@ -7,7 +7,8 @@ unit UAccountKeyStorage;
 interface
 
 uses
-  Classes, SysUtils, UAccounts, UThread, UBaseTypes;
+  Classes, SysUtils, UAccounts, UThread, UBaseTypes,
+  {$IFNDEF FPC}System.Generics.Collections{$ELSE}Generics.Collections{$ENDIF};
 
 type
   TAccountKeyStorageData = record
@@ -22,8 +23,8 @@ type
   // Based on tests, allows a 10-20% memory reduction when multiple accounts use the same Account key
   TAccountKeyStorage = Class
   private
-    FAccountKeys : TPCThreadList;
-    Function Find(list : TList; const accountKey: TAccountKey; var Index: Integer): Boolean;
+    FAccountKeys : TPCThreadList<Pointer>;
+    Function Find(list : TList<Pointer>; const accountKey: TAccountKey; out Index: Integer): Boolean;
   public
     constructor Create;
     destructor Destroy; override;
@@ -31,7 +32,7 @@ type
     function AddAccountKeyExt(Const accountKey: TAccountKey) : PAccountKeyStorageData;
     procedure RemoveAccountKey(Const accountKey: TAccountKey);
     class function KS : TAccountKeyStorage;
-    function LockList : TList;
+    function LockList : TList<Pointer>;
     procedure UnlockList;
   end;
 
@@ -44,7 +45,7 @@ var _aks : TAccountKeyStorage = Nil;
 
 { TAccountKeyStorage }
 
-function TAccountKeyStorage.Find(list : TList; const accountKey: TAccountKey; var Index: Integer): Boolean;
+function TAccountKeyStorage.Find(list : TList<Pointer>; const accountKey: TAccountKey; out Index: Integer): Boolean;
 var L, H, I: Integer;
   C : Integer;
 begin
@@ -76,11 +77,11 @@ end;
 
 constructor TAccountKeyStorage.Create;
 begin
-  FAccountKeys := TPCThreadList.Create('TAccountKeyStorage');
+  FAccountKeys := TPCThreadList<Pointer>.Create('TAccountKeyStorage');
 end;
 
 destructor TAccountKeyStorage.Destroy;
-Var l : TList;
+Var l : TList<Pointer>;
   i : Integer;
   P1 : PAccountKeyStorageData;
   P2 : PAccountKey;
@@ -102,7 +103,7 @@ begin
 end;
 
 function TAccountKeyStorage.AddAccountKey(const accountKey: TAccountKey): PAccountKey;
-var l : TList;
+var l : TList<Pointer>;
   i : Integer;
   P : PAccountKeyStorageData;
 begin
@@ -127,7 +128,7 @@ end;
 
 function TAccountKeyStorage.AddAccountKeyExt(const accountKey: TAccountKey): PAccountKeyStorageData;
   // This function will return allocated pointer and will increase counter like AddAccountKey
-var l : TList;
+var l : TList<Pointer>;
   i : Integer;
 begin
   Result := Nil;
@@ -149,7 +150,7 @@ begin
 end;
 
 procedure TAccountKeyStorage.RemoveAccountKey(const accountKey: TAccountKey);
-var l : TList;
+var l : TList<Pointer>;
   i : Integer;
   P : PAccountKeyStorageData;
 begin
@@ -177,7 +178,7 @@ begin
   Result := _aks;
 end;
 
-function TAccountKeyStorage.LockList: TList;
+function TAccountKeyStorage.LockList: TList<Pointer>;
 begin
   Result := FAccountKeys.LockList;
 end;

src/core/UAccounts.pas

@@ -24,7 +24,8 @@ interface
 
 uses
   Classes, SysUtils, UConst, UCrypto, SyncObjs, UThread, UBaseTypes,
-  UPCOrderedLists, UPCDataTypes;
+  UPCOrderedLists, UPCDataTypes,
+  {$IFNDEF FPC}System.Generics.Collections{$ELSE}Generics.Collections{$ENDIF};
 
 {$I config.inc}
 
@@ -183,9 +184,9 @@ Type
   Private
     FAutoAddAll : Boolean;
     FAccountList : TPCSafeBox;
-    FOrderedAccountKeysList : TPCThreadList; // An ordered list of pointers to quickly find account keys in account list
+    FOrderedAccountKeysList : TPCThreadList<Pointer>; // An ordered list of pointers to quickly find account keys in account list
     FTotalChanges : Integer;
-    Function Find(lockedList : TList; Const AccountKey: TAccountKey; var Index: Integer): Boolean;
+    Function Find(lockedList : TList<Pointer>; Const AccountKey: TAccountKey; var Index: Integer): Boolean;
     function GetAccountKeyChanges(index : Integer): Integer;
     function GetAccountKeyList(index: Integer): TOrderedCardinalList;
     function GetAccountKey(index: Integer): TAccountKey;
@@ -208,7 +209,7 @@ Type
     Property SafeBox : TPCSafeBox read FAccountList;
     Procedure Clear;
     function ToArray : TAccountKeyArray;
-    function Lock : TList;
+    function Lock : TList<Pointer>;
     procedure Unlock;
     function HasAccountKeyChanged : Boolean;
     procedure CopyFrom(const source : TOrderedAccountKeysList);
@@ -244,13 +245,13 @@ Type
 
   TPCSafeBox = Class
   private
-    FBlockAccountsList : TList; // Used when has no PreviousSafebox
+    FBlockAccountsList : TList<Pointer>; // Used when has no PreviousSafebox
     FModifiedBlocksSeparatedChain : TOrderedBlockAccountList; // Used when has PreviousSafebox (Used if we are on a Separated chain)
     //
     // OrderedAccountKeysList (Added after Build 3.0.1) allows an indexed search of public keys in the safebox with mem optimization
     FOrderedAccountKeysList : TOrderedAccountKeysList;
     //
-    FListOfOrderedAccountKeysList : TList;
+    FListOfOrderedAccountKeysList : TList<TOrderedAccountKeysList>;
     FBufferBlocksHash: TBytesBuffer;
     FOrderedByName : TOrderedRawList;
     FTotalBalance: Int64;
@@ -259,7 +260,7 @@ Type
     FWorkSum : UInt64;
     FCurrentProtocol: Integer;
     // Snapshots utility new on V3
-    FSnapshots : TList; // Will save a Snapshots lists in order to rollback Safebox to a previous block state
+    FSnapshots : TList<Pointer>; // Will save a Snapshots lists in order to rollback Safebox to a previous block state
     FMaxSafeboxSnapshots : Integer;
     // To be added to next snapshot
     FModifiedBlocksPreviousState : TOrderedBlockAccountList;
@@ -270,7 +271,7 @@ Type
     FPreviousSafeBox : TPCSafeBox;  // PreviousSafebox is the Safebox with snpashots where this safebox searches
     FPreviousSafeboxOriginBlock : Integer;
     // Has chains based on this Safebox?
-    FSubChains : TList; // Will link to subchains (other safebox) based on a current snapshot of this safebox
+    FSubChains : TList<TPCSafeBox>; // Will link to subchains (other safebox) based on a current snapshot of this safebox
     //
     Procedure AccountKeyListAddAccounts(Const AccountKey : TAccountKey; const accounts : Array of Cardinal);
     Procedure AccountKeyListRemoveAccount(Const AccountKey : TAccountKey; const accounts : Array of Cardinal);
@@ -340,7 +341,7 @@ Type
   TOrderedBlockAccountList = Class
   private
     FMaxBlockNumber : Integer;
-    FList : TList;
+    FList : TList<Pointer>;
     Function Find(const block_number: Cardinal; out Index: Integer): Boolean;
     Function SaveBlockAccount(Const blockAccount : TBlockAccount; UpdateIfFound : Boolean) : Integer;
   public
@@ -356,7 +357,7 @@ Type
 
   TOrderedAccountList = Class
   private
-    FList : TList;
+    FList : TList<Pointer>;
     Function Find(const account_number: Cardinal; var Index: Integer): Boolean;
   public
     Constructor Create;
@@ -377,7 +378,7 @@ Type
 
   TAccountPreviousBlockInfo = Class
   private
-    FList : TList;
+    FList : TList<Pointer>;
     Function FindAccount(const account: Cardinal; var Index: Integer): Boolean;
     function GetData(index : Integer): TAccountPreviousBlockInfoData;
   public
@@ -452,12 +453,12 @@ Type
 
 Const
   CT_OperationBlock_NUL : TOperationBlock = (block:0;account_key:(EC_OpenSSL_NID:0;x:Nil;y:Nil);reward:0;fee:0;protocol_version:0;
-    protocol_available:0;timestamp:0;compact_target:0;nonce:0;block_payload:Nil;operations_hash:Nil;proof_of_work:Nil);
+    protocol_available:0;timestamp:0;compact_target:0;nonce:0;block_payload:Nil;initial_safe_box_hash:Nil;operations_hash:Nil;proof_of_work:Nil);
   CT_AccountInfo_NUL : TAccountInfo = (state:as_Unknown;accountKey:(EC_OpenSSL_NID:0;x:Nil;y:Nil);locked_until_block:0;price:0;account_to_pay:0;new_publicKey:(EC_OpenSSL_NID:0;x:Nil;y:Nil));
   CT_Account_NUL : TAccount = (account:0;accountInfo:(state:as_Unknown;accountKey:(EC_OpenSSL_NID:0;x:Nil;y:Nil);locked_until_block:0;price:0;account_to_pay:0;new_publicKey:(EC_OpenSSL_NID:0;x:Nil;y:Nil));balance:0;updated_block:0;n_operation:0;name:Nil;account_type:0;previous_updated_block:0);
   CT_BlockAccount_NUL : TBlockAccount = (
     blockchainInfo:(block:0;account_key:(EC_OpenSSL_NID:0;x:Nil;y:Nil);reward:0;fee:0;protocol_version:0;
-    protocol_available:0;timestamp:0;compact_target:0;nonce:0;block_payload:Nil;operations_hash:Nil;proof_of_work:Nil);
+    protocol_available:0;timestamp:0;compact_target:0;nonce:0;block_payload:Nil;initial_safe_box_hash:Nil;operations_hash:Nil;proof_of_work:Nil);
     accounts:(
     (account:0;accountInfo:(state:as_Unknown;accountKey:(EC_OpenSSL_NID:0;x:Nil;y:Nil);locked_until_block:0;price:0;account_to_pay:0;new_publicKey:(EC_OpenSSL_NID:0;x:Nil;y:Nil));balance:0;updated_block:0;n_operation:0;name:Nil;account_type:0;previous_updated_block:0),
     (account:0;accountInfo:(state:as_Unknown;accountKey:(EC_OpenSSL_NID:0;x:Nil;y:Nil);locked_until_block:0;price:0;account_to_pay:0;new_publicKey:(EC_OpenSSL_NID:0;x:Nil;y:Nil));balance:0;updated_block:0;n_operation:0;name:Nil;account_type:0;previous_updated_block:0),
@@ -1079,7 +1080,6 @@ end;
 class function TAccountComp.AccountPublicKeyExport(const account: TAccountKey): String;
 Var raw : TRawBytes;
   BN, BNMod, BNDiv : TBigNum;
-  i : Integer;
 begin
   Result := '';
   raw := AccountKey2RawString(account);
@@ -1459,7 +1459,6 @@ end;
 class function TAccountComp.TxtToMoney(const moneytxt: String;
   var money: Int64): Boolean;
 Var s : String;
-  i : Integer;
 begin
   money := 0;
   if Trim(moneytxt)='' then begin
@@ -2095,7 +2094,7 @@ procedure TPCSafeBox.CheckMemory;
 {$IFDEF FPC}
 Var sb : TPCSafeBox;
   tc : TTickCount;
-  auxSnapshotsList : TList;
+  auxSnapshotsList : TList<Pointer>;
   i : Integer;
 {$ENDIF}
 begin
@@ -2107,17 +2106,21 @@ begin
     sb := TPCSafeBox.Create;
     try
       //
-      auxSnapshotsList := TList.Create;
+      auxSnapshotsList := TList<Pointer>.Create;
       Try
         // Save snapshots:
-        auxSnapshotsList.Assign(FSnapshots);
+        for i:=0 to FSnapshots.Count-1 do begin
+          auxSnapshotsList.Add(FSnapshots.Items[i]);
+        end;
         FSnapshots.Clear;
         //
         sb.CopyFrom(Self);
         Self.Clear;
         Self.CopyFrom(sb);
         // Restore snapshots:
-        FSnapshots.Assign(auxSnapshotsList);
+        for i:=0 to auxSnapshotsList.Count-1 do begin
+          FSnapshots.Add(auxSnapshotsList.Items[i]);
+        end;
         // Clear changes to do not fire key activity
         for i := 0 to FListOfOrderedAccountKeysList.count-1 do begin
           TOrderedAccountKeysList( FListOfOrderedAccountKeysList[i] ).ClearAccountKeyChanges;
@@ -2269,11 +2272,11 @@ constructor TPCSafeBox.Create;
 begin
   FMaxSafeboxSnapshots:=CT_DEFAULT_MaxSafeboxSnapshots;
   FLock := TPCCriticalSection.Create('TPCSafeBox_Lock');
-  FBlockAccountsList := TList.Create;
-  FListOfOrderedAccountKeysList := TList.Create;
+  FBlockAccountsList := TList<Pointer>.Create;
+  FListOfOrderedAccountKeysList := TList<TOrderedAccountKeysList>.Create;
   FCurrentProtocol := CT_PROTOCOL_1;
   FOrderedByName := TOrderedRawList.Create;
-  FSnapshots := TList.Create;
+  FSnapshots := TList<Pointer>.Create;
   FPreviousSafeBox := Nil;
   FPreviousSafeboxOriginBlock := -1;
   FModifiedBlocksSeparatedChain := TOrderedBlockAccountList.Create;
@@ -2281,7 +2284,7 @@ begin
   FModifiedBlocksFinalState := TOrderedBlockAccountList.Create;
   FAddedNamesSincePreviousSafebox := TOrderedRawList.Create;
   FDeletedNamesSincePreviousSafebox := TOrderedRawList.Create;
-  FSubChains := TList.Create;
+  FSubChains := TList<TPCSafeBox>.Create;
   FOrderedAccountKeysList := TOrderedAccountKeysList.Create(Nil,True);
   FBufferBlocksHash := TBytesBuffer.Create(1000*32);
   Clear;
@@ -4416,7 +4419,7 @@ end;
 
 constructor TOrderedBlockAccountList.Create;
 begin
-  FList := TList.Create;
+  FList := TList<Pointer>.Create;
   FMaxBlockNumber:=-1;
 end;
 
@@ -4496,7 +4499,7 @@ end;
 
 constructor TOrderedAccountList.Create;
 begin
-  FList := TList.Create;
+  FList := TList<Pointer>.Create;
 end;
 
 destructor TOrderedAccountList.Destroy;
@@ -4563,7 +4566,7 @@ end;
 procedure TOrderedAccountKeysList.AddAccountKey(const AccountKey: TAccountKey);
 Var P : POrderedAccountKeyList;
   i,j : Integer;
-  lockedList, safeboxLockedList : TList;
+  lockedList, safeboxLockedList : TList<Pointer>;
 begin
   lockedList := Lock;
   Try
@@ -4621,7 +4624,7 @@ end;
 procedure TOrderedAccountKeysList.AddAccounts(const AccountKey: TAccountKey; const accounts: array of Cardinal);
 Var P : POrderedAccountKeyList;
   i,i2 : Integer;
-  lockedList : TList;
+  lockedList : TList<Pointer>;
 begin
   lockedList := Lock;
   Try
@@ -4671,7 +4674,7 @@ begin
   end;
 end;
 
-function TOrderedAccountKeysList.Lock: TList;
+function TOrderedAccountKeysList.Lock: TList<Pointer>;
 begin
   Result := FOrderedAccountKeysList.LockList;
 end;
@@ -4687,7 +4690,7 @@ begin
 end;
 
 procedure TOrderedAccountKeysList.CopyFrom(const source: TOrderedAccountKeysList);
-var selfList,sourceList : TList;
+var selfList,sourceList : TList<Pointer>;
   i : Integer;
   newP,sourceP : POrderedAccountKeyList;
 begin
@@ -4723,7 +4726,7 @@ end;
 procedure TOrderedAccountKeysList.ClearAccounts(RemoveAccountList : Boolean);
 Var P : POrderedAccountKeyList;
   i : Integer;
-  lockedList : TList;
+  lockedList : TList<Pointer>;
 begin
   lockedList := Lock;
   Try
@@ -4750,7 +4753,7 @@ begin
 end;
 
 function TOrderedAccountKeysList.Count: Integer;
-var lockedList : TList;
+var lockedList : TList<Pointer>;
 begin
   lockedList := Lock;
   Try
@@ -4767,7 +4770,7 @@ begin
   FAutoAddAll := AutoAddAll;
   FAccountList := AccountList;
   FTotalChanges:=0;
-  FOrderedAccountKeysList := TPCThreadList.Create(ClassName);
+  FOrderedAccountKeysList := TPCThreadList<Pointer>.Create(ClassName);
   if Assigned(AccountList) then begin
     Lock;
     Try
@@ -4794,7 +4797,7 @@ begin
   inherited;
 end;
 
-function TOrderedAccountKeysList.Find(lockedList : TList; const AccountKey: TAccountKey; var Index: Integer): Boolean;
+function TOrderedAccountKeysList.Find(lockedList : TList<Pointer>; const AccountKey: TAccountKey; var Index: Integer): Boolean;
 var L, H, I: Integer;
   C : Int64;
   {$IFDEF useAccountKeyStorage}
@@ -4836,7 +4839,7 @@ begin
 end;
 
 function TOrderedAccountKeysList.GetAccountKeyChanges(index : Integer): Integer;
-var lockedList : TList;
+var lockedList : TList<Pointer>;
 begin
   lockedList := Lock;
   Try
@@ -4847,7 +4850,7 @@ begin
 end;
 
 function TOrderedAccountKeysList.GetAccountKey(index: Integer): TAccountKey;
-Var lockedList : TList;
+Var lockedList : TList<Pointer>;
   {$IFDEF useAccountKeyStorage}
   {$ELSE}
   raw : TRawBytes;
@@ -4867,7 +4870,7 @@ begin
 end;
 
 function TOrderedAccountKeysList.GetAccountKeyList(index: Integer): TOrderedCardinalList;
-var lockedList : TList;
+var lockedList : TList<Pointer>;
 begin
   lockedList := Lock;
   Try
@@ -4878,7 +4881,7 @@ begin
 end;
 
 function TOrderedAccountKeysList.IndexOfAccountKey(const AccountKey: TAccountKey): Integer;
-var lockedList : TList;
+var lockedList : TList<Pointer>;
 begin
   lockedList := Lock;
   Try
@@ -4890,7 +4893,7 @@ end;
 
 procedure TOrderedAccountKeysList.ClearAccountKeyChanges;
 var i : Integer;
-  lockedList : TList;
+  lockedList : TList<Pointer>;
 begin
   lockedList := Lock;
   Try
@@ -4906,7 +4909,7 @@ end;
 procedure TOrderedAccountKeysList.RemoveAccounts(const AccountKey: TAccountKey; const accounts: array of Cardinal);
 Var P : POrderedAccountKeyList;
   i,j : Integer;
-  lockedList : TList;
+  lockedList : TList<Pointer>;
 begin
   lockedList := Lock;
   Try
@@ -4935,7 +4938,7 @@ end;
 procedure TOrderedAccountKeysList.RemoveAccountKey(const AccountKey: TAccountKey);
 Var P : POrderedAccountKeyList;
   i,j : Integer;
-  lockedList : TList;
+  lockedList : TList<Pointer>;
 begin
   lockedList := Lock;
   Try
@@ -4993,7 +4996,7 @@ end;
 
 constructor TAccountPreviousBlockInfo.Create;
 begin
-  FList := TList.Create;
+  FList := TList<Pointer>.Create;
 end;
 
 destructor TAccountPreviousBlockInfo.Destroy;

src/core/UBlockChain.pas

@@ -24,6 +24,7 @@ interface
 
 uses
   Classes, UCrypto, UAccounts, ULog, UThread, SyncObjs, UBaseTypes, SysUtils,
+  {$IFNDEF FPC}System.Generics.Collections{$ELSE}Generics.Collections{$ENDIF},
   UPCDataTypes;
 {$I config.inc}
 
@@ -180,7 +181,7 @@ Type
 
   TOperationsResumeList = Class
   private
-    FList : TPCThreadList;
+    FList : TPCThreadList<Pointer>;
     function GetOperationResume(index: Integer): TOperationResume;
   public
     Constructor Create;
@@ -220,7 +221,7 @@ Type
     destructor Destroy; override;
     function GetBufferForOpHash(UseProtocolV2 : Boolean): TRawBytes; virtual;
     function DoOperation(AccountPreviousUpdatedBlock : TAccountPreviousBlockInfo; AccountTransaction : TPCSafeBoxTransaction; var errors: String): Boolean; virtual; abstract;
-    procedure AffectedAccounts(list : TList); virtual; abstract;
+    procedure AffectedAccounts(list : TList<Cardinal>); virtual; abstract;
     class function OpType: Byte; virtual; abstract;
     Class Function OperationToOperationResume(Block : Cardinal; Operation : TPCOperation; getInfoForAllAccounts : Boolean; Affected_account_number : Cardinal; var OperationResume : TOperationResume) : Boolean; virtual;
     Function GetDigestToSign(current_protocol : Word) : TRawBytes; virtual; abstract;
@@ -229,7 +230,7 @@ Type
     function OperationFee: Int64; virtual; abstract;
     function OperationPayload : TRawBytes; virtual; abstract;
     function SignerAccount : Cardinal; virtual; abstract;
-    procedure SignerAccounts(list : TList); virtual;
+    procedure SignerAccounts(list : TList<Cardinal>); virtual;
     function IsSignerAccount(account : Cardinal) : Boolean; virtual;
     function IsAffectedAccount(account : Cardinal) : Boolean; virtual;
     function DestinationAccount : Int64; virtual;
@@ -277,14 +278,14 @@ Type
     FIntTotalDeleted : Integer;
     FMaxLocksCount : Integer;
     FMaxLocksValue : Integer;
-    FPCOperationsStorageList : TPCThreadList; // Lock thread to POperationTStorage list
-    Function FindOrderedByPtrPCOperation(lockedThreadList : TList; const Value: TPCOperation; out Index: Integer): Boolean;
+    FPCOperationsStorageList : TPCThreadList<Pointer>; // Lock thread to POperationTStorage list
+    Function FindOrderedByPtrPCOperation(lockedThreadList : TList<Pointer>; const Value: TPCOperation; out Index: Integer): Boolean;
   protected
   public
     Constructor Create;
     Destructor Destroy; override;
     //
-    function LockPCOperationsStorage : TList;
+    function LockPCOperationsStorage : TList<Pointer>;
     procedure UnlockPCOperationsStorage;
     Function Count : Integer;
     procedure AddPCOperation(APCOperation : TPCOperation);
@@ -299,20 +300,20 @@ Type
 
   TOperationsHashTree = Class
   private
-    FListOrderedByAccountsData : TList;
-    FListOrderedBySha256 : TList; // Improvement TOperationsHashTree speed 2.1.6
-    FListOrderedByOpReference : TList;
-    FHashTreeOperations : TPCThreadList; // Improvement TOperationsHashTree speed 2.1.6
+    FListOrderedByAccountsData : TList<Pointer>;
+    FListOrderedBySha256 : TList<Integer>; // Improvement TOperationsHashTree speed 2.1.6
+    FListOrderedByOpReference : TList<Integer>;
+    FHashTreeOperations : TPCThreadList<Pointer>; // Improvement TOperationsHashTree speed 2.1.6
     FHashTree: TRawBytes;
     FOnChanged: TNotifyEvent;
     FTotalAmount : Int64;
     FTotalFee : Int64;
     FMax0feeOperationsBySigner : Integer;
-    function InternalCanAddOperationToHashTree(lockedThreadList : TList; op : TPCOperation) : Boolean;
-    function InternalAddOperationToHashTree(list : TList; op : TPCOperation; CalcNewHashTree : Boolean) : Boolean;
-    Function FindOrderedByOpReference(lockedThreadList : TList; const Value: TOpReference; var Index: Integer): Boolean;
-    Function FindOrderedBySha(lockedThreadList : TList; const Value: TRawBytes; var Index: Integer): Boolean;
-    Function FindOrderedByAccountData(lockedThreadList : TList; const account_number : Cardinal; var Index: Integer): Boolean;
+    function InternalCanAddOperationToHashTree(lockedThreadList : TList<Pointer>; op : TPCOperation) : Boolean;
+    function InternalAddOperationToHashTree(list : TList<Pointer>; op : TPCOperation; CalcNewHashTree : Boolean) : Boolean;
+    Function FindOrderedByOpReference(lockedThreadList : TList<Pointer>; const Value: TOpReference; var Index: Integer): Boolean;
+    Function FindOrderedBySha(lockedThreadList : TList<Pointer>; const Value: TRawBytes; var Index: Integer): Boolean;
+    Function FindOrderedByAccountData(lockedThreadList : TList<Pointer>; const account_number : Cardinal; var Index: Integer): Boolean;
     function GetHashTree: TRawBytes;
     procedure SetMax0feeOperationsBySigner(const Value: Integer);
   public
@@ -324,7 +325,7 @@ Type
     Property HashTree : TRawBytes read GetHashTree;
     Function OperationsCount : Integer;
     Function GetOperation(index : Integer) : TPCOperation;
-    Function GetOperationsAffectingAccount(account_number : Cardinal; List : TList) : Integer;
+    Function GetOperationsAffectingAccount(account_number : Cardinal; List : TList<Cardinal>) : Integer;
     Procedure CopyFromHashTree(Sender : TOperationsHashTree);
     Property TotalAmount : Int64 read FTotalAmount;
     Property TotalFee : Int64 read FTotalFee;
@@ -505,7 +506,7 @@ Type
     FUpgradingToV2: Boolean;
     FOnLog: TPCBankLog;
     FBankLock: TPCCriticalSection;
-    FNotifyList : TList;
+    FNotifyList : TList<TPCBankNotify>;
     FStorageClass: TStorageClass;
     function GetStorage: TStorage;
     procedure SetStorageClass(const Value: TStorageClass);
@@ -552,7 +553,7 @@ uses
 var
    _PCOperationsStorage : TPCOperationsStorage;
 
-function TPCOperationsStorage.FindOrderedByPtrPCOperation(lockedThreadList: TList; const Value: TPCOperation; out Index: Integer): Boolean;
+function TPCOperationsStorage.FindOrderedByPtrPCOperation(lockedThreadList: TList<Pointer>; const Value: TPCOperation; out Index: Integer): Boolean;
 var L, H, I: Integer;
   C : PtrInt;
 begin
@@ -578,7 +579,7 @@ end;
 
 constructor TPCOperationsStorage.Create;
 begin
-  FPCOperationsStorageList := TPCThreadList.Create(ClassName);
+  FPCOperationsStorageList := TPCThreadList<Pointer>.Create(ClassName);
   FIntTotalNewOps := 0;
   FIntTotalAdded := 0;
   FIntTotalDeleted := 0;
@@ -587,7 +588,7 @@ begin
 end;
 
 destructor TPCOperationsStorage.Destroy;
-Var list : TList;
+Var list : TList<Pointer>;
   P : PPCOperationTStorage;
   i : Integer;
   pc : TPCOperation;
@@ -611,7 +612,7 @@ begin
   inherited Destroy;
 end;
 
-function TPCOperationsStorage.LockPCOperationsStorage: TList;
+function TPCOperationsStorage.LockPCOperationsStorage: TList<Pointer>;
 begin
   Result := FPCOperationsStorageList.LockList;
 end;
@@ -622,7 +623,7 @@ begin
 end;
 
 function TPCOperationsStorage.Count: Integer;
-var list : TList;
+var list : TList<Pointer>;
 begin
   list := LockPCOperationsStorage;
   try
@@ -634,7 +635,7 @@ end;
 
 procedure TPCOperationsStorage.AddPCOperation(APCOperation: TPCOperation);
 var P : PPCOperationTStorage;
-  list : TList;
+  list : TList<Pointer>;
   iPos : Integer;
 begin
   list := LockPCOperationsStorage;
@@ -662,7 +663,7 @@ end;
 
 procedure TPCOperationsStorage.RemovePCOperation(APCOperation: TPCOperation);
 var P : PPCOperationTStorage;
-  list : TList;
+  list : TList<Pointer>;
   iPos : Integer;
 begin
   list := LockPCOperationsStorage;
@@ -687,7 +688,7 @@ begin
 end;
 
 function TPCOperationsStorage.FindPCOperation(APCOperation: TPCOperation): Boolean;
-var list : TList;
+var list : TList<Pointer>;
   iPos : Integer;
 begin
   list := LockPCOperationsStorage;
@@ -699,7 +700,7 @@ begin
 end;
 
 function TPCOperationsStorage.FindPCOperationAndIncCounterIfFound(APCOperation: TPCOperation): Boolean;
-var list : TList;
+var list : TList<Pointer>;
   iPos : Integer;
 begin
   list := LockPCOperationsStorage;
@@ -725,7 +726,7 @@ begin
 end;
 
 procedure TPCOperationsStorage.GetStats(strings: TStrings);
-var list : TList;
+var list : TList<Pointer>;
   i : Integer;
   P : PPCOperationTStorage;
 begin
@@ -852,7 +853,7 @@ begin
   FIsRestoringFromFile := False;
   FOnLog := Nil;
   FSafeBox := TPCSafeBox.Create;
-  FNotifyList := TList.Create;
+  FNotifyList := TList<TPCBankNotify>.Create;
   FLastBlockCache := TPCOperationsComp.Create(Nil);
   FIsRestoringFromFile:=False;
   FUpgradingToV2:=False;
@@ -2000,7 +2001,7 @@ Type TOperationHashTreeReg = Record
      POperationsHashAccountsData = ^TOperationsHashAccountsData;
 
 function TOperationsHashTree.AddOperationToHashTree(op: TPCOperation) : Boolean;
-Var l : TList;
+Var l : TList<Pointer>;
 begin
   l := FHashTreeOperations.LockList;
   try
@@ -2011,7 +2012,7 @@ begin
 end;
 
 function TOperationsHashTree.CanAddOperationToHashTree(op: TPCOperation): Boolean;
-Var lockedList : TList;
+Var lockedList : TList<Pointer>;
 begin
   lockedList := FHashTreeOperations.LockList;
   Try
@@ -2022,7 +2023,7 @@ begin
 end;
 
 procedure TOperationsHashTree.ClearHastThree;
-var l : TList;
+var l : TList<Pointer>;
   i : Integer;
   P : POperationHashTreeReg;
   PaccData : POperationsHashAccountsData;
@@ -2056,7 +2057,7 @@ end;
 
 procedure TOperationsHashTree.CopyFromHashTree(Sender: TOperationsHashTree);
 Var i : Integer;
-  lme, lsender : TList;
+  lme, lsender : TList<Pointer>;
   PSender : POperationHashTreeReg;
   lastNE : TNotifyEvent;
 begin
@@ -2094,18 +2095,18 @@ end;
 constructor TOperationsHashTree.Create;
 begin
   FOnChanged:=Nil;
-  FListOrderedBySha256 := TList.Create;
-  FListOrderedByAccountsData := TList.Create;
-  FListOrderedByOpReference := TList.Create;
+  FListOrderedBySha256 := TList<Integer>.Create;
+  FListOrderedByAccountsData := TList<Pointer>.Create;
+  FListOrderedByOpReference := TList<Integer>.Create;
   FTotalAmount := 0;
   FTotalFee := 0;
   FHashTree := Nil;
   FMax0feeOperationsBySigner := -1; // Unlimited by default
-  FHashTreeOperations := TPCThreadList.Create('TOperationsHashTree_HashTreeOperations');
+  FHashTreeOperations := TPCThreadList<Pointer>.Create('TOperationsHashTree_HashTreeOperations');
 end;
 
 procedure TOperationsHashTree.Delete(index: Integer);
-Var l : TList;
+Var l : TList<Pointer>;
   P : POperationHashTreeReg;
   i,iDel,iValuePosDeleted : Integer;
   PaccData : POperationsHashAccountsData;
@@ -2127,7 +2128,7 @@ begin
     // Decrease FListOrderedByOpReference values > index
     for i := 0 to FListOrderedByOpReference.Count - 1 do begin
       if PtrInt(FListOrderedByOpReference[i])>index then begin
-        FListOrderedByOpReference[i] := TObject( PtrInt(FListOrderedByOpReference[i]) - 1 );
+        FListOrderedByOpReference[i] := ( (FListOrderedByOpReference[i]) - 1 );
       end;
     end;
 
@@ -2144,7 +2145,7 @@ begin
     // Decrease FListOrderedBySha256 values > index
     for i := 0 to FListOrderedBySha256.Count - 1 do begin
       if PtrInt(FListOrderedBySha256[i])>index then begin
-        FListOrderedBySha256[i] := TObject( PtrInt(FListOrderedBySha256[i]) - 1 );
+        FListOrderedBySha256[i] := ( (FListOrderedBySha256[i]) - 1 );
       end;
     end;
 
@@ -2193,7 +2194,7 @@ begin
 end;
 
 function TOperationsHashTree.GetHashTree: TRawBytes;
-Var l : TList;
+Var l : TList<Pointer>;
   i : Integer;
   P : POperationHashTreeReg;
   tmpRaw : TRawBytes;
@@ -2217,7 +2218,7 @@ begin
 end;
 
 function TOperationsHashTree.GetOperation(index: Integer): TPCOperation;
-Var l : TList;
+Var l : TList<Pointer>;
 begin
   l := FHashTreeOperations.LockList;
   try
@@ -2227,20 +2228,21 @@ begin
   end;
 end;
 
-function TOperationsHashTree.GetOperationsAffectingAccount(account_number: Cardinal; List: TList): Integer;
+function TOperationsHashTree.GetOperationsAffectingAccount(account_number: Cardinal; List: TList<Cardinal>): Integer;
   // This function retrieves operations from HashTree that affeccts to an account_number
-Var l,intl : TList;
+Var l : TList<Pointer>;
+  intl : TList<Cardinal>;
   i,j : Integer;
 begin
   List.Clear;
   l := FHashTreeOperations.LockList;
   try
-    intl := TList.Create;
+    intl := TList<Cardinal>.Create;
     try
       for i := 0 to l.Count - 1 do begin
         intl.Clear;
         POperationHashTreeReg(l[i])^.Op.AffectedAccounts(intl);
-        if intl.IndexOf(TObject(account_number))>=0 then List.Add(TObject(i));
+        if intl.IndexOf(account_number)>=0 then List.Add(Cardinal(i));
       end;
     finally
       intl.Free;
@@ -2253,7 +2255,7 @@ end;
 
 function TOperationsHashTree.IndexOfOperation(op: TPCOperation): Integer;
 Var iPosInOrdered : Integer;
-  l : TList;
+  l : TList<Pointer>;
   OpSha256 : TRawBytes;
 begin
   OpSha256 := op.Sha256;
@@ -2270,7 +2272,7 @@ begin
 end;
 
 function TOperationsHashTree.IndexOfOpReference(const opReference: TOpReference): Integer;
-Var l : TList;
+Var l : TList<Pointer>;
 begin
   l := FHashTreeOperations.LockList;
   Try
@@ -2282,7 +2284,7 @@ begin
 end;
 
 function TOperationsHashTree.CountOperationsBySameSignerWithoutFee(account_number: Cardinal): Integer;
-Var l : TList;
+Var l : TList<Pointer>;
   i : Integer;
 begin
   Result := 0;
@@ -2298,13 +2300,13 @@ begin
   End;
 end;
 
-function TOperationsHashTree.InternalAddOperationToHashTree(list: TList; op: TPCOperation; CalcNewHashTree : Boolean) : Boolean;
+function TOperationsHashTree.InternalAddOperationToHashTree(list: TList<Pointer>; op: TPCOperation; CalcNewHashTree : Boolean) : Boolean;
 Var msCopy : TMemoryStream;
   hForNewHash : TRawBytes;
   P : POperationHashTreeReg;
   PaccData : POperationsHashAccountsData;
   i,npos,iListSigners : Integer;
-  listSigners : TList;
+  listSigners : TList<Cardinal>;
 begin
   if Not InternalCanAddOperationToHashTree(list,op) then begin
     Result := False;
@@ -2342,23 +2344,23 @@ begin
     npos := list.Add(P);
     //
     if Not FindOrderedByOpReference(list,op.GetOpReference,i) then begin
-      FListOrderedByOpReference.Insert(i,TObject(npos));
+      FListOrderedByOpReference.Insert(i, npos);
     end; // TODO: Do not allow duplicate OpReferences?
 
     // Improvement: Will allow to add duplicate Operations, so add only first to orderedBySha
     If Not FindOrderedBySha(list,op.Sha256,i) then begin
       // Protection: Will add only once
-      FListOrderedBySha256.Insert(i,TObject(npos));
+      FListOrderedBySha256.Insert(i, npos);
     end;
     // Improvement TOperationsHashTree speed 2.1.6
     // Mantain an ordered Accounts list with data
-    listSigners := TList.Create;
+    listSigners := TList<Cardinal>.Create;
     try
       op.SignerAccounts(listSigners);
       for iListSigners:=0 to listSigners.Count-1 do begin
-        If Not FindOrderedByAccountData(list,PtrInt(listSigners[iListSigners]),i) then begin
+        If Not FindOrderedByAccountData(list,listSigners[iListSigners],i) then begin
           New(PaccData);
-          PaccData^.account_number:=PtrInt(listSigners[iListSigners]);
+          PaccData^.account_number:=listSigners[iListSigners];
           PaccData^.account_count:=0;
           PaccData^.account_without_fee:=0;
           FListOrderedByAccountsData.Insert(i,PaccData);
@@ -2376,10 +2378,10 @@ begin
   If Assigned(FOnChanged) then FOnChanged(Self);
 end;
 
-function TOperationsHashTree.InternalCanAddOperationToHashTree(lockedThreadList : TList; op: TPCOperation): Boolean;
+function TOperationsHashTree.InternalCanAddOperationToHashTree(lockedThreadList : TList<Pointer>; op: TPCOperation): Boolean;
 Var PaccData : POperationsHashAccountsData;
   iListSigners,iFound : Integer;
-  listSigners : TList;
+  listSigners : TList<Cardinal>;
 begin
   Result := False;
   // Protections:
@@ -2387,11 +2389,11 @@ begin
   if (op.OperationFee=0) And (FMax0feeOperationsBySigner>=0) then begin
     if (FMax0feeOperationsBySigner=0) then Exit // Not allowed 0-fee operations!
     else if (FMax0feeOperationsBySigner>0) then begin
-      listSigners := TList.Create;
+      listSigners := TList<Cardinal>.Create;
       try
         op.SignerAccounts(listSigners);
         for iListSigners:=0 to listSigners.Count-1 do begin
-          If FindOrderedByAccountData(lockedThreadList,PtrInt(listSigners[iListSigners]),iFound) then begin
+          If FindOrderedByAccountData(lockedThreadList,(listSigners[iListSigners]),iFound) then begin
             PaccData := FListOrderedByAccountsData[iFound];
             if (PaccData^.account_without_fee>=FMax0feeOperationsBySigner) then Exit; // Limit 0-fee reached
           end;
@@ -2404,7 +2406,7 @@ begin
   Result := True;
 end;
 
-function TOperationsHashTree.FindOrderedBySha(lockedThreadList : TList; const Value: TRawBytes; var Index: Integer): Boolean;
+function TOperationsHashTree.FindOrderedBySha(lockedThreadList : TList<Pointer>; const Value: TRawBytes; var Index: Integer): Boolean;
 var L, H, I : Integer;
   iLockedThreadListPos : PtrInt;
   C : Int64;
@@ -2431,7 +2433,7 @@ begin
   Index := L;
 end;
 
-function TOperationsHashTree.FindOrderedByAccountData(lockedThreadList: TList; const account_number: Cardinal; var Index: Integer): Boolean;
+function TOperationsHashTree.FindOrderedByAccountData(lockedThreadList: TList<Pointer>; const account_number: Cardinal; var Index: Integer): Boolean;
 var L, H, I : Integer;
   C : Int64;
 begin
@@ -2455,7 +2457,7 @@ begin
   Index := L;
 end;
 
-function TOperationsHashTree.FindOrderedByOpReference(lockedThreadList: TList; const Value: TOpReference; var Index: Integer): Boolean;
+function TOperationsHashTree.FindOrderedByOpReference(lockedThreadList: TList<Pointer>; const Value: TOpReference; var Index: Integer): Boolean;
 var L, H, I : Integer;
   iLockedThreadListPos : PtrInt;
   C : Int64;
@@ -2542,7 +2544,7 @@ end;
 procedure TOperationsHashTree.MarkVerifiedECDSASignatures(operationsHashTreeToMark: TOperationsHashTree);
 var i, iPosInMyList, nMarkedAsGood, nAlreadyMarked : Integer;
   opToMark, opInMyList : TPCOperation;
-  myList, listToMark : TList;
+  myList, listToMark : TList<Pointer>;
 begin
   // Introduced on Build 4.0.2 to increase speed
   // Will search each "operationsHashTreeToMark" operation on my current list. If found, will set same FHasValidSignature in order to mark operation in "operationsHashTreeToMark" as verified
@@ -2584,7 +2586,7 @@ begin
 end;
 
 function TOperationsHashTree.OperationsCount: Integer;
-Var l : TList;
+Var l : TList<Pointer>;
 begin
   l := FHashTreeOperations.LockList;
   try
@@ -2596,7 +2598,7 @@ end;
 
 procedure TOperationsHashTree.RemoveByOpReference(const opReference: TOpReference);
 var i : Integer;
-  l : TList;
+  l : TList<Pointer>;
   iLockedThreadListPos : PtrInt;
 begin
   l := FHashTreeOperations.LockList;
@@ -2613,7 +2615,7 @@ end;
 function TOperationsHashTree.SaveOperationsHashTreeToStream(Stream: TStream; SaveToStorage: Boolean): Boolean;
 Var c, i, OpType: Cardinal;
   bcop: TPCOperation;
-  l : TList;
+  l : TList<Pointer>;
 begin
   l := FHashTreeOperations.LockList;
   Try
@@ -2863,10 +2865,10 @@ begin
   Result := Cardinal(opReference);
 end;
 
-procedure TPCOperation.SignerAccounts(list: TList);
+procedure TPCOperation.SignerAccounts(list: TList<Cardinal>);
 begin
   list.Clear;
-  list.Add(TObject(SignerAccount));
+  list.Add(SignerAccount);
 end;
 
 class function TPCOperation.DecodeOperationHash(const operationHash: TRawBytes;
@@ -3232,12 +3234,12 @@ begin
 end;
 
 function TPCOperation.IsAffectedAccount(account: Cardinal): Boolean;
-Var l : TList;
+Var l : TList<Cardinal>;
 begin
-  l := TList.Create;
+  l := TList<Cardinal>.Create;
   Try
     AffectedAccounts(l);
-    Result := (l.IndexOf(TObject(account))>=0);
+    Result := (l.IndexOf(account)>=0);
   finally
     l.Free;
   end;
@@ -3297,7 +3299,7 @@ end;
 procedure TOperationsResumeList.Clear;
 Var P : POperationResume;
   i : Integer;
-  l : TList;
+  l : TList<Pointer>;
 begin
   l := FList.LockList;
   try
@@ -3312,7 +3314,7 @@ begin
 end;
 
 function TOperationsResumeList.Count: Integer;
-Var l : TList;
+Var l : TList<Pointer>;
 begin
   l := FList.LockList;
   Try
@@ -3324,12 +3326,12 @@ end;
 
 constructor TOperationsResumeList.Create;
 begin
-  FList := TPCThreadList.Create('TOperationsResumeList_List');
+  FList := TPCThreadList<Pointer>.Create('TOperationsResumeList_List');
 end;
 
 procedure TOperationsResumeList.Delete(index: Integer);
 Var P : POperationResume;
-  l : TList;
+  l : TList<Pointer>;
 begin
   l := FList.LockList;
   Try
@@ -3349,7 +3351,7 @@ begin
 end;
 
 function TOperationsResumeList.GetOperationResume(index: Integer): TOperationResume;
-Var l : TList;
+Var l : TList<Pointer>;
 begin
   l := FList.LockList;
   try

src/core/UCrypto.pas

@@ -270,8 +270,7 @@ end;
 
 function TECPrivateKey.GetPublicKey: TECDSA_Public;
 {$IFDEF Use_OpenSSL}
-var ps : PAnsiChar;
-  BNx,BNy : PBIGNUM;
+var BNx,BNy : PBIGNUM;
   ctx : PBN_CTX;
 {$ENDIF}
 begin
@@ -315,6 +314,9 @@ Var ms : TStream;
   LNewPrivateKeyInfo : TECPrivateKeyInfo;
 begin
   Result := Nil;
+  LNewPrivateKeyInfo.EC_OpenSSL_NID := 0;
+  LNewPrivateKeyInfo.EC_KEY_Ptr := Nil;
+  LNewPrivateKeyInfo.RAW_PrivKey := Nil;
   ms := TMemoryStream.Create;
   Try
     ms.WriteBuffer(raw[Low(raw)],Length(raw));
@@ -425,6 +427,9 @@ begin
   if Assigned(FPrivateKeyInfo.EC_KEY_Ptr) then EC_KEY_free(FPrivateKeyInfo.EC_KEY_Ptr);
   {$ENDIF}
   FPrivateKeyInfo := Value;
+  {$IFNDEF Use_OpenSSL}
+  FPrivateKeyInfo.EC_KEY_Ptr := Nil;
+  {$ENDIF}
 end;
 
 function TECPrivateKey.SetPrivateKeyFromHexa(AEC_OpenSSL_NID : Word; const hexa : String) : Boolean;
@@ -447,7 +452,7 @@ begin
     if Assigned(FPrivateKeyInfo.EC_KEY_Ptr) then EC_KEY_free(FPrivateKeyInfo.EC_KEY_Ptr);
     FPrivateKeyInfo.EC_KEY_Ptr := Nil;
 
-    FPrivateKeyInfo.EC_OpenSSL_NID := EC_OpenSSL_NID;
+    FPrivateKeyInfo.EC_OpenSSL_NID := AEC_OpenSSL_NID;
     FPrivateKeyInfo.EC_KEY_Ptr := EC_KEY_new_by_curve_name(EC_OpenSSL_NID);
     If Not Assigned(FPrivateKeyInfo.EC_KEY_Ptr) then Exit;
     if EC_KEY_set_private_key(FPrivateKeyInfo.EC_KEY_Ptr,bn)<>1 then raise ECryptoException.Create('Invalid num to set as private key');

src/core/ULog.pas

@@ -23,7 +23,9 @@ unit ULog;
 interface
 
 uses
-  Classes, UThread, SyncObjs, UConst;
+  Classes, UThread, SyncObjs, UConst,
+  {$IFNDEF FPC}System.Generics.Collections{$ELSE}Generics.Collections{$ENDIF};
+
 
 type
   TLogType = (ltinfo, ltupdate, lterror, ltdebug);
@@ -53,7 +55,7 @@ type
 
   TLog = Class(TComponent)
   private
-    FLogDataList : TThreadList;
+    FLogDataList : TThreadList<Pointer>;
     FOnNewLog: TNewLogEvent;
     FOnInThreadNewLog : TNewLogEvent;
     FFileStream : TFileStream;
@@ -87,7 +89,7 @@ implementation
 
 uses SysUtils;
 
-var _logs : TList;
+var _logs : TList<TLog>;
 Type PLogData = ^TLogData;
 
 { TLog }
@@ -96,13 +98,13 @@ constructor TLog.Create(AOwner: TComponent);
 begin
   FLock := TCriticalSection.Create;
   FProcessGlobalLogs := true;
-  FLogDataList := TThreadList.Create;
+  FLogDataList := TThreadList<Pointer>.Create;
   FFileStream := Nil;
   FFileName := '';
   FSaveTypes := CT_TLogTypes_DEFAULT;
   FOnInThreadNewLog:=Nil;
   FOnNewLog:=Nil;
-  if (Not assigned(_logs)) then _logs := TList.Create;
+  if (Not assigned(_logs)) then _logs := TList<TLog>.Create;
   _logs.Add(self);
   FThreadSafeLogEvent := TThreadSafeLogEvent.Create(true);
   FThreadSafeLogEvent.FLog := Self;
@@ -112,7 +114,7 @@ end;
 
 destructor TLog.Destroy;
 var
-  l : TList;
+  l : TList<Pointer>;
   i : Integer;
   P : PLogData;
 begin
@@ -220,7 +222,7 @@ begin
 end;
 
 procedure TThreadSafeLogEvent.SynchronizedProcess;
-Var l : TList;
+Var l : TList<Pointer>;
   i : Integer;
   P : PLogData;
 begin

src/core/UNetProtection.pas

@@ -33,7 +33,9 @@ unit UNetProtection;
 
 interface
 
-Uses SysUtils, Classes, UJSONFunctions, UThread, ULog, UTime;
+Uses SysUtils, Classes, UJSONFunctions, UThread, ULog, UTime,
+  {$IFNDEF FPC}System.Generics.Collections{$ELSE}Generics.Collections{$ENDIF};
+
 
 Type
   TIpInfo = Record
@@ -51,11 +53,11 @@ Type
 
   TIpInfos = Class
   private
-    FThreadList : TPCThreadList;
+    FThreadList : TPCThreadList<Pointer>;
     FMaxStatsLifetime: Integer;
     FMaxStatsCount: Integer;
     FDeletedStatsCount: Int64;
-    function Find(lockedList : TList; const ip : String; var Index: Integer): Boolean;
+    function Find(lockedList : TList<Pointer>; const ip : String; var Index: Integer): Boolean;
     procedure SetMaxStatsLifetime(const Value: Integer);
     procedure CleanLastStatsByUpdatedTimestamp(minTimestamp : Integer);
     procedure SetMaxStatsCount(const Value: Integer);
@@ -85,7 +87,7 @@ procedure TIpInfos.CleanLastStatsByUpdatedTimestamp(minTimestamp: Integer);
 var jsonOpType, relJsonOpType, relJsonNetTransferType : TPCJSONObject;
   lasts : TPCJSONArray;
   iIp, i,j,k : Integer;
-  list : TList;
+  list : TList<Pointer>;
   p : PIpInfo;
 begin
   list := FThreadList.LockList;
@@ -124,7 +126,7 @@ end;
 procedure TIpInfos.Clear;
 var p : PIpInfo;
   i : Integer;
-  list : TList;
+  list : TList<Pointer>;
 begin
   list := FThreadList.LockList;
   Try
@@ -148,7 +150,7 @@ end;
 
 constructor TIpInfos.Create;
 begin
-  FThreadList := TPCThreadList.Create(Self.ClassName);
+  FThreadList := TPCThreadList<Pointer>.Create(Self.ClassName);
   FMaxStatsLifetime := 60*60*24; // Last values by 24 hours by default
   FMaxStatsCount := 1000; // Max 1000 last stats by default
   FDeletedStatsCount := 0;
@@ -161,7 +163,7 @@ begin
   inherited;
 end;
 
-function TIpInfos.Find(lockedList : TList; const ip: String; var Index: Integer): Boolean;
+function TIpInfos.Find(lockedList : TList<Pointer>; const ip: String; var Index: Integer): Boolean;
 var L, H, I, C: Integer;
   PN : PIpInfo;
 begin
@@ -187,7 +189,7 @@ begin
 end;
 
 function TIpInfos.Lock(index: Integer): TIpInfo;
-var list : TList;
+var list : TList<Pointer>;
 begin
   list := FThreadList.LockList;
   if (list.Count>index) then begin
@@ -229,7 +231,7 @@ begin
 end;
 
 function TIpInfos.Lock(const AIp: String; MarkAsUpdated: Boolean): TPCJSONObject;
-var list : TList;
+var list : TList<Pointer>;
   i : Integer;
   p : PIpInfo;
 begin

src/core/UNetProtocol.pas

@@ -31,6 +31,8 @@ Uses
 {$ENDIF}
   UBlockChain, Classes, SysUtils, UAccounts, UThread,
   UCrypto, UTCPIP, SyncObjs, UBaseTypes, UCommon, UPCOrderedLists,
+  {$IFNDEF FPC}System.Generics.Collections,System.Generics.Defaults
+  {$ELSE}Generics.Collections,Generics.Defaults{$ENDIF},
   UNetProtection;
 
 {$I config.inc}
@@ -141,8 +143,8 @@ Type
     FAllowDeleteOnClean: Boolean;
     FNetData : TNetData;
     FCritical : TPCCriticalSection;
-    FListByIp : TList;
-    FListByNetConnection : TList;
+    FListByIp : TList<Pointer>;
+    FListByNetConnection : TList<Pointer>;
     Procedure SecuredDeleteFromListByIp(index : Integer);
     Function SecuredFindByIp(const ip : String; port : Word; var Index: Integer): Boolean;
     Function SecuredFindByNetConnection(const search : TNetConnection; var Index: Integer): Boolean;
@@ -155,7 +157,7 @@ Type
     Function Count : Integer;
     Function CleanBlackList(forceCleanAll : Boolean) : Integer;
     procedure CleanNodeServersList;
-    Function LockList : TList;
+    Function LockList : TList<Pointer>;
     Procedure UnlockList;
     function IsBlackListed(const ip: String): Boolean;
     function GetNodeServerAddress(const ip : String; port:Word; CanAdd : Boolean; var nodeServerAddress : TNodeServerAddress) : Boolean;
@@ -234,11 +236,11 @@ Type
 
   TNetworkAdjustedTime = Class
   private
-    FTimesList : TPCThreadList;
+    FTimesList : TPCThreadList<Pointer>;
     FTimeOffset : Integer;
     FTotalCounter : Integer;
-    Function IndexOfClientIp(list : TList; const clientIp : String) : Integer;
-    Procedure UpdateMedian(list : TList);
+    Function IndexOfClientIp(list : TList<Pointer>; const clientIp : String) : Integer;
+    Procedure UpdateMedian(list : TList<Pointer>);
   public
     constructor Create;
     destructor Destroy; override;
@@ -260,11 +262,11 @@ Type
     FMinServersConnected: Integer;
     FNetDataNotifyEventsThread : TNetDataNotifyEventsThread;
     FNodePrivateKey : TECPrivateKey;
-    FNetConnections : TPCThreadList;
+    FNetConnections : TPCThreadList<TNetConnection>;
     FNodeServersAddresses : TOrderedServerAddressListTS;
     FLastRequestId : Cardinal;
     FOnProcessReservedAreaMessage: TProcessReservedAreaMessage;
-    FRegisteredRequests : TPCThreadList;
+    FRegisteredRequests : TPCThreadList<Pointer>;
     FIsDiscoveringServers : Boolean;
     FLockGettingNewBlockChainFromClient : TPCCriticalSection;
     FNewBlockChainFromClientStatus : String;
@@ -330,7 +332,7 @@ Type
     procedure OnReadingNewSafeboxProgressNotify(sender : TObject; const mesage : String; curPos, totalCount : Int64);
     Procedure GetNewBlockChainFromClient(Connection : TNetConnection; const why : String);
     Property NodeServersAddresses : TOrderedServerAddressListTS read FNodeServersAddresses;
-    Property NetConnections : TPCThreadList read FNetConnections;
+    Property NetConnections : TPCThreadList<TNetConnection> read FNetConnections;
     Property NetStatistics : TNetStatistics read FNetStatistics;
     Property IsDiscoveringServers : Boolean read FIsDiscoveringServers;
     function IsGettingNewBlockChainFromClient(var status : String) : Boolean;
@@ -612,8 +614,8 @@ constructor TOrderedServerAddressListTS.Create(ANetData : TNetData);
 begin
   FNetData := ANetData;
   FCritical := TPCCriticalSection.Create(Classname);
-  FListByIp := TList.Create;
-  FListByNetConnection := TList.Create;
+  FListByIp := TList<Pointer>.Create;
+  FListByNetConnection := TList<Pointer>.Create;
   FAllowDeleteOnClean := True;
 end;
 
@@ -669,7 +671,7 @@ begin
 end;
 
 procedure TOrderedServerAddressListTS.GetNodeServersToConnnect(maxNodes: Integer; useArray : Boolean; var nsa: TNodeServerAddressArray);
-  Procedure sw(l : TList);
+  Procedure sw(l : TList<Pointer>);
   Var i,j,x,y : Integer;
   begin
     if l.Count<=1 then exit;
@@ -688,12 +690,12 @@ procedure TOrderedServerAddressListTS.GetNodeServersToConnnect(maxNodes: Integer
   End;
 Var i,j, iStart : Integer;
   P : PNodeServerAddress;
-  l : TList;
+  l : TList<Pointer>;
   ns : TNodeServerAddress;
 begin
   FCritical.Acquire;
   Try
-    l := TList.Create;
+    l := TList<Pointer>.Create;
     Try
       if useArray then begin
         for i := 0 to High(nsa) do begin
@@ -828,7 +830,7 @@ begin
   End;
 end;
 
-function TOrderedServerAddressListTS.LockList: TList;
+function TOrderedServerAddressListTS.LockList: TList<Pointer>;
 begin
   FCritical.Acquire;
   Result := FListByIp;
@@ -966,13 +968,12 @@ Type PNetRequestRegistered = ^TNetRequestRegistered;
 procedure TNetData.AddServer(NodeServerAddress: TNodeServerAddress);
 Var P : PNodeServerAddress;
   i : Integer;
-  l : TList;
   currunixtimestamp : Cardinal;
   nsa : TNodeServerAddress;
 begin
   if (trim(NodeServerAddress.ip)='')
      or (SameText(NodeServerAddress.ip,'localhost'))
-     or (SameText('127.',Copy(NodeServerAddress.ip,1,4))) then Exit;
+     or (SameText('127.',NodeServerAddress.ip.Substring(0,4))) then Exit;
 
   if (NodeServerAddress.port<=0) then NodeServerAddress.port := CT_NetServer_Port
   else if (NodeServerAddress.port<>CT_NetServer_Port) then exit;
@@ -999,11 +1000,11 @@ begin
 end;
 
 function TNetData.Connection(index: Integer): TNetConnection;
-Var l : TList;
+Var l : TList<TNetConnection>;
 begin
   l := FNetConnections.LockList;
   try
-    Result := TNetConnection( l[index] );
+    Result := ( l[index] );
   finally
     FNetConnections.UnlockList;
   end;
@@ -1011,7 +1012,7 @@ end;
 
 function TNetData.ConnectionExists(ObjectPointer: TObject): Boolean;
 var i : Integer;
-  l : TList;
+  l : TList<TNetConnection>;
 begin
   Result := false;
   l := FNetConnections.LockList;
@@ -1029,7 +1030,7 @@ end;
 
 function TNetData.ConnectionExistsAndActive(ObjectPointer: TObject): Boolean;
 var i : Integer;
-  l : TList;
+  l : TList<TNetConnection>;
 begin
   Result := false;
   l := FNetConnections.LockList;
@@ -1047,7 +1048,7 @@ end;
 
 function TNetData.ConnectionLock(Sender : TObject; ObjectPointer: TObject; MaxWaitMiliseconds : Cardinal) : Boolean;
 var i : Integer;
-  l : TList;
+  l : TList<TNetConnection>;
   nc : TNetConnection;
   tc : TTickCount;
 begin
@@ -1079,7 +1080,7 @@ end;
 
 function TNetData.ConnectionsCount(CountOnlyNetClients : Boolean): Integer;
 var i : Integer;
-  l : TList;
+  l : TList<TNetConnection>;
 begin
   l := FNetConnections.LockList;
   try
@@ -1095,7 +1096,7 @@ begin
 end;
 
 function TNetData.ConnectionsCountAll: Integer;
-Var l : TList;
+Var l : TList<TNetConnection>;
 begin
   l := FNetConnections.LockList;
   try
@@ -1106,7 +1107,7 @@ begin
 end;
 
 function TNetData.ConnectionsCountClients: Integer;
-Var l : TList; i : Integer;
+Var l : TList<TNetConnection>; i : Integer;
 begin
   Result := 0;
   l := FNetConnections.LockList;
@@ -1120,7 +1121,7 @@ begin
 end;
 
 function TNetData.ConnectionsCountServerClients: Integer;
-Var l : TList; i : Integer;
+Var l : TList<TNetConnection>; i : Integer;
 begin
   Result := 0;
   l := FNetConnections.LockList;
@@ -1135,7 +1136,7 @@ end;
 
 procedure TNetData.ConnectionUnlock(ObjectPointer: TObject);
 var i : Integer;
-  l : TList;
+  l : TList<TNetConnection>;
   nc : TNetConnection;
 begin
   l := FNetConnections.LockList;
@@ -1178,10 +1179,10 @@ begin
   FOnReceivedHelloMessage := Nil;
   FOnGetNewBlockchainFromClientDownloadNewSafebox := Nil;
   FIsDiscoveringServers := false;
-  FRegisteredRequests := TPCThreadList.Create('TNetData_RegisteredRequests');
+  FRegisteredRequests := TPCThreadList<Pointer>.Create('TNetData_RegisteredRequests');
   FNodeServersAddresses := TOrderedServerAddressListTS.Create(Self);
   FLastRequestId := 0;
-  FNetConnections := TPCThreadList.Create('TNetData_NetConnections');
+  FNetConnections := TPCThreadList<TNetConnection>.Create('TNetData_NetConnections');
   FLockGettingNewBlockChainFromClient := TPCCriticalSection.Create('LockGettingNewBlockChainFromClient');
   FNewBlockChainFromClientStatus := '';
   FNodePrivateKey := TECPrivateKey.Create;
@@ -1204,7 +1205,7 @@ begin
 end;
 
 destructor TNetData.Destroy;
-Var l : TList;
+Var l : TList<TNetConnection>;
   i : Integer;
   tdc : TThreadDiscoverConnection;
 begin
@@ -1270,12 +1271,12 @@ end;
 
 procedure TNetData.DisconnectClients;
 var i : Integer;
-  l : TList;
+  l : TList<TNetConnection>;
 begin
   l := FNetConnections.LockList;
   Try
     for i := l.Count - 1 downto 0 do begin
-      if TObject(l[i]) is TNetClient then begin
+      if (l[i] is TNetClient) then begin
         TNetClient(l[i]).Connected := false;
         TNetClient(l[i]).FinalizeConnection;
       end;
@@ -1298,20 +1299,8 @@ begin
 end;
 
 procedure TNetData.DiscoverServers;
-  Procedure sw(l : TList);
-  Var i,j,x,y : Integer;
-  begin
-    if l.Count<=1 then exit;
-    j := Random(l.Count)*3;
-    for i := 0 to j do begin
-      x := Random(l.Count);
-      y := Random(l.Count);
-      if x<>y then l.Exchange(x,y);
-    end;
-  end;
 Var P : PNodeServerAddress;
   i,j,k : Integer;
-  l,lns : TList;
   tdc : TThreadDiscoverConnection;
   canAdd : Boolean;
   nsa : TNodeServerAddressArray;
@@ -1430,7 +1419,7 @@ begin
 end;
 
 function TNetData.FindConnectionByClientRandomValue(Sender: TNetConnection): TNetConnection;
-Var l : TList;
+Var l : TList<TNetConnection>;
   i : Integer;
 begin
   l := FNetConnections.LockList;
@@ -1446,7 +1435,7 @@ begin
 end;
 
 function TNetData.GetConnection(index: Integer; var NetConnection : TNetConnection) : Boolean;
-Var l : TList;
+Var l : TList<TNetConnection>;
 begin
   Result := false; NetConnection := Nil;
   l := FNetConnections.LockList;
@@ -1465,7 +1454,7 @@ procedure TNetData.GetNewBlockChainFromClient(Connection: TNetConnection;
   const why: String);
 Const CT_LogSender = 'GetNewBlockChainFromClient';
 
-  function Do_GetOperationsBlock(AssignToBank : TPCBank; block_start,block_end, MaxWaitMilliseconds : Cardinal; OnlyOperationBlock : Boolean; BlocksList : TList) : Boolean;
+  function Do_GetOperationsBlock(AssignToBank : TPCBank; block_start,block_end, MaxWaitMilliseconds : Cardinal; OnlyOperationBlock : Boolean; BlocksList : TList<TPCOperationsComp>) : Boolean;
   Var SendData,ReceiveData : TMemoryStream;
     headerdata : TNetHeaderData;
     op : TPCOperationsComp;
@@ -1526,11 +1515,11 @@ Const CT_LogSender = 'GetNewBlockChainFromClient';
   end;
 
   function Do_GetOperationBlock(block, MaxWaitMilliseconds : Cardinal; var OperationBlock : TOperationBlock) : Boolean;
-  Var BlocksList : TList;
+  Var BlocksList : TList<TPCOperationsComp>;
     i : Integer;
   begin
     OperationBlock := CT_OperationBlock_NUL;
-    BlocksList := TList.Create;
+    BlocksList := TList<TPCOperationsComp>.Create;
     try
       Result := Do_GetOperationsBlock(TNode.Node.Bank,block,block,MaxWaitMilliseconds,True,BlocksList);
       // Build 2.1.7 - Included protection agains not good block received
@@ -1551,13 +1540,13 @@ Const CT_LogSender = 'GetNewBlockChainFromClient';
     ant_nblock : Int64;
     auxBlock, sbBlock : TOperationBlock;
     distinctmax,distinctmin : Cardinal;
-    BlocksList : TList;
+    BlocksList : TList<TPCOperationsComp>;
     errors : String;
   Begin
     Result := false;
     OperationBlock := CT_OperationBlock_NUL;
     repeat
-      BlocksList := TList.Create;
+      BlocksList := TList<TPCOperationsComp>.Create;
       try
         If Not Do_GetOperationsBlock(Nil,min,max,20000,true,BlocksList) then exit;
         if (BlocksList.Count=0) then begin
@@ -1604,7 +1593,7 @@ Const CT_LogSender = 'GetNewBlockChainFromClient';
   End;
 
   procedure GetNewBank(start_block : Int64);
-  Var BlocksList : TList;
+  Var BlocksList : TList<TPCOperationsComp>;
     i : Integer;
     OpComp,OpExecute : TPCOperationsComp;
     oldBlockchainOperations : TOperationsHashTree;
@@ -1653,7 +1642,7 @@ Const CT_LogSender = 'GetNewBlockChainFromClient';
       // Receive new blocks:
       finished := false;
       repeat
-        BlocksList := TList.Create;
+        BlocksList := TList<TPCOperationsComp>.Create;
         try
           finished := NOT Do_GetOperationsBlock(Bank,start,start + 50,30000,false,BlocksList);
           i := 0;
@@ -1944,7 +1933,7 @@ Const CT_LogSender = 'GetNewBlockChainFromClient';
     newBlock : TBlockAccount;
     opComp : TPCOperationsComp;
     errors : String;
-    blocksList : TList;
+    blocksList : TList<TPCOperationsComp>;
     i : Integer;
     rid : Cardinal;
     download_new_safebox : Boolean;
@@ -1975,7 +1964,7 @@ Const CT_LogSender = 'GetNewBlockChainFromClient';
               TLog.NewLog(ltInfo,ClassName,'Received new safebox!');
               newTmpBank.Storage.SaveBank(True); // Saving bank
               // Receive at least 1 new block
-              blocksList := TList.Create;
+              blocksList := TList<TPCOperationsComp>.Create;
               try
                 if Not Do_GetOperationsBlock(newTmpBank,safebox_last_operation_block.block,safebox_last_operation_block.block+10,20000,False,blocksList) then begin
                   TLog.NewLog(ltError,ClassName,Format('Cannot receive at least 1 new block:%d',[safebox_last_operation_block.block]));
@@ -2207,14 +2196,14 @@ begin
 end;
 
 procedure TNetData.Notification(AComponent: TComponent; Operation: TOperation);
-Var l : TList;
+Var l : TList<TNetConnection>;
 begin
   inherited;
-  if Operation=OpRemove then begin
+  if (Operation=OpRemove) and Assigned(AComponent) and (AComponent is TNetConnection) then begin
     if not (csDestroying in ComponentState) then begin
       l := FNetConnections.LockList;
       try
-        if l.Remove(AComponent)>=0 then begin
+        if l.Remove(TNetConnection(AComponent))>=0 then begin
           NotifyNetConnectionUpdated;
         end;
       finally
@@ -2285,7 +2274,7 @@ end;
 function TNetData.PendingRequest(Sender: TNetConnection; var requests_data : String): Integer;
 Var P : PNetRequestRegistered;
   i : Integer;
-  l : TList;
+  l : TList<Pointer>;
 begin
   requests_data := '';
   l := FRegisteredRequests.LockList;
@@ -2306,7 +2295,7 @@ end;
 
 procedure TNetData.RegisterRequest(Sender: TNetConnection; operation: Word; request_id: Cardinal);
 Var P : PNetRequestRegistered;
-  l : TList;
+  l : TList<Pointer>;
 begin
   l := FRegisteredRequests.LockList;
   Try
@@ -2333,7 +2322,7 @@ end;
 function TNetData.UnRegisterRequest(Sender: TNetConnection; operation: Word; request_id: Cardinal): Boolean;
 Var P : PNetRequestRegistered;
   i : Integer;
-  l : TList;
+  l : TList<Pointer>;
 begin
   Result := false;
   l := FRegisteredRequests.LockList;
@@ -2486,7 +2475,6 @@ end;
 
 function TNetConnection.ConnectTo(ServerIP: String; ServerPort: Word) : Boolean;
 Var nsa : TNodeServerAddress;
-  lns : TList;
   i : Integer;
 begin
   If FIsConnecting then Exit;
@@ -2732,7 +2720,7 @@ procedure TNetConnection.DoProcess_GetBlockchainOperations_Request(HeaderData: T
       op_size : 4 bytes
       op_data : (op_size) bytes
   }
-  function GetBlock(bufferOperationsBlock : TList; nBlock : Integer) : TPCOperationsComp;
+  function GetBlock(bufferOperationsBlock : TList<TPCOperationsComp>; nBlock : Integer) : TPCOperationsComp;
   var i : Integer;
   begin
     // Search at buffer:
@@ -2748,7 +2736,7 @@ procedure TNetConnection.DoProcess_GetBlockchainOperations_Request(HeaderData: T
 Var input_operations_count, cBlock, cBlockOpIndex, c : Cardinal;
   block_op_ref : UInt64;
   i : Integer;
-  bufferOperationsBlock : TList;
+  bufferOperationsBlock : TList<TPCOperationsComp>;
   opc : TPCOperationsComp;
   outputBuffer : TStream;
   opindexdata : TStream;
@@ -2771,7 +2759,7 @@ begin
       Exit;
     end;
     outputBuffer.Write(input_operations_count,SizeOf(input_operations_count));
-    bufferOperationsBlock := TList.Create;
+    bufferOperationsBlock := TList<TPCOperationsComp>.Create;
     opindexdata := TStream.Create;
     Try
       for i := 1 to input_operations_count do begin
@@ -3508,9 +3496,9 @@ Begin
       TLog.NewLog(ltDebug,ClassName,'Corrected timestamp for node ('+ClientRemoteAddr+') old offset: '+IntToStr(lastTimestampDiff)+' current offset '+IntToStr(FTimestampDiff) );
     end;
 
-    if (connection_has_a_server>0) And (Not SameText(Client.RemoteHost,'localhost')) And (Not SameText('127.',Copy(Client.RemoteHost,1,4)))
-      And (Not SameText('192.168.',Copy(Client.RemoteHost,1,8)))
-      And (Not SameText('10.',Copy(Client.RemoteHost,1,3)))
+    if (connection_has_a_server>0) And (Not SameText(Client.RemoteHost,'localhost')) And (Not SameText('127.',Client.RemoteHost.Substring(0,4)))
+      And (Not SameText('192.168.',Client.RemoteHost.Substring(0,8)))
+      And (Not SameText('10.',Client.RemoteHost.Substring(0,3)))
       And (Not TAccountComp.EqualAccountKeys(FClientPublicKey,TNetData.NetData.FNodePrivateKey.PublicKey)) then begin
       nsa := CT_TNodeServerAddress_NUL;
       nsa.ip := Client.RemoteHost;
@@ -4623,7 +4611,7 @@ end;
 { TThreadCheckConnections }
 
 procedure TThreadCheckConnections.BCExecute;
-Var l : TList;
+Var l : TList<TNetConnection>;
   i, nactive,ndeleted,nserverclients : Integer;
   netconn : TNetConnection;
   netserverclientstop : TNetServerClient;
@@ -4705,14 +4693,14 @@ end;
 procedure TThreadGetNewBlockChainFromClient.BCExecute;
 Var i,j : Integer;
   maxWork : UInt64;
-  candidates : TList;
+  candidates : TList<TNetConnection>;
   lop : TOperationBlock;
   nc : TNetConnection;
 begin
   if Not TNode.Node.UpdateBlockchain then Exit;
 
   // Search better candidates:
-  candidates := TList.Create;
+  candidates := TList<TNetConnection>.Create;
   try
     lop := CT_OperationBlock_NUL;
     TNetData.NetData.FMaxRemoteOperationBlock := CT_OperationBlock_NUL;
@@ -4836,10 +4824,10 @@ end;
 { TNetClientsDestroyThread }
 
 procedure TNetClientsDestroyThread.BCExecute;
-Var l,l_to_del : TList;
+Var l,l_to_del : TList<TNetConnection>;
   i : Integer;
 begin
-  l_to_del := TList.Create;
+  l_to_del := TList<TNetConnection>.Create;
   Try
     while not Terminated do begin
       l_to_del.Clear;
@@ -4907,7 +4895,7 @@ Type TNetworkAdjustedTimeReg = Record
    PNetworkAdjustedTimeReg = ^TNetworkAdjustedTimeReg;
 
 procedure TNetworkAdjustedTime.AddNewIp(const clientIp: String; clientTimestamp : Cardinal);
-Var l : TList;
+Var l : TList<Pointer>;
   i : Integer;
   P : PNetworkAdjustedTimeReg;
 begin
@@ -4934,7 +4922,7 @@ end;
 
 constructor TNetworkAdjustedTime.Create;
 begin
-  FTimesList := TPCThreadList.Create('TNetworkAdjustedTime_TimesList');
+  FTimesList := TPCThreadList<Pointer>.Create('TNetworkAdjustedTime_TimesList');
   FTimeOffset := 0;
   FTotalCounter := 0;
 end;
@@ -4942,7 +4930,7 @@ end;
 destructor TNetworkAdjustedTime.Destroy;
 Var P : PNetworkAdjustedTimeReg;
   i : Integer;
-  l : TList;
+  l : TList<Pointer>;
 begin
   l := FTimesList.LockList;
   try
@@ -4964,7 +4952,7 @@ begin
 end;
 
 function TNetworkAdjustedTime.GetMaxAllowedTimestampForNewBlock: Cardinal;
-var l : TList;
+var l : TList<Pointer>;
 begin
   l := FTimesList.LockList;
   try
@@ -4974,7 +4962,7 @@ begin
   end;
 end;
 
-function TNetworkAdjustedTime.IndexOfClientIp(list: TList; const clientIp: String): Integer;
+function TNetworkAdjustedTime.IndexOfClientIp(list: TList<Pointer>; const clientIp: String): Integer;
 begin
   for Result := 0 to list.Count - 1 do begin
     if SameStr(PNetworkAdjustedTimeReg(list[result])^.clientIp,clientIp) then exit;
@@ -4983,7 +4971,7 @@ begin
 end;
 
 procedure TNetworkAdjustedTime.RemoveIp(const clientIp: String);
-Var l : TList;
+Var l : TList<Pointer>;
   i : Integer;
   P : PNetworkAdjustedTimeReg;
 begin
@@ -5008,13 +4996,8 @@ begin
   end;
 end;
 
-function SortPNetworkAdjustedTimeReg(p1, p2: pointer): integer;
-begin
-  Result := PNetworkAdjustedTimeReg(p1)^.timeOffset - PNetworkAdjustedTimeReg(p2)^.timeOffset;
-end;
-
 procedure TNetworkAdjustedTime.UpdateIp(const clientIp: String; clientTimestamp: Cardinal);
-Var l : TList;
+Var l : TList<Pointer>;
   i : Integer;
   P : PNetworkAdjustedTimeReg;
   lastOffset : Integer;
@@ -5039,13 +5022,47 @@ begin
   end;
 end;
 
-procedure TNetworkAdjustedTime.UpdateMedian(list : TList);
+{$IFDEF FPC}
+type
+  TPNetworkAdjustedTimeReg = class(TInterfacedObject, IComparer<Pointer>)
+  public
+    function Compare(constref ALeft, ARight: Pointer): Integer;
+  end;
+
+{ TPNetworkAdjustedTimeReg }
+
+function TPNetworkAdjustedTimeReg.Compare(constref ALeft, ARight: Pointer): Integer;
+begin
+  Result := PNetworkAdjustedTimeReg(ALeft)^.timeOffset - PNetworkAdjustedTimeReg(ARight)^.timeOffset;
+end;
+{$ENDIF}
+
+procedure TNetworkAdjustedTime.UpdateMedian(list : TList<Pointer>);
 Var last : Integer;
   i : Integer;
   s : String;
+{$IFNDEF FPC}
+  LComparison : TComparison<Pointer>;
+{$ELSE}
+  LComparer : TPNetworkAdjustedTimeReg;
+{$ENDIF}
 begin
   last := FTimeOffset;
-  list.Sort(SortPNetworkAdjustedTimeReg);
+  {$IFDEF FPC}
+  LComparer := TPNetworkAdjustedTimeReg.Create;
+  try
+    list.Sort(LComparer);
+  finally
+    LComparer.Free;
+  end;
+  {$ELSE}
+  LComparison :=
+  function(const Left, Right: Pointer): Integer
+  begin
+    Result := PNetworkAdjustedTimeReg(Left)^.timeOffset - PNetworkAdjustedTimeReg(Right)^.timeOffset;
+  end;
+  List.Sort(TComparer<Pointer>.Construct(LComparison));
+  {$ENDIF}
   if list.Count<CT_MinNodesToCalcNAT then begin
     FTimeOffset := 0;
   end else if ((list.Count MOD 2)=0) then begin

src/core/UNode.pas

@@ -34,7 +34,9 @@ unit UNode;
 interface
 
 uses
-  Classes, SysUtils, UBlockChain, UNetProtocol, UAccounts, UCrypto, UThread, SyncObjs, ULog, UBaseTypes, UPCOrderedLists;
+  Classes, SysUtils,
+  {$IFNDEF FPC}System.Generics.Collections{$ELSE}Generics.Collections{$ENDIF},
+  UBlockChain, UNetProtocol, UAccounts, UCrypto, UThread, SyncObjs, ULog, UBaseTypes, UPCOrderedLists;
 
 {$I config.inc}
 
@@ -44,12 +46,14 @@ Type
 
   TSearchOperationResult = (found, invalid_params, blockchain_block_not_found);
 
+  TNodeNotifyEvents = Class;
+
   TNode = Class(TComponent)
   private
     FNodeLog : TLog;
     FLockNodeOperations : TPCCriticalSection;
     FOperationSequenceLock : TPCCriticalSection;
-    FNotifyList : TList;
+    FNotifyList : TList<TNodeNotifyEvents>;
     FBank : TPCBank;
     FOperations : TPCOperationsComp;
     FNetServer : TNetServer;
@@ -111,8 +115,6 @@ Type
     class function NodeVersion : String;
   End;
 
-  TNodeNotifyEvents = Class;
-
   TThreadSafeNodeNotifyEvent = Class(TPCThread)
     FNodeNotifyEvents : TNodeNotifyEvents;
     FNotifyBlocksChanged : Boolean;
@@ -145,7 +147,7 @@ Type
   private
     FNode: TNode;
     FOnKeyActivity: TNotifyEvent;
-    FPendingNotificationsList : TPCThreadList;
+    FPendingNotificationsList : TPCThreadList<Pointer>;
     FThreadSafeNodeNotifyEvent : TThreadSafeNodeNotifyEvent;
     FOnBlocksChanged: TNotifyEvent;
     FOnOperationsChanged: TNotifyEvent;
@@ -568,7 +570,7 @@ begin
   FNetServer := TNetServer.Create;
   FOperations := TPCOperationsComp.Create(Nil);
   FOperations.bank := FBank;
-  FNotifyList := TList.Create;
+  FNotifyList := TList<TNodeNotifyEvents>.Create;
   {$IFDEF BufferOfFutureOperations}
   FBufferAuxWaitingOperations := TOperationsHashTree.Create;
   {$ENDIF}
@@ -815,7 +817,7 @@ procedure TNode.GetStoredOperationsFromAccount(const OperationsResume: TOperatio
   var opc : TPCOperationsComp;
     op : TPCOperation;
     OPR : TOperationResume;
-    l : TList;
+    l : TList<Cardinal>;
     i : Integer;
     last_block_number : Integer;
     found_in_block : Boolean;
@@ -825,7 +827,7 @@ procedure TNode.GetStoredOperationsFromAccount(const OperationsResume: TOperatio
     if (act_depth<=0) then exit;
     opc := TPCOperationsComp.Create(Nil);
     Try
-      l := TList.Create;
+      l := TList<Cardinal>.Create;
       try
         last_block_number := block_number+1;
         while (last_block_number>block_number) And (act_depth>0)
@@ -1225,7 +1227,7 @@ begin
   FWatchKeys := Nil;
   FOnKeyActivity:=Nil;
   FMessages := TStringList.Create;
-  FPendingNotificationsList := TPCThreadList.Create('TNodeNotifyEvents_PendingNotificationsList');
+  FPendingNotificationsList := TPCThreadList<Pointer>.Create('TNodeNotifyEvents_PendingNotificationsList');
   FThreadSafeNodeNotifyEvent := TThreadSafeNodeNotifyEvent.Create(Self);
   Node := _Node;
 end;

src/core/UOpTransaction.pas

@@ -22,7 +22,9 @@ unit UOpTransaction;
 
 interface
 
-Uses UCrypto, UBlockChain, Classes, UAccounts, UBaseTypes, UPCDataTypes;
+Uses UCrypto, UBlockChain, Classes, UAccounts, UBaseTypes,
+  {$IFNDEF FPC}System.Generics.Collections{$ELSE}Generics.Collections{$ENDIF},
+  UPCDataTypes;
 
 Type
   // Operations Type
@@ -80,7 +82,7 @@ Type
   public
     function GetBufferForOpHash(UseProtocolV2 : Boolean): TRawBytes; override;
     function DoOperation(AccountPreviousUpdatedBlock : TAccountPreviousBlockInfo; AccountTransaction : TPCSafeBoxTransaction; var errors : String) : Boolean; override;
-    procedure AffectedAccounts(list : TList); override;
+    procedure AffectedAccounts(list : TList<Cardinal>); override;
     //
     class function OpType : Byte; override;
     function OperationAmount : Int64; override;
@@ -119,7 +121,7 @@ Type
     function SignerAccount : Cardinal; override;
     function DestinationAccount : Int64; override;
     function N_Operation : Cardinal; override;
-    procedure AffectedAccounts(list : TList); override;
+    procedure AffectedAccounts(list : TList<Cardinal>); override;
     function OperationAmountByAccount(account : Cardinal) : Int64; override;
     Constructor Create(current_protocol : Word; account_signer, n_operation, account_target: Cardinal; key:TECPrivateKey; new_account_key : TAccountKey; fee: UInt64; payload: TRawBytes);
     Property Data : TOpChangeKeyData read FData;
@@ -156,7 +158,7 @@ Type
     function SignerAccount : Cardinal; override;
     function N_Operation : Cardinal; override;
     function OperationAmountByAccount(account : Cardinal) : Int64; override;
-    procedure AffectedAccounts(list : TList); override;
+    procedure AffectedAccounts(list : TList<Cardinal>); override;
     Constructor Create(account_number, n_operation: Cardinal; fee: UInt64);
     Property Data : TOpRecoverFoundsData read FData;
     Function toString : String; Override;
@@ -225,7 +227,7 @@ Type
     function DestinationAccount : Int64; override;
     function SellerAccount : Int64; override;
     function N_Operation : Cardinal; override;
-    procedure AffectedAccounts(list : TList); override;
+    procedure AffectedAccounts(list : TList<Cardinal>); override;
     function OperationAmountByAccount(account : Cardinal) : Int64; override;
     Property Data : TOpListAccountData read FData;
     Function toString : String; Override;
@@ -277,7 +279,7 @@ Type
     function SignerAccount : Cardinal; override;
     function DestinationAccount : Int64; override;
     function N_Operation : Cardinal; override;
-    procedure AffectedAccounts(list : TList); override;
+    procedure AffectedAccounts(list : TList<Cardinal>); override;
     function OperationAmountByAccount(account : Cardinal) : Int64; override;
     Constructor CreateChangeAccountInfo(current_protocol : word;
       account_signer, n_operation, account_target: Cardinal; key:TECPrivateKey;
@@ -325,7 +327,7 @@ Type
     function SignerAccount : Cardinal; override;
     function DestinationAccount : Int64; override;
     function N_Operation : Cardinal; override;
-    procedure AffectedAccounts(list : TList); override;
+    procedure AffectedAccounts(list : TList<Cardinal>); override;
     function OperationAmountByAccount(account : Cardinal) : Int64; override;
     Constructor CreateOpData(
       account_signer, account_sender, account_target : Cardinal; signer_key:TECPrivateKey;
@@ -596,10 +598,10 @@ begin
   Result := FData.n_operation;
 end;
 
-procedure TOpChangeAccountInfo.AffectedAccounts(list: TList);
+procedure TOpChangeAccountInfo.AffectedAccounts(list: TList<Cardinal>);
 begin
-  list.Add(TObject(FData.account_signer));
-  if (FData.account_target<>FData.account_signer) then list.Add(TObject(FData.account_target));
+  list.Add(FData.account_signer);
+  if (FData.account_target<>FData.account_signer) then list.Add(FData.account_target);
 end;
 
 function TOpChangeAccountInfo.OperationAmountByAccount(account: Cardinal): Int64;
@@ -702,12 +704,12 @@ end;
 
 { TOpTransaction }
 
-procedure TOpTransaction.AffectedAccounts(list: TList);
+procedure TOpTransaction.AffectedAccounts(list: TList<Cardinal>);
 begin
-  list.Add(TObject(FData.sender));
-  list.Add(TObject(FData.target));
+  list.Add(FData.sender);
+  list.Add(FData.target);
   if (FData.opTransactionStyle in [transaction_with_auto_buy_account, buy_account]) then begin
-    list.Add(TObject(FData.SellerAccount));
+    list.Add(FData.SellerAccount);
   end;
 end;
 
@@ -1154,10 +1156,10 @@ end;
 
 { TOpChangeKey }
 
-procedure TOpChangeKey.AffectedAccounts(list: TList);
+procedure TOpChangeKey.AffectedAccounts(list: TList<Cardinal>);
 begin
-  list.Add(TObject(FData.account_signer));
-  if (FData.account_target<>FData.account_signer) then list.Add(TObject(FData.account_target));
+  list.Add(FData.account_signer);
+  if (FData.account_target<>FData.account_signer) then list.Add(FData.account_target);
 end;
 
 function TOpChangeKey.OperationAmountByAccount(account: Cardinal): Int64;
@@ -1489,9 +1491,9 @@ end;
 
 { TOpRecoverFounds }
 
-procedure TOpRecoverFounds.AffectedAccounts(list: TList);
+procedure TOpRecoverFounds.AffectedAccounts(list: TList<Cardinal>);
 begin
-  list.Add(TObject(FData.account));
+  list.Add(FData.account);
 end;
 
 constructor TOpRecoverFounds.Create(account_number, n_operation : Cardinal; fee: UInt64);
@@ -1640,11 +1642,11 @@ end;
 
 { TOpListAccount }
 
-procedure TOpListAccount.AffectedAccounts(list: TList);
+procedure TOpListAccount.AffectedAccounts(list: TList<Cardinal>);
 begin
-  list.Add(TObject(FData.account_signer));
+  list.Add(FData.account_signer);
   if FData.account_signer<>FData.account_target then
-    list.Add(TObject(FData.account_target));
+    list.Add(FData.account_target);
 end;
 
 function TOpListAccount.OperationAmountByAccount(account: Cardinal): Int64;
@@ -2344,14 +2346,14 @@ begin
   Result := FData.n_operation;
 end;
 
-procedure TOpData.AffectedAccounts(list: TList);
+procedure TOpData.AffectedAccounts(list: TList<Cardinal>);
 begin
-  list.Add(TObject(FData.account_signer));
+  list.Add(FData.account_signer);
   if (FData.account_signer<>FData.account_sender) then begin
-    list.Add(TObject(FData.account_sender));
+    list.Add(FData.account_sender);
   end;
   if (FData.account_signer<>FData.account_target) And (FData.account_sender<>FData.account_target) then begin
-    list.Add(TObject(FData.account_target));
+    list.Add(FData.account_target);
   end;
 end;
 

src/core/UPCOpenSSLSignature.pas

@@ -38,7 +38,7 @@ interface
   ERROR: Use_OpenSSL is not defined!
 {$ENDIF}
 
-Uses SysUtils, UBaseTypes,
+Uses SysUtils,
   UOpenSSL,
   UPCDataTypes;
 

src/core/UPCOrderedLists.pas

@@ -23,7 +23,8 @@ unit UPCOrderedLists;
 interface
 
 uses
-  Classes, SysUtils, UBaseTypes;
+  Classes, SysUtils, UBaseTypes,
+  {$IFNDEF FPC}System.Generics.Collections{$ELSE}Generics.Collections{$ENDIF};
 
 Type
   TCardinalsArray = Array of Cardinal;
@@ -34,7 +35,7 @@ Type
 
   TOrderedCardinalList = Class
   private
-    FOrderedList : TList;
+    FOrderedList : TList<Cardinal>;
     FDisabledsCount : Integer;
     FModifiedWhileDisabled : Boolean;
     FOnListChanged: TNotifyEvent;
@@ -62,7 +63,7 @@ Type
 
   TOrderedCardinalListWithRaw = Class
   private
-    FList : TList;
+    FList : TList<Pointer>;
     Function Find(value : Cardinal; var Index: Integer): Boolean;
   public
     Constructor Create;
@@ -83,7 +84,7 @@ Type
 
   TOrderedRawList = Class
   private
-    FList : TList;
+    FList : TList<Pointer>;
   public
     Constructor Create;
     Destructor Destroy; Override;
@@ -120,7 +121,7 @@ begin
         FOrderedList.Capacity:=nc;
       end;
     end;
-    FOrderedList.Insert(Result,TObject(Value));
+    FOrderedList.Insert(Result,(Value));
     NotifyChanged;
   end;
 end;
@@ -154,7 +155,7 @@ end;
 
 constructor TOrderedCardinalList.Create;
 begin
-  FOrderedList := TList.Create;
+  FOrderedList := TList<Cardinal>.Create;
   FDisabledsCount := 0;
   FModifiedWhileDisabled := false;
 end;
@@ -291,7 +292,7 @@ end;
 
 constructor TOrderedRawList.Create;
 begin
-  FList := TList.Create;
+  FList := TList<Pointer>.Create;
 end;
 
 procedure TOrderedRawList.Delete(index: Integer);
@@ -408,7 +409,7 @@ end;
 
 constructor TOrderedCardinalListWithRaw.Create;
 begin
-  FList := TList.Create;
+  FList := TList<Pointer>.Create;
 end;
 
 destructor TOrderedCardinalListWithRaw.Destroy;

src/core/UPipeline.pas

@@ -20,7 +20,7 @@ unit UPipeline;
 interface
 
 uses
-  Generics.Collections, Classes, SyncObjs, SysUtils, UThread;
+  {$IFNDEF FPC}System.Generics.Collections{$ELSE}Generics.Collections{$ENDIF}, Classes, SyncObjs, SysUtils, UThread;
 
 Type
   { TPipelineQueue }

src/core/UPoolMinerThreads.pas

@@ -25,7 +25,8 @@ interface
 {$I config.inc}
 
 uses
-  Classes, SysUtils, syncobjs, UThread, UPoolMining, UAccounts, UCrypto, ULog, UBlockChain, USha256, URandomHash, UBaseTypes, UCommon;
+  Classes, SysUtils, syncobjs, UThread, UPoolMining, UAccounts, UCrypto, ULog, UBlockChain, USha256, URandomHash, UBaseTypes, UCommon,
+  {$IFNDEF FPC}System.Generics.Collections{$ELSE}Generics.Collections{$ENDIF};
 
 type
   TMinerStats = Record
@@ -55,7 +56,7 @@ Type
     FMinerAddName: String;
     FPoolMinerClient : TPoolMinerClient;
     FOnConnectionStateChanged: TNotifyEvent;
-    FDevicesList : TPCThreadList;
+    FDevicesList : TPCThreadList<TCustomMinerDeviceThread>;
     FMinerThreads: Integer;
     FGlobalMinerValuesForWork : TMinerValuesForWork;
     FTestingPoWLeftBits: Byte;
@@ -76,7 +77,7 @@ Type
     Function CurrentMinerStats : TMinerStats;
     Function GlobalMinerStats : TMinerStats;
     Property GlobalMinerValuesForWork : TMinerValuesForWork read FGlobalMinerValuesForWork;
-    Function DevicesLock : TList;
+    Function DevicesLock : TList<TCustomMinerDeviceThread>;
     procedure DevicesUnlock;
     Property MinerAddName : String read FMinerAddName write SetMinerAddName;
     Property TestingPoWLeftBits : Byte read FTestingPoWLeftBits write SetTestingPoWLeftBits;
@@ -93,7 +94,7 @@ Type
     FOnMinerValuesChanged: TNotifyEvent;
     FOnStateChanged: TNotifyEvent;
     FPaused: Boolean;
-    FLastStats : TPCThreadList;
+    FLastStats : TPCThreadList<Pointer>;
     FLastActiveTC : TTickCount;
     FGlobaDeviceStats : TMinerStats;
     FPartialDeviceStats : TMinerStats;
@@ -125,12 +126,14 @@ Type
     Property PoolMinerThread : TPoolMinerThread read FPoolMinerThread;
   end;
 
+  TCPUOpenSSLMinerThread = Class;
+
   { TCPUDeviceThread }
 
   TCPUDeviceThread = Class(TCustomMinerDeviceThread)
   private
     FCPUs: Integer;
-    FCPUsThreads : TPCThreadList;
+    FCPUsThreads : TPCThreadList<TCPUOpenSSLMinerThread>;
     FUseOpenSSLFunctions: Boolean;
     procedure SetCPUs(AValue: Integer);
     Procedure CheckCPUs;
@@ -180,7 +183,7 @@ Var nID : Cardinal;
   json : TPCJSONObject;
   i : Integer;
   ResponseMethod : String;
-  l : TList;
+  l : TList<TCustomMinerDeviceThread>;
 begin
   DebugStep:='Starting';
   Try
@@ -238,7 +241,7 @@ begin
   FPoolMinerClient.OnConnect := OnPoolMinerClientConnectionChanged;
   FPoolMinerClient.OnDisconnect := OnPoolMinerClientConnectionChanged;
   FOnConnectionStateChanged := Nil;
-  FDevicesList := TPCThreadList.Create('TPoolMinerThread_DevicesList');
+  FDevicesList := TPCThreadList<TCustomMinerDeviceThread>.Create('TPoolMinerThread_DevicesList');
   FMinerThreads := 0;
   FMinerAddName:='';
   FTestingPoWLeftBits := 0;
@@ -247,7 +250,7 @@ begin
 end;
 
 function TPoolMinerThread.CurrentMinerStats: TMinerStats;
-Var l : TList;
+Var l : TList<TCustomMinerDeviceThread>;
   i : Integer;
   ms : TMinerStats;
 begin
@@ -270,7 +273,7 @@ end;
 
 destructor TPoolMinerThread.Destroy;
 Var i : Integer;
-  l : TList;
+  l : TList<TCustomMinerDeviceThread>;
 begin
   l := FDevicesList.LockList;
   try
@@ -289,7 +292,7 @@ begin
   inherited;
 end;
 
-function TPoolMinerThread.DevicesLock: TList;
+function TPoolMinerThread.DevicesLock: TList<TCustomMinerDeviceThread>;
 begin
   Result := FDevicesList.LockList;
 end;
@@ -305,7 +308,7 @@ begin
 end;
 
 function TPoolMinerThread.GlobalMinerStats: TMinerStats;
-Var l : TList;
+Var l : TList<TCustomMinerDeviceThread>;
   i : Integer;
   ms : TMinerStats;
 begin
@@ -359,7 +362,7 @@ begin
 end;
 
 procedure TPoolMinerThread.OnPoolMinerClientConnectionChanged(Sender: TObject);
-Var l : TList;
+Var l : TList<TCustomMinerDeviceThread>;
   i : Integer;
 begin
   TLog.NewLog(ltInfo,ClassName,'Connection state changed. New Value:'+inttostr(Integer(FPoolMinerClient.Connected)));
@@ -375,7 +378,7 @@ begin
 end;
 
 procedure TPoolMinerThread.OnPoolMinerMustChangeValues(Sender: TObject);
-Var l : TList;
+Var l : TList<TCustomMinerDeviceThread>;
   i,j : Integer;
   digest_length : Integer;
   ok : Boolean;
@@ -436,7 +439,7 @@ begin
   FMinerValuesForWork := CT_TMinerValuesForWork_NULL;
   FPartialDeviceStats := CT_TMinerStats_NULL;
   FGlobaDeviceStats := CT_TMinerStats_NULL;
-  FLastStats := TPCThreadList.Create('TCustomMinerDeviceThread_LastStats');
+  FLastStats := TPCThreadList<Pointer>.Create('TCustomMinerDeviceThread_LastStats');
   FOnFoundNOnce:=Nil;
   FOnMinerValuesChanged:=Nil;
   FOnStateChanged:=Nil;
@@ -451,21 +454,22 @@ end;
 destructor TCustomMinerDeviceThread.Destroy;
 Var i : Integer;
   P : PTimeMinerStats;
-  l : TList;
+  ldevices : TList<TCustomMinerDeviceThread>;
+  lstats : TList<Pointer>;
 begin
-  l := FPoolMinerThread.FDevicesList.LockList;
+  ldevices := FPoolMinerThread.FDevicesList.LockList;
   try
-    l.Remove(Self);
+    ldevices.Remove(Self);
   finally
     FPoolMinerThread.FDevicesList.UnlockList;
   end;
-  l := FLastStats.LockList;
+  lstats := FLastStats.LockList;
   try
-    for i:=0 to l.Count-1 do begin
-      P := l[i];
+    for i:=0 to lstats.Count-1 do begin
+      P := lstats[i];
       Dispose(P);
     end;
-    l.clear;
+    lstats.clear;
   finally
     FLastStats.UnlockList;
   end;
@@ -596,7 +600,7 @@ Type TTimeMinerStats = Record
        stats : TMinerStats;
      end;
   PTimeMinerStats = ^TTimeMinerStats;
-Var l : TList;
+Var l : TList<Pointer>;
   i : Integer;
   P : PTimeMinerStats;
   minTC : TTickCount;
@@ -653,7 +657,7 @@ begin
 end;
 
 procedure TCPUDeviceThread.CheckCPUs;
-var l : TList;
+var l : TList<TCPUOpenSSLMinerThread>;
   mt : TCPUOpenSSLMinerThread;
   needminers : Integer;
 begin
@@ -684,7 +688,7 @@ end;
 
 constructor TCPUDeviceThread.Create(PoolMinerThread: TPoolMinerThread; InitialMinerValuesForWork: TMinerValuesForWork);
 begin
-  FCPUsThreads := TPCThreadList.Create('TCPUDeviceThread_CPUsThreads');
+  FCPUsThreads := TPCThreadList<TCPUOpenSSLMinerThread>.Create('TCPUDeviceThread_CPUsThreads');
   FCPUs:=0;
   FUseOpenSSLFunctions := True;
   inherited Create(PoolMinerThread, InitialMinerValuesForWork);
@@ -719,7 +723,7 @@ begin
 end;
 
 procedure TCPUDeviceThread.SetMinerValuesForWork(const Value: TMinerValuesForWork);
-Var l : TList;
+Var l : TList<TCPUOpenSSLMinerThread>;
   i : Integer;
   nextmin : Cardinal;
   npos : Integer;

src/core/UPoolMining.pas

@@ -31,7 +31,8 @@ Uses
   {LCLIntf, LCLType, LMessages,}
 {$ENDIF}
   UTCPIP, SysUtils, UThread, SyncObjs, Classes, UJSONFunctions, UPCEncryption, UNode,
-  UCrypto, UAccounts, UConst, UBlockChain, UBaseTypes;
+  UCrypto, UAccounts, UConst, UBlockChain, UBaseTypes,
+  {$IFNDEF FPC}System.Generics.Collections{$ELSE}Generics.Collections{$ENDIF};
 
 Const
   CT_PoolMining_Method_STATUS = 'status';
@@ -65,7 +66,7 @@ Type
     FLockProcessBuffer : TPCCriticalSection;
     FReceivedBuffer : TBytes;
     FLockReceivedBuffer : TPCCriticalSection;
-    FPendingResponseMessages : TPCThreadList;
+    FPendingResponseMessages : TPCThreadList<Pointer>;
   protected
   public
     Constructor Create(AOwner : TComponent); override;
@@ -129,7 +130,7 @@ Type
     FClientsWins: Integer;
     FClientsCount: Integer;
     FOnMiningServerNewBlockFound: TNotifyEvent;
-    FPoolJobs : TPCThreadList;
+    FPoolJobs : TPCThreadList<Pointer>;
     FPoolThread : TPoolMiningServerThread;
     FMinerOperations : TPCOperationsComp;
     FMaxOperationsPerBlock: Integer;
@@ -199,12 +200,12 @@ begin
   SetLength(FReceivedBuffer,0);
   FLockProcessBuffer := TPCCriticalSection.Create('TJSONRPCTcpIpClient_LockProcessBuffer');
   FLockReceivedBuffer := TPCCriticalSection.Create('TJSONRPCTcpIpClient_LockReceivedBuffer');
-  FPendingResponseMessages := TPCThreadList.Create('TJSONRPCTcpIpClient_PendingResponseMessages');
+  FPendingResponseMessages := TPCThreadList<Pointer>.Create('TJSONRPCTcpIpClient_PendingResponseMessages');
 end;
 
 destructor TJSONRPCTcpIpClient.Destroy;
 var P : PPendingResponseMessage;
-  l : TList;
+  l : TList<Pointer>;
   i : Integer;
 begin
   l := FPendingResponseMessages.LockList;
@@ -232,7 +233,7 @@ var last_bytes_read : Integer;
   i,lasti : Integer;
   continue : Boolean;
   procedure FlushBufferPendingMessages(doSearchId : Boolean; idValue : Integer);
-  var l : TList;
+  var l : TList<Pointer>;
     i : Integer;
     P : PPendingResponseMessage;
   Begin
@@ -392,7 +393,6 @@ Var json : TPCJSONObject;
   stream : TMemoryStream;
   b : Byte;
   P : PPendingResponseMessage;
-  l : TList;
 begin
   json := TPCJSONObject.Create;
   Try
@@ -515,7 +515,8 @@ Type
 procedure TPoolMiningServer.CaptureNewJobAndSendToMiners;
 Var P, PToDelete : PPoolJob;
   i : Integer;
-  l : TList;
+  l : TList<Pointer>;
+  l2 : TList<TNetTcpIpClient>;
   doAdd : Boolean;
   params : TPCJSONObject;
   OpB : TOperationBlock;
@@ -575,13 +576,13 @@ begin
   if (doAdd) And (Assigned(P)) then begin
     params := TPCJSONObject.Create;
     Try
-      l := NetTcpIpClientsLock;
+      l2 := NetTcpIpClientsLock;
       Try
-        for i := 0 to l.Count - 1 do begin
+        for i := 0 to l2.Count - 1 do begin
           if Not Active then exit;
-          SendJobToMiner(P^.OperationsComp,l[i],false,null);
+          SendJobToMiner(P^.OperationsComp,l2[i] as TJSONRPCTcpIpClient,false,null);
         end;
-        TLog.NewLog(ltDebug,ClassName,'Sending job to miners: '+TPCOperationsComp.OperationBlockToText(P^.OperationsComp.OperationBlock)+' Cache blocks:'+Inttostr(l.Count));
+        TLog.NewLog(ltDebug,ClassName,'Sending job to miners: '+TPCOperationsComp.OperationBlockToText(P^.OperationsComp.OperationBlock)+' Cache blocks:'+Inttostr(l2.Count));
       Finally
         NetTcpIpClientsUnlock;
       End;
@@ -594,7 +595,7 @@ end;
 procedure TPoolMiningServer.ClearPoolJobs;
 Var P : PPoolJob;
   i : Integer;
-  l : TList;
+  l : TList<Pointer>;
 begin
   l := FPoolJobs.LockList;
   Try
@@ -626,7 +627,7 @@ begin
   FMinerOperations := TPCOperationsComp.Create(FNodeNotifyEvents.Node.Bank);
   FMinerAccountKey := CT_TECDSA_Public_Nul;
   FMinerPayload := Nil;
-  FPoolJobs := TPCThreadList.Create('TPoolMiningServer_PoolJobs');
+  FPoolJobs := TPCThreadList<Pointer>.Create('TPoolMiningServer_PoolJobs');
   FPoolThread := TPoolMiningServerThread.Create(Self);
   FMax0FeeOperationsPerBlock := CT_MAX_0_fee_operations_per_block_by_miner;
   FMaxOperationsPerBlock := CT_MAX_Operations_per_block_by_miner;
@@ -780,7 +781,7 @@ Var s : String;
   p1,p2,p3 : TRawBytes;
   P : PPoolJob;
   i : Integer;
-  l : TList;
+  l : TList<Pointer>;
   _payloadHexa : AnsiString;
   _payloadRaw : TRawBytes;
   _timestamp, _nOnce : Cardinal;
@@ -912,7 +913,7 @@ var params : TPCJSONObject;
   ts : Cardinal;
 Var P : PPoolJob;
   i,nJobs : Integer;
-  l : TList;
+  l : TList<Pointer>;
 begin
   if FClientsCount<=0 then exit;
   if (Not Assigned(Operations)) then begin

src/core/URPC.pas

@@ -29,6 +29,7 @@ Uses UThread, ULog, UConst, UNode, UAccounts, UCrypto, UBlockChain,
   UJSONFunctions, classes, blcksock, synsock,
   IniFiles, Variants, math, UBaseTypes, UOpenSSL,
   UPCOrderedLists, UPCDataTypes,
+  {$IFNDEF FPC}System.Generics.Collections{$ELSE}Generics.Collections{$ENDIF},
   UNetProtection;
 
 Const
@@ -787,7 +788,7 @@ function TRPCProcess.ProcessMethod(const method: String; params: TPCJSONObject;
   end;
 
   Function GetAccountOperations(accountNumber : Cardinal; jsonArray : TPCJSONArray; maxBlocksDepth, startReg, maxReg: Integer; forceStartBlock : Cardinal) : Boolean;
-  var list : TList;
+  var list : TList<Cardinal>;
     Op : TPCOperation;
     OPR : TOperationResume;
     Obj : TPCJSONObject;
@@ -806,7 +807,7 @@ function TRPCProcess.ProcessMethod(const method: String; params: TPCJSONObject;
       if ((startReg=-1) And (forceStartBlock=0)) then begin
         // 1.5.5 change: If start=-1 then will include PENDING OPERATIONS, otherwise not.
         // Only will return pending operations if start=0, otherwise
-        list := TList.Create;
+        list := TList<Cardinal>.Create;
         Try
           FNode.Operations.OperationsHashTree.GetOperationsAffectingAccount(accountNumber,list);
           for i := list.Count - 1 downto 0 do begin
@@ -842,7 +843,7 @@ function TRPCProcess.ProcessMethod(const method: String; params: TPCJSONObject;
 
   Procedure GetConnections;
   var i : Integer;
-    l : TList;
+    l : TList<TNetConnection>;
     nc : TNetConnection;
     obj: TPCJSONObject;
   Begin
@@ -2574,7 +2575,7 @@ function TRPCProcess.ProcessMethod(const method: String; params: TPCJSONObject;
     senderOperationsHashTree : TOperationsHashTree;
     j,iKey,nSignedAccounts : Integer;
     mop : TOpMultiOperation;
-    lSigners : TList;
+    lSigners : TList<Cardinal>;
     nAccount : Integer;
     pubKey : TAccountKey;
   begin
@@ -2592,7 +2593,7 @@ function TRPCProcess.ProcessMethod(const method: String; params: TPCJSONObject;
     end;
     Try
       nSignedAccounts := 0;
-      lSigners := TList.Create;
+      lSigners := TList<Cardinal>.Create;
       Try
         mop.SignerAccounts(lSigners);
         for j:=0 to lSigners.Count-1 do begin

src/core/URandomHash.pas

@@ -103,7 +103,7 @@ unit URandomHash;
 
 interface
 
-uses Generics.Collections, SysUtils, HlpIHash, HlpBits, HlpHashFactory;
+uses {$IFNDEF FPC}System.Generics.Collections{$ELSE}Generics.Collections{$ENDIF}, SysUtils, HlpIHash, HlpBits, HlpHashFactory;
 
 type
 

src/core/UTCPIP.pas

@@ -19,7 +19,7 @@ unit UTCPIP;
 interface
 
 {$IFDEF FPC}
-  {$mode objfpc}
+  {$mode delphi}
 {$ENDIF}
 
 {$I config.inc}
@@ -42,7 +42,9 @@ uses
   IdTcpClient, IdTCPServer, IdGlobal, IdContext, IdTCPConnection,
   {$ENDIF}
   Classes, Sysutils, UBaseTypes,
-  UThread, SyncObjs;
+  UThread,
+  {$IFNDEF FPC}System.Generics.Collections{$ELSE}Generics.Collections{$ENDIF},
+  SyncObjs;
 
 type
   {$IFDEF DelphiSockets}
@@ -172,7 +174,7 @@ type
     FPort : Word;
     FActive : Boolean;
     {$ENDIF}
-    FNetClients : TPCThreadList;
+    FNetClients : TPCThreadList<TNetTcpIpClient>;
     FMaxConnections : Integer;
     FNetTcpIpClientClass : TNetTcpIpClientClass;
     function GetActive: Boolean;
@@ -191,7 +193,7 @@ type
     Property Port : Word read GetPort Write SetPort;
     Property MaxConnections : Integer read FMaxConnections Write SetMaxConnections;
     Property NetTcpIpClientClass : TNetTcpIpClientClass read FNetTcpIpClientClass write SetNetTcpIpClientClass;
-    Function NetTcpIpClientsLock : TList;
+    Function NetTcpIpClientsLock : TList<TNetTcpIpClient>;
     Procedure NetTcpIpClientsUnlock;
     Procedure WaitUntilNetTcpIpClientsFinalized;
   End;
@@ -753,7 +755,7 @@ begin
   {$ELSE}
   FActive := false;
   {$ENDIF}
-  FNetClients := TPCThreadList.Create('TNetTcpIpServer_NetClients');
+  FNetClients := TPCThreadList<TNetTcpIpClient>.Create('TNetTcpIpServer_NetClients');
 end;
 
 destructor TNetTcpIpServer.Destroy;
@@ -793,7 +795,7 @@ begin
   {$ENDIF}
 end;
 
-function TNetTcpIpServer.NetTcpIpClientsLock: TList;
+function TNetTcpIpServer.NetTcpIpClientsLock: TList<TNetTcpIpClient>;
 begin
   Result := FNetClients.LockList;
 end;
@@ -884,7 +886,7 @@ begin
 end;
 
 procedure TNetTcpIpServer.WaitUntilNetTcpIpClientsFinalized;
-Var l : TList;
+Var l : TList<TNetTcpIpClient>;
 begin
   if Active then Active := false;
   Repeat
@@ -904,7 +906,7 @@ end;
 procedure TTcpIpServerListenerThread.BCExecute;
 var ClientSocket: TSocket;
     ClientThread: TTcpIpSocketThread;
-    lSockets : TList;
+    lSockets : TList<TTcpIpSocketThread>;
     i : Integer;
 begin
   FServerSocket.CreateSocket;
@@ -920,7 +922,7 @@ begin
     exit;
   end;
   FServerSocket.Listen;
-  lSockets := TList.Create;
+  lSockets := TList<TTcpIpSocketThread>.Create;
   try
     while (Not Terminated) And (FNetTcpIpServerServer.Active) do begin
       If (FServerSocket.CanRead(100)) And (lSockets.Count<FNetTcpIpServerServer.MaxConnections) then begin

src/core/UThread.pas

@@ -30,6 +30,7 @@ uses
 {$ELSE}
   {$IFDEF LINUX}cthreads,{$ENDIF}
 {$ENDIF}
+  {$IFNDEF FPC}System.Generics.Collections{$ELSE}Generics.Collections{$ENDIF},
   Classes, SyncObjs, UBaseTypes;
 
 {$I config.inc}
@@ -80,18 +81,18 @@ Type
     property Terminated;
   End;
 
-  TPCThreadList = class
+  TPCThreadList<T> = class
   private
-    FList: TList;
+    FList: TList<T>;
     FLock: TPCCriticalSection;
   public
     constructor Create(const AName : String);
     destructor Destroy; override;
-    function Add(Item: Pointer) : Integer;
+    function Add(Item: T) : Integer;
     procedure Clear;
-    procedure Remove(Item: Pointer); inline;
-    function LockList: TList;
-    function TryLockList(MaxWaitMilliseconds : Cardinal; var lockedList : TList) : Boolean;
+    procedure Remove(Item: T); inline;
+    function LockList: TList<T>;
+    function TryLockList(MaxWaitMilliseconds : Cardinal; var lockedList : TList<T>) : Boolean;
     procedure UnlockList; inline;
   end;
 
@@ -103,7 +104,7 @@ uses
 
 { TPCThread }
 
-Var _threads : TPCThreadList;
+Var _threads : TPCThreadList<TPCThread>;
 
 
 
@@ -124,7 +125,7 @@ begin
 end;
 
 procedure TPCThread.Execute;
-Var l : TList;
+Var l : TList<TPCThread>;
   i : Integer;
 begin
   FStartTickCount := TPlatform.GetTickCount;
@@ -159,7 +160,7 @@ begin
 end;
 
 class function TPCThread.GetThread(index: Integer): TPCThread;
-Var l : TList;
+Var l : TList<TPCThread>;
 begin
   Result := Nil;
   l := _threads.LockList;
@@ -172,7 +173,7 @@ begin
 end;
 
 class function TPCThread.GetThreadByClass(tclass: TPCThreadClass; Exclude: TObject): TPCThread;
-Var l : TList;
+Var l : TList<TPCThread>;
   i : Integer;
 begin
   Result := Nil;
@@ -202,7 +203,7 @@ begin
 end;
 
 class function TPCThread.ThreadClassFound(tclass: TPCThreadClass; Exclude : TObject): Integer;
-Var l : TList;
+Var l : TList<TPCThread>;
 begin
   Result := -1;
   if Not Assigned(_threads) then exit;
@@ -218,7 +219,7 @@ begin
 end;
 
 class function TPCThread.ThreadCount: Integer;
-Var l : TList;
+Var l : TList<TPCThread>;
 begin
   l := _threads.LockList;
   try
@@ -229,7 +230,7 @@ begin
 end;
 
 class procedure TPCThread.ThreadsListInfo(list: TStrings);
-Var l : TList;
+Var l : TList<TPCThread>;
   i : Integer;
 begin
   l := _threads.LockList;
@@ -286,7 +287,7 @@ end;
 
 { TPCThreadList }
 
-function TPCThreadList.Add(Item: Pointer) : Integer;
+function TPCThreadList<T>.Add(Item: T) : Integer;
 begin
   LockList;
   Try
@@ -296,7 +297,7 @@ begin
   End;
 end;
 
-procedure TPCThreadList.Clear;
+procedure TPCThreadList<T>.Clear;
 begin
   LockList;
   Try
@@ -306,13 +307,13 @@ begin
   End;
 end;
 
-constructor TPCThreadList.Create(const AName : String);
+constructor TPCThreadList<T>.Create(const AName : String);
 begin
   FLock := TPCCriticalSection.Create(AName);
-  FList := TList.Create;
+  FList := TList<T>.Create;
 end;
 
-destructor TPCThreadList.Destroy;
+destructor TPCThreadList<T>.Destroy;
 begin
   LockList;
   try
@@ -324,13 +325,13 @@ begin
   end;
 end;
 
-function TPCThreadList.LockList: TList;
+function TPCThreadList<T>.LockList: TList<T>;
 begin
   TPCThread.ProtectEnterCriticalSection(Self,FLock);
   Result := FList;
 end;
 
-procedure TPCThreadList.Remove(Item: Pointer);
+procedure TPCThreadList<T>.Remove(Item: T);
 begin
   LockList;
   try
@@ -340,13 +341,13 @@ begin
   end;
 end;
 
-function TPCThreadList.TryLockList(MaxWaitMilliseconds: Cardinal; var lockedList: TList): Boolean;
+function TPCThreadList<T>.TryLockList(MaxWaitMilliseconds: Cardinal; var lockedList: TList<T>): Boolean;
 begin
   lockedList := FList;
   Result := TPCThread.TryProtectEnterCriticalSection(Self,MaxWaitMilliseconds,FLock);
 end;
 
-procedure TPCThreadList.UnlockList;
+procedure TPCThreadList<T>.UnlockList;
 begin
   FLock.Release;
 end;
@@ -441,7 +442,7 @@ end;
 {$ENDIF}
 
 initialization
-  _threads := TPCThreadList.Create('GLOBAL_THREADS');
+  _threads := TPCThreadList<TPCThread>.Create('GLOBAL_THREADS');
 finalization
   FreeAndNil(_threads);
 end.

src/core/UTxMultiOperation.pas

@@ -23,7 +23,9 @@ unit UTxMultiOperation;
 interface
 
 uses
-  Classes, SysUtils, UCrypto, UBlockChain, UAccounts, UBaseTypes, UPCDataTypes;
+  Classes, SysUtils, UCrypto, UBlockChain, UAccounts, UBaseTypes,
+  {$IFNDEF FPC}System.Generics.Collections{$ELSE}Generics.Collections{$ENDIF},
+  UPCDataTypes;
 
 Type
 
@@ -120,7 +122,7 @@ Type
     function CheckSignatures(AccountTransaction : TPCSafeBoxTransaction; var errors : String) : Boolean;
 
     function DoOperation(AccountPreviousUpdatedBlock : TAccountPreviousBlockInfo; AccountTransaction : TPCSafeBoxTransaction; var errors : String) : Boolean; override;
-    procedure AffectedAccounts(list : TList); override;
+    procedure AffectedAccounts(list : TList<Cardinal>); override;
     //
     Function DoSignMultiOperationSigner(current_protocol : Word; SignerAccount : Cardinal; key : TECPrivateKey) : Integer;
     class function OpType : Byte; override;
@@ -128,7 +130,7 @@ Type
     function OperationFee : Int64; override;
     function OperationPayload : TRawBytes; override;
     function SignerAccount : Cardinal; override;
-    procedure SignerAccounts(list : TList); override;
+    procedure SignerAccounts(list : TList<Cardinal>); override;
     function IsSignerAccount(account : Cardinal) : Boolean; override;
     function DestinationAccount : Int64; override;
     function SellerAccount : Int64; override;
@@ -720,11 +722,11 @@ begin
   Result := True;
 end;
 
-procedure TOpMultiOperation.AffectedAccounts(list: TList);
+procedure TOpMultiOperation.AffectedAccounts(list: TList<Cardinal>);
 Var i : Integer;
   Procedure _doAdd(nAcc : Cardinal);
   Begin
-    If list.IndexOf(TObject(nAcc))<0 then list.Add(TObject(nAcc));
+    If list.IndexOf(nAcc)<0 then list.Add(nAcc);
   end;
 begin
   For i:=low(FData.txSenders) to High(FData.txSenders) do begin
@@ -801,15 +803,15 @@ begin
   else Result := MaxInt;
 end;
 
-procedure TOpMultiOperation.SignerAccounts(list: TList);
+procedure TOpMultiOperation.SignerAccounts(list: TList<Cardinal>);
 var i : Integer;
 begin
   list.Clear;
   for i := 0 to High(FData.txSenders) do begin
-    list.Add(TObject(FData.txSenders[i].Account));
+    list.Add(FData.txSenders[i].Account);
   end;
   for i:= 0 to High(FData.changesInfo) do begin
-    if list.IndexOf(TObject(FData.changesInfo[i].Account))<0 then list.Add(TObject(FData.changesInfo[i].Account));
+    if list.IndexOf(FData.changesInfo[i].Account)<0 then list.Add(FData.changesInfo[i].Account);
   end;
 end;
 

src/core/UWallet.pas

@@ -37,6 +37,7 @@ uses
   {$IFDEF INTERNAL_USE_SETTINGS_UNIT}
   USettings,
   {$ENDIF}
+  {$IFNDEF FPC}System.Generics.Collections{$ELSE}Generics.Collections{$ENDIF},
   UPCDataTypes;
 
 Type
@@ -51,7 +52,7 @@ Type
 
   TWalletKeys = Class(TComponent)
   private
-    FSearchableKeys : TList;
+    FSearchableKeys : TList<Pointer>;
     FFileName: String;
     FWalletPassword: String;
     FWalletFileStream : TFileStream;
@@ -252,7 +253,7 @@ begin
   FIsValidPassword := false;
   FWalletFileStream := Nil;
   FWalletPassword := '';
-  FSearchableKeys := TList.Create;
+  FSearchableKeys := TList<Pointer>.Create;
   FIsReadingStream := false;
 end;
 
@@ -305,6 +306,7 @@ Var i : Integer;
  P : PWalletKey;
  raw : TRawBytes;
  isOk : Boolean;
+ LtmpECPrivKey : TECPrivateKey;
 begin
   FIsValidPassword := false;
   isOk := true;
@@ -318,15 +320,20 @@ begin
     if P^.HasPrivateKey then begin
       isOk := TPCEncryption.DoPascalCoinAESDecrypt(P^.CryptedKey, TEncoding.ASCII.GetBytes(FWalletPassword), raw );
       If isOk then begin
-        P^.PrivateKey := TECPrivateKey.Create;
+        LtmpECPrivKey := TECPrivateKey.Create;
         try
-          P^.PrivateKey.SetPrivateKeyFromHexa(P^.AccountKey.EC_OpenSSL_NID,TEncoding.ASCII.GetString(raw));
-        except on E: Exception do begin
-            P^.PrivateKey.Free;
-            P^.PrivateKey := Nil;
+          LtmpECPrivKey.SetPrivateKeyFromHexa(P^.AccountKey.EC_OpenSSL_NID,TEncoding.ASCII.GetString(raw));
+          if not TAccountComp.EqualAccountKeys(LtmpECPrivKey.PublicKey,P^.AccountKey) then begin
+            TLog.NewLog(lterror,ClassName,Format('Private key and public key does not match! %s <> %s',
+              [TAccountComp.AccountPublicKeyExport(LtmpECPrivKey.PublicKey),
+               TAccountComp.AccountPublicKeyExport(P^.AccountKey)]));
+            LtmpECPrivKey.Free;
+          end else P^.PrivateKey := LtmpECPrivKey;
+        except
+          on E: Exception do begin
+            LtmpECPrivKey.Free;
             isOk := false;
             TLog.NewLog(lterror,ClassName,Format('Fatal error when generating EC private key %d/%d: %s',[i+1,FSearchableKeys.Count,E.Message]));
-            //disabled exit... continue: exit;
           end;
         end;
       end;

src/libraries/pascalcoin/UJSONFunctions.pas

@@ -35,7 +35,8 @@ Uses
   {$ENDIF}
   DBXJSON,
   {$ENDIF}
-  SysUtils, DateUtils, Variants, Classes, ULog;
+  SysUtils, DateUtils, Variants, Classes, ULog,
+  {$IFNDEF FPC}System.Generics.Collections{$ELSE}Generics.Collections{$ENDIF};
 
 Type
   {$IFDEF FPC}
@@ -105,7 +106,7 @@ Type
 
   TPCJSONList = Class(TPCJSONData)
   private
-    FList : TList;
+    FList : TList<TPCJSONData>;
     function GetItems(Index: Integer): TPCJSONData;
     procedure SetItems(Index: Integer; const Value: TPCJSONData);
   protected
@@ -319,7 +320,7 @@ constructor TPCJSONList.Create;
 begin
   inherited;
   FParent := Nil;
-  FList := TList.Create;
+  FList := TList<TPCJSONData>.Create;
 end;
 
 procedure TPCJSONList.Delete(index: Integer);