Experimental GUI: update to latest core

src/gui-experimental/UCTRLSyncronization.lfm

@@ -10,8 +10,7 @@ object CTRLSyncronization: TCTRLSyncronization
   ClientWidth = 728
   OnCreate = FormCreate
   OnDestroy = FormDestroy
-  LCLVersion = '1.8.2.0'
-  Visible = False
+  LCLVersion = '2.0.2.0'
   object paSplash: TPanel
     Left = 0
     Height = 428

src/gui-experimental/UCTRLSyncronization.pas

@@ -91,7 +91,9 @@ implementation
 
 {$R *.lfm}
 
-uses UCommon, UTime, UConst, UUserInterface, UAccounts, UNode;
+uses
+  UCommon, UTime, UConst, UAccounts, UNode, UBlockChain,
+  UUserInterface;
 
 procedure TCTRLSyncronization.FormCreate(Sender: TObject);
 begin
@@ -215,59 +217,59 @@ end;
 procedure TCTRLSyncronization.UpdateBlockChainState;
 Var
   f, favg : real;
+  LMemPool : TPCOperationsComp;
 begin
-  TUserInterface.Node.Operations.Lock;
-  try
-    if not TUserInterface.Started then exit;
-    UpdateNodeStatus;
-    if Assigned(TUserInterface.Node) then begin
-      if TUserInterface.Node.Bank.BlocksCount>0 then begin
-        lblTotalBlocksValue.Caption :=  Inttostr(TUserInterface.Node.Bank.BlocksCount)+' (0..'+Inttostr(TUserInterface.Node.Bank.BlocksCount-1)+')'; ;
-      end else lblTotalBlocksValue.Caption :=  '(none)';
-      lblTotalAccountsValue.Caption := Inttostr(TUserInterface.Node.Bank.AccountsCount);
-      lblBlockAgeValue.Caption := UnixTimeToLocalElapsedTime(TUserInterface.Node.Bank.LastOperationBlock.timestamp);
-      lblPendingOperationsValue.Caption := Inttostr(TUserInterface.Node.Operations.Count);
-      lblBlockTargetValue.Caption := InttoHex(TUserInterface.Node.Operations.OperationBlock.compact_target,8);
-      favg := TUserInterface.Node.Bank.GetActualTargetSecondsAverage(CT_CalcNewTargetBlocksAverage);
-      f := (CT_NewLineSecondsAvg - favg) / CT_NewLineSecondsAvg;
-      lblTimeAverage.Caption := 'Last '+Inttostr(CT_CalcNewTargetBlocksAverage)+': '+FormatFloat('0.0',favg)+' sec. (Optimal '+Inttostr(CT_NewLineSecondsAvg)+'s) Deviation '+FormatFloat('0.00%',f*100);
-      if favg>=CT_NewLineSecondsAvg then begin
-        lblTimeAverage.Font.Color := clNavy;
-      end else begin
-        lblTimeAverage.Font.Color := clOlive;
-      end;
-      lblTimeAverageAux.Caption := Format('Last %d: %s sec. - %d: %s sec. - %d: %s sec. - %d: %s sec. - %d: %s sec.',[
-          CT_CalcNewTargetBlocksAverage * 2 ,FormatFloat('0.0',TUserInterface.Node.Bank.GetActualTargetSecondsAverage(CT_CalcNewTargetBlocksAverage * 2)),
-          ((CT_CalcNewTargetBlocksAverage * 3) DIV 2) ,FormatFloat('0.0',TUserInterface.Node.Bank.GetActualTargetSecondsAverage((CT_CalcNewTargetBlocksAverage * 3) DIV 2)),
-          ((CT_CalcNewTargetBlocksAverage DIV 4)*3),FormatFloat('0.0',TUserInterface.Node.Bank.GetActualTargetSecondsAverage(((CT_CalcNewTargetBlocksAverage DIV 4)*3))),
-          CT_CalcNewTargetBlocksAverage DIV 2,FormatFloat('0.0',TUserInterface.Node.Bank.GetActualTargetSecondsAverage(CT_CalcNewTargetBlocksAverage DIV 2)),
-          CT_CalcNewTargetBlocksAverage DIV 4,FormatFloat('0.0',TUserInterface.Node.Bank.GetActualTargetSecondsAverage(CT_CalcNewTargetBlocksAverage DIV 4))]);
+  if not TUserInterface.Started then exit;
+  UpdateNodeStatus;
+  if Assigned(TUserInterface.Node) then begin
+    if TUserInterface.Node.Bank.BlocksCount>0 then begin
+      lblTotalBlocksValue.Caption :=  Inttostr(TUserInterface.Node.Bank.BlocksCount)+' (0..'+Inttostr(TUserInterface.Node.Bank.BlocksCount-1)+')'; ;
+    end else lblTotalBlocksValue.Caption :=  '(none)';
+    lblTotalAccountsValue.Caption := Inttostr(TUserInterface.Node.Bank.AccountsCount);
+    lblBlockAgeValue.Caption := UnixTimeToLocalElapsedTime(TUserInterface.Node.Bank.LastOperationBlock.timestamp);
+    LMemPool := TUserInterface.Node.LockMempoolRead;
+    try
+      lblPendingOperationsValue.Caption := Inttostr(LMemPool.Count);
+      lblBlockTargetValue.Caption := InttoHex(LMemPool.OperationBlock.compact_target,8);
+    finally
+      TUserInterface.Node.UnlockMempoolRead;
+    end;
+    favg := TUserInterface.Node.Bank.GetActualTargetSecondsAverage(CT_CalcNewTargetBlocksAverage);
+    f := (CT_NewLineSecondsAvg - favg) / CT_NewLineSecondsAvg;
+    lblTimeAverage.Caption := 'Last '+Inttostr(CT_CalcNewTargetBlocksAverage)+': '+FormatFloat('0.0',favg)+' sec. (Optimal '+Inttostr(CT_NewLineSecondsAvg)+'s) Deviation '+FormatFloat('0.00%',f*100);
+    if favg>=CT_NewLineSecondsAvg then begin
+      lblTimeAverage.Font.Color := clNavy;
     end else begin
-      lblTotalBlocksValue.Caption := '';
-      lblTotalAccountsValue.Caption := '';
-      lblBlockAgeValue.Caption := '';
-      lblPendingOperationsValue.Caption := '';
-      lblBlockTargetValue.Caption := '';
-      lblTimeAverage.Caption := '';
-      lblTimeAverageAux.Caption := '';
+      lblTimeAverage.Font.Color := clOlive;
     end;
-    if (Assigned(TUserInterface.PoolMiningServer)) And (TUserInterface.PoolMiningServer.Active) then begin
-      If TUserInterface.PoolMiningServer.ClientsCount>0 then begin
-        lblMinersClientsValue.Caption := IntToStr(TUserInterface.PoolMiningServer.ClientsCount)+' connected JSON-RPC clients';
-        lblMinersClientsValue.Font.Color := clNavy;
-      end else begin
-        lblMinersClientsValue.Caption := 'No JSON-RPC clients';
-        lblMinersClientsValue.Font.Color := clDkGray;
-      end;
-      MinedBlocksCount := TUserInterface.PoolMiningServer.ClientsWins;
+    lblTimeAverageAux.Caption := Format('Last %d: %s sec. - %d: %s sec. - %d: %s sec. - %d: %s sec. - %d: %s sec.',[
+        CT_CalcNewTargetBlocksAverage * 2 ,FormatFloat('0.0',TUserInterface.Node.Bank.GetActualTargetSecondsAverage(CT_CalcNewTargetBlocksAverage * 2)),
+        ((CT_CalcNewTargetBlocksAverage * 3) DIV 2) ,FormatFloat('0.0',TUserInterface.Node.Bank.GetActualTargetSecondsAverage((CT_CalcNewTargetBlocksAverage * 3) DIV 2)),
+        ((CT_CalcNewTargetBlocksAverage DIV 4)*3),FormatFloat('0.0',TUserInterface.Node.Bank.GetActualTargetSecondsAverage(((CT_CalcNewTargetBlocksAverage DIV 4)*3))),
+        CT_CalcNewTargetBlocksAverage DIV 2,FormatFloat('0.0',TUserInterface.Node.Bank.GetActualTargetSecondsAverage(CT_CalcNewTargetBlocksAverage DIV 2)),
+        CT_CalcNewTargetBlocksAverage DIV 4,FormatFloat('0.0',TUserInterface.Node.Bank.GetActualTargetSecondsAverage(CT_CalcNewTargetBlocksAverage DIV 4))]);
+  end else begin
+    lblTotalBlocksValue.Caption := '';
+    lblTotalAccountsValue.Caption := '';
+    lblBlockAgeValue.Caption := '';
+    lblPendingOperationsValue.Caption := '';
+    lblBlockTargetValue.Caption := '';
+    lblTimeAverage.Caption := '';
+    lblTimeAverageAux.Caption := '';
+  end;
+  if (Assigned(TUserInterface.PoolMiningServer)) And (TUserInterface.PoolMiningServer.Active) then begin
+    If TUserInterface.PoolMiningServer.ClientsCount>0 then begin
+      lblMinersClientsValue.Caption := IntToStr(TUserInterface.PoolMiningServer.ClientsCount)+' connected JSON-RPC clients';
+      lblMinersClientsValue.Font.Color := clNavy;
     end else begin
-      MinedBlocksCount := 0;
-      lblMinersClientsValue.Caption := 'JSON-RPC server not active';
-      lblMinersClientsValue.Font.Color := clRed;
+      lblMinersClientsValue.Caption := 'No JSON-RPC clients';
+      lblMinersClientsValue.Font.Color := clDkGray;
     end;
-
-  finally
-    TUserInterface.Node.Operations.Unlock;
+    MinedBlocksCount := TUserInterface.PoolMiningServer.ClientsWins;
+  end else begin
+    MinedBlocksCount := 0;
+    lblMinersClientsValue.Caption := 'JSON-RPC server not active';
+    lblMinersClientsValue.Font.Color := clRed;
   end;
 end;
 

src/gui-experimental/UCTRLWallet.lfm

@@ -10,7 +10,7 @@ object CTRLWallet: TCTRLWallet
   ClientWidth = 1151
   OnCreate = FormCreate
   OnResize = FormResize
-  Visible = False
+  LCLVersion = '2.0.2.0'
   object PairSplitter1: TPairSplitter
     Cursor = crDefault
     Left = 0

src/gui-experimental/UCTRLWallet.pas

@@ -628,7 +628,7 @@ begin
   if ASelection.RowCount = 1 then begin
     if not TAccountComp.AccountTxtNumberToAccountNumber(FAccountsGrid.Rows[ASelection.Row].Account, accNo) then
       raise Exception.Create('Error Parsing Account Number From Grid');
-    account := TNode.Node.Operations.SafeBoxTransaction.Account(accNo);
+    account := TNode.Node.GetAccount(accNo);
     miEnlistAccountsForSale.Visible := IIF(TAccountComp.IsAccountForSale(account.accountInfo), False, True);
     miDelistAccountsFromSale.Visible := not miEnlistAccountsForSale.Visible;
   end;

src/gui-experimental/UFRMAccountExplorer.lfm

@@ -5,13 +5,13 @@ object FRMAccountExplorer: TFRMAccountExplorer
   Width = 868
   ActiveControl = cbMyPrivateKeys
   Caption = 'Accounts Explorer'
-  ClientHeight = 451
+  ClientHeight = 431
   ClientWidth = 868
   Menu = meAccountExplorerMenu
   OnCreate = FormCreate
   OnDestroy = FormDestroy
   Position = poOwnerFormCenter
-  Visible = False
+  LCLVersion = '2.0.2.0'
   object Splitter1: TSplitter
     Left = 380
     Height = 385

src/gui-experimental/UFRMAccountExplorer.pas

@@ -24,8 +24,8 @@ interface
 
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ComCtrls,
-  ExtCtrls, StdCtrls, Buttons, Grids, Menus, UCommon.UI,
-  UGridUtils, UNode, UAccounts, UBlockChain;
+  ExtCtrls, StdCtrls, Buttons, Grids, Menus,
+  UCommon.UI, UBaseTypes, UGridUtils, UNode, UAccounts, UBlockChain;
 
 type
 
@@ -194,6 +194,7 @@ type
     FOrderedAccountsKeyList : TOrderedAccountKeysList;
     FMinAccountBalance : Int64;
     FMaxAccountBalance : Int64;
+    FLastAccountsGridInvalidateTC : TTickCount;
     procedure RefreshMyKeysCombo;
     procedure RefreshAccountsGrid(RefreshData : Boolean);
     procedure OnLoaded(Sender: TObject);
@@ -211,8 +212,9 @@ implementation
 
 {$R *.lfm}
 
-uses UFRMAccountSelect, UConst, USettings,
-     UWallet, UCrypto, UFRMMemoText, UUserInterface, UCommon, UPCOrderedLists;
+uses
+  UConst, USettings, UWallet, UCrypto, UCoreUtils,
+  UFRMAccountSelect, UFRMMemoText, UUserInterface, UCommon, UPCOrderedLists;
 
 { TFRMAccountExplorer }
 
@@ -220,6 +222,7 @@ uses UFRMAccountSelect, UConst, USettings,
 
 procedure TFRMAccountExplorer.FormCreate(Sender: TObject);
 begin
+  FLastAccountsGridInvalidateTC := TPlatform.GetTickCount;
   FMinAccountBalance := 0;
   FMaxAccountBalance := CT_MaxWalletAmount;
   FOrderedAccountsKeyList := Nil;
@@ -284,70 +287,49 @@ Var accl : TOrderedCardinalList;
   l : TOrderedCardinalList;
   i,j,k : Integer;
   c  : Cardinal;
-  applyfilter : Boolean;
+  LApplyfilter : Boolean;
   acc : TAccount;
+  LFilters : TAccountsGridFilter;
 begin
   If Not Assigned(FOrderedAccountsKeyList) Then exit;
+
   if Not RefreshData then begin
-    dgAccounts.Invalidate;
+    if TPlatform.GetElapsedMilliseconds(FLastAccountsGridInvalidateTC)>1000 then begin
+      FLastAccountsGridInvalidateTC := TPlatform.GetTickCount;
+      dgAccounts.Invalidate;
+    end;
     exit;
   end;
-  applyfilter := (cbFilterAccounts.Checked) and ((FMinAccountBalance>0) Or (FMaxAccountBalance<CT_MaxWalletAmount));
-  FAccountsGrid.ShowAllAccounts := (Not cbExploreMyAccounts.Checked) And (not applyfilter);
-  if Not FAccountsGrid.ShowAllAccounts then begin
-    accl := FAccountsGrid.LockAccountsList;
-    Try
-      accl.Clear;
-      if cbExploreMyAccounts.Checked then begin
-        if cbMyPrivateKeys.ItemIndex<0 then exit;
-        if cbMyPrivateKeys.ItemIndex=0 then begin
-          // All keys in the wallet
-          for i := 0 to TWallet.Keys.Count - 1 do begin
-            j := FOrderedAccountsKeyList.IndexOfAccountKey(TWallet.Keys[i].AccountKey);
-            if (j>=0) then begin
-              l := FOrderedAccountsKeyList.AccountKeyList[j];
-              for k := 0 to l.Count - 1 do begin
-                if applyfilter then begin
-                  acc := TUserInterface.Node.Bank.SafeBox.Account(l.Get(k));
-                  if (acc.balance>=FMinAccountBalance) And (acc.balance<=FMaxAccountBalance) then accl.Add(acc.account);
-                end else accl.Add(l.Get(k));
-              end;
-            end;
-          end;
-        end else begin
+  LApplyfilter := (cbFilterAccounts.Checked) and ((FMinAccountBalance>0) Or ((FMaxAccountBalance<CT_MaxWalletAmount) and (FMaxAccountBalance>=0)));
+  if (Not cbExploreMyAccounts.Checked) And (not LApplyfilter) then begin
+    FAccountsGrid.AccountsGridDatasource := acds_Node;
+    FAccountsGrid.UpdateData;
+  end else begin
+    LFilters := FAccountsGrid.AccountsGridFilter;
+    LFilters.MinBalance := FMinAccountBalance;
+    LFilters.MaxBalance := FMaxAccountBalance;
+    if cbExploreMyAccounts.Checked then begin
+      TNode.Node.Bank.SafeBox.StartThreadSafe;
+      try
+        LFilters.OrderedAccountsKeyList := TWallet.Keys.AccountsKeyList;
+        if cbMyPrivateKeys.ItemIndex>0 then begin
           i := PtrInt(cbMyPrivateKeys.Items.Objects[cbMyPrivateKeys.ItemIndex]);
           if (i>=0) And (i<TWallet.Keys.Count) then begin
-            j := FOrderedAccountsKeyList.IndexOfAccountKey(TWallet.Keys[i].AccountKey);
-            if (j>=0) then begin
-              l := FOrderedAccountsKeyList.AccountKeyList[j];
-              for k := 0 to l.Count - 1 do begin
-                if applyfilter then begin
-                  acc := TUserInterface.Node.Bank.SafeBox.Account(l.Get(k));
-                  if (acc.balance>=FMinAccountBalance) And (acc.balance<=FMaxAccountBalance) then accl.Add(acc.account);
-                end else accl.Add(l.Get(k));
-              end;
-            end;
-          end;
-        end;
-      end else begin
-        // There is a filter... check every account...
-        c := 0;
-        while (c<TUserInterface.Node.Bank.SafeBox.AccountsCount) do begin
-          acc := TUserInterface.Node.Bank.SafeBox.Account(c);
-          if (acc.balance>=FMinAccountBalance) And (acc.balance<=FMaxAccountBalance) then accl.Add(acc.account);
-          inc(c);
-        end;
+            LFilters.indexAccountsKeyList := TWallet.Keys.AccountsKeyList.IndexOfAccountKey(TWallet.Keys[i].AccountKey);
+          end
+        end else LFilters.indexAccountsKeyList := -1;
+      finally
+        TNode.Node.Bank.SafeBox.EndThreadSave;
       end;
-    Finally
-      FAccountsGrid.UnlockAccountsList;
-    End;
-    lblAccountsCount.Caption := inttostr(accl.Count);
-  end else begin
-    lblAccountsCount.Caption := inttostr(TUserInterface.Node.Bank.AccountsCount);
+    end else begin
+      LFilters.OrderedAccountsKeyList := Nil;
+      LFilters.indexAccountsKeyList := -1;
+    end;
+    FAccountsGrid.AccountsGridFilter := LFilters;
+    FAccountsGrid.AccountsGridDatasource := acds_NodeFiltered;
   end;
+
   bbChangeKeyName.Enabled := cbExploreMyAccounts.Checked;
-  // Show Totals:
-  lblAccountsBalance.Caption := TAccountComp.FormatMoney(FAccountsGrid.AccountsBalance);
   OnSelectedAccountChanged;
 end;
 
@@ -717,7 +699,7 @@ begin
   if accn >= TUserInterface.Node.Bank.AccountsCount then
     raise Exception.Create('Account not found');
 
-  acc := TUserInterface.Node.Operations.SafeBoxTransaction.Account(accn);
+  acc := TUserInterface.Node.GetAccount(accn);
 
   i := FAccountOperationsGrid.DrawGrid.Row;
   if (i>0) and (i<=FAccountOperationsGrid.OperationsResume.Count) then begin

src/gui-experimental/UFRMAccountSelect.lfm

@@ -15,7 +15,7 @@ object FRMAccountSelect: TFRMAccountSelect
   OnCreate = FormCreate
   OnDestroy = FormDestroy
   Position = poOwnerFormCenter
-  Visible = False
+  LCLVersion = '2.0.2.0'
   object pnlAccountsTop: TPanel
     Left = 395
     Height = 282

src/gui-experimental/UFRMAccountSelect.pas

@@ -497,11 +497,11 @@ begin
   If (searchValues.inAccountKey.EC_OpenSSL_NID=0) AND (searchValues.inWalletKeys=Nil) And (searchValues.maxBal<0) And (searchValues.minBal<=0) And
      (Not searchValues.onlyForPrivateSaleToMe) And (Not searchValues.onlyForPublicSale) And (Not searchValues.onlyForSale) And
      (Length(searchValues.searchName)=0) then begin
-    FAccountsGrid.ShowAllAccounts:=True;
+    FAccountsGrid.AccountsGridDatasource := acds_Node;
     lblAccountsCount.Caption := IntToStr(FAccountsGrid.Node.Bank.SafeBox.AccountsCount);
     lblAccountsBalance.Caption := TAccountComp.FormatMoney(FAccountsGrid.AccountsBalance);
   end else begin
-    FAccountsGrid.ShowAllAccounts:=False;
+    FAccountsGrid.AccountsGridDatasource := acds_InternalList;
     FSearchThread.DoSearch(searchValues);
   end;
 end;

src/gui-experimental/UFRMMessages.lfm

@@ -11,8 +11,7 @@ object FRMMessages: TFRMMessages
   OnCreate = FormCreate
   OnDestroy = FormDestroy
   Position = poOwnerFormCenter
-  LCLVersion = '1.8.2.0'
-  Visible = False
+  LCLVersion = '2.0.2.0'
   object Label11: TLabel
     Left = 15
     Height = 15

src/gui-experimental/UFRMMessages.pas

@@ -56,7 +56,7 @@ type
 
 implementation
 
-uses UUserInterface, USettings;
+uses UUserInterface, USettings, Generics.Collections;
 
 {$R *.lfm}
 
@@ -105,7 +105,7 @@ end;
 procedure TFRMMessages.UpdateAvailableConnections;
 Var i : integer;
  NC : TNetConnection;
- l : TList;
+ l : TList<TNetConnection>;
 begin
   if Not TNetData.NetData.NetConnections.TryLockList(100,l) then exit;
   try

src/gui-experimental/UFRMNodes.lfm

@@ -10,7 +10,7 @@ object FRMNodes: TFRMNodes
   OnCreate = FormCreate
   OnDestroy = FormDestroy
   Position = poOwnerFormCenter
-  Visible = False
+  LCLVersion = '2.0.2.0'
   object Label3: TLabel
     Left = 15
     Height = 15

src/gui-experimental/UFRMNodes.pas

@@ -60,7 +60,7 @@ type
 
 implementation
 
-uses UCommon, UUserInterface, UTime;
+uses UCommon, UUserInterface, UTime, Generics.Collections;
 
 {$R *.lfm}
 
@@ -87,7 +87,7 @@ procedure TFRMNodes.CM_NetConnectionUpdated(var Msg: TMessage);
 Const CT_BooleanToString : Array[Boolean] of String = ('False','True');
 Var i : integer;
  NC : TNetConnection;
- l : TList;
+ l : TList<TNetConnection>;
  sClientApp, sLastConnTime : String;
  strings, sNSC, sRS, sDisc : TStrings;
  hh,nn,ss,ms : Word;
@@ -170,7 +170,7 @@ end;
 procedure TFRMNodes.CM_NetNodeServersUpdated(var Msg: TMessage);
 Var i : integer;
  P : PNodeServerAddress;
- l : TList;
+ l : TList<Pointer>;
  strings : TStrings;
  s : String;
 begin
@@ -185,6 +185,10 @@ begin
         P := l[i];
         if Not (P^.is_blacklisted) then begin
           s := Format('Server IP:%s:%d',[P^.ip,P^.port]);
+          if (P^.last_connection_by_me>0) then begin
+            s := s + ' [Server] ';
+          end;
+
           if Assigned(P.netConnection) then begin
             If P.last_connection>0 then  s := s+ ' ** ACTIVE **'
             else s := s+' ** TRYING TO CONNECT **';
@@ -226,7 +230,7 @@ procedure TFRMNodes.CM_BlackListUpdated(var Msg: TMessage);
 Const CT_TRUE_FALSE : Array[Boolean] Of AnsiString = ('FALSE','TRUE');
 Var i,j,n : integer;
  P : PNodeServerAddress;
- l : TList;
+ l : TList<Pointer>;
  strings : TStrings;
 begin
   l := TNetData.NetData.NodeServersAddresses.LockList;
@@ -235,8 +239,7 @@ begin
     strings.BeginUpdate;
     Try
       strings.Clear;
-//      strings.Add('BlackList Updated: %s by TID: %p', [DateTimeToStr(now), TThread.CurrentThread.ThreadID]);  XXXXXXXXXXXXXXXX Windows %p is invalid (not a pointer)
-      strings.Add('BlackList Updated: %s by TID: %s', [DateTimeToStr(now), IntToHex(PtrInt(TThread.CurrentThread.ThreadID),8)]);
+      strings.Add('BlackList Updated: '+DateTimeToStr(now)+' by TID:'+IntToHex(PtrInt(TThread.CurrentThread.ThreadID),8));
       j := 0; n:=0;
       for i := 0 to l.Count - 1 do begin
         P := l[i];

src/gui-experimental/UFRMOperation.lfm

@@ -16,7 +16,7 @@ object FRMOperation: TFRMOperation
   OnCreate = FormCreate
   OnDestroy = FormDestroy
   Position = poOwnerFormCenter
-  Visible = False
+  LCLVersion = '2.0.2.0'
   object lblAccountCaption: TLabel
     Left = 25
     Height = 13

src/gui-experimental/UFRMOperation.pas

@@ -177,7 +177,7 @@ type
 implementation
 
 uses
-  UECIES, UConst, UOpTransaction, UAES, UFRMWalletKeys, UUserInterface, UPCDataTypes;
+  UECIES, UCoreUtils, UConst, UOpTransaction, UAES, UFRMWalletKeys, UUserInterface, UPCDataTypes;
 
 {$R *.lfm}
 
@@ -221,7 +221,7 @@ begin
     for iAcc := 0 to Length(_senderAccounts) - 1 do begin
 loop_start:
       op := Nil;
-      account := FNode.Operations.SafeBoxTransaction.Account(_senderAccounts[iAcc]);
+      account := FNode.GetAccount(_senderAccounts[iAcc]);
       If Not UpdatePayload(account, errors) then
         raise Exception.Create('Error encoding payload of sender account '+TAccountComp.AccountNumberToAccountTxtNumber(account.account)+': '+errors);
       i := WalletKeys.IndexOfAccountKey(account.accountInfo.accountKey);
@@ -552,7 +552,7 @@ end;
 
 function TFRMOperation.GetDefaultSenderAccount: TAccount;
 begin
-  if FSenderAccounts.Count>=1 then Result := FNode.Operations.SafeBoxTransaction.Account( FSenderAccounts.Get(0) )
+  if FSenderAccounts.Count>=1 then Result := FNode.GetAccount( FSenderAccounts.Get(0) )
   else Result := CT_Account_NUL;
 end;
 
@@ -607,8 +607,8 @@ begin
   end;
   If SenderAccounts.Count>=1 then begin
     ebSignerAccount.text := TAccountComp.AccountNumberToAccountTxtNumber(SenderAccounts.Get(0));
-    ebChangeName.Text := FNode.Operations.SafeBoxTransaction.Account(SenderAccounts.Get(0)).name.ToPrintable;
-    ebChangeType.Text := IntToStr(FNode.Operations.SafeBoxTransaction.Account(SenderAccounts.Get(0)).account_type);
+    ebChangeName.Text := FNode.GetAccount(SenderAccounts.Get(0)).name.ToPrintable;
+    ebChangeType.Text := IntToStr(FNode.GetAccount(SenderAccounts.Get(0)).account_type);
   end else begin
     ebSignerAccount.text := '';
     ebChangeName.Text := '';
@@ -699,7 +699,7 @@ begin
       ebSenderAccount.Text := TAccountComp.AccountNumberToAccountTxtNumber(SenderAccounts.Get(0));
       memoAccounts.Visible := false;
       ebSenderAccount.Visible := true;
-      balance := TNode.Node.Operations.SafeBoxTransaction.Account(SenderAccounts.Get(0)).balance;
+      balance := TNode.Node.GetAccount(SenderAccounts.Get(0)).balance;
     end else begin
       // Multiple sender accounts
       lblAccountCaption.Caption := 'Accounts';
@@ -707,7 +707,7 @@ begin
       ebSenderAccount.Visible := false;
       accountstext := '';
       for i := 0 to SenderAccounts.Count - 1 do begin
-         acc := TNode.Node.Operations.SafeBoxTransaction.Account(SenderAccounts.Get(i));
+         acc := TNode.Node.GetAccount(SenderAccounts.Get(i));
          balance := balance + acc.balance;
          if (accountstext<>'') then accountstext:=accountstext+'; ';
          accountstext := accountstext+TAccountComp.AccountNumberToAccountTxtNumber(acc.account)+' ('+TAccountComp.FormatMoney(acc.balance)+')';
@@ -760,7 +760,7 @@ begin
       errors := 'Invalid account number';
       exit;
     end;
-    AccountToBuy := FNode.Operations.SafeBoxTransaction.Account(c);
+    AccountToBuy := FNode.GetAccount(c);
     If not TAccountComp.IsAccountForSale(AccountToBuy.accountInfo) then begin
       errors := 'Account '+TAccountComp.AccountNumberToAccountTxtNumber(c)+' is not for sale';
       exit;
@@ -822,7 +822,7 @@ begin
       errors := 'Signer account does not exists '+TAccountComp.AccountNumberToAccountTxtNumber(auxC);
       exit;
     end;
-    SignerAccount := FNode.Operations.SafeBoxTransaction.Account(auxC);
+    SignerAccount := FNode.GetAccount(auxC);
     if (TAccountComp.IsAccountLocked(SignerAccount.accountInfo,FNode.Bank.BlocksCount)) then begin
       errors := 'Signer account '+TAccountComp.AccountNumberToAccountTxtNumber(SignerAccount.account)+' is locked until block '+IntToStr(SignerAccount.accountInfo.locked_until_block);
       exit;
@@ -917,7 +917,7 @@ begin
         errors := 'Signer account does not exists '+TAccountComp.AccountNumberToAccountTxtNumber(auxC);
         exit;
       end;
-      SignerAccount := FNode.Operations.SafeBoxTransaction.Account(auxC);
+      SignerAccount := FNode.GetAccount(auxC);
       if (TAccountComp.IsAccountLocked(SignerAccount.accountInfo,FNode.Bank.BlocksCount)) then begin
         errors := 'Signer account '+TAccountComp.AccountNumberToAccountTxtNumber(SignerAccount.account)+' is locked until block '+IntToStr(SignerAccount.accountInfo.locked_until_block);
         exit;
@@ -963,7 +963,7 @@ begin
       errors := 'Signer account does not exists '+TAccountComp.AccountNumberToAccountTxtNumber(auxC);
       exit;
     end;
-    SignerAccount := FNode.Operations.SafeBoxTransaction.Account(auxC);
+    SignerAccount := FNode.GetAccount(auxC);
     if (TAccountComp.IsAccountLocked(SignerAccount.accountInfo,FNode.Bank.BlocksCount)) then begin
       errors := 'Signer account '+TAccountComp.AccountNumberToAccountTxtNumber(SignerAccount.account)+' is locked until block '+IntToStr(SignerAccount.accountInfo.locked_until_block);
       exit;
@@ -1133,7 +1133,7 @@ begin
         errors := 'Signer account does not exists '+TAccountComp.AccountNumberToAccountTxtNumber(auxC);
         exit;
       end;
-      SignerAccount := FNode.Operations.SafeBoxTransaction.Account(auxC);
+      SignerAccount := FNode.GetAccount(auxC);
       // Seller
       If Not TAccountComp.AccountTxtNumberToAccountNumber(ebSellerAccount.Text,auxC) then begin
         errors := 'Invalid seller account';
@@ -1148,7 +1148,7 @@ begin
         exit;
       end;
 
-      SellerAccount := FNode.Operations.SafeBoxTransaction.Account(auxC);
+      SellerAccount := FNode.GetAccount(auxC);
       if rbListAccountForPrivateSale.Checked then begin
         lblSaleNewOwnerPublicKey.Enabled := true;
         ebSaleNewOwnerPublicKey.Enabled := true;
@@ -1209,7 +1209,7 @@ begin
     lblTransactionErrors.Caption := errors;
     exit;
   end;
-  DestAccount := TNode.Node.Operations.SafeBoxTransaction.Account(c);
+  DestAccount := TNode.Node.GetAccount(c);
   if SenderAccounts.Count=1 then begin
     if not TAccountComp.TxtToMoney(ebAmount.Text,amount) then begin
       errors := 'Invalid amount ('+ebAmount.Text+')';
@@ -1256,7 +1256,7 @@ begin
     if (rbEncryptedWithOldEC.Checked) then begin
       // Use sender
       errors := 'Error encrypting';
-      account := FNode.Operations.SafeBoxTransaction.Account(SenderAccount.account);
+      account := FNode.GetAccount(SenderAccount.account);
       payload_encrypted := ECIESEncrypt(account.accountInfo.accountKey,TEncoding.ANSI.GetBytes(payload_u));
       valid := Length(payload_encrypted)>0;
     end else if (rbEncryptedWithEC.Checked) then begin
@@ -1292,7 +1292,7 @@ begin
           errors := 'Invalid payload encrypted account number: '+TAccountComp.AccountNumberToAccountTxtNumber(dest_account_number);
           exit;
         end;
-        account := FNode.Operations.SafeBoxTransaction.Account(dest_account_number);
+        account := FNode.GetAccount(dest_account_number);
         payload_encrypted := ECIESEncrypt(account.accountInfo.accountKey,TEncoding.ANSI.GetBytes(payload_u));
         valid := Length(payload_encrypted)>0;
       end else if (PageControlOpType.ActivePage=tsChangePrivateKey) then begin

src/gui-experimental/UFRMPayloadDecoder.lfm

@@ -15,8 +15,7 @@ object FRMPayloadDecoder: TFRMPayloadDecoder
   Font.Name = 'Tahoma'
   OnCreate = FormCreate
   Position = poOwnerFormCenter
-  LCLVersion = '1.8.2.0'
-  Visible = False
+  LCLVersion = '2.0.2.0'
   object Label1: TLabel
     Left = 20
     Height = 13

src/gui-experimental/UFRMPayloadDecoder.pas

@@ -96,7 +96,9 @@ implementation
 
 {$R *.lfm}
 
-Uses UNode, UTime, UECIES, UAES, UAccounts, UCommon, UFRMMemoText, USettings, UBaseTypes;
+Uses
+  UNode, UTime, UECIES, UAES, UAccounts, UCommon, USettings, UBaseTypes,
+  UPCEncryption, UFRMMemoText;
 
 { TFRMPayloadDecoder }
 
@@ -347,10 +349,12 @@ procedure TFRMPayloadDecoder.TryToDecode;
   Var i : Integer;
   begin
     Result := false;
+    if Not assigned(TWallet.Keys) then exit;
+
     for i := 0 to TWallet.Keys.Count - 1 do begin
       WalletKey := TWallet.Keys.Key[i];
       If Assigned(WalletKey.PrivateKey) then begin
-        If ECIESDecrypt(WalletKey.PrivateKey.EC_OpenSSL_NID,WalletKey.PrivateKey.PrivateKey,false,raw,Decrypted) then begin
+        if TPCEncryption.DoPascalCoinECIESDecrypt(WalletKey.PrivateKey.PrivateKey,raw,Decrypted) then begin
           Result := true;
           exit;
         end;
@@ -359,12 +363,12 @@ procedure TFRMPayloadDecoder.TryToDecode;
 
   end;
 
-  Function  UsePassword(const raw : TRawBytes; var Decrypted: TRawBytes; var PasswordUsed : AnsiString) : Boolean;
+  Function  UsePassword(const raw : TRawBytes; var Decrypted : TRawBytes; var PasswordUsed : AnsiString) : Boolean;
   Var i : Integer;
   Begin
     Result := false;
     for i := 0 to memoPasswords.Lines.Count - 1 do begin
-      if (TAESComp.EVP_Decrypt_AES256(raw,memoPasswords.Lines[i],Decrypted)) then begin
+      if TPCEncryption.DoPascalCoinAESDecrypt(raw,TEncoding.ANSI.GetBytes(memoPasswords.Lines[i]),Decrypted) then begin
         if (TCrypto.IsHumanReadable(Decrypted)) then begin
           Result := true;
           PasswordUsed := memoPasswords.Lines[i];
@@ -377,42 +381,47 @@ procedure TFRMPayloadDecoder.TryToDecode;
 
 Var raw : TRawBytes;
   WalletKey : TWalletKey;
-  Decrypted: TRawBytes;
+  Decrypted : TRawBytes;
   PasswordUsed : AnsiString;
   ok : boolean;
 begin
   ok := true;
-  raw := FOpResume.OriginalPayload;
-  if Length(raw)>0 then begin
-    // First try to a human readable...
-    if (cbMethodPublicPayload.Checked) and (TCrypto.IsHumanReadable(raw)) then begin
-      if cbShowAsHexadecimal.Checked then memoDecoded.Lines.Text := TCrypto.ToHexaString(raw)
-      else memoDecoded.Lines.Text := TEncoding.ANSI.GetString(raw);
-      lblDecodedMethod.Caption := 'Not encrypted payload';
-    end else if (cbUsingPrivateKeys.Checked) And (UseWallet(raw,Decrypted,WalletKey)) then begin
-      if cbShowAsHexadecimal.Checked then memoDecoded.Lines.Text := TCrypto.ToHexaString(Decrypted)
-      else memoDecoded.Lines.Text := TEncoding.ANSI.GetString(Decrypted);
-      lblDecodedMethod.Caption := 'Encrypted with EC '+TAccountComp.GetECInfoTxt(WalletKey.PrivateKey.EC_OpenSSL_NID);
-    end else if (cbUsingPasswords.Checked) And (UsePassword(raw,Decrypted,PasswordUsed)) then begin
-      if cbShowAsHexadecimal.Checked then memoDecoded.Lines.Text := TCrypto.ToHexaString(Decrypted)
-      else memoDecoded.Lines.Text := TEncoding.ANSI.GetString(Decrypted);
-      lblDecodedMethod.Caption := 'Encrypted with pwd:"'+PasswordUsed+'"';
+  if Assigned(TWallet.Keys) then begin
+    raw := FOpResume.OriginalPayload;
+    if Length(raw)>0 then begin
+      // First try to a human readable...
+      if (cbMethodPublicPayload.Checked) and (TCrypto.IsHumanReadable(raw)) then begin
+        if cbShowAsHexadecimal.Checked then memoDecoded.Lines.Text := TCrypto.ToHexaString(raw)
+        else memoDecoded.Lines.Text := TEncoding.ANSI.GetString(raw);
+        lblDecodedMethod.Caption := 'Not encrypted payload';
+      end else if (cbUsingPrivateKeys.Checked) And (UseWallet(raw,Decrypted,WalletKey)) then begin
+        if cbShowAsHexadecimal.Checked then memoDecoded.Lines.Text := TCrypto.ToHexaString(Decrypted)
+        else memoDecoded.Lines.Text := TEncoding.ANSI.GetString(Decrypted);
+        lblDecodedMethod.Caption := 'Encrypted with EC '+TAccountComp.GetECInfoTxt(WalletKey.PrivateKey.EC_OpenSSL_NID);
+      end else if (cbUsingPasswords.Checked) And (UsePassword(raw,Decrypted,PasswordUsed)) then begin
+        if cbShowAsHexadecimal.Checked then memoDecoded.Lines.Text := TCrypto.ToHexaString(Decrypted)
+        else memoDecoded.Lines.Text := TEncoding.ANSI.GetString(Decrypted);
+        lblDecodedMethod.Caption := 'Encrypted with pwd:"'+PasswordUsed+'"';
+      end else begin
+        memoDecoded.Lines.Text := 'CANNOT DECRYPT';
+        lblDecodedMethod.Caption := '';
+        ok := false;
+      end;
+      if ok then begin
+        memoDecoded.Font.Color := clBlack;
+        memoDecoded.Color := clWhite;
+      end else begin
+        memoDecoded.Font.Color := clRed;
+        memoDecoded.Color := clBtnFace;
+      end;
     end else begin
-      memoDecoded.Lines.Text := 'CANNOT DECRYPT';
+      memoDecoded.Lines.Text := '(No payload)';
+      memoDecoded.Font.Color := clDkGray;
+      memoDecoded.Color := clLtGray;
       lblDecodedMethod.Caption := '';
-      ok := false;
-    end;
-    if ok then begin
-      memoDecoded.Font.Color := clBlack;
-      memoDecoded.Color := clWhite;
-    end else begin
-      memoDecoded.Font.Color := clRed;
-      memoDecoded.Color := clBtnFace;
     end;
   end else begin
-    memoDecoded.Lines.Text := '(No payload)';
-    memoDecoded.Font.Color := clDkGray;
-    memoDecoded.Color := clLtGray;
+    memoDecoded.Lines.Text := '';
     lblDecodedMethod.Caption := '';
   end;
 end;

src/gui-experimental/UFRMSaleAccounts.pas

@@ -92,7 +92,7 @@ begin
     operation_to_string := '';
     for iAcc := 0 to FSenderAccounts.Count - 1 do begin
       op := Nil;
-      account := FNode.Operations.SafeBoxTransaction.Account(FSenderAccounts.Get(iAcc));
+      account := FNode.GetAccount(FSenderAccounts.Get(iAcc));
       If Not UpdatePayload(account, errors) then
         raise Exception.Create('Error encoding payload of sender account '+TAccountComp.AccountNumberToAccountTxtNumber(account.account)+': '+errors);
       i := WalletKeys.IndexOfAccountKey(account.accountInfo.accountKey);
@@ -236,7 +236,7 @@ begin
       ebSenderAccount.Text := TAccountComp.AccountNumberToAccountTxtNumber(SenderAccounts.Get(0));
       memoAccounts.Visible := false;
       ebSenderAccount.Visible := true;
-      balance := TNode.Node.Operations.SafeBoxTransaction.Account(SenderAccounts.Get(0)).balance;
+      balance := TNode.Node.GetAccount(SenderAccounts.Get(0)).balance;
     end else begin
       // Multiple sender accounts
       lblAccountCaption.Caption := 'Accounts';
@@ -244,7 +244,7 @@ begin
       ebSenderAccount.Visible := false;
       accountstext := '';
       for i := 0 to SenderAccounts.Count - 1 do begin
-         acc := TNode.Node.Operations.SafeBoxTransaction.Account(SenderAccounts.Get(i));
+         acc := TNode.Node.GetAccount(SenderAccounts.Get(i));
          balance := balance + acc.balance;
          if (accountstext<>'') then accountstext:=accountstext+'; ';
          accountstext := accountstext+TAccountComp.AccountNumberToAccountTxtNumber(acc.account)+' ('+TAccountComp.FormatMoney(acc.balance)+')';

src/gui-experimental/UUserInterface.pas

@@ -485,12 +485,18 @@ begin
 end;
 
 class procedure TUserInterface.OnLoaded(Sender: TObject);
+var LLockedMempool : TPCOperationsComp;
 begin
   FPoolMiningServer := TPoolMiningServer.Create;
   FPoolMiningServer.Port := TSettings.MinerServerRpcPort;
   FPoolMiningServer.MinerAccountKey := TWallet.MiningKey;
   FPoolMiningServer.MinerPayload := TEncoding.ANSI.GetBytes(TSettings.MinerName);
-  FNode.Operations.AccountKey := TWallet.MiningKey;
+  LLockedMempool := FNode.LockMempoolWrite;
+  try
+    LLockedMempool.AccountKey := TWallet.MiningKey;
+  finally
+    FNode.UnlockMempoolWrite;
+  end;
   FPoolMiningServer.Active := TSettings.MinerServerRpcActive;
   FPoolMiningServer.OnMiningServerNewBlockFound := NotifyMiningServerNewBlockFoundEvent;
   State := uisLoaded;
@@ -531,8 +537,10 @@ begin
 end;
 
 class procedure TUserInterface.OnSettingsChanged(Sender: TObject);
-Var wa : Boolean;
+var
+  wa : Boolean;
   i : Integer;
+  LLockedMempool : TPCOperationsComp;
 begin
   if TSettings.SaveLogFiles then begin
     if TSettings.SaveDebugLogs then
@@ -548,7 +556,12 @@ begin
     wa := FNode.NetServer.Active;
     FNode.NetServer.Port := TSettings.InternetServerPort;
     FNode.NetServer.Active := wa;
-    FNode.Operations.BlockPayload := TEncoding.ANSI.GetBytes(TSettings.MinerName);
+    LLockedMempool := FNode.LockMempoolWrite;
+    try
+      LLockedMempool.BlockPayload := TEncoding.ANSI.GetBytes(TSettings.MinerName);
+    finally
+      FNode.UnlockMempoolWrite;
+    end;
     FNode.NodeLogFilename := TFolderHelper.GetPascalCoinDataFolder+PathDelim+'blocks.log';
   end;
   if Assigned(FPoolMiningServer) then begin
@@ -723,7 +736,7 @@ class procedure TUserInterface.ShowAccountInfoDialog(parentForm: TForm; const ac
 begin
   if account >= TUserInterface.Node.Bank.AccountsCount then
     raise EUserInterface.Create('Account not found');
-  ShowAccountInfoDialog(parentForm, TUserInterface.Node.Operations.SafeBoxTransaction.Account(account));
+  ShowAccountInfoDialog(parentForm, TUserInterface.Node.GetAccount(account));
 end;
 
 class procedure TUserInterface.ShowAccountInfoDialog(parentForm: TForm; const account : TAccount); overload;

src/gui-experimental/core.utils/UCoreUtils.pas

@@ -234,11 +234,13 @@ var
   LAccs: TList<TAccount>;
   LAcc: TAccount;
   LList: TOrderedCardinalList;
+  LMemPool: TPCOperationsComp;
   Disposables: TDisposables;
 begin
   Balance := CT_BalanceSummary_Nil;
   LAccs := Disposables.AddObject(TList<TAccount>.Create) as TList<TAccount>;
-  TNode.Node.Bank.SafeBox.StartThreadSafe;
+//  TNode.Node.Bank.SafeBox.StartThreadSafe;
+  LMemPool := TNode.Node.LockMempoolRead;
   try
     for i := 0 to TWallet.Keys.Count - 1 do
     begin
@@ -246,7 +248,7 @@ begin
       for j := 0 to LList.Count - 1 do
       begin
         if IncludePending then
-          LAcc := TNode.Node.Operations.SafeBoxTransaction.Account(LList.Get(j))
+          LAcc := LMemPool.SafeBoxTransaction.Account(LList.Get(j))
         else
           LAcc := TNode.Node.Bank.SafeBox.Account(LList.Get(j));
         LAccs.Add(LAcc);
@@ -255,7 +257,8 @@ begin
       end;
     end;
   finally
-    TNode.Node.Bank.SafeBox.EndThreadSave;
+    TNode.Node.UnlockMempoolRead;
+//    TNode.Node.Bank.SafeBox.EndThreadSave;
   end;
   LAccs.Sort(TAccountComparer.Create);
   Result := LAccs.ToArray;
@@ -328,11 +331,18 @@ end;
 function TNodeHelper.GetAccounts(const AAccountNumbers: array of cardinal; AIncludePending: boolean = True): TArray<TAccount>;
 var
   i: integer;
+  LMemPool : TPCOperationsComp;
 begin
   SetLength(Result, Length(AAccountNumbers));
-  if AIncludePending then
-    for i := Low(AAccountNumbers) to High(AAccountNumbers) do
-      Result[i] := Self.Operations.SafeBoxTransaction.Account(AAccountNumbers[i])
+  if AIncludePending then begin
+    LMemPool := Self.LockMempoolRead;
+    try
+      for i := Low(AAccountNumbers) to High(AAccountNumbers) do
+        Result[i] := LMemPool.SafeBoxTransaction.Account(AAccountNumbers[i])
+    finally
+      Self.UnlockMempoolRead;
+    end;
+  end
   else
     for i := Low(AAccountNumbers) to High(AAccountNumbers) do
       Result[i] := Self.Bank.SafeBox.Account(AAccountNumbers[i]);
@@ -340,37 +350,43 @@ end;
 
 function TNodeHelper.GetPendingOperationsAffectingAccounts(const AAccountNumbers: array of cardinal; ASkipCount, ATakeCount: integer): TArray<TOperationResume>;
 var
-  LList: Classes.TList;
+  LList: TList<Cardinal>;
   LOps: TList<TOperationResume>;
   LOp: TPCOperation;
   LOpResume: TOperationResume;
+  LMemPool : TPCOperationsComp;
   LAccNo: cardinal;
   LNumOps, i: integer;
   GC: TDisposables;
 begin
   LNumOps := 0;
-  LList := GC.AddObject(Classes.TList.Create) as Classes.TList;
+  LList := GC.AddObject(TList<Cardinal>.Create) as TList<Cardinal>;
   LOps := GC.AddObject(TList<TOperationResume>.Create) as TList<TOperationResume>;
   for LAccNo in AAccountNumbers do
   begin
+    LMemPool := Self.LockMempoolRead;
+    try
     LList.Clear;
-    Self.Operations.OperationsHashTree.GetOperationsAffectingAccount(LAccNo, LList);
+    LMemPool.OperationsHashTree.GetOperationsAffectingAccount(LAccNo, LList);
     if LList.Count > 0 then
       for i := LList.Count - 1 downto 0 do
       begin
         Inc(LNumOps);
         if (LNumOps > ASkipCount) and (LNumOps <= ASkipCount + ATakeCount) then
         begin
-          LOp := Self.Operations.OperationsHashTree.GetOperation(PtrInt(LList[i]));
+          LOp := LMemPool.OperationsHashTree.GetOperation(LList[i]);
           if TPCOperation.OperationToOperationResume(0, LOp, False, LAccNo, LOpResume) then
           begin
             LOpResume.NOpInsideBlock := i;
-            LOpResume.Block := Node.Operations.OperationBlock.block;
-            LOpResume.Balance := Node.Operations.SafeBoxTransaction.Account(LAccNo {Op.SignerAccount}).balance;
+            LOpResume.Block := LMemPool.OperationBlock.block;
+            LOpResume.Balance := LMemPool.SafeBoxTransaction.Account(LAccNo {Op.SignerAccount}).balance;
             LOps.Add(LOpResume);
           end;
         end;
       end;
+    finally
+      Self.UnlockMempoolRead;
+    end;
   end;
   Result := LOps.ToArray;
 end;
@@ -381,7 +397,7 @@ type
 var
   i: integer;
   LBlock: cardinal;
-  LRelevantBlockOps: Classes.TList;
+  LRelevantBlockOps: TList<Cardinal>;
   LOp: TPCOperation;
   LOpResume: TOperationResume;
   LFoundOps: TList<TOperationResume>;
@@ -409,7 +425,7 @@ var
     LDisposables: TDisposables;
   begin
     LOpsComp := LDisposables.AddObject(TPCOperationsComp.Create(nil)) as TPCOperationsComp;
-    LRelevantBlockOps := LDisposables.AddObject(Classes.TList.Create) as Classes.TList;
+    LRelevantBlockOps := LDisposables.AddObject(TList<Cardinal>.Create) as TList<Cardinal>;
 
     // load block
     if not Bank.Storage.LoadBlockChainBlock(LOpsComp, ABlockNum) then
@@ -425,10 +441,10 @@ var
       LOpsComp.OperationsHashTree.GetOperationsAffectingAccount(LAccNo, LRelevantBlockOps);
       for i := LRelevantBlockOps.Count - 1 downto 0 do
       begin
-        LOp := LOpsComp.Operation[PtrInt(LRelevantBlockOps.Items[i])];
+        LOp := LOpsComp.Operation[LRelevantBlockOps.Items[i]];
         if TPCOperation.OperationToOperationResume(i, LOp, False, LAccNo, LOpResume) then
         begin
-          LOpResume.NOpInsideBlock := PtrInt(LRelevantBlockOps.Items[i]);
+          LOpResume.NOpInsideBlock := LRelevantBlockOps.Items[i];
           LOpResume.time := LOpsComp.OperationBlock.timestamp;
           LOpResume.Block := ABlockNum;
           if LAccountBalances[LAccNo] >= 0 then

src/gui-experimental/core.utils/UDataSources.pas

@@ -234,27 +234,28 @@ end;
 procedure TAccountsDataSource.FetchAll(const AContainer: TList<TAccount>);
 var
   i: integer;
-  acc: TAccount;
-  safeBox: TPCSafeBox;
+  LAcc: TAccount;
+  LSafeBox: TPCSafeBox;
+  LMemPool : TPCOperationsComp;
 begin
-  safeBox := TNode.Node.Bank.SafeBox;
-  safeBox.StartThreadSafe;
+  LSafeBox := TNode.Node.Bank.SafeBox;
+  LMemPool := TNode.Node.LockMempoolRead;
   try
     if FKeys.Count = 0 then
-      for i := 0 to safeBox.AccountsCount - 1 do
-        AContainer.Add(safeBox.Account(i)) // Load all accounts
+      for i := 0 to LSafeBox.AccountsCount - 1 do
+        AContainer.Add(LSafeBox.Account(i)) // Load all accounts
     else
-      for i := 0 to safeBox.AccountsCount - 1 do begin
+      for i := 0 to LSafeBox.AccountsCount - 1 do begin
         // Load key-matching accounts
         if FIncludePending then
-          acc := TNode.Node.Operations.SafeBoxTransaction.Account(i)
+          LAcc := LMemPool.SafeBoxTransaction.Account(i)
         else
-          acc := safeBox.Account(i);
-        if FKeys.Contains(acc.accountInfo.accountKey) then
-          AContainer.Add(acc);
+          LAcc := LSafeBox.Account(i);
+        if FKeys.Contains(LAcc.accountInfo.accountKey) then
+          AContainer.Add(LAcc);
       end;
   finally
-    safeBox.EndThreadSave;
+    TNode.Node.UnlockMempoolRead;
   end;
 end;
 
@@ -393,23 +394,29 @@ end;
 procedure TPendingOperationsDataSource.FetchAll(const AContainer: TList<TOperationResume>);
 var
   i: integer;
-  node: TNode;
-  Op: TPCOperation;
-  OPR: TOperationResume;
+  LNode: TNode;
+  LOp: TPCOperation;
+  LOPR: TOperationResume;
+  LMemPool : TPCOperationsComp;
 begin
-  node := TNode.Node;
-  if not Assigned(Node) then
+  LNode := TNode.Node;
+  if not Assigned(LNode) then
     exit;
-  for i := Node.Operations.Count - 1 downto 0 do
-  begin
-    Op := Node.Operations.OperationsHashTree.GetOperation(i);
-    if TPCOperation.OperationToOperationResume(0, Op, False, Op.SignerAccount, OPR) then
+  LMemPool := LNode.LockMempoolRead;
+  try
+    for i := LMemPool.Count - 1 downto 0 do
     begin
-      OPR.NOpInsideBlock := i;
-      OPR.Block := Node.Bank.BlocksCount;
-      OPR.Balance := Node.Operations.SafeBoxTransaction.Account(Op.SignerAccount).balance;
-      AContainer.Add(OPR);
+      LOp := LMemPool.OperationsHashTree.GetOperation(i);
+      if TPCOperation.OperationToOperationResume(0, LOp, False, LOp.SignerAccount, LOPR) then
+      begin
+        LOPR.NOpInsideBlock := i;
+        LOPR.Block := LNode.Bank.BlocksCount;
+        LOPR.Balance := LMemPool.SafeBoxTransaction.Account(LOp.SignerAccount).balance;
+        AContainer.Add(LOPR);
+      end;
     end;
+  finally
+    LNode.UnlockMempoolRead;
   end;
 end;
 

src/gui-experimental/wizards/operations/UWIZBuyAccount_Details.lfm

@@ -8,7 +8,7 @@ object WIZBuyAccount_Details: TWIZBuyAccount_Details
   Caption = 'WIZBuyAccount_Details'
   ClientHeight = 561
   ClientWidth = 450
-  Visible = False
+  LCLVersion = '2.0.2.0'
   object gbAccountToBuy: TGroupBox
     Left = 8
     Height = 124

src/gui-experimental/wizards/operations/UWIZBuyAccount_Details.pas

@@ -122,7 +122,7 @@ begin
       lblAccountToBuyDetails.Caption := ''
     else
     begin
-      LTempAccount := TNode.Node.Operations.SafeBoxTransaction.account(LAccountNumber);
+      LTempAccount := TNode.Node.GetAccount(LAccountNumber);
       lblAccountToBuyDetails.Caption := LTempAccount.Name.ToPrintable;
     end;
 end;
@@ -163,7 +163,7 @@ begin
 
   // Account To Buy section
   TAccountComp.AccountTxtNumberToAccountNumber(txtAccountToBuy.Text, LAccountNumber);
-  Model.BuyAccount.AccountToBuy := TNode.Node.Operations.SafeBoxTransaction.account(LAccountNumber);
+  Model.BuyAccount.AccountToBuy := TNode.Node.GetAccount(LAccountNumber);
 
   // Fee Section
   Model.Fee.SingleOperationFee := TSettings.DefaultFee;
@@ -204,7 +204,7 @@ begin
     Exit(False);
   end;
 
-  LAccountToBuy := TNode.Node.Operations.SafeBoxTransaction.Account(LAccountNumber);
+  LAccountToBuy := TNode.Node.GetAccount(LAccountNumber);
 
   if not TAccountComp.IsAccountForSale(LAccountToBuy.accountInfo) then
   begin

src/gui-experimental/wizards/operations/UWIZEnlistAccountForSale_EnterSeller.lfm

@@ -7,7 +7,7 @@ object WIZEnlistAccountForSale_EnterSeller: TWIZEnlistAccountForSale_EnterSeller
   Caption = 'WIZEnlistAccountForSale_EnterSeller'
   ClientHeight = 286
   ClientWidth = 450
-  Visible = False
+  LCLVersion = '2.0.2.0'
   object gbBeneficiary: TGroupBox
     Left = 8
     Height = 124

src/gui-experimental/wizards/operations/UWIZEnlistAccountForSale_EnterSeller.pas

@@ -73,7 +73,7 @@ begin
     end
     else
     begin
-      LAccount := TNode.Node.Operations.SafeBoxTransaction.account(LAccountNumber);
+      LAccount := TNode.Node.GetAccount(LAccountNumber);
       lblBeneficiaryDetails.Caption := LAccount.Name.ToPrintable;
       lblBeneficiaryDetails.Visible := True;
     end;
@@ -118,7 +118,7 @@ var
   LAccount: TAccount;
 begin
   TAccountComp.AccountTxtNumberToAccountNumber(edtBeneficiaryAcc.Text, LAccountNumber);
-  Model.SendPASC.DestinationAccount := TNode.Node.Operations.SafeBoxTransaction.account(LAccountNumber);
+  Model.SendPASC.DestinationAccount := TNode.Node.GetAccount(LAccountNumber);
 end;
 
 function TWIZEnlistAccountForSale_EnterSeller.Validate(out message: ansistring): boolean;
@@ -147,7 +147,7 @@ begin
       Exit(False);
     end;
 
-  Model.EnlistAccountForSale.SellerAccount := TNode.Node.Operations.SafeBoxTransaction.account(LAccountNumber);
+  Model.EnlistAccountForSale.SellerAccount := TNode.Node.GetAccount(LAccountNumber);
 
 end;
 

src/gui-experimental/wizards/operations/UWIZSendPASC_Details.lfm

@@ -8,8 +8,7 @@ object WIZSendPASC_Details: TWIZSendPASC_Details
   Caption = 'WIZSendPASC_Details'
   ClientHeight = 379
   ClientWidth = 450
-  LCLVersion = '1.8.2.0'
-  Visible = False
+  LCLVersion = '2.0.2.0'
   object gbRecipient: TGroupBox
     Left = 8
     Height = 124

src/gui-experimental/wizards/operations/UWIZSendPASC_Details.pas

@@ -69,6 +69,7 @@ uses
   UCoreUtils,
   UBaseTypes,
   UCoreObjects,
+  UBlockChain,
   UFRMAccountSelect,
   UCommon.Collections,
   Generics.Collections,
@@ -102,13 +103,13 @@ var
   LTempAccount: TAccount;
   LAccountNumber: cardinal;
 begin
+
   // Recipient section
   if TAccountComp.AccountTxtNumberToAccountNumber(txtRecipient.Text, LAccountNumber) then
     if ((LAccountNumber < 0) or (LAccountNumber >= TNode.Node.Bank.AccountsCount)) then
       lblRecipientDetails.Caption := ''
-    else
-    begin
-      LTempAccount := TNode.Node.Operations.SafeBoxTransaction.account(LAccountNumber);
+    else begin
+      LTempAccount := TNode.Node.GetAccount(LAccountNumber);
       lblRecipientDetails.Caption := LTempAccount.Name.ToPrintable;
     end;
 
@@ -138,7 +139,7 @@ begin
 
   // Recipient section
   TAccountComp.AccountTxtNumberToAccountNumber(txtRecipient.Text, LAccountNumber);
-  Model.SendPASC.DestinationAccount := TNode.Node.Operations.SafeBoxTransaction.account(LAccountNumber);
+  Model.SendPASC.DestinationAccount := TNode.Node.GetAccount(LAccountNumber);
 
   // Quantity section
   if chkSendAll.Checked then

src/gui-experimental/wizards/wallet/UWIZAddKey_SelectEncryption.lfm

@@ -7,8 +7,7 @@ object WIZAddKey_SelectEncryption: TWIZAddKey_SelectEncryption
   ClientHeight = 240
   ClientWidth = 320
   OnCreate = FormCreate
-  LCLVersion = '1.8.4.0'
-  Visible = False
+  LCLVersion = '2.0.2.0'
   object rgKeyType: TRadioGroup
     Left = 24
     Height = 209

src/gui-experimental/wizards/wallet/UWIZAddKey_SelectEncryption.pas

@@ -38,9 +38,7 @@ implementation
 {$R *.lfm}
 
 uses
-  UAccounts,
-  UConst,
-  UMemory;
+  UAccounts, UConst, UMemory, Generics.Collections;
 
 { TWIZAddKey_SelectEncryption }
 
@@ -48,13 +46,13 @@ procedure TWIZAddKey_SelectEncryption.FormCreate(Sender: TObject);
 var
   i : Integer;
   GC : TDisposables;
-  availableEncryptionTypes : TList;
+  availableEncryptionTypes : TList<Word>;
 begin
   rgKeyType.Items.Clear;
-  availableEncryptionTypes := GC.AddObject( TList.Create ) as TList;
+  availableEncryptionTypes := GC.AddObject( TList<Word>.Create ) as TList<Word>;
   TAccountComp.ValidsEC_OpenSSL_NID(availableEncryptionTypes);
   for i := 0 to availableEncryptionTypes.Count - 1 do begin
-    rgKeyType.Items.AddObject(GetOptionText(PtrInt(availableEncryptionTypes[i])),availableEncryptionTypes[i]);
+    rgKeyType.Items.AddObject(GetOptionText(availableEncryptionTypes[i]),TObject(availableEncryptionTypes[i]));
   end;
 end;
 

src/pascalcoin_wallet_experimental.lpi

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="10"/>
+    <Version Value="11"/>
     <PathDelim Value="\"/>
     <General>
       <Flags>
@@ -73,9 +73,10 @@
       <Version Value="2"/>
     </PublishOptions>
     <RunParams>
-      <local>
-        <FormatVersion Value="1"/>
-      </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default"/>
+      </Modes>
     </RunParams>
     <RequiredPackages Count="1">
       <Item1>