Support v7 Account Abstraction (#35)

0xFirekeeper · web-flow · commit 1b507171945a · 2025-07-28T23:11:16.000+07:00
Introduces an EntryPoint parameter to the smart wallet creation flow across C++, Blueprint, and K2Node interfaces. Updates the Thirdweb native bindings, async task, handle, and node logic to support specifying an entry point contract when creating a smart wallet. Closes BLD-12  ## Summary by CodeRabbit * **New Features** * Added support for specifying an "EntryPoint" when creating a smart wallet, available as an advanced option in relevant wallet creation interfaces. * **Bug Fixes** * None. * **Other Updates** * Updated underlying binary libraries for all supported platforms to newer versions.
diff --git a/Source/ThirdParty/Android/libthirdweb.a b/Source/ThirdParty/Android/libthirdweb.a
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e060a9a85ddbcf516ff145274a1078d5e2831b38da86f3f06bcb79c0c17fa5f5
-size 90101708
+oid sha256:b4a86ab50091595341ad09c1b7444e301b841cc563bdd49c099e8b9f0c5298ee
+size 90295496
diff --git a/Source/ThirdParty/IOS/libthirdweb.a b/Source/ThirdParty/IOS/libthirdweb.a
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:08b0e2326d039b37bf43a974d71938637cf9046c9727db67e60abf34702e2655
-size 60908448
+oid sha256:24c8435e0800a406aa2b98844fb3d5e965b818eadebd04175eceb92d4b7d5848
+size 61038216
diff --git a/Source/ThirdParty/IOS/libthirdweb.sim.a b/Source/ThirdParty/IOS/libthirdweb.sim.a
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:08b0e2326d039b37bf43a974d71938637cf9046c9727db67e60abf34702e2655
-size 60908448
+oid sha256:24c8435e0800a406aa2b98844fb3d5e965b818eadebd04175eceb92d4b7d5848
+size 61038216
diff --git a/Source/ThirdParty/Linux/libthirdweb.a b/Source/ThirdParty/Linux/libthirdweb.a
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7b07c08e98ebee619bbe748db696d183758bebad4ccb05fbde9eb7bda9f787d4
-size 93167880
+oid sha256:dab9d37bb5f57f9d87ffd33f77cfdd48ae1d1ad1111800e9bbbeb941e8046df8
+size 93401358
diff --git a/Source/ThirdParty/LinuxArm64/libthirdweb.a b/Source/ThirdParty/LinuxArm64/libthirdweb.a
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0aaf37728278a2e7585294be6d39d38ab5b69ba04f6de158420122d4bd640a48
-size 92229694
+oid sha256:3342709533c62476386dff58ffe69078a4de667b09a4ac21f730b13cced26bfa
+size 92446652
diff --git a/Source/ThirdParty/Mac/libthirdweb.a b/Source/ThirdParty/Mac/libthirdweb.a
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:580c5df5378c664e65a79b0233424a326672e0dc5b7d019d5ff478ed789f94f3
-size 122069736
+oid sha256:ea2625e4ecb1b50ac269caf3322cdf27d99db528cf854c0915af89af1ab7e1be
+size 122366264
diff --git a/Source/ThirdParty/Win64/libthirdweb.lib b/Source/ThirdParty/Win64/libthirdweb.lib
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5fc1a193b2de0035535b7ad396c4bad63fc63f734334d731571512b8a613b812
-size 95165930
+oid sha256:f18455208814da13616c679cd9dac43e169f13fe4f3d86f4f4d5d78d25948041
+size 95517218
diff --git a/Source/Thirdweb/Private/AsyncTasks/Wallets/InApp/Create/AsyncTaskThirdwebCreateSmartWallet.cpp b/Source/Thirdweb/Private/AsyncTasks/Wallets/InApp/Create/AsyncTaskThirdwebCreateSmartWallet.cpp
@@ -14,6 +14,7 @@ void UAsyncTaskThirdwebCreateSmartWallet::Activate()
 		bGasless,
 		Factory,
 		AccountOverride,
+		EntryPoint,
 		BIND_UOBJECT_DELEGATE(FSmartWalletHandle::FCreateSmartWalletDelegate, HandleResponse),
 		BIND_UOBJECT_DELEGATE(FStringDelegate, HandleFailed)
 	);
diff --git a/Source/Thirdweb/Private/Wallets/ThirdwebSmartWalletHandle.cpp b/Source/Thirdweb/Private/Wallets/ThirdwebSmartWalletHandle.cpp
@@ -40,6 +40,7 @@ void FSmartWalletHandle::Create(const FInAppWalletHandle& InInAppWallet,
                                 const bool bGasless,
                                 const FString& Factory,
                                 const FString& AccountOverride,
+								const FString& EntryPoint,
                                 const FCreateSmartWalletDelegate& SuccessDelegate,
                                 const FStringDelegate& ErrorDelegate)
 {
@@ -54,7 +55,7 @@ void FSmartWalletHandle::Create(const FInAppWalletHandle& InInAppWallet,
 		return;
 	}
 
-	UE::Tasks::Launch(UE_SOURCE_LOCATION, [InInAppWallet, ChainID, bGasless, Factory, AccountOverride, SuccessDelegate, ErrorDelegate]
+	UE::Tasks::Launch(UE_SOURCE_LOCATION, [InInAppWallet, ChainID, bGasless, Factory, AccountOverride, EntryPoint, SuccessDelegate, ErrorDelegate]
 	{
 		if (FString Error; Thirdweb::create_smart_wallet(
 			TO_RUST_STRING(UThirdwebRuntimeSettings::GetClientId()),
@@ -64,7 +65,8 @@ void FSmartWalletHandle::Create(const FInAppWalletHandle& InInAppWallet,
 			TO_RUST_STRING(FString::Printf(TEXT("%lld"), ChainID)),
 			bGasless,
 			TO_RUST_STRING(Factory),
-			TO_RUST_STRING(AccountOverride)
+			TO_RUST_STRING(AccountOverride),
+			TO_RUST_STRING(EntryPoint)
 		).AssignResult(Error))
 		{
 			const FSmartWalletHandle SmartWallet = FSmartWalletHandle(InInAppWallet, Error, Factory);
diff --git a/Source/Thirdweb/Public/AsyncTasks/Wallets/InApp/Create/AsyncTaskThirdwebCreateSmartWallet.h b/Source/Thirdweb/Public/AsyncTasks/Wallets/InApp/Create/AsyncTaskThirdwebCreateSmartWallet.h
@@ -16,20 +16,24 @@ class THIRDWEB_API UAsyncTaskThirdwebCreateSmartWallet : public UAsyncTaskThirdw
 public:
 	virtual void Activate() override;
 
-	UFUNCTION(BlueprintCallable, meta=(BlueprintInternalUseOnly="true", WorldContext="WorldContextObject", AdvancedDisplay="Factory,AccountOverride"), Category="Thirdweb|Wallets|Smart")
+	UFUNCTION(BlueprintCallable,
+		meta=(BlueprintInternalUseOnly="true", WorldContext="WorldContextObject", AdvancedDisplay="Factory,AccountOverride,EntryPoint"),
+		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 = "")
+	                                                              const FString& AccountOverride = "",
+	                                                              const FString& EntryPoint = "")
 	{
 		NEW_TASK
 		Task->InAppWallet = InAppWallet;
 		Task->ChainID = ChainID;
 		Task->bGasless = bGasless;
 		Task->Factory = Factory;
 		Task->AccountOverride = AccountOverride;
+		Task->EntryPoint = EntryPoint;
 		RR_TASK
 	};
 
@@ -57,6 +61,9 @@ class THIRDWEB_API UAsyncTaskThirdwebCreateSmartWallet : public UAsyncTaskThirdw
 	UPROPERTY(Transient)
 	FString AccountOverride;
 
+	UPROPERTY(Transient)
+	FString EntryPoint;
+
 private:
 	UFUNCTION()
 	void HandleResponse(const FSmartWalletHandle& Wallet);
diff --git a/Source/Thirdweb/Public/Thirdweb.h b/Source/Thirdweb/Public/Thirdweb.h
@@ -73,14 +73,15 @@ namespace Thirdweb
 
 	// Smart Wallet Methods
 
-	FFIResult create_smart_wallet(const char* client_id,
-	                              const char* bundle_id,
-	                              const char* secret_key,
-	                              uintptr_t personal_wallet_handle_id,
-	                              const char* chain_id,
-	                              bool gasless,
-	                              const char* factory,
-	                              const char* account_override);
+	FFIResult create_smart_wallet(const char *client_id,
+                              const char *bundle_id,
+                              const char *secret_key,
+                              uintptr_t personal_wallet_handle_id,
+                              const char *chain_id,
+                              bool gasless,
+                              const char *factory,
+                              const char *account_override,
+                              const char *entry_point);
 	FFIResult smart_wallet_is_deployed(uintptr_t handle_id);
 	FFIResult smart_wallet_get_all_admins(uintptr_t handle_id);
 	FFIResult smart_wallet_get_all_active_signers(uintptr_t handle_id);
diff --git a/Source/Thirdweb/Public/Wallets/ThirdwebSmartWalletHandle.h b/Source/Thirdweb/Public/Wallets/ThirdwebSmartWalletHandle.h
@@ -52,10 +52,11 @@ struct THIRDWEB_API FSmartWalletHandle : public FWalletHandle
 	 * @param bGasless Boolean indicating whether the transaction is gasless.
 	 * @param Factory String identifying the factory contract.
 	 * @param AccountOverride String for account override.
+	 * @param EntryPoint String for the entry point contract.
 	 * @param SuccessDelegate Delegate to call upon successful creation of the smart wallet.
 	 * @param ErrorDelegate Delegate to call if there is an error during creation.
 	 */
-	static void Create(const FInAppWalletHandle& InInAppWallet, const int64 ChainID, const bool bGasless, const FString& Factory, const FString& AccountOverride, const FCreateSmartWalletDelegate& SuccessDelegate, const FStringDelegate& ErrorDelegate);
+	static void Create(const FInAppWalletHandle& InInAppWallet, const int64 ChainID, const bool bGasless, const FString& Factory, const FString& AccountOverride, const FString& EntryPoint, const FCreateSmartWalletDelegate& SuccessDelegate, const FStringDelegate& ErrorDelegate);
 
 	/** Check if the smart wallet is deployed */
 	void IsDeployed(const FBoolDelegate& SuccessDelegate, const FStringDelegate& ErrorDelegate);
diff --git a/Source/ThirdwebUncookedOnly/Private/K2Node/K2Node_ThirdwebCreateWallet.cpp b/Source/ThirdwebUncookedOnly/Private/K2Node/K2Node_ThirdwebCreateWallet.cpp
@@ -29,6 +29,7 @@ namespace TwPins
 	const FName Gasless = FName(TEXT("bGasless"));
 	const FName Factory = FName(TEXT("Factory"));
 	const FName AccountOverride = FName(TEXT("AccountOverride"));
+	const FName EntryPoint = FName(TEXT("EntryPoint"));
 }
 
 #define LOCTEXT_NAMESPACE "ThirdwebUncookedOnly"
@@ -144,6 +145,7 @@ void UK2Node_ThirdwebCreateWallet::AllocateDefaultPins()
 	SetPinDefaultValue(CreatePin(EGPD_Input, UEdGraphSchema_K2::PC_Boolean, TwPins::Gasless), TEXT("true"));
 	SetPinAdvancedView(CreatePin(EGPD_Input, UEdGraphSchema_K2::PC_String, TwPins::Factory));
 	SetPinAdvancedView(CreatePin(EGPD_Input, UEdGraphSchema_K2::PC_String, TwPins::AccountOverride));
+	SetPinAdvancedView(CreatePin(EGPD_Input, UEdGraphSchema_K2::PC_String, TwPins::EntryPoint));
 
 	// Smart Wallet Output Pins
 	SetPinFriendlyName(
@@ -242,6 +244,7 @@ bool UK2Node_ThirdwebCreateWallet::UpdatePins()
 	SetPinVisibility(GetGaslessPin(), Type == EThirdwebWalletType::Smart);
 	SetPinVisibility(GetFactoryPin(), Type == EThirdwebWalletType::Smart);
 	SetPinVisibility(GetAccountOverridePin(), Type == EThirdwebWalletType::Smart);
+	SetPinVisibility(GetEntryPointPin(), Type == EThirdwebWalletType::Smart);
 	SetPinVisibility(GetSmartWalletPin(), Type == EThirdwebWalletType::Smart);
 
 
@@ -289,6 +292,13 @@ UEdGraphPin* UK2Node_ThirdwebCreateWallet::GetAccountOverridePin() const
 	return Pin;
 }
 
+UEdGraphPin* UK2Node_ThirdwebCreateWallet::GetEntryPointPin() const
+{
+	UEdGraphPin* Pin = FindPin(TwPins::EntryPoint);
+	check(Pin == NULL || Pin->Direction == EGPD_Input);
+	return Pin;
+}
+
 UEdGraphPin* UK2Node_ThirdwebCreateWallet::GetSmartWalletPin() const
 {
 	UEdGraphPin* Pin = FindPin(TwPins::SmartWallet);
diff --git a/Source/ThirdwebUncookedOnly/Public/K2Node/K2Node_ThirdwebCreateWallet.h b/Source/ThirdwebUncookedOnly/Public/K2Node/K2Node_ThirdwebCreateWallet.h
@@ -16,6 +16,7 @@ namespace TwPins
 	extern const FName Gasless;
 	extern const FName Factory;
 	extern const FName AccountOverride;
+	extern const FName EntryPoint;
 }
 
 UCLASS()
@@ -58,5 +59,6 @@ class THIRDWEBUNCOOKEDONLY_API UK2Node_ThirdwebCreateWallet : public UK2Node_Thi
 	UEdGraphPin* GetGaslessPin() const;
 	UEdGraphPin* GetFactoryPin() const;
 	UEdGraphPin* GetAccountOverridePin() const;
+	UEdGraphPin* GetEntryPointPin() const;
 	virtual UEdGraphPin* GetSmartWalletPin() const override;
 };

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,7 @@ void FSmartWalletHandle::Create(const FInAppWalletHandle& InInAppWallet,`
`40`	`40`	`const bool bGasless,`
`41`	`41`	`const FString& Factory,`
`42`	`42`	`const FString& AccountOverride,`
	`43`	`+ const FString& EntryPoint,`
`43`	`44`	`const FCreateSmartWalletDelegate& SuccessDelegate,`
`44`	`45`	`const FStringDelegate& ErrorDelegate)`
`45`	`46`	`{`
`@@ -54,7 +55,7 @@ void FSmartWalletHandle::Create(const FInAppWalletHandle& InInAppWallet,`
`54`	`55`	`return;`
`55`	`56`	`}`
`56`	`57`
`57`		`- UE::Tasks::Launch(UE_SOURCE_LOCATION, [InInAppWallet, ChainID, bGasless, Factory, AccountOverride, SuccessDelegate, ErrorDelegate]`
	`58`	`+ UE::Tasks::Launch(UE_SOURCE_LOCATION, [InInAppWallet, ChainID, bGasless, Factory, AccountOverride, EntryPoint, SuccessDelegate, ErrorDelegate]`
`58`	`59`	`{`
`59`	`60`	`if (FString Error; Thirdweb::create_smart_wallet(`
`60`	`61`	`TO_RUST_STRING(UThirdwebRuntimeSettings::GetClientId()),`
`@@ -64,7 +65,8 @@ void FSmartWalletHandle::Create(const FInAppWalletHandle& InInAppWallet,`
`64`	`65`	`TO_RUST_STRING(FString::Printf(TEXT("%lld"), ChainID)),`
`65`	`66`	`bGasless,`
`66`	`67`	`TO_RUST_STRING(Factory),`
`67`		`- TO_RUST_STRING(AccountOverride)`
	`68`	`+ TO_RUST_STRING(AccountOverride),`
	`69`	`+ TO_RUST_STRING(EntryPoint)`
`68`	`70`	`).AssignResult(Error))`
`69`	`71`	`{`
`70`	`72`	`const FSmartWalletHandle SmartWallet = FSmartWalletHandle(InInAppWallet, Error, Factory);`