Browse Source

Lazarus/FPC bug-fixes for EPASA

Herman Schoenfeld 4 years ago
parent
commit
3c82c944ec
3 changed files with 5 additions and 3 deletions
  1. 2 2
      src/core/UEPasa.pas
  2. 1 1
      src/core/URPC.pas
  3. 2 0
      src/gui-classic/UFRMWallet.pas

+ 2 - 2
src/core/UEPasa.pas

@@ -119,7 +119,7 @@ type
       property HasPayload: boolean read GetHasPayload;
       property HasPayload: boolean read GetHasPayload;
       class property Empty : TEPasa read GetEmptyValue;
       class property Empty : TEPasa read GetEmptyValue;
 
 
-      function GetRawPayloadBytes(): TArray<Byte>; inline;
+      function GetRawPayloadBytes(): TBytes; inline;
 
 
       function ToClassicPASAString(): String; overload;
       function ToClassicPASAString(): String; overload;
       function ToString(): String; overload;
       function ToString(): String; overload;
@@ -350,7 +350,7 @@ begin
   Result := PayloadType.HasTrait(ptPublic) OR PayloadType.HasTrait(ptRecipientKeyEncrypted) OR PayloadType.HasTrait(ptSenderKeyEncrypted);
   Result := PayloadType.HasTrait(ptPublic) OR PayloadType.HasTrait(ptRecipientKeyEncrypted) OR PayloadType.HasTrait(ptSenderKeyEncrypted);
 end;
 end;
 
 
-function TEPasa.GetRawPayloadBytes: TArray<Byte>;
+function TEPasa.GetRawPayloadBytes: TBytes;
 begin
 begin
   if (PayloadType.HasTrait(ptAsciiFormatted)) then
   if (PayloadType.HasTrait(ptAsciiFormatted)) then
     Exit(TEncoding.ASCII.GetBytes(Payload));
     Exit(TEncoding.ASCII.GetBytes(Payload));

+ 1 - 1
src/core/URPC.pas

@@ -421,7 +421,7 @@ begin
 
 
    if AEPASA.PayloadType.HasTrait(ptPublic) then begin
    if AEPASA.PayloadType.HasTrait(ptPublic) then begin
      AInputParams.SetAs('payload_method', TPCJSONVariantValue.CreateFromVariant('none'));
      AInputParams.SetAs('payload_method', TPCJSONVariantValue.CreateFromVariant('none'));
-     AInputParams.SetAs('payload', TPCJSONVariantValue.CreateFromVariant(AEPASA.GetRawPayloadBytes().ToHexaString()));
+     AInputParams.SetAs('payload', TPCJSONVariantValue.CreateFromVariant(AEPASA.GetRawPayloadBytes.ToHexaString));
    end else if AEPASA.PayloadType.HasTrait(ptSenderKeyEncrypted) then begin
    end else if AEPASA.PayloadType.HasTrait(ptSenderKeyEncrypted) then begin
      AInputParams.SetAs('payload_method', TPCJSONVariantValue.CreateFromVariant('sender'));
      AInputParams.SetAs('payload_method', TPCJSONVariantValue.CreateFromVariant('sender'));
      AInputParams.SetAs('payload', TPCJSONVariantValue.CreateFromVariant(AEPASA.GetRawPayloadBytes().ToHexaString()));
      AInputParams.SetAs('payload', TPCJSONVariantValue.CreateFromVariant(AEPASA.GetRawPayloadBytes().ToHexaString()));

+ 2 - 0
src/gui-classic/UFRMWallet.pas

@@ -1087,7 +1087,9 @@ begin
   mi := TMenuItem.Create(MainMenu);
   mi := TMenuItem.Create(MainMenu);
   mi.Caption:='Create a block';
   mi.Caption:='Create a block';
   mi.OnClick:=Test_CreateABlock;
   mi.OnClick:=Test_CreateABlock;
+  {$IFnDEF FPC}
   mi.ShortCut := TextToShortCut('CTRL+B');
   mi.ShortCut := TextToShortCut('CTRL+B');
+  {$ENDIF}
   miAbout.Add(mi);
   miAbout.Add(mi);
   {$ENDIF}
   {$ENDIF}
   mi := TMenuItem.Create(MainMenu);
   mi := TMenuItem.Create(MainMenu);