make switch network awaitable

Author: joaquim-verges

.gitignore

@@ -68,4 +68,5 @@ crashlytics-build.properties
 
 build/
 releases/
+Documentation/
 

Assets/Plugin/thirdweb.jslib

@@ -54,8 +54,25 @@ var plugin = {
         dynCall_viii(cb, idPtr, null, buffer);
       });
   },
-  ThirdwebSwitchNetwork: async function (chainId) {
-    await window.bridge.switchNetwork(chainId);
+  ThirdwebSwitchNetwork: async function (taskId, chainId, cb) {
+    // convert taskId from pointer to str and allocate it to keep in memory
+    var id = UTF8ToString(taskId);
+    var idSize = lengthBytesUTF8(id) + 1;
+    var idPtr = _malloc(idSize);
+    stringToUTF8(id, idPtr, idSize);
+    // execute bridge call
+    window.bridge
+      .switchNetwork(chainId)
+      .then(() => {
+        dynCall_viii(cb, idPtr, null, null);
+      })
+      .catch((err) => {
+        var msg = err.message;
+        var bufferSize = lengthBytesUTF8(msg) + 1;
+        var buffer = _malloc(bufferSize);
+        stringToUTF8(msg, buffer, bufferSize);
+        dynCall_viii(cb, idPtr, null, buffer);
+      });
   },
 };
 

Assets/Thirdweb/Scripts/Bridge.cs

@@ -66,12 +66,17 @@ public static async Task<string> Connect() {
             return result;
         }
 
-        public static void SwitchNetwork(int chainId) {
+        public static async Task SwitchNetwork(int chainId) {
             if (Application.isEditor) {
                 Debug.LogWarning("Switching networks is not supported in the editor. Please build and run the app instead.");
                 return;
             }
-            ThirdwebSwitchNetwork(chainId);
+            var task = new TaskCompletionSource<string>();
+            string taskId = Guid.NewGuid().ToString();
+            taskMap[taskId] = task;
+            ThirdwebSwitchNetwork(taskId, chainId, jsCallback);
+            await task.Task;
+            return;
         }
 
         public static async Task<T> InvokeRoute<T>(string route, string[] body)
@@ -105,6 +110,6 @@ public static async Task<T> InvokeRoute<T>(string route, string[] body)
         [DllImport("__Internal")]
         private static extern string ThirdwebConnect(string taskId, Action<string, string, string> cb);
         [DllImport("__Internal")]
-        private static extern string ThirdwebSwitchNetwork(int chainId);
+        private static extern string ThirdwebSwitchNetwork(string taskId, int chainId, Action<string, string, string> cb);
     }
 }

Assets/Thirdweb/Scripts/ERC1155.cs

@@ -5,7 +5,7 @@
 namespace Thirdweb
 {
     /// <summary>
-    /// Interact with any <c>ERC1155</c> compatible contract.
+    /// Interact with any ERC1155 compatible contract.
     /// </summary>
     public class ERC1155
     {

Assets/Thirdweb/Scripts/Wallet.cs

@@ -60,9 +60,9 @@ public async Task<int> GetChainId()
         /// <summary>
         /// Prompt the connected wallet to switch to the giiven chainId
         /// </summary>
-        public void SwitchNetwork(int chainId)
+        public async Task SwitchNetwork(int chainId)
         {
-            Bridge.SwitchNetwork(chainId);
+            await Bridge.SwitchNetwork(chainId);
         }
 
         /// <summary>

Assets/ThirdwebSDKDemos.cs

@@ -26,7 +26,7 @@ public async void OnLoginCLick()
         loginButton.text = "Connected as: " + address.Substring(0, 6) + "...";
         int chain = await sdk.wallet.GetChainId();
         if (chain != 5) {
-            sdk.wallet.SwitchNetwork(5);
+            await sdk.wallet.SwitchNetwork(5);
         }
     }
 
@@ -61,6 +61,9 @@ public async void GetERC721()
         // resultText.text = "Fetching all NFTs";
         // List<NFT> result = await contract.ERC721.GetAll();
         // resultText.text = "Fetched " + result.Count + " NFTs";
+        // for (int i = 0; i < result.Count; i++) {
+        //     Debug.Log(result[i].metadata.name + " owned by " + result[i].owner);
+        // }
 
         // custom function call
         // string uri = await contract.Read<string>("tokenURI", count);

Assets/WebGLTemplates/Thirdweb/lib/thirdweb.js

@@ -1,6 +1,6 @@
 /// --- Thirdweb Brige ---
 import { ethers } from "./ethers.js";
-import { ThirdwebSDK } from "https://esm.sh/@thirdweb-dev/sdk@nightly?bundle";
+import { ThirdwebSDK } from "https://esm.sh/@thirdweb-dev/sdk?bundle";
 
 // big number transform
 const bigNumberReplacer = (key, value) => {