Merge pull request #247 from 0xsequence/240-pluginmanager-returns-a-nullptr-on-windows

240 pluginmanager returns a nullptr on windows

Author: BellringerQuinn

Plugins/SequencePlugin/Source/SequencePlugin/Private/GeneralTesting.cpp

@@ -284,8 +284,8 @@ void AGeneralTesting::TestHistory() const
 		FSeqGetTransactionHistoryArgs args;
 		args.filter.accountAddress = Api->GetWalletAddress();
 		args.includeMetaData = true;
-		args.page->page = 0;
-		args.page->more = true;
+		args.page.page = 0;
+		args.page.more = true;
 		Api->GetTransactionHistory(args,GenericSuccess,GenericFailure);
 	}
 }

Plugins/SequencePlugin/Source/SequencePlugin/Private/SequenceRPCManager.cpp

@@ -100,16 +100,25 @@ void USequenceRPCManager::SendIntent(const FString& Url, TFunction<FString(TOpti
 
 FString USequenceRPCManager::GetPluginVersion()
 {
-	const TSharedPtr<IPlugin> Plugin = IPluginManager::Get().FindPlugin(TEXT("SequencePlugin"));
-	if (Plugin.IsValid())
-	{
-		return Plugin->GetDescriptor().VersionName;
-	}
-	else 
+	// Get the PluginManager instance
+	IPluginManager& PluginManager = IPluginManager::Get();
+
+	// Find the plugin by name
+	TSharedPtr<IPlugin> SequencePlugin = PluginManager.FindPlugin(TEXT("SequencePlugin"));
+
+	// Check if the plugin was found
+	if (SequencePlugin.IsValid())
 	{
-		UE_LOG(LogTemp, Error, TEXT("[Failed to find Sequence Plugin, Unknown version]"));
-		return FString("UNKNOWN");
+		// Retrieve the descriptor, which includes metadata such as the version
+		const FPluginDescriptor& Descriptor = SequencePlugin->GetDescriptor();
+
+		// Return the version string
+		return Descriptor.VersionName;
 	}
+
+	// Return a default value if the plugin is not found
+	UE_LOG(LogTemp, Error, TEXT("[Failed to find Sequence Plugin, Unknown version]"));
+	return TEXT("Plugin not found");
 }
 
 FString USequenceRPCManager::BuildGetFeeOptionsIntent(const FCredentials_BE& Credentials, const TArray<TransactionUnion>& Transactions, TOptional<int64> CurrentTime) const

Plugins/SequencePlugin/Source/SequencePlugin/Private/SequenceRPCManager.h

@@ -51,7 +51,7 @@ class SEQUENCEPLUGIN_API USequenceRPCManager : public UObject
 	 */
 	bool PreserveSessionWallet = false;
 
-	inline const static FString WaaSVersion = FString(TEXT("1.0.0 (Unreal ")).Append(USequenceRPCManager::GetPluginVersion()).Append(TEXT(")"));
+	inline const static FString WaaSVersion = FString(TEXT("1.0.0 (Unreal ")).Append(GetPluginVersion()).Append(TEXT(")"));
 
 	inline const static FString WaaSAuthenticatorIntentsUrlPath = TEXT("/rpc/WaasAuthenticator/SendIntent");
 	inline const static FString WaaSAuthenticatorRegisterUrlPath = TEXT("/rpc/WaasAuthenticator/RegisterSession");

Plugins/SequencePlugin/Source/SequencePlugin/Private/Tests/IndexerTests.cpp

@@ -194,8 +194,8 @@ void GetTransactionHistoryTest(UIndexer* Indexer, TFunction<void(FString)> OnSuc
 	FSeqGetTransactionHistoryArgs Args;
 	Args.filter.accountAddress = "0x0E0f9d1c4BeF9f0B8a2D9D4c09529F260C7758A2";
 	Args.includeMetaData = true;
-	Args.page->page = 0;
-	Args.page->more = true;
+	Args.page.page = 0;
+	Args.page.more = true;
 	Indexer->GetTransactionHistory(GTestingChainID, Args, GenericSuccess, GenericFailure);
 }
 

Plugins/SequencePlugin/Source/SequencePlugin/Public/Indexer/Structs/SeqGetTokenSuppliesArgs.h

@@ -15,7 +15,7 @@ struct SEQUENCEPLUGIN_API FSeqGetTokenSuppliesArgs
     UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Default")
         bool includeMetaData = false;
     UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Default")
-        TOptional<FSeqPage> page;
+        FSeqPage page;
 
     bool customGetter = true;
     FString GetArgs() { 
@@ -24,10 +24,10 @@ struct SEQUENCEPLUGIN_API FSeqGetTokenSuppliesArgs
         JsonObject->SetStringField("contractAddress", contractAddress);
         JsonObject->SetBoolField("includeMetaData", includeMetaData);
 
-        if (page.IsSet())
+        if (page.containsData())
         {
             TSharedPtr<FJsonObject> PageObject = MakeShared<FJsonObject>();
-            FJsonObjectConverter::UStructToJsonObject(FSeqPage::StaticStruct(), &(page.GetValue()), PageObject.ToSharedRef(), 0, 0);
+            FJsonObjectConverter::UStructToJsonObject(FSeqPage::StaticStruct(), &(page), PageObject.ToSharedRef(), 0, 0);
             JsonObject->SetObjectField("page", PageObject);
         }
 

Plugins/SequencePlugin/Source/SequencePlugin/Public/Indexer/Structs/SeqGetTransactionHistoryArgs.h

@@ -15,7 +15,7 @@ struct SEQUENCEPLUGIN_API FSeqGetTransactionHistoryArgs
     UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Default")
         FSeqTransactionHistoryFilter filter;
     UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Default")
-        TOptional<FSeqPage> page;
+        FSeqPage page;
     UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Default")
         bool includeMetaData = false;
 
@@ -25,12 +25,12 @@ struct SEQUENCEPLUGIN_API FSeqGetTransactionHistoryArgs
         FString ret = "{";
         ret.Append("\"filter\":");
         ret.Append(filter.GetArgs());//get the args! MUST Have this!
-        if (page.IsSet())
+        if (page.containsData())
         {
             ret.Append(".\"page\":");
-            ret.Append(page.GetValue().GetArgs());
+            ret.Append(page.GetArgs());
             TSharedPtr<FJsonObject> PageObject = MakeShared<FJsonObject>();
-            FJsonObjectConverter::UStructToJsonObject(FSeqPage::StaticStruct(), &(page.GetValue()), PageObject.ToSharedRef(), 0, 0);
+            FJsonObjectConverter::UStructToJsonObject(FSeqPage::StaticStruct(), &page, PageObject.ToSharedRef(), 0, 0);
 
         }