Working Gasless Support + fixes

Author: 0xFirekeeper

Assets/Thirdweb/Core/Contract Definitions/Forwarder/ContractDefinition/ForwardRequest.cs

@@ -4,6 +4,7 @@
 using System.Numerics;
 using Nethereum.Hex.HexTypes;
 using Nethereum.ABI.FunctionEncoding.Attributes;
+using Newtonsoft.Json;
 
 namespace Thirdweb.Contracts.Forwarder.ContractDefinition
 {
@@ -12,21 +13,27 @@ public partial class ForwardRequest : ForwardRequestBase { }
     public class ForwardRequestBase
     {
         [Parameter("address", "from", 1)]
+        [JsonProperty("from")]
         public virtual string From { get; set; }
 
         [Parameter("address", "to", 2)]
+        [JsonProperty("to")]
         public virtual string To { get; set; }
 
         [Parameter("uint256", "value", 3)]
+        [JsonProperty("value")]
         public virtual BigInteger Value { get; set; }
 
         [Parameter("uint256", "gas", 4)]
+        [JsonProperty("gas")]
         public virtual BigInteger Gas { get; set; }
 
         [Parameter("uint256", "nonce", 5)]
+        [JsonProperty("nonce")]
         public virtual BigInteger Nonce { get; set; }
 
         [Parameter("bytes", "data", 6)]
+        [JsonProperty("data")]
         public virtual string Data { get; set; }
     }
 }

Assets/Thirdweb/Core/Scripts/TransactionManager.cs

@@ -49,12 +49,7 @@ public static async Task<TransactionReceipt> ThirdwebWriteRawResult<TWFunction>(
             functionMessage.Gas = gas.Value < 100000 ? 100000 : gas.Value;
             functionMessage.FromAddress = await ThirdwebManager.Instance.SDK.wallet.GetAddress();
 
-            if (
-                ThirdwebManager.Instance.SDK.options.gasless != null
-                && ThirdwebManager.Instance.SDK.options.gasless.Value.openzeppelin != null
-                && !string.IsNullOrEmpty(ThirdwebManager.Instance.SDK.options.gasless.Value.openzeppelin.Value.relayerUrl)
-                && !string.IsNullOrEmpty(ThirdwebManager.Instance.SDK.options.gasless.Value.openzeppelin.Value.relayerForwarderAddress)
-            )
+            if (ThirdwebManager.Instance.SDK.options.gasless != null && ThirdwebManager.Instance.SDK.options.gasless.Value.openzeppelin != null)
             {
                 string relayerUrl = ThirdwebManager.Instance.SDK.options.gasless.Value.openzeppelin?.relayerUrl;
                 string relayerForwarderAddress = ThirdwebManager.Instance.SDK.options.gasless.Value.openzeppelin?.relayerForwarderAddress;
@@ -82,8 +77,6 @@ public static async Task<TransactionReceipt> ThirdwebWriteRawResult<TWFunction>(
 
                 string txHash = null;
 
-                Debug.Log(JsonConvert.SerializeObject(postData));
-
                 using (UnityWebRequest req = UnityWebRequest.Post(relayerUrl, ""))
                 {
                     byte[] bodyRaw = System.Text.Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(postData));
@@ -93,17 +86,18 @@ public static async Task<TransactionReceipt> ThirdwebWriteRawResult<TWFunction>(
                     await req.SendWebRequest();
                     if (req.result != UnityWebRequest.Result.Success)
                     {
-                        req.Dispose();
                         throw new UnityException(
                             $"Forward Request Failed!\nError: {req.downloadHandler.text}\nRelayer URL: {relayerUrl}\nRelayer Forwarder Address: {relayerForwarderAddress}\nRequest: {request}\nSignature: {signature}\nPost Data: {postData}"
                         );
                     }
                     else
                     {
-                        txHash = req.downloadHandler.text;
+                        var response = JsonConvert.DeserializeObject<RelayerResponse>(req.downloadHandler.text);
+                        var result = JsonConvert.DeserializeObject<RelayerResult>(response.result);
+                        txHash = result.txHash;
+                        Debug.Log(txHash);
                     }
                 }
-
                 return await ThirdwebManager.Instance.SDK.nativeSession.web3.TransactionReceiptPolling.PollForReceiptAsync(txHash);
             }
             else
@@ -113,12 +107,33 @@ public static async Task<TransactionReceipt> ThirdwebWriteRawResult<TWFunction>(
             }
         }
 
+        [System.Serializable]
+        public struct RelayerResponse
+        {
+            [JsonProperty("result")]
+            public string result;
+        }
+
+        [System.Serializable]
+        public struct RelayerResult
+        {
+            [JsonProperty("txHash")]
+            public string txHash;
+        }
+
         [System.Serializable]
         public struct RelayerRequest
         {
+            [JsonProperty("request")]
             public MinimalForwarder.ForwardRequest request;
+
+            [JsonProperty("signature")]
             public string signature;
+
+            [JsonProperty("forwarderAddress")]
             public string forwarderAddress;
+
+            [JsonProperty("type")]
             public string type;
 
             public RelayerRequest(ForwardRequest request, string signature, string forwarderAddress)

Assets/Thirdweb/Examples/Prefabs/ThirdwebManager.prefab

@@ -52,7 +52,7 @@ MonoBehaviour:
       draggable: 1
       expandable: 1
       multipleSelection: 1
-      isExpanded: 1
+      isExpanded: 0
       label:
         m_Text: Keys
         m_Image: {fileID: 0}
@@ -67,7 +67,7 @@ MonoBehaviour:
       elementNameOverride: 
       elementIcon: {fileID: 0}
     reqReferences: {fileID: 0}
-    isExpanded: 1
+    isExpanded: 0
     _keyValues: 000000000100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d000000
     _keys: 000000000100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d000000
     _values:
@@ -114,5 +114,5 @@ MonoBehaviour:
       chainId: 97
       rpcOverride: 
   storageIpfsGatewayUrl: https://gateway.ipfscdn.io/ipfs/
-  relayerUrl: 
-  relayerForwarderAddress: 
+  relayerUrl: https://api.defender.openzeppelin.com/autotasks/7d795312-855d-4f02-900a-30c1dde211cb/runs/webhook/76da2beb-fbb1-4082-bbb8-d4429dedee81/E33wsMacq1ZDCQVHPTZVo
+  relayerForwarderAddress: 0x5001A14CA6163143316a7C614e30e6041033Ac20

Assets/Thirdweb/Examples/Scenes/Scene_Prefabs.unity

@@ -2280,22 +2280,6 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 0}
     m_Modifications:
-    - target: {fileID: 4404896360829706404, guid: 379ed01658d62a14484f953196ff19db, type: 3}
-      propertyPath: relayerUrl
-      value: https://api.defender.openzeppelin.com/autotasks/7d795312-855d-4f02-900a-30c1dde211cb/runs/webhook/76da2beb-fbb1-4082-bbb8-d4429dedee81/E33wsMacq1ZDCQVHPTZVo
-      objectReference: {fileID: 0}
-    - target: {fileID: 4404896360829706404, guid: 379ed01658d62a14484f953196ff19db, type: 3}
-      propertyPath: relayerForwarderAddress
-      value: 0x5001A14CA6163143316a7C614e30e6041033Ac20
-      objectReference: {fileID: 0}
-    - target: {fileID: 4404896360829706404, guid: 379ed01658d62a14484f953196ff19db, type: 3}
-      propertyPath: supportedChainData.isExpanded
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4404896360829706404, guid: 379ed01658d62a14484f953196ff19db, type: 3}
-      propertyPath: supportedChainData.reorderableList.isExpanded
-      value: 0
-      objectReference: {fileID: 0}
     - target: {fileID: 4404896360829706405, guid: 379ed01658d62a14484f953196ff19db, type: 3}
       propertyPath: m_RootOrder
       value: 3

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

@@ -41,6 +41,7 @@ public async void MintERC20()
             // }
 
             // Claiming
+            Debugger.Instance.Log("Request Sent", "Pending confirmation...");
             Contract contract = ThirdwebManager.Instance.SDK.GetContract(DROP_ERC20_CONTRACT);
             var result = await contract.ERC20.Claim("0.3");
             Debugger.Instance.Log("[Claim ERC20] Successful", result.ToString());
@@ -86,6 +87,7 @@ public async void MintERC721()
             // }
 
             // NFT Drop Claiming
+            Debugger.Instance.Log("Request Sent", "Pending confirmation...");
             Contract contract = ThirdwebManager.Instance.SDK.GetContract(DROP_ERC721_CONTRACT);
             var result = await contract.ERC721.Claim(1);
             Debugger.Instance.Log("[Claim ERC721] Successful", result[0].ToString());
@@ -143,6 +145,8 @@ public async void MintERC1155()
             //     return;
             // }
 
+            // Edition Drop Claiming
+            Debugger.Instance.Log("Request Sent", "Pending confirmation...");
             Contract contract = ThirdwebManager.Instance.SDK.GetContract(DROP_ERC1155_CONTRACT);
             TransactionResult transactionResult = await contract.ERC1155.Claim("0", 1);
             Debugger.Instance.Log("[Claim ERC1155] Successful", transactionResult.ToString());
@@ -220,6 +224,7 @@ public async void OpenPack()
             // var result = await pack.Create(newPackInput);
             // Debugger.Instance.Log("[Create Pack] Successful", result.ToString());
 
+            Debugger.Instance.Log("Request Sent", "Pending confirmation...");
             PackRewards rewards = await pack.Open("1");
             Debugger.Instance.Log("[Open Pack] Successful", rewards.ToString());
         }