AnsiString to String on core - Logs and OpenSSL

src/core/UBlockChain.pas

@@ -157,15 +157,15 @@ Type
     DestAccount : Int64;   //
     SellerAccount : Int64; // Protocol 2 - only used when is a pay to transaction
     newKey : TAccountKey;
-    OperationTxt : AnsiString;
+    OperationTxt : String;
     Amount : Int64;
     Fee : Int64;
     Balance : Int64;
     OriginalPayload : TRawBytes;
-    PrintablePayload : AnsiString;
+    PrintablePayload : String;
     OperationHash : TRawBytes;
     OperationHash_OLD : TRawBytes; // Will include old oeration hash value
-    errors : AnsiString;
+    errors : String;
     // New on V3 for PIP-0017
     isMultiOperation : Boolean;
     Senders : TMultiOpSenders;

src/core/ULog.pas

@@ -29,7 +29,7 @@ type
   TLogType = (ltinfo, ltupdate, lterror, ltdebug);
   TLogTypes = set of TLogType;
 
-  TNewLogEvent = procedure(logtype : TLogType; Time : TDateTime; ThreadID : TThreadID; Const sender, logtext : AnsiString) of object;
+  TNewLogEvent = procedure(logtype : TLogType; Time : TDateTime; ThreadID : TThreadID; Const sender, logtext : String) of object;
 
   TLog = Class;
 
@@ -48,7 +48,7 @@ type
     Logtype : TLogType;
     Time : TDateTime;
     ThreadID : TThreadID;
-    Sender, Logtext : AnsiString
+    Sender, Logtext : String
   End;
 
   TLog = Class(TComponent)
@@ -57,28 +57,28 @@ type
     FOnNewLog: TNewLogEvent;
     FOnInThreadNewLog : TNewLogEvent;
     FFileStream : TFileStream;
-    FFileName: AnsiString;
+    FFileName: String;
     FSaveTypes: TLogTypes;
     FThreadSafeLogEvent : TThreadSafeLogEvent;
     FProcessGlobalLogs: Boolean;
     FLock : TCriticalSection;
-    procedure SetFileName(const Value: AnsiString);
+    procedure SetFileName(const Value: String);
   protected
-    Procedure DoLog(logtype : TLogType; sender, logtext : AnsiString); virtual;
+    Procedure DoLog(logtype : TLogType; const sender, logtext : String); virtual;
   public
     Constructor Create(AOwner : TComponent); override;
     Destructor Destroy; override;
     Class Procedure NewLog(logtype : TLogType; Const sender, logtext : String);
     Property OnInThreadNewLog : TNewLogEvent read FOnInThreadNewLog write FOnInThreadNewLog;
     Property OnNewLog : TNewLogEvent read FOnNewLog write FOnNewLog;
-    Property FileName : AnsiString read FFileName write SetFileName;
+    Property FileName : String read FFileName write SetFileName;
     Property SaveTypes : TLogTypes read FSaveTypes write FSaveTypes;
     Property ProcessGlobalLogs : Boolean read FProcessGlobalLogs write FProcessGlobalLogs;
     Procedure NotifyNewLog(logtype : TLogType; Const sender, logtext : String);
   End;
 
 Const
-  CT_LogType : Array[TLogType] of AnsiString = ('Info','Update','Error','Debug');
+  CT_LogType : Array[TLogType] of String = ('Info','Update','Error','Debug');
   CT_TLogTypes_ALL : TLogTypes = [ltinfo, ltupdate, lterror, ltdebug];
   CT_TLogTypes_DEFAULT : TLogTypes = [ltinfo, ltupdate, lterror];
 
@@ -138,7 +138,7 @@ begin
   inherited;
 end;
 
-procedure TLog.DoLog(logtype: TLogType; sender, logtext: AnsiString);
+procedure TLog.DoLog(logtype: TLogType; const sender, logtext: String);
 begin
 //
 end;
@@ -155,7 +155,7 @@ begin
 end;
 
 procedure TLog.NotifyNewLog(logtype: TLogType; Const sender, logtext: String);
-Var s,tid : AnsiString;
+Var s,tid : RawByteString;
   P : PLogData;
 begin
   FLock.Acquire;
@@ -184,7 +184,7 @@ begin
   DoLog(logtype,sender,logtext);
 end;
 
-procedure TLog.SetFileName(const Value: AnsiString);
+procedure TLog.SetFileName(const Value: String);
 var fm : Word;
 begin
   if FFileName = Value then exit;

src/core/UNode.pas

@@ -94,8 +94,8 @@ Type
     Function FindNOperations(account, start_block : Cardinal; allow_search_previous : Boolean; n_operation_low, n_operation_high : Cardinal; OpResumeList : TOperationsResumeList) : TSearchOperationResult;
     //
     Procedure InitSafeboxAndOperations(max_block_to_read : Cardinal = $FFFFFFFF; restoreProgressNotify : TProgressNotify = Nil);
-    Procedure AutoDiscoverNodes(Const ips : AnsiString);
-    Function IsBlockChainValid(var WhyNot : AnsiString) : Boolean;
+    Procedure AutoDiscoverNodes(Const ips : String);
+    Function IsBlockChainValid(var WhyNot : String) : Boolean;
     Function IsReady(Var CurrentProcess : String) : Boolean;
     Property PeerCache : AnsiString read FPeerCache write FPeerCache;
     Procedure DisableNewBlocks;
@@ -536,7 +536,7 @@ begin
   end;
 end;
 
-procedure TNode.AutoDiscoverNodes(const ips: AnsiString);
+procedure TNode.AutoDiscoverNodes(const ips: String);
 Var i,j : Integer;
   nsarr : TNodeServerAddressArray;
 begin
@@ -725,7 +725,7 @@ begin
   Result := FNodeLog.FileName;
 end;
 
-function TNode.IsBlockChainValid(var WhyNot : AnsiString): Boolean;
+function TNode.IsBlockChainValid(var WhyNot : String): Boolean;
 Var unixtimediff : Integer;
 begin
   Result :=false;

src/core/UOpenSSL.pas

@@ -36,38 +36,38 @@ var
   {$IFEND}
   {$IFDEF OpenSSL10}
   {$IFDEF LINUX}
-  SSL_C_LIB : AnsiString = './libcrypto.so.1.0.0';
+  SSL_C_LIB : String = './libcrypto.so.1.0.0';
   {$ELSE}
-  SSL_C_LIB : AnsiString = './libcrypto.1.0.0.dylib';
+  SSL_C_LIB : String = './libcrypto.1.0.0.dylib';
   {$ENDIF}
   {$ELSE}
   {$IFDEF LINUX}
-  SSL_C_LIB : AnsiString = './libcrypto.so.1.1';
+  SSL_C_LIB : String = './libcrypto.so.1.1';
   {$ELSE}
-  SSL_C_LIB : AnsiString = './libcrypto.1.1.dylib';
+  SSL_C_LIB : String = './libcrypto.1.1.dylib';
   {$ENDIF}
   {$ENDIF}
 {$ELSE}
   {$IFDEF OpenSSL10}
     {$IFDEF FPC}
       {$ifdef CPU32}
-	  SSL_C_LIB : AnsiString = 'libeay32.dll';
+	  SSL_C_LIB : String = 'libeay32.dll';
       {$ENDIF}
       {$ifdef CPU64}
-	  SSL_C_LIB : AnsiString = 'libeay64.dll';
+	  SSL_C_LIB : String = 'libeay64.dll';
       {$ENDIF}
     {$ELSE}
       {$IFDEF CPUX64}
-        SSL_C_LIB : AnsiString = 'libeay64.dll';
+        SSL_C_LIB : String = 'libeay64.dll';
       {$ELSE}
-        SSL_C_LIB : AnsiString = 'libeay32.dll';
+        SSL_C_LIB : String = 'libeay32.dll';
       {$ENDIF}
     {$ENDIF}
   {$ELSE}
     {$ifdef CPUX64}
-      SSL_C_LIB : AnsiString = 'libcrypto-1_1-x64.dll';
+      SSL_C_LIB : String = 'libcrypto-1_1-x64.dll';
     {$ELSE}
-      SSL_C_LIB : AnsiString = 'libcrypto-1_1.dll';
+      SSL_C_LIB : String = 'libcrypto-1_1.dll';
     {$ENDIF}
   {$ENDIF}
 {$ENDIF}
@@ -243,7 +243,11 @@ begin
     {$IFDEF UNIX}
     hCrypt := LoadLibrary(SSL_C_LIB);
     {$ELSE}
-    hCrypt := LoadLibraryA(PAnsiChar(SSL_C_LIB));
+      {$IFDEF FPC}
+    hCrypt := LoadLibrary(PAnsiChar(SSL_C_LIB));
+      {$ELSE}
+    hCrypt := LoadLibrary(PWideChar(SSL_C_LIB));
+      {$ENDIF}
     {$ENDIF}
   end;
   Result := hCrypt <> 0;

src/core/upcdaemon.pas

@@ -81,7 +81,7 @@ Type
   TPCDaemonMapper = Class(TCustomDaemonMapper)
   private
     FLog : TLog;
-    procedure OnPascalCoinInThreadLog(logtype : TLogType; Time : TDateTime; AThreadID : TThreadID; Const sender, logtext : AnsiString);
+    procedure OnPascalCoinInThreadLog(logtype : TLogType; Time : TDateTime; AThreadID : TThreadID; Const sender, logtext : String);
   protected
     Procedure DoOnCreate; override;
     Procedure DoOnDestroy; override;
@@ -341,7 +341,7 @@ end;
 { TPCDaemonMapper }
 
 procedure TPCDaemonMapper.OnPascalCoinInThreadLog(logtype: TLogType;
-  Time: TDateTime; AThreadID: TThreadID; const sender, logtext: AnsiString);
+  Time: TDateTime; AThreadID: TThreadID; const sender, logtext: String);
 Var s : AnsiString;
 begin
 //  If Not SameText(sender,TPCDaemonThread.ClassName) then exit;