Remove default rpc id, allow disabling initialize on awake

Author: 0xFirekeeper

Assets/Thirdweb/Core/Scripts/ThirdwebManager.cs

@@ -21,7 +21,7 @@ public ChainData(string identifier, string chainId, string rpcOverride)
 public class ThirdwebManager : MonoBehaviour
 {
     [Tooltip("The chain to initialize the SDK with")]
-    public string chain = "goerli";
+    public string activeChain = "goerli";
 
     [Tooltip("Support any chain by adding it to this list from the inspector")]
     public List<ChainData> supportedChains =
@@ -46,6 +46,9 @@ public class ThirdwebManager : MonoBehaviour
     [Tooltip("Thirdweb Client ID (https://thirdweb.com/create-api-key/). Used for default thirdweb services such as Storage and Account Abstraction.")]
     public string clientId;
 
+    [Tooltip("Whether the SDK should initialize on awake or not")]
+    public bool initializeOnAwake = true;
+
     [Tooltip("The name of your app")]
     public string appName = null;
 
@@ -112,8 +115,6 @@ public class ThirdwebManager : MonoBehaviour
 
     private void Awake()
     {
-        // Single persistent instance at all times.
-
         if (Instance == null)
         {
             Instance = this;
@@ -126,42 +127,59 @@ private void Awake()
             return;
         }
 
-        // Inspector chain data dictionary.
+        if (initializeOnAwake)
+            Initialize(activeChain);
+    }
 
-        ChainData currentChain = supportedChains.Find(x => x.identifier == chain);
+    public void Initialize(string chainIdentifier)
+    {
+        // Pass supported chains with replaced RPCs
 
-        // Chain ID must be provided on native platforms.
+        var options = new ThirdwebSDK.Options();
 
-        BigInteger chainId = -1;
+        activeChain = chainIdentifier;
+        string activeChainId = null;
+        string activeChainRpc = null;
 
-        if (string.IsNullOrEmpty(currentChain.chainId))
-            throw new UnityException("You must provide a Chain ID on native platforms!");
+        var supportedChainData = new List<ThirdwebChainData>();
+        foreach (var chainData in this.supportedChains)
+        {
+            if (string.IsNullOrEmpty(chainData.identifier))
+                throw new UnityException($"You must provide a valid chain identifier! See https://thirdweb.com/dashboard/rpc for a list of supported chains.");
 
-        if (!BigInteger.TryParse(currentChain.chainId, out chainId))
-            throw new UnityException("The Chain ID must be a non-negative integer!");
+            if (string.IsNullOrEmpty(chainData.chainId) || !BigInteger.TryParse(chainData.chainId, out _))
+                throw new UnityException($"Could not add {chainData.identifier} to supported chains, you must provide a valid chain ID!");
 
-        // Must provide a proper chain identifier (https://thirdweb.com/dashboard/rpc) or RPC override.
+            if (!string.IsNullOrEmpty(chainData.rpcOverride) && !chainData.rpcOverride.StartsWith("https://"))
+                throw new UnityException($"Could not add {chainData.identifier} to supported chains, RPC overrides must start with https:// or be left empty to use thirdweb RPCs!");
 
-        string chainOrRPC = null;
+            string rpc = string.IsNullOrEmpty(chainData.rpcOverride)
+                ? (string.IsNullOrEmpty(clientId) ? $"https://{chainData.identifier}.rpc.thirdweb.com/" : $"https://{chainData.identifier}.rpc.thirdweb.com/{clientId}")
+                : chainData.rpcOverride;
 
-        if (!string.IsNullOrEmpty(currentChain.rpcOverride))
-        {
-            if (!currentChain.rpcOverride.StartsWith("https://"))
-                throw new UnityException("RPC overrides must start with https:// !");
-            else
-                chainOrRPC = currentChain.rpcOverride;
-        }
-        else
-        {
-            if (string.IsNullOrEmpty(currentChain.identifier))
-                throw new UnityException("When not providing an RPC, you must provide a chain identifier!");
-            else
-                chainOrRPC = currentChain.identifier;
+            if (new System.Uri(rpc).Host.EndsWith(".thirdweb.com"))
+                rpc = rpc.AppendBundleIdQueryParam();
+
+            if (chainData.identifier == activeChain)
+            {
+                activeChainId = chainData.chainId;
+                activeChainRpc = rpc;
+            }
+
+            try
+            {
+                supportedChainData.Add(ThirdwebSession.FetchChainData(BigInteger.Parse(chainData.chainId), rpc));
+            }
+            catch (System.Exception e)
+            {
+                Debug.LogWarning($"Failed to fetch chain data for {chainData.identifier} ({chainData.chainId}) - {e}, skipping...");
+                continue;
+            }
         }
 
-        // Set up storage and gasless options (if any)
+        options.supportedChains = supportedChainData.ToArray();
 
-        var options = new ThirdwebSDK.Options();
+        // Set up storage and gasless options (if any)
 
         if (!string.IsNullOrEmpty(storageIpfsGatewayUrl))
         {
@@ -200,43 +218,17 @@ private void Awake()
             {
                 factoryAddress = factoryAddress,
                 gasless = gasless,
-                bundlerUrl = string.IsNullOrEmpty(bundlerUrl) ? $"https://{currentChain.identifier}.bundler.thirdweb.com" : bundlerUrl,
-                paymasterUrl = string.IsNullOrEmpty(paymasterUrl) ? $"https://{currentChain.identifier}.bundler.thirdweb.com" : paymasterUrl,
+                bundlerUrl = string.IsNullOrEmpty(bundlerUrl) ? $"https://{activeChain}.bundler.thirdweb.com" : bundlerUrl,
+                paymasterUrl = string.IsNullOrEmpty(paymasterUrl) ? $"https://{activeChain}.bundler.thirdweb.com" : paymasterUrl,
                 entryPointAddress = string.IsNullOrEmpty(entryPointAddress) ? Thirdweb.AccountAbstraction.Constants.DEFAULT_ENTRYPOINT_ADDRESS : entryPointAddress,
             };
 
         // Set up Client ID
 
         options.clientId = string.IsNullOrEmpty(clientId) ? null : clientId;
 
-        // Pass supported chains with replaced RPCs
-
-        var supportedChainData = new List<ThirdwebChainData>();
-        foreach (var chain in this.supportedChains)
-        {
-            string rpc = string.IsNullOrEmpty(chain.rpcOverride)
-                ? (
-                    string.IsNullOrEmpty(clientId)
-                        ? $"https://{chain.identifier}.rpc.thirdweb.com/339d65590ba0fa79e4c8be0af33d64eda709e13652acb02c6be63f5a1fbef9c3"
-                        : $"https://{chain.identifier}.rpc.thirdweb.com/{clientId}"
-                )
-                : chain.rpcOverride;
-
-            if (new System.Uri(rpc).Host.EndsWith(".thirdweb.com"))
-                rpc = rpc.AppendBundleIdQueryParam();
-            try
-            {
-                supportedChainData.Add(ThirdwebSession.FetchChainData(BigInteger.Parse(chain.chainId), rpc));
-            }
-            catch (System.Exception e)
-            {
-                Debug.LogWarning($"Failed to fetch chain data for {chain.identifier} ({chain.chainId}) - {e}, skipping...");
-                continue;
-            }
-        }
-
-        options.supportedChains = supportedChainData.ToArray();
+        // Pass active chain rpc and chainId
 
-        SDK = new ThirdwebSDK(chainOrRPC, chainId, options);
+        SDK = new ThirdwebSDK(activeChainRpc, BigInteger.Parse(activeChainId), options);
     }
 }

Assets/Thirdweb/Core/Scripts/ThirdwebSDK.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Numerics;
+using Newtonsoft.Json;
 using UnityEngine;
 
 namespace Thirdweb
@@ -241,14 +242,10 @@ public struct BiconomyOptions
             this.storage = new Storage(options.storage, options.clientId);
 
             string rpc = !chainOrRPC.StartsWith("https://")
-                ? (
-                    string.IsNullOrEmpty(options.clientId)
-                        ? $"https://{chainOrRPC}.rpc.thirdweb.com/339d65590ba0fa79e4c8be0af33d64eda709e13652acb02c6be63f5a1fbef9c3"
-                        : $"https://{chainOrRPC}.rpc.thirdweb.com/{options.clientId}"
-                )
+                ? (string.IsNullOrEmpty(options.clientId) ? $"https://{chainOrRPC}.rpc.thirdweb.com/" : $"https://{chainOrRPC}.rpc.thirdweb.com/{options.clientId}")
                 : chainOrRPC;
 
-            if (new System.Uri(rpc).Host.EndsWith(".thirdweb.com"))
+            if (new System.Uri(rpc).Host.EndsWith(".thirdweb.com") && !rpc.Contains("bundleId="))
                 rpc = rpc.AppendBundleIdQueryParam();
 
             if (Utils.IsWebGLBuild())
@@ -266,6 +263,8 @@ public struct BiconomyOptions
                 Debug.LogWarning(
                     "No Client ID provided. You will have limited access to thirdweb services for storage, RPC, and Account Abstraction. You can get a Client ID from https://thirdweb.com/create-api-key/"
                 );
+
+            Debug.Log($"Thirdweb SDK Initialized.\nRPC: {rpc}\nChain ID: {chainId}\nOptions: {JsonConvert.SerializeObject(options, Formatting.Indented)}");
         }
 
         /// <summary>

Assets/Thirdweb/Core/Scripts/ThirdwebSession.cs

@@ -216,7 +216,7 @@ public static ThirdwebChainData FetchChainData(BigInteger chainId, string rpcOve
             {
                 chainId = BigInteger.Parse(currentNetwork.chainId).ToHex(false, true) ?? BigInteger.Parse(chainId.ToString()).ToHex(false, true),
                 blockExplorerUrls = explorerUrls.ToArray(),
-                chainName = currentNetwork.name ?? ThirdwebManager.Instance.chain,
+                chainName = currentNetwork.name ?? ThirdwebManager.Instance.activeChain,
                 iconUrls = new string[] { currentNetwork.icon },
                 nativeCurrency = new ThirdwebNativeCurrency()
                 {

Assets/Thirdweb/Editor/ThirdwebManagerEditor.cs

@@ -5,8 +5,10 @@
 [CustomEditor(typeof(ThirdwebManager))]
 public class ThirdwebManagerEditor : Editor
 {
-    private SerializedProperty chainProperty;
+    private SerializedProperty activeChainProperty;
     private SerializedProperty supportedChainsProperty;
+    private SerializedProperty clientIdProperty;
+    private SerializedProperty initializeOnAwakeProperty;
     private SerializedProperty appNameProperty;
     private SerializedProperty appDescriptionProperty;
     private SerializedProperty appIconsProperty;
@@ -20,7 +22,6 @@ public class ThirdwebManagerEditor : Editor
     private SerializedProperty walletConnectProjectIdProperty;
     private SerializedProperty paperClientIdProperty;
     private SerializedProperty factoryAddressProperty;
-    private SerializedProperty clientIdProperty;
     private SerializedProperty gaslessProperty;
     private SerializedProperty bundlerUrlProperty;
     private SerializedProperty paymasterUrlProperty;
@@ -42,8 +43,10 @@ public class ThirdwebManagerEditor : Editor
 
     private void OnEnable()
     {
-        chainProperty = serializedObject.FindProperty("chain");
+        activeChainProperty = serializedObject.FindProperty("activeChain");
         supportedChainsProperty = serializedObject.FindProperty("supportedChains");
+        clientIdProperty = serializedObject.FindProperty("clientId");
+        initializeOnAwakeProperty = serializedObject.FindProperty("initializeOnAwake");
         appNameProperty = serializedObject.FindProperty("appName");
         appDescriptionProperty = serializedObject.FindProperty("appDescription");
         appIconsProperty = serializedObject.FindProperty("appIcons");
@@ -57,7 +60,6 @@ private void OnEnable()
         walletConnectProjectIdProperty = serializedObject.FindProperty("walletConnectProjectId");
         paperClientIdProperty = serializedObject.FindProperty("paperClientId");
         factoryAddressProperty = serializedObject.FindProperty("factoryAddress");
-        clientIdProperty = serializedObject.FindProperty("clientId");
         gaslessProperty = serializedObject.FindProperty("gasless");
         bundlerUrlProperty = serializedObject.FindProperty("bundlerUrl");
         paymasterUrlProperty = serializedObject.FindProperty("paymasterUrl");
@@ -156,10 +158,11 @@ public override void OnInspectorGUI()
             () =>
             {
                 EditorGUILayout.BeginVertical(EditorStyles.helpBox);
-                EditorGUILayout.PropertyField(chainProperty);
+                EditorGUILayout.PropertyField(activeChainProperty);
                 EditorGUILayout.Space(10);
                 supportedChainsList.DoLayoutList();
                 EditorGUILayout.PropertyField(clientIdProperty);
+                EditorGUILayout.PropertyField(initializeOnAwakeProperty);
                 EditorGUILayout.EndVertical();
             }
         );

Assets/Thirdweb/Examples/Scripts/Prefabs/Prefab_ConnectWallet.cs

@@ -135,7 +135,7 @@ private void Start()
 
         OrGameObject.SetActive(usingEmailWallet && usingNormalWallet);
 
-        _currentChainData = ThirdwebManager.Instance.supportedChains.Find(x => x.identifier == ThirdwebManager.Instance.chain);
+        _currentChainData = ThirdwebManager.Instance.supportedChains.Find(x => x.identifier == ThirdwebManager.Instance.activeChain);
         _address = null;
         _email = null;
         _password = null;