Default Account Factory (#184)

Author: 0xFirekeeper

Assets/Thirdweb/Core/Prefabs/ThirdwebManager.prefab

@@ -104,7 +104,7 @@ MonoBehaviour:
   walletConnectMobileWallets: []
   walletConnectThemeMode: 
   factoryAddress: 
-  gasless: 0
+  gasless: 1
   erc20PaymasterAddress: 
   erc20TokenAddress: 
   bundlerUrl: 

Assets/Thirdweb/Core/Scripts/AccountAbstraction/Core/Constants.cs

@@ -2,6 +2,7 @@ namespace Thirdweb.AccountAbstraction
 {
     public static class Constants
     {
+        public const string DEFAULT_FACTORY_ADDRESS = "0x85e23b94e7F5E9cC1fF78BCe78cfb15B81f0DF00";
         public const string DEFAULT_ENTRYPOINT_ADDRESS = "0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789"; // v0.6
         public const string DUMMY_SIG = "0xfffffffffffffffffffffffffffffff0000000000000000000000000000000007aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1c";
         public const string DUMMY_PAYMASTER_AND_DATA_HEX =

Assets/Thirdweb/Core/Scripts/ThirdwebManager.cs

@@ -286,18 +286,16 @@ public void Initialize(string chainIdentifier)
                 customScheme = string.IsNullOrEmpty(thirdwebConfig.customScheme) ? null : thirdwebConfig.customScheme,
             };
 
-            options.smartWalletConfig = string.IsNullOrEmpty(factoryAddress)
-                ? null
-                : new ThirdwebSDK.SmartWalletConfig()
-                {
-                    factoryAddress = factoryAddress,
-                    gasless = gasless,
-                    erc20PaymasterAddress = string.IsNullOrEmpty(erc20PaymasterAddress) ? null : erc20PaymasterAddress,
-                    erc20TokenAddress = string.IsNullOrEmpty(erc20TokenAddress) ? null : erc20TokenAddress,
-                    bundlerUrl = string.IsNullOrEmpty(bundlerUrl) ? $"https://{activeChainId}.bundler.thirdweb.com" : bundlerUrl,
-                    paymasterUrl = string.IsNullOrEmpty(paymasterUrl) ? $"https://{activeChainId}.bundler.thirdweb.com" : paymasterUrl,
-                    entryPointAddress = string.IsNullOrEmpty(entryPointAddress) ? Thirdweb.AccountAbstraction.Constants.DEFAULT_ENTRYPOINT_ADDRESS : entryPointAddress,
-                };
+            options.smartWalletConfig = new ThirdwebSDK.SmartWalletConfig()
+            {
+                factoryAddress = string.IsNullOrEmpty(factoryAddress) ? Thirdweb.AccountAbstraction.Constants.DEFAULT_FACTORY_ADDRESS : factoryAddress,
+                gasless = gasless,
+                erc20PaymasterAddress = string.IsNullOrEmpty(erc20PaymasterAddress) ? null : erc20PaymasterAddress,
+                erc20TokenAddress = string.IsNullOrEmpty(erc20TokenAddress) ? null : erc20TokenAddress,
+                bundlerUrl = string.IsNullOrEmpty(bundlerUrl) ? $"https://{activeChainId}.bundler.thirdweb.com" : bundlerUrl,
+                paymasterUrl = string.IsNullOrEmpty(paymasterUrl) ? $"https://{activeChainId}.bundler.thirdweb.com" : paymasterUrl,
+                entryPointAddress = string.IsNullOrEmpty(entryPointAddress) ? Thirdweb.AccountAbstraction.Constants.DEFAULT_ENTRYPOINT_ADDRESS : entryPointAddress,
+            };
 
             // Pass active chain rpc and chainId
 

Assets/Thirdweb/Editor/ThirdwebManagerEditor.cs

@@ -317,7 +317,6 @@ public override void OnInspectorGUI()
                 () =>
                 {
                     EditorGUILayout.BeginVertical(EditorStyles.helpBox);
-                    EditorGUILayout.PropertyField(factoryAddressProperty);
                     EditorGUILayout.PropertyField(gaslessProperty);
 
                     EditorGUI.BeginChangeCheck();
@@ -329,6 +328,7 @@ public override void OnInspectorGUI()
 
                     if (showSmartWalletOptionalFields)
                     {
+                        EditorGUILayout.PropertyField(factoryAddressProperty);
                         EditorGUILayout.PropertyField(erc20PaymasterAddressProperty);
                         EditorGUILayout.PropertyField(erc20TokenAddressProperty);
                         EditorGUILayout.PropertyField(bundlerUrlProperty);