v1.5.0

Makefile

@@ -0,0 +1,41 @@
+PYTHON_EXE ?= C:\Program Files\Python311\python.exe
+BUILDS_DIR ?= E:\UnrealEngine\Thirdweb\PluginBuilds
+BUILD_HOST_PLATFORM ?= false
+UE_VERSION ?= 5.4
+PLUGIN_VERSION ?= 1.3.0
+
+# Determine the current OS in a platform-independent manner
+ifeq ($(OS),Windows_NT)
+  SHELL := cmd.exe
+  TARGET_PLATFORMS ?= Win64+Android+Linux+LinuxArm64
+  PATH_SEP := \\
+  UE4CLI_CONFIG_DIR_BASE := %APPDATA%\ue4cli
+else
+  UNAME_S := $(shell uname -s)
+  UE4CLI_CONFIG_DIR_BASE := ~/.config/ue4cli
+  PATH_SEP := /
+  ifeq ($(UNAME_S),Linux)
+    TARGET_PLATFORMS ?= Android+Linux+LinuxArm64
+  else ifeq ($(UNAME_S),darwin)
+    TARGET_PLATFORMS ?= IOS+Mac+TVOS+VisionOS
+  endif
+endif
+
+ifeq ($(BUILD_HOST_PLATFORM),false)
+  HOST_PLATFORM_FLAG := -NoHostPlatform
+ else
+  HOST_PLATFORM_FLAG := 
+endif
+
+UE4_EXE := $(PYTHON_EXE) -m ue4cli
+UE4CLI_CONFIG_DIR := $(UE4CLI_CONFIG_DIR_BASE)$(PATH_SEP)$(UE_VERSION)
+
+.PHONY: build
+build:
+	$(UE4_EXE) setroot $(UE_ENGINE_DIR)
+	$(UE4_EXE) package $(HOST_PLATFORM_FLAG) -TargetPlatforms=$(TARGET_PLATFORMS) -Package=$(BUILDS_DIR)\\$(UE_VERSION)
+
+.PHONY: compress
+compress:
+	cd $(BUILDS_DIR)
+	pwsh -Command Compress-Archive -LiteralPath "$(BUILDS_DIR)\\$(UE_VERSION)\\Source", "$(BUILDS_DIR)\\$(UE_VERSION)\\Content", "$(BUILDS_DIR)\\$(UE_VERSION)\\Thirdweb.uplugin" -DestinationPath "$(BUILDS_DIR)\\ThirdwebSDK-$(PLUGIN_VERSION)-$(UE_VERSION).zip" -CompressionLevel Optimal

Scripts/BuildPlugin.bat

@@ -1,3 +1,2 @@
 @echo off
-CD /D ..
 ue4 package -NoHostPlatform -TargetPlatforms=Win64+Android+Linux+LinuxArm64

Source/Thirdweb/Private/AsyncTasks/AsyncTaskThirdwebBase.cpp

@@ -0,0 +1,7 @@
+// Copyright (c) 2024 Thirdweb. All Rights Reserved.
+
+#include "AsyncTasks/AsyncTaskThirdwebBase.h"
+
+void UAsyncTaskThirdwebBase::Activate()
+{
+}

Source/Thirdweb/Private/AsyncTasks/Wallets/InApp/AsyncTaskThirdwebGetLinkedAccounts.cpp

@@ -0,0 +1,64 @@
+// Copyright (c) 2024 Thirdweb. All Rights Reserved.
+
+#include "AsyncTasks/Wallets/InApp/AsyncTaskThirdwebGetLinkedAccounts.h"
+
+#include "Components/SlateWrapperTypes.h"
+
+void UAsyncTaskThirdwebGetLinkedAccounts::Activate()
+{
+	InAppWallet.GetLinkedAccounts(BIND_UOBJECT_DELEGATE(FInAppWalletHandle::FGetLinkedAccountsDelegate, HandleResponse), BIND_UOBJECT_DELEGATE(FStringDelegate, HandleFailed));
+}
+
+UAsyncTaskThirdwebGetLinkedAccounts* UAsyncTaskThirdwebGetLinkedAccounts::GetLinkedAccounts(UObject* WorldContextObject, const FInAppWalletHandle& Wallet)
+{
+	if (!WorldContextObject)
+	{
+		return nullptr;
+	}
+	NEW_TASK
+	Task->InAppWallet = Wallet;
+	Task->RegisterWithGameInstance(WorldContextObject);
+	return Task;
+}
+
+void UAsyncTaskThirdwebGetLinkedAccounts::HandleResponse(const TArray<FString>& LinkedAccounts)
+{
+	if (IsInGameThread())
+	{
+		Success.Broadcast(LinkedAccounts, TEXT(""));
+		SetReadyToDestroy();
+	}
+	else
+	{
+		// Retry on the GameThread.
+		TWeakObjectPtr<UAsyncTaskThirdwebGetLinkedAccounts> WeakThis = this;
+		FFunctionGraphTask::CreateAndDispatchWhenReady([WeakThis, LinkedAccounts]()
+		{
+			if (WeakThis.IsValid())
+			{
+				WeakThis->HandleResponse(LinkedAccounts);
+			}
+		}, TStatId(), nullptr, ENamedThreads::GameThread);
+	}
+}
+
+void UAsyncTaskThirdwebGetLinkedAccounts::HandleFailed(const FString& Error)
+{
+	if (IsInGameThread())
+	{
+		Failed.Broadcast({}, Error);
+		SetReadyToDestroy();
+	}
+	else
+	{
+		// Retry on the GameThread.
+		TWeakObjectPtr<UAsyncTaskThirdwebGetLinkedAccounts> WeakThis = this;
+		FFunctionGraphTask::CreateAndDispatchWhenReady([WeakThis, Error]()
+		{
+			if (WeakThis.IsValid())
+			{
+				WeakThis->HandleFailed(Error);
+			}
+		}, TStatId(), nullptr, ENamedThreads::GameThread);
+	}
+}

Source/Thirdweb/Private/AsyncTasks/Wallets/InApp/AsyncTaskThirdwebInAppSignMessage.cpp

@@ -0,0 +1,65 @@
+// Copyright (c) 2024 Thirdweb. All Rights Reserved.
+
+#include "AsyncTasks/Wallets/InApp/AsyncTaskThirdwebInAppSignMessage.h"
+
+#include "Components/SlateWrapperTypes.h"
+
+void UAsyncTaskThirdwebInAppSignMessage::Activate()
+{
+	InAppWallet.Sign(UnsignedMessage, BIND_UOBJECT_DELEGATE(FStringDelegate, HandleResponse), BIND_UOBJECT_DELEGATE(FStringDelegate, HandleFailed));
+}
+
+UAsyncTaskThirdwebInAppSignMessage* UAsyncTaskThirdwebInAppSignMessage::SignMessage(UObject* WorldContextObject, const FInAppWalletHandle& Wallet, const FString& Message)
+{
+	if (!WorldContextObject)
+	{
+		return nullptr;
+	}
+	NEW_TASK
+	Task->InAppWallet = Wallet;
+	Task->UnsignedMessage = Message;
+	Task->RegisterWithGameInstance(WorldContextObject);
+	return Task;
+}
+
+void UAsyncTaskThirdwebInAppSignMessage::HandleResponse(const FString& SignedMessage)
+{
+	if (IsInGameThread())
+	{
+		Success.Broadcast(SignedMessage, TEXT(""));
+		SetReadyToDestroy();
+	}
+	else
+	{
+		// Retry on the GameThread.
+		TWeakObjectPtr<UAsyncTaskThirdwebInAppSignMessage> WeakThis = this;
+		FFunctionGraphTask::CreateAndDispatchWhenReady([WeakThis, SignedMessage]()
+		{
+			if (WeakThis.IsValid())
+			{
+				WeakThis->HandleResponse(SignedMessage);
+			}
+		}, TStatId(), nullptr, ENamedThreads::GameThread);
+	}
+}
+
+void UAsyncTaskThirdwebInAppSignMessage::HandleFailed(const FString& Error)
+{
+	if (IsInGameThread())
+	{
+		Failed.Broadcast(TEXT(""), Error);
+		SetReadyToDestroy();
+	}
+	else
+	{
+		// Retry on the GameThread.
+		TWeakObjectPtr<UAsyncTaskThirdwebInAppSignMessage> WeakThis = this;
+		FFunctionGraphTask::CreateAndDispatchWhenReady([WeakThis, Error]()
+		{
+			if (WeakThis.IsValid())
+			{
+				WeakThis->HandleFailed(Error);
+			}
+		}, TStatId(), nullptr, ENamedThreads::GameThread);
+	}
+}

Source/Thirdweb/Private/AsyncTasks/AsyncTaskThirdwebLoginWithOAuth.cpp → Source/Thirdweb/Private/AsyncTasks/Wallets/InApp/AsyncTaskThirdwebLoginWithOAuth.cpp

@@ -29,28 +29,58 @@ UAsyncTaskThirdwebLoginWithOAuth* UAsyncTaskThirdwebLoginWithOAuth::LoginWithOAu
 	{
 		return nullptr;
 	}
-	UAsyncTaskThirdwebLoginWithOAuth* Task = NewObject<UAsyncTaskThirdwebLoginWithOAuth>(WorldContextObject);
+	NEW_TASK
 	Task->Wallet = Wallet;
 	Task->Browser = CreateWidget<UThirdwebOAuthBrowserUserWidget>(UGameplayStatics::GetGameInstance(WorldContextObject), UThirdwebOAuthBrowserUserWidget::StaticClass());
 	Task->RegisterWithGameInstance(WorldContextObject);
 	return Task;
 }
 
-void UAsyncTaskThirdwebLoginWithOAuth::HandleFailed(const FString& Error)
+void UAsyncTaskThirdwebLoginWithOAuth::HandleAuthenticated(const FString& AuthResult)
 {
-	Failed.Broadcast(Error);
-	Browser->RemoveFromParent();
-	SetReadyToDestroy();
+	Wallet.SignInWithOAuth(AuthResult, BIND_UOBJECT_DELEGATE(FSimpleDelegate, HandleSignedIn), BIND_UOBJECT_DELEGATE(FStringDelegate, HandleFailed));
 }
 
-void UAsyncTaskThirdwebLoginWithOAuth::HandleAuthenticated(const FString& AuthResult)
+void UAsyncTaskThirdwebLoginWithOAuth::HandleSignedIn()
 {
-	if (FString Error; !Wallet.SignInWithOAuth(AuthResult, Error))
+	if (IsInGameThread())
 	{
-		return HandleFailed(Error);
+		Success.Broadcast(TEXT(""));
+		Browser->RemoveFromParent();
+		SetReadyToDestroy();
+	}
+	else
+	{
+		// Retry on the GameThread.
+		TWeakObjectPtr<UAsyncTaskThirdwebLoginWithOAuth> WeakThis = this;
+		FFunctionGraphTask::CreateAndDispatchWhenReady([WeakThis]()
+		{
+			if (WeakThis.IsValid())
+			{
+				WeakThis->HandleSignedIn();
+			}
+		}, TStatId(), nullptr, ENamedThreads::GameThread);
 	}
-	Success.Broadcast(TEXT(""));
-	Browser->RemoveFromParent();
-	SetReadyToDestroy();
 }
 
+void UAsyncTaskThirdwebLoginWithOAuth::HandleFailed(const FString& Error)
+{
+	if (IsInGameThread())
+	{
+		Browser->RemoveFromParent();
+		Failed.Broadcast(TEXT(""));
+		SetReadyToDestroy();
+	}
+	else
+	{
+		// Retry on the GameThread.
+		TWeakObjectPtr<UAsyncTaskThirdwebLoginWithOAuth> WeakThis = this;
+		FFunctionGraphTask::CreateAndDispatchWhenReady([WeakThis, Error]()
+		{
+			if (WeakThis.IsValid())
+			{
+				WeakThis->HandleFailed(Error);
+			}
+		}, TStatId(), nullptr, ENamedThreads::GameThread);
+	}
+}

Source/Thirdweb/Private/AsyncTasks/Wallets/InApp/AsyncTaskThirdwebSendOTP.cpp

@@ -0,0 +1,64 @@
+// Copyright (c) 2024 Thirdweb. All Rights Reserved.
+
+#include "AsyncTasks/Wallets/InApp/AsyncTaskThirdwebSendOTP.h"
+
+#include "Components/SlateWrapperTypes.h"
+
+void UAsyncTaskThirdwebSendOTP::Activate()
+{
+	InAppWallet.SendOTP(BIND_UOBJECT_DELEGATE(FStreamableDelegate, HandleResponse), BIND_UOBJECT_DELEGATE(FStringDelegate, HandleFailed));
+}
+
+UAsyncTaskThirdwebSendOTP* UAsyncTaskThirdwebSendOTP::SendOTP(UObject* WorldContextObject, const FInAppWalletHandle& Wallet)
+{
+	if (!WorldContextObject)
+	{
+		return nullptr;
+	}
+	NEW_TASK
+	Task->InAppWallet = Wallet;
+	Task->RegisterWithGameInstance(WorldContextObject);
+	return Task;
+}
+
+void UAsyncTaskThirdwebSendOTP::HandleResponse()
+{
+	if (IsInGameThread())
+	{
+		Success.Broadcast(TEXT(""));
+		SetReadyToDestroy();
+	}
+	else
+	{
+		// Retry on the GameThread.
+		TWeakObjectPtr<UAsyncTaskThirdwebSendOTP> WeakThis = this;
+		FFunctionGraphTask::CreateAndDispatchWhenReady([WeakThis]()
+		{
+			if (WeakThis.IsValid())
+			{
+				WeakThis->HandleResponse();
+			}
+		}, TStatId(), nullptr, ENamedThreads::GameThread);
+	}
+}
+
+void UAsyncTaskThirdwebSendOTP::HandleFailed(const FString& Error)
+{
+	if (IsInGameThread())
+	{
+		Failed.Broadcast(Error);
+		SetReadyToDestroy();
+	}
+	else
+	{
+		// Retry on the GameThread.
+		TWeakObjectPtr<UAsyncTaskThirdwebSendOTP> WeakThis = this;
+		FFunctionGraphTask::CreateAndDispatchWhenReady([WeakThis, Error]()
+		{
+			if (WeakThis.IsValid())
+			{
+				WeakThis->HandleFailed(Error);
+			}
+		}, TStatId(), nullptr, ENamedThreads::GameThread);
+	}
+}

Source/Thirdweb/Private/AsyncTasks/Wallets/InApp/Create/AsyncTaskThirdwebCreateAuthEndpointWallet.cpp

@@ -0,0 +1,16 @@
+// Copyright (c) 2024 Thirdweb. All Rights Reserved.
+
+#include "AsyncTasks/Wallets/InApp/Create/AsyncTaskThirdwebCreateAuthEndpointWallet.h"
+
+#include "ThirdwebRuntimeSettings.h"
+
+#include "Wallets/ThirdwebInAppWalletHandle.h"
+
+void UAsyncTaskThirdwebCreateAuthEndpointWallet::Activate()
+{
+	if (UThirdwebRuntimeSettings::IsEcosystem())
+	{
+		return FInAppWalletHandle::CreateEcosystemAuthEndpointWallet(EcosystemPartnerId, BIND_CREATE_WALLET_SUCCESS_DELEGATE, BIND_CREATE_WALLET_ERROR_DELEGATE);
+	}
+	FInAppWalletHandle::CreateAuthEndpointWallet(BIND_CREATE_WALLET_SUCCESS_DELEGATE, BIND_CREATE_WALLET_ERROR_DELEGATE);
+}

Source/Thirdweb/Private/AsyncTasks/Wallets/InApp/Create/AsyncTaskThirdwebCreateEmailWallet.cpp

@@ -0,0 +1,16 @@
+// Copyright (c) 2024 Thirdweb. All Rights Reserved.
+
+#include "AsyncTasks/Wallets/InApp/Create/AsyncTaskThirdwebCreateEmailWallet.h"
+
+#include "ThirdwebRuntimeSettings.h"
+
+#include "Wallets/ThirdwebInAppWalletHandle.h"
+
+void UAsyncTaskThirdwebCreateEmailWallet::Activate()
+{
+	if (UThirdwebRuntimeSettings::IsEcosystem())
+	{
+		return FInAppWalletHandle::CreateEcosystemEmailWallet(EcosystemPartnerId, AuthInput, BIND_CREATE_WALLET_SUCCESS_DELEGATE, BIND_CREATE_WALLET_ERROR_DELEGATE);
+	}
+	FInAppWalletHandle::CreateEmailWallet(AuthInput,BIND_CREATE_WALLET_SUCCESS_DELEGATE, BIND_CREATE_WALLET_ERROR_DELEGATE);
+}