Core: Replace NotifyEventToMany with TNotifyManyEvent & related changes

src/core/UAccounts.pas

@@ -23,7 +23,8 @@ unit UAccounts;
 interface
 
 uses
-  Classes, UConst, UCrypto, SyncObjs, UThread, UBaseTypes;
+  Classes, SysUtils, UConst, UCrypto, SyncObjs, UThread, UBaseTypes;
+
 {$I config.inc}
 
 Type
@@ -287,8 +288,22 @@ Type
   TOrderedAccountList = Class;
   TOrderedBlockAccountList = Class;
 
+  { TProgressNotify }
+
   TProgressNotify = procedure(sender : TObject; const message : AnsiString; curPos, totalCount : Int64) of object;
 
+  { TProgressNotifyMany }
+
+  TProgressNotifyMany = TArray<TProgressNotify>;
+
+  { TProgressNotifyManyHelper }
+
+  TProgressNotifyManyHelper = record helper for TProgressNotifyMany
+    procedure Add(listener : TProgressNotify);
+    procedure Remove(listener : TProgressNotify);
+    procedure Invoke(sender : TObject; const message : AnsiString; curPos, totalCount : Int64);
+  end;
+
   { TPCSafeBox }
 
   TAccountUpdateStyle = (aus_transaction_commit, aus_rollback, aus_commiting_from_otherchain);
@@ -523,7 +538,7 @@ Procedure Check_Safebox_Integrity(sb : TPCSafebox; title: String);
 implementation
 
 uses
-  SysUtils, ULog, UOpenSSLdef, UOpenSSL, UAccountKeyStorage, math;
+  ULog, UOpenSSLdef, UOpenSSL, UAccountKeyStorage, math, UCommon;
 
 { This function is for testing purpose only.
   Will check if Account Names are well assigned and stored }
@@ -1516,6 +1531,27 @@ begin
   list.Add(TObject(CT_NID_secp521r1)); // = 716
 end;
 
+{ TProgressNotifyManyHelper }
+
+procedure TProgressNotifyManyHelper.Add(listener : TProgressNotify);
+begin
+  if TArrayTool<TProgressNotify>.IndexOf(self, listener) = -1 then begin
+    TArrayTool<TProgressNotify>.Add(self, listener);
+  end;
+end;
+
+procedure TProgressNotifyManyHelper.Remove(listener : TProgressNotify);
+begin
+  TArrayTool<TProgressNotify>.Remove(self, listener);
+end;
+
+procedure TProgressNotifyManyHelper.Invoke(sender : TObject; const message : AnsiString; curPos, totalCount : Int64);
+var i : Integer;
+begin
+  for i := low(self) to high(self) do
+    self[i](sender, message, curPos, totalCount);
+end;
+
 { TPCSafeBox }
 
 // New on version 2: To reduce mem usage

src/core/UBaseTypes.pas

@@ -76,7 +76,8 @@ Type
     class function GetElapsedMilliseconds(Const previousTickCount : TTickCount) : Int64;
   End;
 
-  TNotifyEventToMany = Class
+  //HS -- removed, TNotifyManyEvent in UCommon.pas
+  {TNotifyEventToMany = Class
   private
     FList : Array of TNotifyEvent;
   public
@@ -87,7 +88,7 @@ Type
     function Count : Integer;
     procedure Delete(index : Integer);
     Constructor Create;
-  End;
+  End;}
 
 
 implementation
@@ -310,69 +311,5 @@ begin
   Result := {$IFDEF CPU64}GetTickCount64{$ELSE}{$IFNDEF FPC}Windows.{$ELSE}SysUtils.{$ENDIF}GetTickCount{$ENDIF};
 end;
 
-{ TNotifyEventToMany }
-
-procedure TNotifyEventToMany.Add(newNotifyEvent: TNotifyEvent);
-begin
-  if IndexOf(newNotifyEvent)>=0 then exit;
-  SetLength(FList,length(FList)+1);
-  FList[high(FList)] := newNotifyEvent;
-end;
-
-function TNotifyEventToMany.Count: Integer;
-begin
-  Result := Length(FList);
-end;
-
-constructor TNotifyEventToMany.Create;
-begin
-  SetLength(FList,0);
-end;
-
-procedure TNotifyEventToMany.Delete(index: Integer);
-Var i : Integer;
-begin
-  if (index<0) Or (index>High(FList)) then raise Exception.Create('Invalid index '+Inttostr(index)+' in '+Self.ClassName+'.Delete');
-  for i := index+1 to high(FList) do begin
-    FList[i-1] := FList[i];
-  end;
-  SetLength(FList,length(FList)-1);
-end;
-
-function TNotifyEventToMany.IndexOf(search: TNotifyEvent): Integer;
-begin
-  for Result := low(FList) to high(FList) do begin
-    if (TMethod(FList[Result]).Code = TMethod(search).Code) And
-       (TMethod(FList[Result]).Data = TMethod(search).Data) then Exit;
-  end;
-  Result := -1;
-end;
-
-procedure TNotifyEventToMany.Invoke(sender: TObject);
-Var i,j : Integer;
-begin
-  j := -1;
-  Try
-    for i := low(FList) to high(FList) do begin
-      j := i;
-      FList[i](sender);
-    end;
-  Except
-    On E:Exception do begin
-      E.Message := Format('Error TNotifyManyEventHelper.Invoke %d/%d (%s) %s',[j+1,length(FList),E.ClassType,E.Message]);
-      Raise;
-    end;
-  End;
-end;
-
-procedure TNotifyEventToMany.Remove(removeNotifyEvent: TNotifyEvent);
-Var i : Integer;
-begin
-  i := IndexOf(removeNotifyEvent);
-  if (i>=0) then begin
-    Delete(i);
-  end;
-end;
-
 end.
 

src/core/UNetProtocol.pas

@@ -29,7 +29,7 @@ Uses
   {LCLIntf, LCLType, LMessages,}
 {$ENDIF}
   UBlockChain, Classes, SysUtils, UAccounts, UThread,
-  UCrypto, UTCPIP, SyncObjs, UBaseTypes;
+  UCrypto, UTCPIP, SyncObjs, UBaseTypes, UCommon;
 
 {$I config.inc}
 
@@ -256,7 +256,7 @@ Type
     FRegisteredRequests : TPCThreadList;
     FIsDiscoveringServers : Boolean;
     FIsGettingNewBlockChainFromClient : Boolean;
-    FOnConnectivityChanged : TNotifyEventToMany;
+    FOnConnectivityChanged : TNotifyManyEvent;
     FOnNetConnectionsUpdated: TNotifyEvent;
     FOnNodeServersUpdated: TNotifyEvent;
     FOnBlackListUpdated: TNotifyEvent;
@@ -319,7 +319,7 @@ Type
     Property IsGettingNewBlockChainFromClient : Boolean read FIsGettingNewBlockChainFromClient;
     Property MaxRemoteOperationBlock : TOperationBlock read FMaxRemoteOperationBlock;
     Property NodePrivateKey : TECPrivateKey read FNodePrivateKey;
-    property OnConnectivityChanged : TNotifyEventToMany read FOnConnectivityChanged;
+    property OnConnectivityChanged : TNotifyManyEvent read FOnConnectivityChanged;
     Property OnNetConnectionsUpdated : TNotifyEvent read FOnNetConnectionsUpdated write FOnNetConnectionsUpdated;
     Property OnNodeServersUpdated : TNotifyEvent read FOnNodeServersUpdated write FOnNodeServersUpdated;
     Property OnBlackListUpdated : TNotifyEvent read FOnBlackListUpdated write FOnBlackListUpdated;
@@ -1146,7 +1146,7 @@ begin
   SetLength(FFixedServers,0);
   FMaxRemoteOperationBlock := CT_OperationBlock_NUL;
   FNetStatistics := CT_TNetStatistics_NUL;
-  FOnConnectivityChanged := TNotifyEventToMany.Create;
+  //FOnConnectivityChanged := TNotifyEventToMany.Create; //xxxxxxxxxxxxxxxxxx HS - removed TNotifyEventMany auto-collected
   FOnStatisticsChanged := Nil;
   FOnNetConnectionsUpdated := Nil;
   FOnNodeServersUpdated := Nil;

src/core/UNode.pas

@@ -34,7 +34,7 @@ unit UNode;
 interface
 
 uses
-  Classes, UBlockChain, UNetProtocol, UAccounts, UCrypto, UThread, SyncObjs, ULog;
+  Classes, SysUtils, UBlockChain, UNetProtocol, UAccounts, UCrypto, UThread, SyncObjs, ULog;
 
 {$I config.inc}
 
@@ -117,7 +117,22 @@ Type
     Constructor Create(ANodeNotifyEvents : TNodeNotifyEvents);
   End;
 
+  { TNodeMessage Event }
+
   TNodeMessageEvent = Procedure(NetConnection : TNetConnection; MessageData : TRawBytes) of object;
+
+  { TNodeMessageManyEvent }
+
+  TNodeMessageManyEvent = TArray<TNodeMessageEvent>;
+
+  { TNodeMessageManyEventHelper }
+
+  TNodeMessageManyEventHelper = record helper for TNodeMessageManyEvent
+    procedure Add(listener : TNodeMessageEvent);
+    procedure Remove(listener : TNodeMessageEvent);
+    procedure Invoke(NetConnection : TNetConnection; MessageData : TRawBytes);
+  end;
+
   { TNodeNotifyEvents is ThreadSafe and will only notify in the main thread }
   TNodeNotifyEvents = Class(TComponent)
   private
@@ -169,7 +184,7 @@ Type
 
 implementation
 
-Uses UOpTransaction, SysUtils,  UConst, UTime;
+Uses UOpTransaction, UConst, UTime, UCommon;
 
 var _Node : TNode;
 
@@ -1118,6 +1133,27 @@ begin
   FNodeLog.FileName := Value;
 end;
 
+{ TNodeMessageManyEventHelper }
+
+procedure TNodeMessageManyEventHelper.Add(listener : TNodeMessageEvent);
+begin
+  if TArrayTool<TNodeMessageEvent>.IndexOf(self, listener) = -1 then begin
+    TArrayTool<TNodeMessageEvent>.Add(self, listener);
+  end;
+end;
+
+procedure TNodeMessageManyEventHelper.Remove(listener : TNodeMessageEvent);
+begin
+  TArrayTool<TNodeMessageEvent>.Remove(self, listener);
+end;
+
+procedure TNodeMessageManyEventHelper.Invoke(NetConnection : TNetConnection; MessageData : TRawBytes);
+var i : Integer;
+begin
+  for i := low(self) to high(self) do
+    self[i](NetConnection, MessageData);
+end;
+
 { TNodeNotifyEvents }
 
 constructor TNodeNotifyEvents.Create(AOwner: TComponent);

src/core/USettings.pas

@@ -25,7 +25,7 @@ unit USettings;
 interface
 
 uses
-  UAppParams, UBaseTypes;
+  UAppParams, UBaseTypes, UCommon;
 
 const
   // App Params
@@ -62,7 +62,7 @@ type
 
   TSettings = class
     private
-      class var FOnChanged : TNotifyEventToMany;
+      class var FOnChanged : TNotifyManyEvent;
       class var FAppParams : TAppParams;
       class function GetInternetServerPort : Integer; static;
       class procedure SetInternetServerPort(AInt:Integer); static;
@@ -101,7 +101,7 @@ type
     public
       class procedure Load;
       class procedure Save;
-      class property OnChanged : TNotifyEventToMany read FOnChanged;
+      class property OnChanged : TNotifyManyEvent read FOnChanged;
       class property InternetServerPort : Integer read GetInternetServerPort write SetInternetServerPort;
       class property RpcPortEnabled : boolean read GetRpcPortEnabled write SetRpcPortEnabled;
       class property RpcAllowedIPs : string read GetRpcAllowedIPs write SetRpcAllowedIPs;
@@ -345,7 +345,6 @@ end;
 
 initialization
   TSettings.FAppParams := nil;
-  TSettings.FOnChanged := TNotifyEventToMany.Create;
 
 finalization
   if Assigned(TSettings.FAppParams) then

src/core/UWallet.pas

@@ -23,7 +23,7 @@ unit UWallet;
 interface
 
 uses
-  Classes, USettings, UBlockChain, UAccounts, UCrypto, UBaseTypes;
+  Classes, USettings, UBlockChain, UAccounts, UCrypto, UBaseTypes, UCommon;
 
 Type
   TWalletKey = Record
@@ -44,7 +44,7 @@ Type
     FIsValidPassword: Boolean;
     FWalletFileName: AnsiString;
     FIsReadingStream : Boolean;
-    FOnChanged: TNotifyEventToMany;
+    FOnChanged: TNotifyManyEvent;
     function GetHasPassword : boolean;
     function GetKey(index: Integer): TWalletKey;
     procedure SetWalletPassword(const Value: AnsiString);
@@ -67,7 +67,7 @@ Type
     Procedure Clear; virtual;
     Function Count : Integer;
     Property WalletFileName : AnsiString read FWalletFileName write SetWalletFileName;
-    Property OnChanged : TNotifyEventToMany read FOnChanged;
+    Property OnChanged : TNotifyManyEvent read FOnChanged;
     Procedure SetName(index : Integer; Const newName : AnsiString);
     Function LockWallet : Boolean;
   End;
@@ -227,7 +227,6 @@ begin
   FWalletPassword := '';
   FSearchableKeys := TList.Create;
   FIsReadingStream := false;
-  FOnChanged := TNotifyEventToMany.Create;
 end;
 
 procedure TWalletKeys.Delete(index: Integer);
@@ -243,7 +242,6 @@ end;
 
 destructor TWalletKeys.destroy;
 begin
-  FreeAndNil(FOnChanged);
   FreeAndNil(FWalletFileStream);
   Clear;
   FreeAndNil(FSearchableKeys);

src/gui-classic/UFRMOperation.pas

@@ -25,6 +25,7 @@ interface
 uses
 {$IFnDEF FPC}
   Windows,
+  System.Actions,
 {$ELSE}
   LCLIntf, LCLType, LMessages,
 {$ENDIF}
@@ -180,7 +181,8 @@ type
 implementation
 
 uses
-  UECIES, UConst, UOpTransaction, UFRMNewPrivateKeyType, UAES, UFRMWalletKeys;
+  UECIES, UConst, UOpTransaction, UFRMNewPrivateKeyType, UAES, UFRMWalletKeys,
+  UCommon;
 
 {$IFnDEF FPC}
   {$R *.dfm}

src/gui-classic/UFRMWallet.pas

@@ -313,7 +313,8 @@ implementation
 Uses UFolderHelper, UOpenSSL, UOpenSSLdef, UTime, UFileStorage,
   UThread, UOpTransaction, UECIES, UFRMPascalCoinWalletConfig,
   UFRMOperationsExplorer,
-  UFRMAbout, UFRMOperation, UFRMWalletKeys, UFRMPayloadDecoder, UFRMNodesIp, UFRMMemoText, USettings;
+  UFRMAbout, UFRMOperation, UFRMWalletKeys, UFRMPayloadDecoder, UFRMNodesIp, UFRMMemoText,
+  USettings, UCommon;
 
 Type
 

src/gui-classic/UFRMWalletKeys.pas

@@ -95,7 +95,7 @@ uses
 {$ELSE}
   LCLIntf, LCLType,
 {$ENDIF}
-  UCrypto, UAccounts, UFRMNewPrivateKeyType, UAES, UBaseTypes;
+  UCrypto, UAccounts, UFRMNewPrivateKeyType, UAES, UBaseTypes, UCommon;
 
 {$IFnDEF FPC}
   {$R *.dfm}

src/pascalcoin_wallet_classic.lpi

@@ -213,7 +213,7 @@
     </Target>
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)"/>
-      <OtherUnitFiles Value="core;gui-classic;libraries\synapse;libraries\pascalcoin"/>
+      <OtherUnitFiles Value="core;gui-classic;libraries\synapse;libraries\sphere10;libraries\hashlib4pascal;libraries\generics.collections;libraries\pascalcoin"/>
       <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Parsing>