Cb2

lastrelease.txt

@@ -1 +1 @@
-0.4.2Cb1 0.4.2Cb1 x {LastOfficial} {LastBeta} {TestNet}
+0.4.2Cb2 0.4.2Cb2 x {LastOfficial} {LastBeta} {TestNet}

masterpaskalform.lfm

@@ -318,7 +318,7 @@ object Form1: TForm1
     Height = 488
     Top = 38
     Width = 640
-    ActivePage = tabOptions
+    ActivePage = TabWallet
     Align = alTop
     Anchors = [akTop, akLeft, akRight, akBottom]
     Font.CharSet = ANSI_CHARSET
@@ -327,7 +327,7 @@ object Form1: TForm1
     Font.Pitch = fpVariable
     Font.Quality = fqDraft
     ParentFont = False
-    TabIndex = 2
+    TabIndex = 0
     TabOrder = 0
     object TabWallet: TTabSheet
       Caption = 'Wallet'

masterpaskalform.pas

@@ -1219,7 +1219,7 @@ procedure TUpdateMNs.Execute;
         LastRunMNVerification := UTCTime;
         TextLine := RunMNVerification(MyLastBlock,GetSynctus,LocalMN_IP,GetWallArrIndex(WallAddIndex(LocalMN_Sign)).PublicKey,GetWallArrIndex(WallAddIndex(LocalMN_Sign)).PrivateKey);
         OutGoingMsjsAdd(ProtocolLine(MNCheck)+TextLine);
-        ToLog('console','Masternodes Verification completed: '+TextLine)
+        //ToLog('console','Masternodes Verification completed: '+TextLine)
         end;
       end;
     While LengthWaitingMNs > 0 do
@@ -2825,9 +2825,12 @@ procedure TForm1.IdTCPServer1Exception(AContext: TIdContext;AException: Exceptio
 // Copy address button
 Procedure TForm1.BCopyAddrClick(sender: TObject);
 Begin
+  Clipboard.AsText:= DireccionesPanel.Cells[0,DireccionesPanel.Row];
+  {
   if GetWallArrIndex(DireccionesPanel.Row-1).custom <> '' then
     Clipboard.AsText:= GetWallArrIndex(DireccionesPanel.Row-1).custom
   else Clipboard.AsText:= GetWallArrIndex(DireccionesPanel.Row-1).Hash;
+  }
   info('Copied to clipboard');//'Copied to clipboard'
 End;
 

mpparser.pas

@@ -797,7 +797,8 @@ function SendFunds(LineText:string;showOutput:boolean=true):string;
       end;
    Setlength(orderstring,length(orderstring)-2);
    OrderString := StringReplace(OrderString,'PSK','NSLORDER',[]);
-   result := SendOrderToNode(OrderString);
+   ToLog('console','Send to Node '+OrderString);
+   //result := SendOrderToNode(OrderString);
    ToLog('console','Node result: '+result);
    //OutgoingMsjsAdd(OrderString);
    EndPerformance('SendFunds');

mprpc.pas

@@ -42,6 +42,7 @@ function RPC_NewAddressFull(NosoPParams:string):string;
 Function RPC_SetDefault(NosoPParams:string):string;
 Function RPC_GVTInfo(NosoPParams:string):string;
 Function RPC_CheckCertificate(NosoPParams:string):string;
+Function RPC_SubmitOrder(NosoPParams:string;waitresponse:boolean=false):string;
 function RPC_SendFunds(NosoPParams:string):string;
 
 
@@ -425,6 +426,15 @@ function ObjectFromString(MyString:string): string;
 else if objecttype = 'walletbalance' then
    begin
    resultado.Add('balance',StrToInt64(parameter(mystring,1)))
+   end
+else if objecttype = 'submitorder' then
+   begin
+   resultado.Add('result',StrToBool(parameter(mystring,1)))
+   end
+else if objecttype = 'submitorderwr' then
+   begin
+   resultado.Add('result',StrToBool(parameter(mystring,1)));
+   resultado.Add('response',StringReplace(parameter(mystring,2),'_',' ',[rfReplaceAll, rfIgnoreCase]))
    end;
 
 result := resultado.AsJSON;
@@ -479,6 +489,8 @@ function ParseRPCJSON(jsonreceived:string):string;
       else if method = 'getgvtinfo' then result := GetJSONResponse(RPC_GVTInfo(NosoPParams),jsonid)
       else if method = 'sendfunds' then result := GetJSONResponse(RPC_SendFunds(NosoPParams),jsonid)
       else if method = 'checkcertificate' then result := GetJSONResponse(RPC_CheckCertificate(NosoPParams),jsonid)
+      else if method = 'submitorder' then result := GetJSONResponse(RPC_SubmitOrder(NosoPParams),jsonid)
+      else if method = 'submitorderwr' then result := GetJSONResponse(RPC_SubmitOrder(NosoPParams,true),jsonid)
       else result := GetJSONErrorCode(402,-1);
       Except on E:Exception do
          ToLog('exceps',FormatDateTime('dd mm YYYY HH:MM:SS.zzz', Now)+' -> '+'JSON RPC error: '+E.Message);
@@ -879,6 +891,21 @@ function RPC_NewAddressFull(NosoPParams:string):string;
     end;
 End;
 
+
+Function RPC_SubmitOrder(NosoPParams:string;waitresponse:boolean=false):string;
+var
+  ResultLine : string;
+Begin
+  //ToLog('Console',NosoPParams);
+  ResultLine := SendOrderToNode(NosoPParams);
+  ResultLine := StringReplace(ResultLine,' ','_',[rfReplaceAll, rfIgnoreCase]);
+  if not waitresponse then result := 'submitorder'#127'True'
+  else
+    begin
+    result := 'submitorderwr'#127'True'#127+ResultLine;
+    end;
+End;
+
 function RPC_SendFunds(NosoPParams:string):string;
 var
   destination,  reference : string;