Assets/Thirdweb/Editor/ThirdwebManagerEditor.cs

@@ -5,119 +5,59 @@
 
 namespace Thirdweb.Editor
 {
-    [CustomEditor(typeof(ThirdwebManager))]
-    public class ThirdwebManagerEditor : UnityEditor.Editor
+    public abstract class ThirdwebManagerBaseEditor<T> : UnityEditor.Editor
+        where T : MonoBehaviour
     {
-        private SerializedProperty clientIdProp;
-        private SerializedProperty bundleIdProp;
-        private SerializedProperty initializeOnAwakeProp;
-        private SerializedProperty showDebugLogsProp;
-        private SerializedProperty optOutUsageAnalyticsProp;
-        private SerializedProperty supportedChainsProp;
-        private SerializedProperty redirectPageHtmlOverrideProp;
-
-        private int selectedTab = 0;
-        private readonly string[] tabTitles = { "Client", "Preferences", "Misc", "Debug" };
+        protected SerializedProperty initializeOnAwakeProp;
+        protected SerializedProperty showDebugLogsProp;
+        protected SerializedProperty autoConnectLastWalletProp;
+        protected SerializedProperty supportedChainsProp;
+        protected SerializedProperty includedWalletIdsProp;
+        protected SerializedProperty redirectPageHtmlOverrideProp;
+        protected SerializedProperty rpcOverridesProp;
 
-        private GUIStyle headerStyle;
-        private GUIStyle buttonStyle;
+        protected int selectedTab;
+        protected GUIStyle buttonStyle;
+        protected Texture2D bannerImage;
 
-        private Texture2D bannerImage;
+        protected virtual string[] TabTitles => new string[] { "Client/Server", "Preferences", "Misc", "Debug" };
 
-        private void OnEnable()
+        protected virtual void OnEnable()
         {
-            clientIdProp = FindProperty("ClientId");
-            bundleIdProp = FindProperty("BundleId");
-            initializeOnAwakeProp = FindProperty("InitializeOnAwake");
-            showDebugLogsProp = FindProperty("ShowDebugLogs");
-            optOutUsageAnalyticsProp = FindProperty("OptOutUsageAnalytics");
-            supportedChainsProp = FindProperty("SupportedChains");
-            redirectPageHtmlOverrideProp = FindProperty("RedirectPageHtmlOverride");
+            initializeOnAwakeProp = FindProp("InitializeOnAwake");
+            showDebugLogsProp = FindProp("ShowDebugLogs");
+            autoConnectLastWalletProp = FindProp("AutoConnectLastWallet");
+            supportedChainsProp = FindProp("SupportedChains");
+            includedWalletIdsProp = FindProp("IncludedWalletIds");
+            redirectPageHtmlOverrideProp = FindProp("RedirectPageHtmlOverride");
+            rpcOverridesProp = FindProp("RpcOverrides");
 
             bannerImage = Resources.Load<Texture2D>("EditorBanner");
         }
 
-        private void InitializeStyles()
-        {
-            buttonStyle = new GUIStyle(GUI.skin.button)
-            {
-                fontStyle = FontStyle.Bold,
-                alignment = TextAnchor.MiddleLeft,
-                padding = new RectOffset(10, 10, 10, 10)
-            };
-        }
-
-        private SerializedProperty FindProperty(string propertyName)
-        {
-            var targetType = target.GetType();
-            var property = targetType.GetProperty(propertyName, BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public);
-            if (property == null)
-                return null;
-
-            var backingFieldName = $"<{propertyName}>k__BackingField";
-            return serializedObject.FindProperty(backingFieldName);
-        }
-
         public override void OnInspectorGUI()
         {
             serializedObject.Update();
 
-            if (headerStyle == null || buttonStyle == null)
+            if (buttonStyle == null)
             {
                 InitializeStyles();
             }
 
-            // Draw Banner and Title
             DrawBannerAndTitle();
-
-            // Draw Tab Bar
             DrawTabs();
-
-            // Draw Selected Tab Content
             GUILayout.Space(10);
             DrawSelectedTabContent();
 
             serializedObject.ApplyModifiedProperties();
         }
 
-        private void DrawBannerAndTitle()
-        {
-            GUILayout.BeginVertical();
-            GUILayout.Space(10);
-
-            GUILayout.BeginHorizontal();
-
-            if (bannerImage != null)
-            {
-                GUILayout.Label(bannerImage, GUILayout.Width(64), GUILayout.Height(64));
-            }
-
-            GUILayout.Space(10);
-
-            GUILayout.BeginVertical();
-            GUILayout.Space(10);
-            GUILayout.Label("Thirdweb Configuration", EditorStyles.boldLabel);
-            GUILayout.Label("Configure your settings and preferences.\nYou can access ThirdwebManager.Instance from anywhere.", EditorStyles.miniLabel);
-            GUILayout.EndVertical();
-
-            GUILayout.EndHorizontal();
-
-            GUILayout.Space(10);
-
-            GUILayout.EndVertical();
-        }
-
-        private void DrawTabs()
-        {
-            selectedTab = GUILayout.Toolbar(selectedTab, tabTitles, GUILayout.Height(25));
-        }
-
-        private void DrawSelectedTabContent()
+        protected virtual void DrawSelectedTabContent()
         {
             switch (selectedTab)
             {
                 case 0:
-                    DrawClientTab();
+                    DrawClientOrServerTab();
                     break;
                 case 1:
                     DrawPreferencesTab();
@@ -134,62 +74,54 @@ private void DrawSelectedTabContent()
             }
         }
 
-        private void DrawClientTab()
-        {
-            EditorGUILayout.HelpBox("Configure your client settings here.", MessageType.Info);
-            DrawProperty(clientIdProp, "Client ID");
-            DrawProperty(bundleIdProp, "Bundle ID");
-            DrawButton(
-                "Create API Key",
-                () =>
-                {
-                    Application.OpenURL("https://thirdweb.com/create-api-key");
-                }
-            );
-        }
+        protected abstract void DrawClientOrServerTab();
 
-        private void DrawPreferencesTab()
+        protected virtual void DrawPreferencesTab()
         {
             EditorGUILayout.HelpBox("Set your preferences and initialization options here.", MessageType.Info);
             DrawProperty(initializeOnAwakeProp, "Initialize On Awake");
             DrawProperty(showDebugLogsProp, "Show Debug Logs");
-            DrawProperty(optOutUsageAnalyticsProp, "Opt-Out of Usage Analytics");
+            DrawProperty(autoConnectLastWalletProp, "Auto-Connect Last Wallet");
         }
 
-        private void DrawMiscTab()
+        protected virtual void DrawMiscTab()
         {
             EditorGUILayout.HelpBox("Configure other settings here.", MessageType.Info);
-
-            // Wallet Connect Settings
-            GUILayout.Label("Wallet Connect Settings", EditorStyles.boldLabel);
-            DrawProperty(supportedChainsProp, "Supported Chains");
-
+            DrawProperty(rpcOverridesProp, "RPC Overrides");
             GUILayout.Space(10);
-
-            // Desktop OAuth Settings
-            GUILayout.Label("Desktop OAuth Settings", EditorStyles.boldLabel);
-            EditorGUILayout.LabelField("Redirect Page HTML Override", EditorStyles.boldLabel);
+            EditorGUILayout.LabelField("OAuth Redirect Page HTML Override", EditorStyles.boldLabel);
             redirectPageHtmlOverrideProp.stringValue = EditorGUILayout.TextArea(redirectPageHtmlOverrideProp.stringValue, GUILayout.MinHeight(75));
+            GUILayout.Space(10);
+            DrawProperty(supportedChainsProp, "WalletConnect Supported Chains");
+            DrawProperty(includedWalletIdsProp, "WalletConnect Included Wallet IDs");
         }
 
-        private void DrawDebugTab()
+        protected virtual void DrawDebugTab()
         {
             EditorGUILayout.HelpBox("Debug your settings here.", MessageType.Info);
-
             DrawButton(
                 "Log Active Wallet Info",
                 () =>
                 {
                     if (Application.isPlaying)
                     {
-                        var wallet = ((ThirdwebManager)target).GetActiveWallet();
-                        if (wallet != null)
+                        var mgr = target as T;
+                        var method = mgr.GetType().GetMethod("GetActiveWallet", BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic);
+                        if (method != null)
                         {
-                            Debug.Log($"Active Wallet ({wallet.GetType().Name}) Address: {wallet.GetAddress().Result}");
+                            var wallet = method.Invoke(mgr, null) as IThirdwebWallet;
+                            if (wallet != null)
+                            {
+                                Debug.Log($"Active Wallet ({wallet.GetType().Name}) Address: {wallet.GetAddress().Result}");
+                            }
+                            else
+                            {
+                                Debug.LogWarning("No active wallet found.");
+                            }
                         }
                         else
                         {
-                            Debug.LogWarning("No active wallet found.");
+                            Debug.LogWarning("GetActiveWallet() not found.");
                         }
                     }
                     else
@@ -198,7 +130,6 @@ private void DrawDebugTab()
                     }
                 }
             );
-
             DrawButton(
                 "Open Documentation",
                 () =>
@@ -208,7 +139,42 @@ private void DrawDebugTab()
             );
         }
 
-        private void DrawProperty(SerializedProperty property, string label)
+        protected void DrawBannerAndTitle()
+        {
+            GUILayout.BeginVertical();
+            GUILayout.Space(10);
+            GUILayout.BeginHorizontal();
+            if (bannerImage != null)
+            {
+                GUILayout.Label(bannerImage, GUILayout.Width(64), GUILayout.Height(64));
+            }
+            GUILayout.Space(10);
+            GUILayout.BeginVertical();
+            GUILayout.Space(10);
+            GUILayout.Label("Thirdweb Configuration", EditorStyles.boldLabel);
+            GUILayout.Label("Configure your settings and preferences.\nYou can access ThirdwebManager.Instance from anywhere.", EditorStyles.miniLabel);
+            GUILayout.EndVertical();
+            GUILayout.EndHorizontal();
+            GUILayout.Space(10);
+            GUILayout.EndVertical();
+        }
+
+        protected void DrawTabs()
+        {
+            selectedTab = GUILayout.Toolbar(selectedTab, TabTitles, GUILayout.Height(25));
+        }
+
+        protected void InitializeStyles()
+        {
+            buttonStyle = new GUIStyle(GUI.skin.button)
+            {
+                fontStyle = FontStyle.Bold,
+                alignment = TextAnchor.MiddleLeft,
+                padding = new RectOffset(10, 10, 10, 10)
+            };
+        }
+
+        protected void DrawProperty(SerializedProperty property, string label)
         {
             if (property != null)
             {
@@ -220,15 +186,81 @@ private void DrawProperty(SerializedProperty property, string label)
             }
         }
 
-        private void DrawButton(string label, System.Action action)
+        protected void DrawButton(string label, System.Action action)
         {
             GUILayout.FlexibleSpace();
-            // center label
             if (GUILayout.Button(label, buttonStyle, GUILayout.Height(35), GUILayout.ExpandWidth(true)))
             {
                 action.Invoke();
             }
             GUILayout.FlexibleSpace();
         }
+
+        protected SerializedProperty FindProp(string propName)
+        {
+            var targetType = target.GetType();
+            var property = targetType.GetProperty(propName, BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public);
+            if (property == null)
+                return null;
+            var backingFieldName = $"<{propName}>k__BackingField";
+            return serializedObject.FindProperty(backingFieldName);
+        }
+    }
+
+    [CustomEditor(typeof(ThirdwebManager))]
+    public class ThirdwebManagerEditor : ThirdwebManagerBaseEditor<ThirdwebManager>
+    {
+        SerializedProperty clientIdProp;
+        SerializedProperty bundleIdProp;
+
+        protected override void OnEnable()
+        {
+            base.OnEnable();
+            clientIdProp = FindProp("ClientId");
+            bundleIdProp = FindProp("BundleId");
+        }
+
+        protected override string[] TabTitles => new string[] { "Client", "Preferences", "Misc", "Debug" };
+
+        protected override void DrawClientOrServerTab()
+        {
+            EditorGUILayout.HelpBox("Configure your client settings here.", MessageType.Info);
+            DrawProperty(clientIdProp, "Client ID");
+            DrawProperty(bundleIdProp, "Bundle ID");
+            DrawButton(
+                "Create API Key",
+                () =>
+                {
+                    Application.OpenURL("https://thirdweb.com/create-api-key");
+                }
+            );
+        }
+    }
+
+    [CustomEditor(typeof(ThirdwebManagerServer))]
+    public class ThirdwebManagerServerEditor : ThirdwebManagerBaseEditor<ThirdwebManagerServer>
+    {
+        SerializedProperty secretKeyProp;
+
+        protected override void OnEnable()
+        {
+            base.OnEnable();
+            secretKeyProp = FindProp("SecretKey");
+        }
+
+        protected override string[] TabTitles => new string[] { "Client", "Preferences", "Misc", "Debug" };
+
+        protected override void DrawClientOrServerTab()
+        {
+            EditorGUILayout.HelpBox("Configure your client settings here.", MessageType.Info);
+            DrawProperty(secretKeyProp, "Secret Key");
+            DrawButton(
+                "Create API Key",
+                () =>
+                {
+                    Application.OpenURL("https://thirdweb.com/create-api-key");
+                }
+            );
+        }
     }
 }

Assets/Thirdweb/Examples/Scripts/PlaygroundManager.cs

@@ -125,6 +125,7 @@ private async void ConnectWallet(WalletOptions options)
             currentPanel.Action1Button.onClick.AddListener(async () =>
             {
                 var address = await wallet.GetAddress();
+                address.CopyToClipboard();
                 Log(currentPanel.LogText, $"Address: {address}");
             });
 

Assets/Thirdweb/Plugins/ThreadingPatcher/Editor/WebGLThreadingPatcher.cs

@@ -18,7 +18,11 @@ public void OnPostBuildPlayerScriptDLLs(BuildReport report)
             if (report.summary.platform != BuildTarget.WebGL)
                 return;
 
+#if UNITY_2022_1_OR_NEWER
             var mscorLibDll = report.GetFiles().FirstOrDefault(f => f.path.EndsWith("mscorlib.dll")).path;
+#else
+            var mscorLibDll = report.files.FirstOrDefault(f => f.path.EndsWith("mscorlib.dll")).path;
+#endif
             if (mscorLibDll == null)
             {
                 Debug.LogError("Can't find mscorlib.dll in build dll files");

Assets/Thirdweb/Plugins/ThreadingPatcher/Plugins/SystemThreadingTimer.jslib

@@ -15,7 +15,7 @@ var SystemThreadingTimerLib = {
 		setTimeout(function()
 		{
 			if (id === vars.currentCallbackId)
-				Runtime.dynCall('v', vars.callback);
+				{{{ makeDynCall("v", "vars.callback") }}}();
 		},
 		interval);
 	}