v1.8.1 (#21)

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

@@ -1,6 +1,7 @@
 // Copyright (c) 2024 Thirdweb. All Rights Reserved.
 
 #include "AsyncTasks/Wallets/InApp/Create/AsyncTaskThirdwebCreateAuthEndpointWallet.h"
+
 #include "Wallets/ThirdwebInAppWalletHandle.h"
 
 void UAsyncTaskThirdwebCreateAuthEndpointWallet::Activate()

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

@@ -1,6 +1,7 @@
 // Copyright (c) 2024 Thirdweb. All Rights Reserved.
 
 #include "AsyncTasks/Wallets/InApp/Create/AsyncTaskThirdwebCreateEmailWallet.h"
+
 #include "Wallets/ThirdwebInAppWalletHandle.h"
 
 void UAsyncTaskThirdwebCreateEmailWallet::Activate()

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

@@ -1,6 +1,7 @@
 // Copyright (c) 2024 Thirdweb. All Rights Reserved.
 
 #include "AsyncTasks/Wallets/InApp/Create/AsyncTaskThirdwebCreateGuestWallet.h"
+
 #include "Wallets/ThirdwebInAppWalletHandle.h"
 
 void UAsyncTaskThirdwebCreateGuestWallet::Activate()

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

@@ -3,21 +3,8 @@
 #include "AsyncTasks/Wallets/InApp/Create/AsyncTaskThirdwebCreateOAuthWallet.h"
 
 #include "ThirdwebRuntimeSettings.h"
-
 #include "Wallets/ThirdwebInAppWalletHandle.h"
 
-UAsyncTaskThirdwebCreateOAuthWallet* UAsyncTaskThirdwebCreateOAuthWallet::CreateOAuthWallet(UObject* WorldContextObject, const EThirdwebOAuthProvider Provider)
-{
-	if (!WorldContextObject)
-	{
-		return nullptr;
-	}
-	ThisClass* Task = NewObject<ThisClass>(WorldContextObject);
-	Task->Provider = Provider;
-	Task->RegisterWithGameInstance(WorldContextObject);
-	return Task;
-}
-
 void UAsyncTaskThirdwebCreateOAuthWallet::Activate()
 {
 	FInAppWalletHandle::CreateOAuthWallet(Provider,BIND_CREATE_WALLET_SUCCESS_DELEGATE, BIND_CREATE_WALLET_ERROR_DELEGATE);

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

@@ -3,32 +3,8 @@
 #include "AsyncTasks/Wallets/InApp/Create/AsyncTaskThirdwebCreateSmartWallet.h"
 
 #include "Components/SlateWrapperTypes.h"
-
 #include "Wallets/ThirdwebSmartWalletHandle.h"
 
-UAsyncTaskThirdwebCreateSmartWallet* UAsyncTaskThirdwebCreateSmartWallet::CreateSmartWallet(UObject* WorldContextObject,
-                                                                                            const FInAppWalletHandle& InAppWallet,
-                                                                                            const int64 ChainID,
-                                                                                            const bool bGasless,
-                                                                                            const FString& Factory,
-                                                                                            const FString& AccountOverride)
-{
-	if (!WorldContextObject)
-	{
-		return nullptr;
-	}
-	NEW_TASK
-
-	Task->InAppWallet = InAppWallet;
-	Task->ChainID = ChainID;
-	Task->bGasless = bGasless;
-	Task->Factory = Factory;
-	Task->AccountOverride = AccountOverride;
-
-	Task->RegisterWithGameInstance(WorldContextObject);
-	return Task;
-}
-
 void UAsyncTaskThirdwebCreateSmartWallet::Activate()
 {
 	FSmartWalletHandle::Create(

Source/Thirdweb/Private/Engine/BackendWallet/ThirdwebBackendWallet.cpp

@@ -2,6 +2,8 @@
 
 #include "Engine/BackendWallet/ThirdwebBackendWallet.h"
 
+#include "Dom/JsonObject.h"
+
 FThirdwebBackendWallet FThirdwebBackendWallet::FromJson(const TSharedPtr<FJsonObject>& JsonObject)
 {
 	FThirdwebBackendWallet Wallet;

Source/Thirdweb/Private/Engine/Marketplace/DirectListings/ThirdwebMarketplaceDirectListing.cpp

@@ -2,6 +2,7 @@
 
 #include "Engine/Marketplace/DirectListings/ThirdwebMarketplaceDirectListing.h"
 
+#include "Dom/JsonObject.h"
 #include "Engine/Marketplace/ThirdwebMarketplaceCommon.h"
 
 FThirdwebMarketplaceDirectListing FThirdwebMarketplaceDirectListing::FromJson(const TSharedPtr<FJsonObject>& JsonObject)

Source/Thirdweb/Private/Engine/Marketplace/DirectListings/ThirdwebMarketplaceDirectListingRequest.cpp

@@ -2,6 +2,7 @@
 
 #include "Engine/Marketplace/DirectListings/ThirdwebMarketplaceDirectListingRequest.h"
 
+#include "Dom/JsonObject.h"
 #include "Engine/Marketplace/ThirdwebMarketplaceCommon.h"
 
 TSharedPtr<FJsonObject> FThirdwebMarketplaceCreateDirectListingRequest::ToJson() const

Source/Thirdweb/Private/Engine/Marketplace/EnglishAuctions/ThirdwebMarketplaceBid.cpp

@@ -2,6 +2,8 @@
 
 #include "Engine/Marketplace/EnglishAuctions/ThirdwebMarketplaceBid.h"
 
+#include "Dom/JsonObject.h"
+
 FThirdwebMarketplaceBid FThirdwebMarketplaceBid::FromJson(const TSharedPtr<FJsonObject>& JsonObject)
 {
 	FThirdwebMarketplaceBid Bid;

Source/Thirdweb/Private/Engine/Marketplace/EnglishAuctions/ThirdwebMarketplaceCreateEnglishAuctionRequest.cpp

@@ -2,6 +2,8 @@
 
 #include "Engine/Marketplace/EnglishAuctions/ThirdwebMarketplaceCreateEnglishAuctionRequest.h"
 
+#include "Dom/JsonObject.h"
+
 TSharedPtr<FJsonObject> FThirdwebMarketplaceCreateEnglishAuctionRequest::ToJson() const
 {
 	TSharedPtr<FJsonObject> JsonObject = MakeShareable(new FJsonObject);

Source/Thirdweb/Private/Engine/Marketplace/EnglishAuctions/ThirdwebMarketplaceEnglishAuction.cpp

@@ -2,9 +2,9 @@
 
 #include "Engine/Marketplace/EnglishAuctions/ThirdwebMarketplaceEnglishAuction.h"
 
+#include "Dom/JsonObject.h"
 #include "Engine/Marketplace/ThirdwebMarketplaceCommon.h"
 
-
 FThirdwebMarketplaceEnglishAuction FThirdwebMarketplaceEnglishAuction::FromJson(const TSharedPtr<FJsonObject>& JsonObject)
 {
 	FThirdwebMarketplaceEnglishAuction Auction;

Source/Thirdweb/Private/Engine/Marketplace/Offers/ThirdwebMarketplaceMakeOfferRequest.cpp

@@ -2,6 +2,8 @@
 
 #include "Engine/Marketplace/Offers/ThirdwebMarketplaceMakeOfferRequest.h"
 
+#include "Dom/JsonObject.h"
+
 TSharedPtr<FJsonObject> FThirdwebMarketplaceMakeOfferRequest::ToJson() const
 {
 	TSharedPtr<FJsonObject> JsonObject = MakeShareable(new FJsonObject);

Source/Thirdweb/Private/Engine/Marketplace/Offers/ThirdwebMarketplaceOffer.cpp

@@ -2,6 +2,7 @@
 
 #include "Engine/Marketplace/Offers/ThirdwebMarketplaceOffer.h"
 
+#include "Dom/JsonObject.h"
 #include "Engine/Marketplace/ThirdwebMarketplaceCommon.h"
 #include "Misc/DateTime.h"
 

Source/Thirdweb/Private/Engine/Marketplace/ThirdwebMarketplaceInternalEntryBase.cpp

@@ -2,9 +2,9 @@
 
 #include "Engine/Marketplace/ThirdwebMarketplaceInternalEntryBase.h"
 
+#include "Dom/JsonObject.h"
 #include "Engine/Marketplace/ThirdwebMarketplaceCommon.h"
 
-
 void FThirdwebMarketplaceInternalEntryBase::Load(const FThirdwebMarketplaceInternalEntryBase& Base)
 {
 	AssetContractAddress = Base.AssetContractAddress;

Source/Thirdweb/Private/Engine/Transaction/ThirdwebEngineTransactionStatusResult.cpp

@@ -3,6 +3,7 @@
 #include "Engine/Transaction/ThirdwebEngineTransactionStatusResult.h"
 
 #include "ThirdwebUtils.h"
+#include "Dom/JsonObject.h"
 #include "Engine/ThirdwebEngineCommon.h"
 
 FThirdwebEngineTransactionStatusResult::FThirdwebEngineTransactionStatusResult()

Source/Thirdweb/Private/Wallets/ThirdwebInAppWalletHandle.cpp

@@ -544,6 +544,11 @@ void FInAppWalletHandle::SignInWithOAuth(const FString& AuthResult, const FStrea
 	CHECK_VALIDITY(ErrorDelegate)
 	CHECK_SOURCE(OAuthProvider, ErrorDelegate)
 
+	if (AuthResult.IsEmpty())
+	{
+		ErrorDelegate.Execute(TEXT("Empty Auth Result"));
+		return;
+	}
 	FString Result = ThirdwebUtils::ParseAuthResult(AuthResult);
 	FInAppWalletHandle ThisCopy = *this;
 	UE::Tasks::Launch(UE_SOURCE_LOCATION, [ThisCopy, Result, SuccessDelegate, ErrorDelegate]

Source/Thirdweb/Public/AsyncTasks/Wallets/InApp/Create/AsyncTaskThirdwebCreateOAuthWallet.h

@@ -14,7 +14,12 @@ class THIRDWEB_API UAsyncTaskThirdwebCreateOAuthWallet : public UAsyncTaskThirdw
 
 public:
 	UFUNCTION(BlueprintCallable, meta=(BlueprintInternalUseOnly="true", WorldContext="WorldContextObject"), Category="Thirdweb|Wallets|InApp")
-	static UAsyncTaskThirdwebCreateOAuthWallet* CreateOAuthWallet(UObject* WorldContextObject, const EThirdwebOAuthProvider Provider);
+	static UAsyncTaskThirdwebCreateOAuthWallet* CreateOAuthWallet(UObject* WorldContextObject, const EThirdwebOAuthProvider Provider)
+	{
+		NEW_TASK
+		Task->Provider = Provider;
+		RR_TASK
+	}
 
 protected:
 	UPROPERTY(Transient)

Source/Thirdweb/Public/AsyncTasks/Wallets/InApp/Create/AsyncTaskThirdwebCreateSmartWallet.h

@@ -17,12 +17,23 @@ class THIRDWEB_API UAsyncTaskThirdwebCreateSmartWallet : public UAsyncTaskThirdw
 	virtual void Activate() override;
 
 	UFUNCTION(BlueprintCallable, meta=(BlueprintInternalUseOnly="true", WorldContext="WorldContextObject", AdvancedDisplay="Factory,AccountOverride"), Category="Thirdweb|Wallets|Smart")
-	static UAsyncTaskThirdwebCreateSmartWallet* CreateSmartWallet(UObject* WorldContextObject,
-	                                                              const FInAppWalletHandle& InAppWallet,
-	                                                              const int64 ChainID,
-	                                                              const bool bGasless = true,
-	                                                              const FString& Factory = "",
-	                                                              const FString& AccountOverride = "");
+	static UAsyncTaskThirdwebCreateSmartWallet* CreateSmartWallet(
+		UObject* WorldContextObject,
+		const FInAppWalletHandle& InAppWallet,
+		const int64 ChainID,
+		const bool bGasless = true,
+		const FString& Factory = "",
+		const FString& AccountOverride = ""
+	)
+	{
+		NEW_TASK
+		Task->InAppWallet = InAppWallet;
+		Task->ChainID = ChainID;
+		Task->bGasless = bGasless;
+		Task->Factory = Factory;
+		Task->AccountOverride = AccountOverride;
+		RR_TASK
+	};
 
 	DECLARE_DYNAMIC_MULTICAST_DELEGATE_TwoParams(FCreateSmartWalletDelegate, const FSmartWalletHandle&, SmartWallet, const FString&, Error);
 

Source/Thirdweb/Public/AsyncTasks/Wallets/Smart/AsyncTaskThirdwebSmartSignMessage.h

@@ -6,7 +6,7 @@
 #include "AsyncTaskThirdwebSmartSignMessage.generated.h"
 
 
-UCLASS()
+UCLASS(Abstract)
 class THIRDWEB_API UAsyncTaskThirdwebSmartSignMessage : public UAsyncTaskThirdwebSmartBase
 {
 	GENERATED_BODY()

Source/ThirdwebUncookedOnly/Private/K2Node/K2Node_ThirdwebBaseAsyncTask.cpp

@@ -90,6 +90,10 @@ UEdGraphPin* UK2Node_ThirdwebBaseAsyncTask::SetPinVisibility(UEdGraphPin* Pin, c
 	if (Pin)
 	{
 		Pin->bHidden = !bShow;
+		if (!bShow && Pin->LinkedTo.Num() > 0)
+		{
+			Pin->BreakAllPinLinks();
+		}
 	}
 	return Pin;
 }
@@ -168,6 +172,15 @@ void UK2Node_ThirdwebBaseAsyncTask::SetNodeHasAdvanced(const bool bHasAdvanced)
 	}
 }
 
+UEdGraphPin* UK2Node_ThirdwebBaseAsyncTask::BreakPinLinksIf(UEdGraphPin* Pin, const bool bBreak)
+{
+	if (bBreak && Pin && Pin->LinkedTo.Num() > 0)
+	{
+		Pin->BreakAllPinLinks();
+	}
+	return Pin;
+}
+
 UEdGraphPin* UK2Node_ThirdwebBaseAsyncTask::GetProviderPin() const
 {
 	UEdGraphPin* Pin = FindPin(TwPins::Provider);
@@ -189,6 +202,13 @@ UEdGraphPin* UK2Node_ThirdwebBaseAsyncTask::GetWalletPin() const
 	return Pin;
 }
 
+UEdGraphPin* UK2Node_ThirdwebBaseAsyncTask::GetSignaturePin() const
+{
+	UEdGraphPin* Pin = FindPin(TwPins::Signature);
+	check(Pin == NULL || Pin->Direction == EGPD_Input);
+	return Pin;
+}
+
 UEdGraphPin* UK2Node_ThirdwebBaseAsyncTask::GetInAppWalletPin() const
 {
 	UEdGraphPin* Pin = FindPin(TwPins::InAppWallet);