Skip to content

Commit e552b98

Browse files
dirtycajunricedirtycajunrice
authored
v1.8.1 (#21)
1 parent 83fe3b6 commit e552b98

File tree

44 files changed

+422
-241
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+422
-241
lines changed

‎Content/Defaults/WBP_Thirdweb_OAuthOverlay.uasset

-2.54 KB
Binary file not shown.

‎Content/Examples/NodeDocs/Thirdweb_AllNodes.uasset

-1.18 KB
Binary file not shown.

‎Content/Examples/Widgets/BP_Thirdweb_OTPVerifyModal.uasset

-4.28 KB
Binary file not shown.

‎Content/Examples/Widgets/WBP_Thirdweb_Guest.uasset

-2.64 KB
Binary file not shown.

‎Content/Examples/Widgets/WBP_Thirdweb_InApp.uasset

-14.1 KB
Binary file not shown.

‎Content/Examples/Widgets/WBP_Thirdweb_Smart.uasset

-7.64 KB
Binary file not shown.

‎Makefile

Lines changed: 0 additions & 41 deletions
This file was deleted.

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// Copyright (c) 2024 Thirdweb. All Rights Reserved.
22

33
#include "AsyncTasks/Wallets/InApp/Create/AsyncTaskThirdwebCreateAuthEndpointWallet.h"
4+
45
#include "Wallets/ThirdwebInAppWalletHandle.h"
56

67
void UAsyncTaskThirdwebCreateAuthEndpointWallet::Activate()

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// Copyright (c) 2024 Thirdweb. All Rights Reserved.
22

33
#include "AsyncTasks/Wallets/InApp/Create/AsyncTaskThirdwebCreateEmailWallet.h"
4+
45
#include "Wallets/ThirdwebInAppWalletHandle.h"
56

67
void UAsyncTaskThirdwebCreateEmailWallet::Activate()

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// Copyright (c) 2024 Thirdweb. All Rights Reserved.
22

33
#include "AsyncTasks/Wallets/InApp/Create/AsyncTaskThirdwebCreateGuestWallet.h"
4+
45
#include "Wallets/ThirdwebInAppWalletHandle.h"
56

67
void UAsyncTaskThirdwebCreateGuestWallet::Activate()

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

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,8 @@
33
#include "AsyncTasks/Wallets/InApp/Create/AsyncTaskThirdwebCreateOAuthWallet.h"
44

55
#include "ThirdwebRuntimeSettings.h"
6-
76
#include "Wallets/ThirdwebInAppWalletHandle.h"
87

9-
UAsyncTaskThirdwebCreateOAuthWallet* UAsyncTaskThirdwebCreateOAuthWallet::CreateOAuthWallet(UObject* WorldContextObject, const EThirdwebOAuthProvider Provider)
10-
{
11-
if (!WorldContextObject)
12-
{
13-
return nullptr;
14-
}
15-
ThisClass* Task = NewObject<ThisClass>(WorldContextObject);
16-
Task->Provider = Provider;
17-
Task->RegisterWithGameInstance(WorldContextObject);
18-
return Task;
19-
}
20-
218
void UAsyncTaskThirdwebCreateOAuthWallet::Activate()
229
{
2310
FInAppWalletHandle::CreateOAuthWallet(Provider,BIND_CREATE_WALLET_SUCCESS_DELEGATE, BIND_CREATE_WALLET_ERROR_DELEGATE);

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

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,8 @@
33
#include "AsyncTasks/Wallets/InApp/Create/AsyncTaskThirdwebCreateSmartWallet.h"
44

55
#include "Components/SlateWrapperTypes.h"
6-
76
#include "Wallets/ThirdwebSmartWalletHandle.h"
87

9-
UAsyncTaskThirdwebCreateSmartWallet* UAsyncTaskThirdwebCreateSmartWallet::CreateSmartWallet(UObject* WorldContextObject,
10-
const FInAppWalletHandle& InAppWallet,
11-
const int64 ChainID,
12-
const bool bGasless,
13-
const FString& Factory,
14-
const FString& AccountOverride)
15-
{
16-
if (!WorldContextObject)
17-
{
18-
return nullptr;
19-
}
20-
NEW_TASK
21-
22-
Task->InAppWallet = InAppWallet;
23-
Task->ChainID = ChainID;
24-
Task->bGasless = bGasless;
25-
Task->Factory = Factory;
26-
Task->AccountOverride = AccountOverride;
27-
28-
Task->RegisterWithGameInstance(WorldContextObject);
29-
return Task;
30-
}
31-
328
void UAsyncTaskThirdwebCreateSmartWallet::Activate()
339
{
3410
FSmartWalletHandle::Create(

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
#include "Engine/BackendWallet/ThirdwebBackendWallet.h"
44

5+
#include "Dom/JsonObject.h"
6+
57
FThirdwebBackendWallet FThirdwebBackendWallet::FromJson(const TSharedPtr<FJsonObject>& JsonObject)
68
{
79
FThirdwebBackendWallet Wallet;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
#include "Engine/Marketplace/DirectListings/ThirdwebMarketplaceDirectListing.h"
44

5+
#include "Dom/JsonObject.h"
56
#include "Engine/Marketplace/ThirdwebMarketplaceCommon.h"
67

78
FThirdwebMarketplaceDirectListing FThirdwebMarketplaceDirectListing::FromJson(const TSharedPtr<FJsonObject>& JsonObject)

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
#include "Engine/Marketplace/DirectListings/ThirdwebMarketplaceDirectListingRequest.h"
44

5+
#include "Dom/JsonObject.h"
56
#include "Engine/Marketplace/ThirdwebMarketplaceCommon.h"
67

78
TSharedPtr<FJsonObject> FThirdwebMarketplaceCreateDirectListingRequest::ToJson() const

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
#include "Engine/Marketplace/EnglishAuctions/ThirdwebMarketplaceBid.h"
44

5+
#include "Dom/JsonObject.h"
6+
57
FThirdwebMarketplaceBid FThirdwebMarketplaceBid::FromJson(const TSharedPtr<FJsonObject>& JsonObject)
68
{
79
FThirdwebMarketplaceBid Bid;

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
#include "Engine/Marketplace/EnglishAuctions/ThirdwebMarketplaceCreateEnglishAuctionRequest.h"
44

5+
#include "Dom/JsonObject.h"
6+
57
TSharedPtr<FJsonObject> FThirdwebMarketplaceCreateEnglishAuctionRequest::ToJson() const
68
{
79
TSharedPtr<FJsonObject> JsonObject = MakeShareable(new FJsonObject);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
#include "Engine/Marketplace/EnglishAuctions/ThirdwebMarketplaceEnglishAuction.h"
44

5+
#include "Dom/JsonObject.h"
56
#include "Engine/Marketplace/ThirdwebMarketplaceCommon.h"
67

7-
88
FThirdwebMarketplaceEnglishAuction FThirdwebMarketplaceEnglishAuction::FromJson(const TSharedPtr<FJsonObject>& JsonObject)
99
{
1010
FThirdwebMarketplaceEnglishAuction Auction;

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
#include "Engine/Marketplace/Offers/ThirdwebMarketplaceMakeOfferRequest.h"
44

5+
#include "Dom/JsonObject.h"
6+
57
TSharedPtr<FJsonObject> FThirdwebMarketplaceMakeOfferRequest::ToJson() const
68
{
79
TSharedPtr<FJsonObject> JsonObject = MakeShareable(new FJsonObject);

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
#include "Engine/Marketplace/Offers/ThirdwebMarketplaceOffer.h"
44

5+
#include "Dom/JsonObject.h"
56
#include "Engine/Marketplace/ThirdwebMarketplaceCommon.h"
67
#include "Misc/DateTime.h"
78

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
#include "Engine/Marketplace/ThirdwebMarketplaceInternalEntryBase.h"
44

5+
#include "Dom/JsonObject.h"
56
#include "Engine/Marketplace/ThirdwebMarketplaceCommon.h"
67

7-
88
void FThirdwebMarketplaceInternalEntryBase::Load(const FThirdwebMarketplaceInternalEntryBase& Base)
99
{
1010
AssetContractAddress = Base.AssetContractAddress;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
#include "Engine/Transaction/ThirdwebEngineTransactionStatusResult.h"
44

55
#include "ThirdwebUtils.h"
6+
#include "Dom/JsonObject.h"
67
#include "Engine/ThirdwebEngineCommon.h"
78

89
FThirdwebEngineTransactionStatusResult::FThirdwebEngineTransactionStatusResult()

‎Source/Thirdweb/Private/Wallets/ThirdwebInAppWalletHandle.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -544,6 +544,11 @@ void FInAppWalletHandle::SignInWithOAuth(const FString& AuthResult, const FStrea
544544
CHECK_VALIDITY(ErrorDelegate)
545545
CHECK_SOURCE(OAuthProvider, ErrorDelegate)
546546

547+
if (AuthResult.IsEmpty())
548+
{
549+
ErrorDelegate.Execute(TEXT("Empty Auth Result"));
550+
return;
551+
}
547552
FString Result = ThirdwebUtils::ParseAuthResult(AuthResult);
548553
FInAppWalletHandle ThisCopy = *this;
549554
UE::Tasks::Launch(UE_SOURCE_LOCATION, [ThisCopy, Result, SuccessDelegate, ErrorDelegate]

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,12 @@ class THIRDWEB_API UAsyncTaskThirdwebCreateOAuthWallet : public UAsyncTaskThirdw
1414

1515
public:
1616
UFUNCTION(BlueprintCallable, meta=(BlueprintInternalUseOnly="true", WorldContext="WorldContextObject"), Category="Thirdweb|Wallets|InApp")
17-
static UAsyncTaskThirdwebCreateOAuthWallet* CreateOAuthWallet(UObject* WorldContextObject, const EThirdwebOAuthProvider Provider);
17+
static UAsyncTaskThirdwebCreateOAuthWallet* CreateOAuthWallet(UObject* WorldContextObject, const EThirdwebOAuthProvider Provider)
18+
{
19+
NEW_TASK
20+
Task->Provider = Provider;
21+
RR_TASK
22+
}
1823

1924
protected:
2025
UPROPERTY(Transient)

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

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,23 @@ class THIRDWEB_API UAsyncTaskThirdwebCreateSmartWallet : public UAsyncTaskThirdw
1717
virtual void Activate() override;
1818

1919
UFUNCTION(BlueprintCallable, meta=(BlueprintInternalUseOnly="true", WorldContext="WorldContextObject", AdvancedDisplay="Factory,AccountOverride"), Category="Thirdweb|Wallets|Smart")
20-
static UAsyncTaskThirdwebCreateSmartWallet* CreateSmartWallet(UObject* WorldContextObject,
21-
const FInAppWalletHandle& InAppWallet,
22-
const int64 ChainID,
23-
const bool bGasless = true,
24-
const FString& Factory = "",
25-
const FString& AccountOverride = "");
20+
static UAsyncTaskThirdwebCreateSmartWallet* CreateSmartWallet(
21+
UObject* WorldContextObject,
22+
const FInAppWalletHandle& InAppWallet,
23+
const int64 ChainID,
24+
const bool bGasless = true,
25+
const FString& Factory = "",
26+
const FString& AccountOverride = ""
27+
)
28+
{
29+
NEW_TASK
30+
Task->InAppWallet = InAppWallet;
31+
Task->ChainID = ChainID;
32+
Task->bGasless = bGasless;
33+
Task->Factory = Factory;
34+
Task->AccountOverride = AccountOverride;
35+
RR_TASK
36+
};
2637

2738
DECLARE_DYNAMIC_MULTICAST_DELEGATE_TwoParams(FCreateSmartWalletDelegate, const FSmartWalletHandle&, SmartWallet, const FString&, Error);
2839

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include "AsyncTaskThirdwebSmartSignMessage.generated.h"
77

88

9-
UCLASS()
9+
UCLASS(Abstract)
1010
class THIRDWEB_API UAsyncTaskThirdwebSmartSignMessage : public UAsyncTaskThirdwebSmartBase
1111
{
1212
GENERATED_BODY()

‎Source/ThirdwebUncookedOnly/Private/K2Node/K2Node_ThirdwebBaseAsyncTask.cpp

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,10 @@ UEdGraphPin* UK2Node_ThirdwebBaseAsyncTask::SetPinVisibility(UEdGraphPin* Pin, c
9090
if (Pin)
9191
{
9292
Pin->bHidden = !bShow;
93+
if (!bShow && Pin->LinkedTo.Num() > 0)
94+
{
95+
Pin->BreakAllPinLinks();
96+
}
9397
}
9498
return Pin;
9599
}
@@ -168,6 +172,15 @@ void UK2Node_ThirdwebBaseAsyncTask::SetNodeHasAdvanced(const bool bHasAdvanced)
168172
}
169173
}
170174

175+
UEdGraphPin* UK2Node_ThirdwebBaseAsyncTask::BreakPinLinksIf(UEdGraphPin* Pin, const bool bBreak)
176+
{
177+
if (bBreak && Pin && Pin->LinkedTo.Num() > 0)
178+
{
179+
Pin->BreakAllPinLinks();
180+
}
181+
return Pin;
182+
}
183+
171184
UEdGraphPin* UK2Node_ThirdwebBaseAsyncTask::GetProviderPin() const
172185
{
173186
UEdGraphPin* Pin = FindPin(TwPins::Provider);
@@ -189,6 +202,13 @@ UEdGraphPin* UK2Node_ThirdwebBaseAsyncTask::GetWalletPin() const
189202
return Pin;
190203
}
191204

205+
UEdGraphPin* UK2Node_ThirdwebBaseAsyncTask::GetSignaturePin() const
206+
{
207+
UEdGraphPin* Pin = FindPin(TwPins::Signature);
208+
check(Pin == NULL || Pin->Direction == EGPD_Input);
209+
return Pin;
210+
}
211+
192212
UEdGraphPin* UK2Node_ThirdwebBaseAsyncTask::GetInAppWalletPin() const
193213
{
194214
UEdGraphPin* Pin = FindPin(TwPins::InAppWallet);

0 commit comments

Comments
 (0)