Merge: upstream fixes

README.md

@@ -34,6 +34,13 @@ Also, consider a donation at PascalCoin development account: "0-10"
 
 ## History:  
 
+### Build 2.1.3.0 - 2017-11-15
+- Fixed BUG when buying account assigning an invalid public key
+- Added maxim value to node servers buffer, deleting old node servers not used, this improves speed
+- Re-add orphaned operations back into the pending pool
+- RPC locking to prevent N_Operation race-condition on concurrent invocations
+- Minor bugs
+
 ### Build 2.1.2.0 - 2017-07-27
 - No more blockchain in installer = TRUE DELETABLE BLOCKCHAIN (Safebox will be automatically downloaded by client from network)
 - Fixed storage bug when downloading a new safebox

README.txt

@@ -34,6 +34,13 @@ Also, consider a donation at PascalCoin development account: "0-10"
 
 ## History:  
 
+### Build 2.1.3.0 - 2017-11-15
+- Fixed BUG when buying account assigning an invalid public key
+- Added maxim value to node servers buffer, deleting old node servers not used, this improves speed
+- Re-add orphaned operations back into the pending pool
+- RPC locking to prevent N_Operation race-condition on concurrent invocations
+- Minor bugs
+
 ### Build 2.1.2.0 - 2017-07-27
 - No more blockchain in installer = TRUE DELETABLE BLOCKCHAIN (Safebox will be automatically downloaded by client from network)
 - Fixed storage bug when downloading a new safebox

Units/PascalCoin/UConst.pas

@@ -131,14 +131,15 @@ Const
   CT_OpSubtype_ChangeKeySigned            = 71;
   CT_OpSubtype_ChangeAccountInfo          = 81;
 
-  CT_ClientAppVersion : AnsiString = '2.1.2';
+  CT_ClientAppVersion : AnsiString = '2.1.3';
 
   CT_Discover_IPs =  'bpascal1.dynamic-dns.net;bpascal2.dynamic-dns.net;pascalcoin2.ddns.net;pascalcoin1.dynamic-dns.net;pascalcoin1.dns1.us';
 
   CT_TRUE_FALSE : Array[Boolean] Of AnsiString = ('FALSE','TRUE');
 
   CT_MAX_0_fee_operations_per_block_by_miner = {$IFDEF PRODUCTION}2000{$ELSE}{$IFDEF TESTNET}2{$ELSE}{$ENDIF}{$ENDIF};
-  CT_MAX_Operations_per_block_by_miner =  {$IFDEF PRODUCTION}5000{$ELSE}{$IFDEF TESTNET}50000{$ELSE}{$ENDIF}{$ENDIF};
+
+  CT_MAX_Operations_per_block_by_miner =  {$IFDEF PRODUCTION}10000{$ELSE}{$IFDEF TESTNET}50000{$ELSE}{$ENDIF}{$ENDIF};
 
   // App Params
   CT_PARAM_GridAccountsStream = 'GridAccountsStreamV2';

Units/PascalCoin/UOpTransaction.pas

@@ -758,6 +758,7 @@ begin
       errors := Format('Signed price (%d) is not the same of account price (%d)',[FData.AccountPrice,target.accountInfo.price]);
       exit;
     end;
+    If Not (TAccountComp.IsValidAccountKey(FData.new_accountkey,errors)) then exit; // BUG 20171511
     _IsBuyTransaction := True;
     FPrevious_Seller_updated_block := seller.updated_block;
   end else if
@@ -773,6 +774,7 @@ begin
       errors := 'Tx-Buy account is not allowed on Protocol 1';
       exit;
     end;
+    If Not (TAccountComp.IsValidAccountKey(FData.new_accountkey,errors)) then exit; // BUG 20171511
 
     _IsBuyTransaction := true; // Automatic buy
     // Fill the purchase data

Units/PascalCoin/config.inc

@@ -32,7 +32,7 @@
   {$DEFINE TESTNET}
 
   // For GUI: Allows to show average time on blockchain explorer
-  {.$DEFINE SHOW_AVERAGE_TIME_STATS}
+  {$DEFINE SHOW_AVERAGE_TIME_STATS}
 
   // For special use: Allows to store in a buffer, miPendingOperations not proceded due to n_operation value invalid
   {.$DEFINE BufferOfFutureOperations}