Merge branch 'master' into feature/listAccountsIntent

Author: andygruening

Plugins/SequencePlugin/Content/Core/Demonstration/BP_CustomSpectatorPawn.uasset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:50bb71756e9653a7e53d27382c9cbbb8840158b71dc4fc644726b891dde7cc1b
-size 1756023
+oid sha256:10573b8cbd7d0227e1b076717a6f3ad32df4d95bb13ba798d3d581713ed13b23
+size 1779559

Plugins/SequencePlugin/Content/Core/Pawn_Components/AC_SequencePawn_Component.uasset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:302ed79846bfceb18d24b4b894fadadaab5b197ee231c9d86e5cd0bf9af424f1
-size 2371483
+oid sha256:c9e98f46668233166316278e81da225edcc5b5dec838547eff17f2473d3fb020
+size 2374223

Plugins/SequencePlugin/Source/SequencePlugin/Private/ABI/ABI.cpp

@@ -1,34 +1,31 @@
 // Copyright 2024 Horizon Blockchain Games Inc. All rights reserved.
 
 #include "ABI/ABI.h"
-#include "ABI/ABIEncodeable.h"
+#include "ABI/ABIElement.h"
 #include "Eth/Crypto.h"
 #include "Types/BinaryData.h"
 
 TFixedABIData ABI::UInt32(uint32 Input)
 {
 	TArray<uint8> Arr;
-	ABIEncodeable::PushEmptyBlock(Arr);
-	ABIEncodeable::CopyInUInt32(Arr, Input, 0);
+	ABIElement::PushEmptyBlock(Arr);
+	ABIElement::CopyInUInt32(Arr, Input, 0);
 	return TFixedABIData(Arr);
 }
 
 TFixedABIData ABI::Int32(int32 Input)
 {
 	TArray<uint8> Arr;
-	ABIEncodeable::PushEmptyBlock(Arr);
-	ABIEncodeable::CopyInInt32(Arr, Input, 0);
+	ABIElement::PushEmptyBlock(Arr);
+	ABIElement::CopyInInt32(Arr, Input, 0);
 	return TFixedABIData(Arr);
 }
 
 TFixedABIData ABI::Bool(bool Input)
 {
 	TArray<uint8> Arr;
-	ABIEncodeable::PushEmptyBlock(Arr);
-	if(Input)
-	{
-		Arr[GBlockByteLength - 1] = 0x00;
-	}
+	ABIElement::PushEmptyBlock(Arr);
+	Arr[GBlockByteLength - 1] = Input ? 0x01 : 0x00;
 	return TFixedABIData(Arr);
 }
 
@@ -51,22 +48,70 @@ TDynamicABIData ABI::String(FString Input)
 	return TDynamicABIData(Arr);
 }
 
-FUnsizedData ABI::Encode(FString Signature, TArray<ABIEncodeable*> Arr)
+
+// DEPRECATED
+FUnsizedData ABI::Encode(FString Signature, TArray<ABIElement*> Args)
+{
+	TArray<TSharedPtr<ABIElement>> NewArgs;
+	for(auto i = 0; i < Args.Num(); i++)
+	{
+		NewArgs.Push(Args[i]->Clone());
+	}
+
+	TOptional<FUnsizedData> Encoded = Encode(Signature, NewArgs);
+
+	if(Encoded.IsSet())
+	{
+		return Encoded.GetValue();
+	}
+	else
+	{
+		return FUnsizedData { TArray<uint8>() };
+	}
+}
+
+TOptional<FUnsizedData> ABI::Encode(FString Signature, TArray<TSharedPtr<ABIElement>> Args)
 {
-	TFixedABIArray FixedArr(Arr);
+	if(!IsValidSignature(Signature))
+	{
+		UE_LOG(LogTemp, Display, TEXT("Invalid signature! Remember that ABI signatures should only contain argument types without spaces and NOT names."));
+		return TOptional<FUnsizedData>();
+	}
+	
+	TFixedABIArray FixedArr(Args);
 	FUnsizedData Data {
 		FixedArr.Encode()
 	};
 	FUnsizedData SignatureData = StringToUTF8(Signature);
 	FHash256 Hash = GetKeccakHash(SignatureData);
-	Data.Arr->Insert(Hash.Ptr(), 4, 0);
+	Data.Arr->Insert(Hash.Ptr(), GSignatureLength, 0);
 	return Data;
 }
 
-FString ABI::Display(FString Signature, TArray<ABIEncodeable*> Arr)
+void ABI::Decode(TArray<uint8> Data, TArray<TSharedPtr<ABIElement>> Args)
+{
+	TFixedABIArray FixedArr(Args);
+	FixedArr.Decode(Data, GSignatureLength, GSignatureLength);
+}
+
+bool ABI::IsValidSignature(FString Signature)
+{
+	const FRegexPattern FunctionABIRegex(TEXT("^[A-Z|a-z|,-|0-9]+(([A-Z|a-z|0-9]+(, [A-Z|a-z|0-9]+))?)$"));
+	FRegexMatcher MyMatcher(FunctionABIRegex, Signature);
+	return MyMatcher.FindNext();
+}
+
+FString ABI::Display(FString Signature, TArray<TSharedPtr<ABIElement>> Args)
 {
 	FString Str = "";
-	FString Reference = Encode(Signature, Arr).ToHex();
+	TOptional<FUnsizedData> Encoded = Encode(Signature, Args);
+
+	if(!Encoded.IsSet())
+	{
+		return "Signature not valid!";
+	}
+	
+	FString Reference = Encoded.GetValue().ToHex();
 
 	for(int i = 0; i < Reference.Len(); i++)
 	{