fixed compiler issues after plugin-packaging

andygruening · andygruening · commit b4da9bf8f6c7 · 2024-10-30T12:55:51.000+01:00
diff --git a/Plugins/SequencePlugin/SequencePlugin.uplugin b/Plugins/SequencePlugin/SequencePlugin.uplugin
@@ -1,8 +1,8 @@
 {
-	"EngineVersion":"5.4",
+	"EngineVersion": "5.4",
 	"FileVersion": 3,
 	"Version": 3,
-	"VersionName": "1.3",
+	"VersionName": "1.4.0",
 	"FriendlyName": "SequencePlugin",
 	"Description": "",
 	"Category": "Sequence",
@@ -26,7 +26,7 @@
 			"Name": "SequencePlugin",
 			"Type": "Runtime",
 			"LoadingPhase": "Default",
-			"WhitelistPlatforms": [
+			"PlatformAllowList": [
 				"Mac",
 				"Win64",
 				"Android",
diff --git a/Plugins/SequencePlugin/Source/SequencePlugin/Private/ABI/ABI.cpp b/Plugins/SequencePlugin/Source/SequencePlugin/Private/ABI/ABI.cpp
@@ -3,6 +3,7 @@
 #include "ABI/ABI.h"
 #include "ABI/ABIElement.h"
 #include "Eth/Crypto.h"
+#include "Internationalization/Regex.h"
 #include "Types/BinaryData.h"
 
 TFixedABIData ABI::UInt32(uint32 Input)
diff --git a/Plugins/SequencePlugin/Source/SequencePlugin/Private/Sequence/SequenceWalletQrCode.cpp b/Plugins/SequencePlugin/Source/SequencePlugin/Private/Sequence/SequenceWalletQrCode.cpp
@@ -3,6 +3,7 @@
 #include "../../Public/Sequence/SequenceWalletQrCode.h"
 
 #include "ObjectHandler.h"
+#include "Misc/Base64.h"
 #include "Util/Log.h"
 #include "Sequence/SequenceAPI.h"
 
diff --git a/Plugins/SequencePlugin/Source/SequencePlugin/Private/Types/ERC1155.cpp b/Plugins/SequencePlugin/Source/SequencePlugin/Private/Types/ERC1155.cpp
@@ -55,7 +55,6 @@ FRawTransaction UERC1155::MakeSetApprovalForAllTransaction(const FString& Oppera
 	TFixedABIData ABIAccount = ABI::Address(WalletAddressBytes);
 	TFixedABIData ABIApproval = ABI::Bool(Approved);
 
-
 	TArray<ABIElement*> Arr;
 	Arr.Add(&ABIAccount);
 	Arr.Add(&ABIApproval);
@@ -113,16 +112,16 @@ FRawTransaction UERC1155::MakeBatchMintTransaction(const FString& ToAddress, con
 	TArray<TSharedPtr<ABIElement>> TokenIdsArray;
 	for (uint32 TokenId : TokenIds)
 	{
-		const TFixedABIData* Data = new TFixedABIData(ABI::Int32(TokenId));
-		TokenIdsArray.Add(MakeShared<TFixedABIData>(*Data));
+		const TFixedABIData* TokenIdData = new TFixedABIData(ABI::Int32(TokenId));
+		TokenIdsArray.Add(MakeShared<TFixedABIData>(*TokenIdData));
 	}
 	TDynamicABIArray ABIArrayTokenIds(TokenIdsArray);
 
 	TArray<TSharedPtr<ABIElement>> AmountsArray;
 	for (uint32 Amount : Amounts)
 	{
-		const TFixedABIData* Data = new TFixedABIData(ABI::Int32(Amount));
-		AmountsArray.Add(MakeShared<TFixedABIData>(*Data));
+		const TFixedABIData* AmountData = new TFixedABIData(ABI::Int32(Amount));
+		AmountsArray.Add(MakeShared<TFixedABIData>(*AmountData));
 	}
 	
 	TDynamicABIArray ABIArrayAmounts(AmountsArray);
@@ -174,16 +173,16 @@ FRawTransaction UERC1155::MakeBatchBurnTransaction(const TArray<int32>& TokenIds
 	TArray<TSharedPtr<ABIElement>> TokenIdsArray;
 	for (uint32 TokenId : TokenIds)
 	{
-		const TFixedABIData* Data = new TFixedABIData(ABI::Int32(TokenId));
-		TokenIdsArray.Add(MakeShared<TFixedABIData>(*Data));
+		const TFixedABIData* TokenIdData = new TFixedABIData(ABI::Int32(TokenId));
+		TokenIdsArray.Add(MakeShared<TFixedABIData>(*TokenIdData));
 	}
 	TDynamicABIArray ABIArrayTokenIds(TokenIdsArray);
 
 	TArray<TSharedPtr<ABIElement>> AmountsArray;
 	for (uint32 Amount : Amounts)
 	{
-		const TFixedABIData* Data = new TFixedABIData(ABI::Int32(Amount));
-		AmountsArray.Add(MakeShared<TFixedABIData>(*Data));
+		const TFixedABIData* AmountData = new TFixedABIData(ABI::Int32(Amount));
+		AmountsArray.Add(MakeShared<TFixedABIData>(*AmountData));
 	}
 	TDynamicABIArray ABIArrayAmounts(AmountsArray);
 
diff --git a/Plugins/SequencePlugin/Source/SequencePlugin/Private/Types/ERC1155SaleContract.cpp b/Plugins/SequencePlugin/Source/SequencePlugin/Private/Types/ERC1155SaleContract.cpp
@@ -26,16 +26,16 @@ FRawTransaction UERC1155SaleContract::MakePurchaseTransaction(const FString& ToA
 	TArray<TSharedPtr<ABIElement>> TokenIdsArray;
 	for (uint32 TokenId : TokenIds)
 	{
-		const TFixedABIData* Data = new TFixedABIData(ABI::Int32(TokenId));
-		TokenIdsArray.Add(MakeShared<TFixedABIData>(*Data));
+		const TFixedABIData* TokenIdData = new TFixedABIData(ABI::Int32(TokenId));
+		TokenIdsArray.Add(MakeShared<TFixedABIData>(*TokenIdData));
 	}
 	TDynamicABIArray ABIArrayTokenIds(TokenIdsArray);
 
 	TArray<TSharedPtr<ABIElement>> AmountsArray;
 	for (uint32 Amount : Amounts)
 	{
-		const TFixedABIData* Data = new TFixedABIData(ABI::Int32(Amount));
-		AmountsArray.Add(MakeShared<TFixedABIData>(*Data));
+		const TFixedABIData* AmountData = new TFixedABIData(ABI::Int32(Amount));
+		AmountsArray.Add(MakeShared<TFixedABIData>(*AmountData));
 	}
 	TDynamicABIArray ABIArrayAmounts(AmountsArray);
 
@@ -46,8 +46,8 @@ FRawTransaction UERC1155SaleContract::MakePurchaseTransaction(const FString& ToA
 		ProofBytes.SetNumUninitialized(32);
 		FMemory::Memcpy(ProofBytes.GetData(), TCHAR_TO_UTF8(*ProofEntry), FMath::Min(ProofEntry.Len(), 32));
 
-		const TFixedABIData* Data = new TFixedABIData(ProofBytes);
-		ProofArray.Add(MakeShared<TFixedABIData>(*Data));
+		const TFixedABIData* ProofData = new TFixedABIData(ProofBytes);
+		ProofArray.Add(MakeShared<TFixedABIData>(*ProofData));
 	}
 	TDynamicABIArray ABIArrayProof(ProofArray);
 
diff --git a/Plugins/SequencePlugin/Source/SequencePlugin/Private/Types/ERC721.cpp b/Plugins/SequencePlugin/Source/SequencePlugin/Private/Types/ERC721.cpp
@@ -122,8 +122,8 @@ FRawTransaction UERC721::MakeBatchBurnTransaction(const TArray<int32>& TokenIds)
 	TArray<TSharedPtr<ABIElement>> TokenIdsArray;
 	for (uint32 TokenId : TokenIds)
 	{
-		const TFixedABIData* Data = new TFixedABIData(ABI::Int32(TokenId));
-		TokenIdsArray.Add(MakeShared<TFixedABIData>(*Data));
+		const TFixedABIData* TokenIdData = new TFixedABIData(ABI::Int32(TokenId));
+		TokenIdsArray.Add(MakeShared<TFixedABIData>(*TokenIdData));
 	}
 	TDynamicABIArray ABIArrayTokenIds(TokenIdsArray);
 
diff --git a/Plugins/SequencePlugin/Source/SequencePlugin/Private/Types/ERC721SaleContract.cpp b/Plugins/SequencePlugin/Source/SequencePlugin/Private/Types/ERC721SaleContract.cpp
@@ -36,8 +36,8 @@ FRawTransaction UERC721SaleContract::MakePurchaseTransaction(const FString& ToAd
         ProofBytes.SetNumUninitialized(32);
         FMemory::Memcpy(ProofBytes.GetData(), TCHAR_TO_UTF8(*ProofEntry), FMath::Min(ProofEntry.Len(), 32));
         
-        const TFixedABIData* Data = new TFixedABIData(ProofBytes);
-        ProofArray.Add(MakeShared<TFixedABIData>(*Data));
+        const TFixedABIData* ProofData = new TFixedABIData(ProofBytes);
+        ProofArray.Add(MakeShared<TFixedABIData>(*ProofData));
     }
     TDynamicABIArray ABIArrayProof(ProofArray);
 

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,6 @@ FRawTransaction UERC1155::MakeSetApprovalForAllTransaction(const FString& Oppera`
`55`	`55`	`TFixedABIData ABIAccount = ABI::Address(WalletAddressBytes);`
`56`	`56`	`TFixedABIData ABIApproval = ABI::Bool(Approved);`
`57`	`57`
`58`		`-`
`59`	`58`	`TArray<ABIElement*> Arr;`
`60`	`59`	`Arr.Add(&ABIAccount);`
`61`	`60`	`Arr.Add(&ABIApproval);`
`@@ -113,16 +112,16 @@ FRawTransaction UERC1155::MakeBatchMintTransaction(const FString& ToAddress, con`
`113`	`112`	`TArray<TSharedPtr<ABIElement>> TokenIdsArray;`
`114`	`113`	`for (uint32 TokenId : TokenIds)`
`115`	`114`	`{`
`116`		`- const TFixedABIData* Data = new TFixedABIData(ABI::Int32(TokenId));`
`117`		`- TokenIdsArray.Add(MakeShared<TFixedABIData>(*Data));`
	`115`	`+ const TFixedABIData* TokenIdData = new TFixedABIData(ABI::Int32(TokenId));`
	`116`	`+ TokenIdsArray.Add(MakeShared<TFixedABIData>(*TokenIdData));`
`118`	`117`	`}`
`119`	`118`	`TDynamicABIArray ABIArrayTokenIds(TokenIdsArray);`
`120`	`119`
`121`	`120`	`TArray<TSharedPtr<ABIElement>> AmountsArray;`
`122`	`121`	`for (uint32 Amount : Amounts)`
`123`	`122`	`{`
`124`		`- const TFixedABIData* Data = new TFixedABIData(ABI::Int32(Amount));`
`125`		`- AmountsArray.Add(MakeShared<TFixedABIData>(*Data));`
	`123`	`+ const TFixedABIData* AmountData = new TFixedABIData(ABI::Int32(Amount));`
	`124`	`+ AmountsArray.Add(MakeShared<TFixedABIData>(*AmountData));`
`126`	`125`	`}`
`127`	`126`
`128`	`127`	`TDynamicABIArray ABIArrayAmounts(AmountsArray);`
`@@ -174,16 +173,16 @@ FRawTransaction UERC1155::MakeBatchBurnTransaction(const TArray<int32>& TokenIds`
`174`	`173`	`TArray<TSharedPtr<ABIElement>> TokenIdsArray;`
`175`	`174`	`for (uint32 TokenId : TokenIds)`
`176`	`175`	`{`
`177`		`- const TFixedABIData* Data = new TFixedABIData(ABI::Int32(TokenId));`
`178`		`- TokenIdsArray.Add(MakeShared<TFixedABIData>(*Data));`
	`176`	`+ const TFixedABIData* TokenIdData = new TFixedABIData(ABI::Int32(TokenId));`
	`177`	`+ TokenIdsArray.Add(MakeShared<TFixedABIData>(*TokenIdData));`
`179`	`178`	`}`
`180`	`179`	`TDynamicABIArray ABIArrayTokenIds(TokenIdsArray);`
`181`	`180`
`182`	`181`	`TArray<TSharedPtr<ABIElement>> AmountsArray;`
`183`	`182`	`for (uint32 Amount : Amounts)`
`184`	`183`	`{`
`185`		`- const TFixedABIData* Data = new TFixedABIData(ABI::Int32(Amount));`
`186`		`- AmountsArray.Add(MakeShared<TFixedABIData>(*Data));`
	`184`	`+ const TFixedABIData* AmountData = new TFixedABIData(ABI::Int32(Amount));`
	`185`	`+ AmountsArray.Add(MakeShared<TFixedABIData>(*AmountData));`
`187`	`186`	`}`
`188`	`187`	`TDynamicABIArray ABIArrayAmounts(AmountsArray);`
`189`	`188`
Original file line number	Diff line number	Diff line change
`@@ -26,16 +26,16 @@ FRawTransaction UERC1155SaleContract::MakePurchaseTransaction(const FString& ToA`
`26`	`26`	`TArray<TSharedPtr<ABIElement>> TokenIdsArray;`
`27`	`27`	`for (uint32 TokenId : TokenIds)`
`28`	`28`	`{`
`29`		`- const TFixedABIData* Data = new TFixedABIData(ABI::Int32(TokenId));`
`30`		`- TokenIdsArray.Add(MakeShared<TFixedABIData>(*Data));`
	`29`	`+ const TFixedABIData* TokenIdData = new TFixedABIData(ABI::Int32(TokenId));`
	`30`	`+ TokenIdsArray.Add(MakeShared<TFixedABIData>(*TokenIdData));`
`31`	`31`	`}`
`32`	`32`	`TDynamicABIArray ABIArrayTokenIds(TokenIdsArray);`
`33`	`33`
`34`	`34`	`TArray<TSharedPtr<ABIElement>> AmountsArray;`
`35`	`35`	`for (uint32 Amount : Amounts)`
`36`	`36`	`{`
`37`		`- const TFixedABIData* Data = new TFixedABIData(ABI::Int32(Amount));`
`38`		`- AmountsArray.Add(MakeShared<TFixedABIData>(*Data));`
	`37`	`+ const TFixedABIData* AmountData = new TFixedABIData(ABI::Int32(Amount));`
	`38`	`+ AmountsArray.Add(MakeShared<TFixedABIData>(*AmountData));`
`39`	`39`	`}`
`40`	`40`	`TDynamicABIArray ABIArrayAmounts(AmountsArray);`
`41`	`41`
`@@ -46,8 +46,8 @@ FRawTransaction UERC1155SaleContract::MakePurchaseTransaction(const FString& ToA`
`46`	`46`	`ProofBytes.SetNumUninitialized(32);`
`47`	`47`	`FMemory::Memcpy(ProofBytes.GetData(), TCHAR_TO_UTF8(*ProofEntry), FMath::Min(ProofEntry.Len(), 32));`
`48`	`48`
`49`		`- const TFixedABIData* Data = new TFixedABIData(ProofBytes);`
`50`		`- ProofArray.Add(MakeShared<TFixedABIData>(*Data));`
	`49`	`+ const TFixedABIData* ProofData = new TFixedABIData(ProofBytes);`
	`50`	`+ ProofArray.Add(MakeShared<TFixedABIData>(*ProofData));`
`51`	`51`	`}`
`52`	`52`	`TDynamicABIArray ABIArrayProof(ProofArray);`
`53`	`53`
Original file line number	Diff line number	Diff line change
`@@ -122,8 +122,8 @@ FRawTransaction UERC721::MakeBatchBurnTransaction(const TArray<int32>& TokenIds)`
`122`	`122`	`TArray<TSharedPtr<ABIElement>> TokenIdsArray;`
`123`	`123`	`for (uint32 TokenId : TokenIds)`
`124`	`124`	`{`
`125`		`- const TFixedABIData* Data = new TFixedABIData(ABI::Int32(TokenId));`
`126`		`- TokenIdsArray.Add(MakeShared<TFixedABIData>(*Data));`
	`125`	`+ const TFixedABIData* TokenIdData = new TFixedABIData(ABI::Int32(TokenId));`
	`126`	`+ TokenIdsArray.Add(MakeShared<TFixedABIData>(*TokenIdData));`
`127`	`127`	`}`
`128`	`128`	`TDynamicABIArray ABIArrayTokenIds(TokenIdsArray);`
`129`	`129`
Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,8 @@ FRawTransaction UERC721SaleContract::MakePurchaseTransaction(const FString& ToAd`
`36`	`36`	`ProofBytes.SetNumUninitialized(32);`
`37`	`37`	`FMemory::Memcpy(ProofBytes.GetData(), TCHAR_TO_UTF8(*ProofEntry), FMath::Min(ProofEntry.Len(), 32));`
`38`	`38`
`39`		`- const TFixedABIData* Data = new TFixedABIData(ProofBytes);`
`40`		`- ProofArray.Add(MakeShared<TFixedABIData>(*Data));`
	`39`	`+ const TFixedABIData* ProofData = new TFixedABIData(ProofBytes);`
	`40`	`+ ProofArray.Add(MakeShared<TFixedABIData>(*ProofData));`
`41`	`41`	`}`
`42`	`42`	`TDynamicABIArray ABIArrayProof(ProofArray);`
`43`	`43`