Misc fixes, apply formatting, show error message in UI

joaquim-verges · joaquim-verges · commit ee27afe09333 · 2022-11-28T21:01:22.000+13:00
diff --git a/Assets/Plugin/thirdweb.jslib b/Assets/Plugin/thirdweb.jslib
@@ -17,7 +17,7 @@ var plugin = {
       })
       .catch((err) => {
         console.error("ThirdwebSDK invoke error", err);
-        var msg = err.message;
+        var msg = err.reason || err.message;
         var bufferSize = lengthBytesUTF8(msg) + 1;
         var buffer = _malloc(bufferSize);
         stringToUTF8(msg, buffer, bufferSize);
diff --git a/Assets/Thirdweb/Demo/ThirdwebDemoScene.unity b/Assets/Thirdweb/Demo/ThirdwebDemoScene.unity
@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 705507994}
-  m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
+  m_IndirectSpecularColor: {r: 0.44657815, g: 0.49641192, b: 0.57481617, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -1174,9 +1174,9 @@ RectTransform:
   m_RootOrder: 12
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
-  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 1}
   m_AnchoredPosition: {x: -0.26769364, y: 64.86401}
-  m_SizeDelta: {x: 4924.909, y: 830.7549}
+  m_SizeDelta: {x: 4924.909, y: -249.06401}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!114 &545609470
 MonoBehaviour:
diff --git a/Assets/Thirdweb/Demo/ThirdwebSDKDemos.cs b/Assets/Thirdweb/Demo/ThirdwebSDKDemos.cs
@@ -42,14 +42,14 @@ public async void OnBalanceClick()
     public async void OnSignClick()
     {
         resultText.text = "Signing...";
-        var data = await sdk.wallet.Authenticate("example.com");
-        if (data.payload.address != null)
+        try
         {
+            var data = await sdk.wallet.Authenticate("example.com");
             resultText.text = "Sig: " + data.payload.address.Substring(0, 6) + "...";
         }
-        else
+        catch (System.Exception e)
         {
-            resultText.text = "Failed to authenticate";
+            resultText.text = "Auth Error: " + e.Message;
         }
     }
 
@@ -80,12 +80,14 @@ public async void GetERC721()
 
     public async void GetERC1155()
     {
-        var contract = sdk.GetContract("0x86B7df0dc0A790789D8fDE4C604EF8187FF8AD2A"); // Edition Drop
-                                                                                      // Fetch single NFT
-                                                                                      // count++;
-                                                                                      // resultText.text = "Fetching Token: " + count;
-                                                                                      // NFT result = await contract.ERC1155.Get(count.ToString());
-                                                                                      // resultText.text = result.metadata.name + " (x" + result.supply + ")";
+        var contract = sdk.GetContract("0x86B7df0dc0A790789D8fDE4C604EF8187FF8AD2A");
+
+        // Edition Drop
+        // Fetch single NFT
+        // count++;
+        // resultText.text = "Fetching Token: " + count;
+        // NFT result = await contract.ERC1155.Get(count.ToString());
+        // resultText.text = result.metadata.name + " (x" + result.supply + ")";
 
         // fetch all NFTs
         resultText.text = "Fetching all NFTs";
@@ -124,15 +126,15 @@ public async void MintERC721()
         };
         string connectedAddress = await sdk.wallet.GetAddress();
         var payload = new ERC721MintPayload(connectedAddress, meta);
-        var p = await contract.ERC721.signature.Generate(payload); // typically generated on the backend
-        var result = await contract.ERC721.signature.Mint(p);
-        if (result.isSuccessful())
+        try
         {
+            var p = await contract.ERC721.signature.Generate(payload); // typically generated on the backend
+            var result = await contract.ERC721.signature.Mint(p);
             resultText.text = "SigMinted tokenId: " + result.id;
         }
-        else
+        catch (System.Exception e)
         {
-            resultText.text = "SigMint failed (see console)";
+            resultText.text = "Sigmint Failed (see console): " + e.Message;
         }
     }
 
@@ -146,15 +148,15 @@ public async void MintERC1155()
         var canClaim = await contract.ERC1155.claimConditions.CanClaim("0", 1);
         if (canClaim)
         {
-            var result = await contract.ERC1155.Claim("0", 1);
-            var newSupply = await contract.ERC1155.TotalSupply("0");
-            if (result[0].isSuccessful())
+            try
             {
+                var result = await contract.ERC1155.Claim("0", 1);
+                var newSupply = await contract.ERC1155.TotalSupply("0");
                 resultText.text = "Claim successful! New supply: " + newSupply;
             }
-            else
+            catch (System.Exception e)
             {
-                resultText.text = "Claim failed (see console)";
+                resultText.text = "Claim Failed: " + e.Message;
             }
         }
         else
@@ -177,18 +179,16 @@ public async void MintERC20()
 
         // Mint
         var contract = sdk.GetContract("0xB4870B21f80223696b68798a755478C86ce349bE"); // Token
-        var result = await contract.ERC20.Mint("1.2");
-        if (result.isSuccessful())
+        try
         {
+            var result = await contract.ERC20.Mint("1.2");
             resultText.text = "mint successful";
         }
-        else
+        catch (System.Exception e)
         {
-            resultText.text = "Mint failed (see console)";
+            resultText.text = "Mint failed (see console): " + e.Message;
         }
 
-
-
         // sig mint
         // var contract = sdk.GetContract("0xB4870B21f80223696b68798a755478C86ce349bE"); // Token
         // var payload = new ERC20MintPayload("0xE79ee09bD47F4F5381dbbACaCff2040f2FbC5803", "3.2");
@@ -213,14 +213,14 @@ public async void BuyListing()
 
         // buy listing
         var marketplace = sdk.GetContract("0xC7DBaD01B18403c041132C5e8c7e9a6542C4291A").marketplace; // Marketplace
-        var result = await marketplace.BuyListing("0", 1);
-        if (result.isSuccessful())
+        try
         {
+            var result = await marketplace.BuyListing("0", 1);
             resultText.text = "NFT bought successfully";
         }
-        else
+        catch (System.Exception e)
         {
-            resultText.text = "Buy failed (see console)";
+            resultText.text = "Error Buying listing (see console): " + e.Message;
         }
     }
 
diff --git a/Assets/Thirdweb/Scripts/Bridge.cs b/Assets/Thirdweb/Scripts/Bridge.cs
@@ -33,30 +33,34 @@ private static void jsCallback(string taskId, string result, string error)
         {
             if (taskMap.ContainsKey(taskId))
             {
-                if (error != null) 
+                if (error != null)
                 {
-                    // TODO wrap error in proper result type
                     taskMap[taskId].TrySetException(new Exception(error));
-                } else 
+                }
+                else
                 {
                     taskMap[taskId].TrySetResult(result);
                 }
                 taskMap.Remove(taskId);
             }
         }
 
-        public static void Initialize(string chainOrRPC, ThirdwebSDK.Options options) {
-            if (Application.isEditor) {
+        public static void Initialize(string chainOrRPC, ThirdwebSDK.Options options)
+        {
+            if (Application.isEditor)
+            {
                 Debug.LogWarning("Initializing the thirdweb SDK is not supported in the editor. Please build and run the app instead.");
                 return;
             }
             ThirdwebInitialize(chainOrRPC, Utils.ToJson(options));
         }
 
-        public static async Task<string> Connect() {
-            if (Application.isEditor) {
+        public static async Task<string> Connect()
+        {
+            if (Application.isEditor)
+            {
                 Debug.LogWarning("Connecting wallets is not supported in the editor. Please build and run the app instead.");
-                return "0x0000000000000000000000000000000000000000";
+                return Utils.AddressZero;
             }
             var task = new TaskCompletionSource<string>();
             string taskId = Guid.NewGuid().ToString();
@@ -66,8 +70,10 @@ public static async Task<string> Connect() {
             return result;
         }
 
-        public static async Task SwitchNetwork(int chainId) {
-            if (Application.isEditor) {
+        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;
             }
@@ -81,7 +87,8 @@ public static async Task SwitchNetwork(int chainId) {
 
         public static async Task<T> InvokeRoute<T>(string route, string[] body)
         {
-            if (Application.isEditor) {
+            if (Application.isEditor)
+            {
                 Debug.LogWarning("Interacting with the thirdweb SDK is not supported in the editor. Please build and run the app instead.");
                 return default(T);
             }
@@ -91,7 +98,7 @@ public static async Task<T> InvokeRoute<T>(string route, string[] body)
             taskMap[taskId] = task;
             ThirdwebInvoke(taskId, route, msg, jsCallback);
             string result = await task.Task;
-            Debug.Log($"InvokeRoute Result: {result}");
+            // Debug.Log($"InvokeRoute Result: {result}");
             return JsonConvert.DeserializeObject<Result<T>>(result).result;
         }
 
diff --git a/Assets/Thirdweb/Scripts/Common.cs b/Assets/Thirdweb/Scripts/Common.cs
@@ -1,19 +1,24 @@
-namespace Thirdweb {
-    public abstract class Routable {
+namespace Thirdweb
+{
+    public abstract class Routable
+    {
         public static string separator = "/";
         public static string subSeparator = "#";
 
-        public static string append(string route, string subRoute) {
+        public static string append(string route, string subRoute)
+        {
             return $"{route}{separator}{subRoute}";
         }
 
         protected string baseRoute;
 
-        public Routable(string baseRoute) {
+        public Routable(string baseRoute)
+        {
             this.baseRoute = baseRoute;
         }
 
-        protected string getRoute(string functionName) {
+        protected string getRoute(string functionName)
+        {
             return $"{baseRoute}{separator}{functionName}";
         }
     }
diff --git a/Assets/Thirdweb/Scripts/Deployer.cs b/Assets/Thirdweb/Scripts/Deployer.cs
@@ -62,11 +62,13 @@ public async Task<string> DeployMarketplace(MarketplaceContractDeployMetadata me
             return await Bridge.InvokeRoute<string>(getRoute("deployMarketplace"), Utils.ToJsonStringArray(metadata));
         }
 
-        public async Task<string> DeployReleasedContract(string releaserAddress, string contractName, object[] constructorParams) {
+        public async Task<string> DeployReleasedContract(string releaserAddress, string contractName, object[] constructorParams)
+        {
             return await Bridge.InvokeRoute<string>(getRoute("deployReleasedContract"), Utils.ToJsonStringArray(releaserAddress, contractName, constructorParams));
         }
 
-        public async Task<string> DeployFromContractUri(string uri, object[] constructorParams) {
+        public async Task<string> DeployFromContractUri(string uri, object[] constructorParams)
+        {
             return await Bridge.InvokeRoute<string>(getRoute("deployContractFromUri"), Utils.ToJsonStringArray(uri, constructorParams));
         }
     }
diff --git a/Assets/Thirdweb/Scripts/ERC1155.cs b/Assets/Thirdweb/Scripts/ERC1155.cs
@@ -90,7 +90,7 @@ public async Task<int> TotalCount()
         /// </summary>
         public async Task<int> TotalSupply(string tokenId)
         {
-            return await Bridge.InvokeRoute<int>(getRoute("totalUnclaimedSupply"), Utils.ToJsonStringArray(tokenId));
+            return await Bridge.InvokeRoute<int>(getRoute("totalSupply"), Utils.ToJsonStringArray(tokenId));
         }
 
         // WRITE FUNCTIONS
@@ -122,17 +122,17 @@ public async Task<TransactionResult> Burn(string tokenId, int amount)
         /// <summary>
         /// Claim NFTs from a Drop contract
         /// </summary>
-        public async Task<TransactionResult[]> Claim(string tokenId, int amount)
+        public async Task<TransactionResult> Claim(string tokenId, int amount)
         {
-            return await Bridge.InvokeRoute<TransactionResult[]>(getRoute("claim"), Utils.ToJsonStringArray(tokenId, amount));
+            return await Bridge.InvokeRoute<TransactionResult>(getRoute("claim"), Utils.ToJsonStringArray(tokenId, amount));
         }
 
         /// <summary>
         /// Claim NFTs from a Drop contract and send them to the given address
         /// </summary>
-        public async Task<TransactionResult[]> ClaimTo(string address, string tokenId, int amount)
+        public async Task<TransactionResult> ClaimTo(string address, string tokenId, int amount)
         {
-            return await Bridge.InvokeRoute<TransactionResult[]>(getRoute("claimTo"), Utils.ToJsonStringArray(address, tokenId, amount));
+            return await Bridge.InvokeRoute<TransactionResult>(getRoute("claimTo"), Utils.ToJsonStringArray(address, tokenId, amount));
         }
 
         /// <summary>
@@ -173,7 +173,7 @@ public async Task<TransactionResult> MintAdditionalSupplyTo(string address, stri
     /// </summary>
     public class ERC1155ClaimConditions : Routable
     {
-        public ERC1155ClaimConditions(string parentRoute) : base(Routable.append(parentRoute, "claimConditions")) 
+        public ERC1155ClaimConditions(string parentRoute) : base(Routable.append(parentRoute, "claimConditions"))
         {
         }
 
@@ -212,7 +212,7 @@ public async Task<bool> GetClaimerProofs(string tokenId, string claimerAddress)
 
     // TODO switch to another JSON serializer that supports polymorphism
     [System.Serializable]
-    #nullable enable
+#nullable enable
     public class ERC1155MintPayload
     {
         public string to;
@@ -310,7 +310,7 @@ public class ERC1155Signature : Routable
         /// <summary>
         /// Generate, verify and mint signed mintable payloads
         /// </summary>
-        public ERC1155Signature(string parentRoute) : base(Routable.append(parentRoute, "signature")) 
+        public ERC1155Signature(string parentRoute) : base(Routable.append(parentRoute, "signature"))
         {
         }
 
diff --git a/Assets/Thirdweb/Scripts/ERC20.cs b/Assets/Thirdweb/Scripts/ERC20.cs
@@ -185,10 +185,10 @@ public struct ERC20SignedPayload
     /// <summary>
     /// Fetch claim conditions for a given ERC20 drop contract
     /// </summary>
-    #nullable enable
+#nullable enable
     public class ERC20ClaimConditions : Routable
     {
-        public ERC20ClaimConditions(string parentRoute) : base(Routable.append(parentRoute, "claimConditions")) 
+        public ERC20ClaimConditions(string parentRoute) : base(Routable.append(parentRoute, "claimConditions"))
         {
         }
 
@@ -234,7 +234,7 @@ public class ERC20Signature : Routable
         /// <summary>
         /// Generate, verify and mint signed mintable payloads
         /// </summary>
-        public ERC20Signature(string parentRoute) : base(Routable.append(parentRoute, "signature")) 
+        public ERC20Signature(string parentRoute) : base(Routable.append(parentRoute, "signature"))
         {
         }
 
diff --git a/Assets/Thirdweb/Scripts/ERC721.cs b/Assets/Thirdweb/Scripts/ERC721.cs
@@ -176,7 +176,7 @@ public async Task<TransactionResult> MintTo(string address, NFTMetadata nft)
     /// </summary>
     public class ERC721ClaimConditions : Routable
     {
-       public ERC721ClaimConditions(string parentRoute) : base(Routable.append(parentRoute, "claimConditions")) 
+        public ERC721ClaimConditions(string parentRoute) : base(Routable.append(parentRoute, "claimConditions"))
         {
         }
 
@@ -214,7 +214,7 @@ public async Task<bool> GetClaimerProofs(string claimerAddress)
     }
 
     [System.Serializable]
-    #nullable enable
+#nullable enable
     public class ERC721MintPayload
     {
         public string to;
@@ -278,7 +278,7 @@ public class ERC721Signature : Routable
         /// <summary>
         /// Generate, verify and mint signed mintable payloads
         /// </summary>
-        public ERC721Signature(string parentRoute) : base(Routable.append(parentRoute, "signature")) 
+        public ERC721Signature(string parentRoute) : base(Routable.append(parentRoute, "signature"))
         {
         }
 
diff --git a/Assets/Thirdweb/Scripts/Marketplace.cs b/Assets/Thirdweb/Scripts/Marketplace.cs
@@ -119,7 +119,8 @@ public async Task<TransactionResult> CancelListing(string listingId)
 
     // AUCTION
 
-    public class MarketplaceAuction : Routable {
+    public class MarketplaceAuction : Routable
+    {
         public MarketplaceAuction(string parentRoute) : base(Routable.append(parentRoute, "auction"))
         {
         }
diff --git a/Assets/Thirdweb/Scripts/ThirdwebSDK.cs b/Assets/Thirdweb/Scripts/ThirdwebSDK.cs
diff --git a/Assets/Thirdweb/Scripts/Types.cs b/Assets/Thirdweb/Scripts/Types.cs
diff --git a/Assets/Thirdweb/Scripts/Utils.cs b/Assets/Thirdweb/Scripts/Utils.cs
diff --git a/Assets/Thirdweb/Scripts/Wallet.cs b/Assets/Thirdweb/Scripts/Wallet.cs

Original file line number	Diff line number	Diff line change
`@@ -42,14 +42,14 @@ public async void OnBalanceClick()`
`42`	`42`	`public async void OnSignClick()`
`43`	`43`	`{`
`44`	`44`	`resultText.text = "Signing...";`
`45`		`- var data = await sdk.wallet.Authenticate("example.com");`
`46`		`- if (data.payload.address != null)`
	`45`	`+ try`
`47`	`46`	`{`
	`47`	`+ var data = await sdk.wallet.Authenticate("example.com");`
`48`	`48`	`resultText.text = "Sig: " + data.payload.address.Substring(0, 6) + "...";`
`49`	`49`	`}`
`50`		`- else`
	`50`	`+ catch (System.Exception e)`
`51`	`51`	`{`
`52`		`- resultText.text = "Failed to authenticate";`
	`52`	`+ resultText.text = "Auth Error: " + e.Message;`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`
`@@ -80,12 +80,14 @@ public async void GetERC721()`
`80`	`80`
`81`	`81`	`public async void GetERC1155()`
`82`	`82`	`{`
`83`		`- var contract = sdk.GetContract("0x86B7df0dc0A790789D8fDE4C604EF8187FF8AD2A"); // Edition Drop`
`84`		`- // Fetch single NFT`
`85`		`- // count++;`
`86`		`- // resultText.text = "Fetching Token: " + count;`
`87`		`- // NFT result = await contract.ERC1155.Get(count.ToString());`
`88`		`- // resultText.text = result.metadata.name + " (x" + result.supply + ")";`
	`83`	`+ var contract = sdk.GetContract("0x86B7df0dc0A790789D8fDE4C604EF8187FF8AD2A");`
	`84`	`+`
	`85`	`+ // Edition Drop`
	`86`	`+ // Fetch single NFT`
	`87`	`+ // count++;`
	`88`	`+ // resultText.text = "Fetching Token: " + count;`
	`89`	`+ // NFT result = await contract.ERC1155.Get(count.ToString());`
	`90`	`+ // resultText.text = result.metadata.name + " (x" + result.supply + ")";`
`89`	`91`
`90`	`92`	`// fetch all NFTs`
`91`	`93`	`resultText.text = "Fetching all NFTs";`
`@@ -124,15 +126,15 @@ public async void MintERC721()`
`124`	`126`	`};`
`125`	`127`	`string connectedAddress = await sdk.wallet.GetAddress();`
`126`	`128`	`var payload = new ERC721MintPayload(connectedAddress, meta);`
`127`		`- var p = await contract.ERC721.signature.Generate(payload); // typically generated on the backend`
`128`		`- var result = await contract.ERC721.signature.Mint(p);`
`129`		`- if (result.isSuccessful())`
	`129`	`+ try`
`130`	`130`	`{`
	`131`	`+ var p = await contract.ERC721.signature.Generate(payload); // typically generated on the backend`
	`132`	`+ var result = await contract.ERC721.signature.Mint(p);`
`131`	`133`	`resultText.text = "SigMinted tokenId: " + result.id;`
`132`	`134`	`}`
`133`		`- else`
	`135`	`+ catch (System.Exception e)`
`134`	`136`	`{`
`135`		`- resultText.text = "SigMint failed (see console)";`
	`137`	`+ resultText.text = "Sigmint Failed (see console): " + e.Message;`
`136`	`138`	`}`
`137`	`139`	`}`
`138`	`140`
`@@ -146,15 +148,15 @@ public async void MintERC1155()`
`146`	`148`	`var canClaim = await contract.ERC1155.claimConditions.CanClaim("0", 1);`
`147`	`149`	`if (canClaim)`
`148`	`150`	`{`
`149`		`- var result = await contract.ERC1155.Claim("0", 1);`
`150`		`- var newSupply = await contract.ERC1155.TotalSupply("0");`
`151`		`- if (result[0].isSuccessful())`
	`151`	`+ try`
`152`	`152`	`{`
	`153`	`+ var result = await contract.ERC1155.Claim("0", 1);`
	`154`	`+ var newSupply = await contract.ERC1155.TotalSupply("0");`
`153`	`155`	`resultText.text = "Claim successful! New supply: " + newSupply;`
`154`	`156`	`}`
`155`		`- else`
	`157`	`+ catch (System.Exception e)`
`156`	`158`	`{`
`157`		`- resultText.text = "Claim failed (see console)";`
	`159`	`+ resultText.text = "Claim Failed: " + e.Message;`
`158`	`160`	`}`
`159`	`161`	`}`
`160`	`162`	`else`
`@@ -177,18 +179,16 @@ public async void MintERC20()`
`177`	`179`
`178`	`180`	`// Mint`
`179`	`181`	`var contract = sdk.GetContract("0xB4870B21f80223696b68798a755478C86ce349bE"); // Token`
`180`		`- var result = await contract.ERC20.Mint("1.2");`
`181`		`- if (result.isSuccessful())`
	`182`	`+ try`
`182`	`183`	`{`
	`184`	`+ var result = await contract.ERC20.Mint("1.2");`
`183`	`185`	`resultText.text = "mint successful";`
`184`	`186`	`}`
`185`		`- else`
	`187`	`+ catch (System.Exception e)`
`186`	`188`	`{`
`187`		`- resultText.text = "Mint failed (see console)";`
	`189`	`+ resultText.text = "Mint failed (see console): " + e.Message;`
`188`	`190`	`}`
`189`	`191`
`190`		`-`
`191`		`-`
`192`	`192`	`// sig mint`
`193`	`193`	`// var contract = sdk.GetContract("0xB4870B21f80223696b68798a755478C86ce349bE"); // Token`
`194`	`194`	`// var payload = new ERC20MintPayload("0xE79ee09bD47F4F5381dbbACaCff2040f2FbC5803", "3.2");`
`@@ -213,14 +213,14 @@ public async void BuyListing()`
`213`	`213`
`214`	`214`	`// buy listing`
`215`	`215`	`var marketplace = sdk.GetContract("0xC7DBaD01B18403c041132C5e8c7e9a6542C4291A").marketplace; // Marketplace`
`216`		`- var result = await marketplace.BuyListing("0", 1);`
`217`		`- if (result.isSuccessful())`
	`216`	`+ try`
`218`	`217`	`{`
	`218`	`+ var result = await marketplace.BuyListing("0", 1);`
`219`	`219`	`resultText.text = "NFT bought successfully";`
`220`	`220`	`}`
`221`		`- else`
	`221`	`+ catch (System.Exception e)`
`222`	`222`	`{`
`223`		`- resultText.text = "Buy failed (see console)";`
	`223`	`+ resultText.text = "Error Buying listing (see console): " + e.Message;`
`224`	`224`	`}`
`225`	`225`	`}`
`226`	`226`
Original file line number	Diff line number	Diff line change
`@@ -33,30 +33,34 @@ private static void jsCallback(string taskId, string result, string error)`
`33`	`33`	`{`
`34`	`34`	`if (taskMap.ContainsKey(taskId))`
`35`	`35`	`{`
`36`		`- if (error != null)`
	`36`	`+ if (error != null)`
`37`	`37`	`{`
`38`		`- // TODO wrap error in proper result type`
`39`	`38`	`taskMap[taskId].TrySetException(new Exception(error));`
`40`		`- } else`
	`39`	`+ }`
	`40`	`+ else`
`41`	`41`	`{`
`42`	`42`	`taskMap[taskId].TrySetResult(result);`
`43`	`43`	`}`
`44`	`44`	`taskMap.Remove(taskId);`
`45`	`45`	`}`
`46`	`46`	`}`
`47`	`47`
`48`		`- public static void Initialize(string chainOrRPC, ThirdwebSDK.Options options) {`
`49`		`- if (Application.isEditor) {`
	`48`	`+ public static void Initialize(string chainOrRPC, ThirdwebSDK.Options options)`
	`49`	`+ {`
	`50`	`+ if (Application.isEditor)`
	`51`	`+ {`
`50`	`52`	`Debug.LogWarning("Initializing the thirdweb SDK is not supported in the editor. Please build and run the app instead.");`
`51`	`53`	`return;`
`52`	`54`	`}`
`53`	`55`	`ThirdwebInitialize(chainOrRPC, Utils.ToJson(options));`
`54`	`56`	`}`
`55`	`57`
`56`		`- public static async Task<string> Connect() {`
`57`		`- if (Application.isEditor) {`
	`58`	`+ public static async Task<string> Connect()`
	`59`	`+ {`
	`60`	`+ if (Application.isEditor)`
	`61`	`+ {`
`58`	`62`	`Debug.LogWarning("Connecting wallets is not supported in the editor. Please build and run the app instead.");`
`59`		`- return "0x0000000000000000000000000000000000000000";`
	`63`	`+ return Utils.AddressZero;`
`60`	`64`	`}`
`61`	`65`	`var task = new TaskCompletionSource<string>();`
`62`	`66`	`string taskId = Guid.NewGuid().ToString();`
`@@ -66,8 +70,10 @@ public static async Task<string> Connect() {`
`66`	`70`	`return result;`
`67`	`71`	`}`
`68`	`72`
`69`		`- public static async Task SwitchNetwork(int chainId) {`
`70`		`- if (Application.isEditor) {`
	`73`	`+ public static async Task SwitchNetwork(int chainId)`
	`74`	`+ {`
	`75`	`+ if (Application.isEditor)`
	`76`	`+ {`
`71`	`77`	`Debug.LogWarning("Switching networks is not supported in the editor. Please build and run the app instead.");`
`72`	`78`	`return;`
`73`	`79`	`}`
`@@ -81,7 +87,8 @@ public static async Task SwitchNetwork(int chainId) {`
`81`	`87`
`82`	`88`	`public static async Task<T> InvokeRoute<T>(string route, string[] body)`
`83`	`89`	`{`
`84`		`- if (Application.isEditor) {`
	`90`	`+ if (Application.isEditor)`
	`91`	`+ {`
`85`	`92`	`Debug.LogWarning("Interacting with the thirdweb SDK is not supported in the editor. Please build and run the app instead.");`
`86`	`93`	`return default(T);`
`87`	`94`	`}`
`@@ -91,7 +98,7 @@ public static async Task<T> InvokeRoute<T>(string route, string[] body)`
`91`	`98`	`taskMap[taskId] = task;`
`92`	`99`	`ThirdwebInvoke(taskId, route, msg, jsCallback);`
`93`	`100`	`string result = await task.Task;`
`94`		`- Debug.Log($"InvokeRoute Result: {result}");`
	`101`	`+ // Debug.Log($"InvokeRoute Result: {result}");`
`95`	`102`	`return JsonConvert.DeserializeObject<Result<T>>(result).result;`
`96`	`103`	`}`
`97`	`104`
Original file line number	Diff line number	Diff line change
`@@ -62,11 +62,13 @@ public async Task<string> DeployMarketplace(MarketplaceContractDeployMetadata me`
`62`	`62`	`return await Bridge.InvokeRoute<string>(getRoute("deployMarketplace"), Utils.ToJsonStringArray(metadata));`
`63`	`63`	`}`
`64`	`64`
`65`		`- public async Task<string> DeployReleasedContract(string releaserAddress, string contractName, object[] constructorParams) {`
	`65`	`+ public async Task<string> DeployReleasedContract(string releaserAddress, string contractName, object[] constructorParams)`
	`66`	`+ {`
`66`	`67`	`return await Bridge.InvokeRoute<string>(getRoute("deployReleasedContract"), Utils.ToJsonStringArray(releaserAddress, contractName, constructorParams));`
`67`	`68`	`}`
`68`	`69`
`69`		`- public async Task<string> DeployFromContractUri(string uri, object[] constructorParams) {`
	`70`	`+ public async Task<string> DeployFromContractUri(string uri, object[] constructorParams)`
	`71`	`+ {`
`70`	`72`	`return await Bridge.InvokeRoute<string>(getRoute("deployContractFromUri"), Utils.ToJsonStringArray(uri, constructorParams));`
`71`	`73`	`}`
`72`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ public async Task<int> TotalCount()`
`90`	`90`	`/// </summary>`
`91`	`91`	`public async Task<int> TotalSupply(string tokenId)`
`92`	`92`	`{`
`93`		`- return await Bridge.InvokeRoute<int>(getRoute("totalUnclaimedSupply"), Utils.ToJsonStringArray(tokenId));`
	`93`	`+ return await Bridge.InvokeRoute<int>(getRoute("totalSupply"), Utils.ToJsonStringArray(tokenId));`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`// WRITE FUNCTIONS`
`@@ -122,17 +122,17 @@ public async Task<TransactionResult> Burn(string tokenId, int amount)`
`122`	`122`	`/// <summary>`
`123`	`123`	`/// Claim NFTs from a Drop contract`
`124`	`124`	`/// </summary>`
`125`		`- public async Task<TransactionResult[]> Claim(string tokenId, int amount)`
	`125`	`+ public async Task<TransactionResult> Claim(string tokenId, int amount)`
`126`	`126`	`{`
`127`		`- return await Bridge.InvokeRoute<TransactionResult[]>(getRoute("claim"), Utils.ToJsonStringArray(tokenId, amount));`
	`127`	`+ return await Bridge.InvokeRoute<TransactionResult>(getRoute("claim"), Utils.ToJsonStringArray(tokenId, amount));`
`128`	`128`	`}`
`129`	`129`
`130`	`130`	`/// <summary>`
`131`	`131`	`/// Claim NFTs from a Drop contract and send them to the given address`
`132`	`132`	`/// </summary>`
`133`		`- public async Task<TransactionResult[]> ClaimTo(string address, string tokenId, int amount)`
	`133`	`+ public async Task<TransactionResult> ClaimTo(string address, string tokenId, int amount)`
`134`	`134`	`{`
`135`		`- return await Bridge.InvokeRoute<TransactionResult[]>(getRoute("claimTo"), Utils.ToJsonStringArray(address, tokenId, amount));`
	`135`	`+ return await Bridge.InvokeRoute<TransactionResult>(getRoute("claimTo"), Utils.ToJsonStringArray(address, tokenId, amount));`
`136`	`136`	`}`
`137`	`137`
`138`	`138`	`/// <summary>`
`@@ -173,7 +173,7 @@ public async Task<TransactionResult> MintAdditionalSupplyTo(string address, stri`
`173`	`173`	`/// </summary>`
`174`	`174`	`public class ERC1155ClaimConditions : Routable`
`175`	`175`	`{`
`176`		`- public ERC1155ClaimConditions(string parentRoute) : base(Routable.append(parentRoute, "claimConditions"))`
	`176`	`+ public ERC1155ClaimConditions(string parentRoute) : base(Routable.append(parentRoute, "claimConditions"))`
`177`	`177`	`{`
`178`	`178`	`}`
`179`	`179`
`@@ -212,7 +212,7 @@ public async Task<bool> GetClaimerProofs(string tokenId, string claimerAddress)`
`212`	`212`
`213`	`213`	`// TODO switch to another JSON serializer that supports polymorphism`
`214`	`214`	`[System.Serializable]`
`215`		`- #nullable enable`
	`215`	`+#nullable enable`
`216`	`216`	`public class ERC1155MintPayload`
`217`	`217`	`{`
`218`	`218`	`public string to;`
`@@ -310,7 +310,7 @@ public class ERC1155Signature : Routable`
`310`	`310`	`/// <summary>`
`311`	`311`	`/// Generate, verify and mint signed mintable payloads`
`312`	`312`	`/// </summary>`
`313`		`- public ERC1155Signature(string parentRoute) : base(Routable.append(parentRoute, "signature"))`
	`313`	`+ public ERC1155Signature(string parentRoute) : base(Routable.append(parentRoute, "signature"))`
`314`	`314`	`{`
`315`	`315`	`}`
`316`	`316`
Original file line number	Diff line number	Diff line change
`@@ -185,10 +185,10 @@ public struct ERC20SignedPayload`
`185`	`185`	`/// <summary>`
`186`	`186`	`/// Fetch claim conditions for a given ERC20 drop contract`
`187`	`187`	`/// </summary>`
`188`		`- #nullable enable`
	`188`	`+#nullable enable`
`189`	`189`	`public class ERC20ClaimConditions : Routable`
`190`	`190`	`{`
`191`		`- public ERC20ClaimConditions(string parentRoute) : base(Routable.append(parentRoute, "claimConditions"))`
	`191`	`+ public ERC20ClaimConditions(string parentRoute) : base(Routable.append(parentRoute, "claimConditions"))`
`192`	`192`	`{`
`193`	`193`	`}`
`194`	`194`
`@@ -234,7 +234,7 @@ public class ERC20Signature : Routable`
`234`	`234`	`/// <summary>`
`235`	`235`	`/// Generate, verify and mint signed mintable payloads`
`236`	`236`	`/// </summary>`
`237`		`- public ERC20Signature(string parentRoute) : base(Routable.append(parentRoute, "signature"))`
	`237`	`+ public ERC20Signature(string parentRoute) : base(Routable.append(parentRoute, "signature"))`
`238`	`238`	`{`
`239`	`239`	`}`
`240`	`240`
Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ public async Task<TransactionResult> MintTo(string address, NFTMetadata nft)`
`176`	`176`	`/// </summary>`
`177`	`177`	`public class ERC721ClaimConditions : Routable`
`178`	`178`	`{`
`179`		`- public ERC721ClaimConditions(string parentRoute) : base(Routable.append(parentRoute, "claimConditions"))`
	`179`	`+ public ERC721ClaimConditions(string parentRoute) : base(Routable.append(parentRoute, "claimConditions"))`
`180`	`180`	`{`
`181`	`181`	`}`
`182`	`182`
`@@ -214,7 +214,7 @@ public async Task<bool> GetClaimerProofs(string claimerAddress)`
`214`	`214`	`}`
`215`	`215`
`216`	`216`	`[System.Serializable]`
`217`		`- #nullable enable`
	`217`	`+#nullable enable`
`218`	`218`	`public class ERC721MintPayload`
`219`	`219`	`{`
`220`	`220`	`public string to;`
`@@ -278,7 +278,7 @@ public class ERC721Signature : Routable`
`278`	`278`	`/// <summary>`
`279`	`279`	`/// Generate, verify and mint signed mintable payloads`
`280`	`280`	`/// </summary>`
`281`		`- public ERC721Signature(string parentRoute) : base(Routable.append(parentRoute, "signature"))`
	`281`	`+ public ERC721Signature(string parentRoute) : base(Routable.append(parentRoute, "signature"))`
`282`	`282`	`{`
`283`	`283`	`}`
`284`	`284`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,8 @@ public async Task<TransactionResult> CancelListing(string listingId)`
`119`	`119`
`120`	`120`	`// AUCTION`
`121`	`121`
`122`		`- public class MarketplaceAuction : Routable {`
	`122`	`+ public class MarketplaceAuction : Routable`
	`123`	`+ {`
`123`	`124`	`public MarketplaceAuction(string parentRoute) : base(Routable.append(parentRoute, "auction"))`
`124`	`125`	`{`
`125`	`126`	`}`