Expose forwarder domain and version (#61)

Author: 0xFirekeeper

Assets/Thirdweb/Core/Scripts/ThirdwebSDK.cs

@@ -66,6 +66,8 @@ public struct OZDefenderOptions
         {
             public string relayerUrl;
             public string relayerForwarderAddress;
+            public string domainName;
+            public string domainVersion;
         }
 
         /// <summary>

Assets/Thirdweb/Core/Scripts/TransactionManager.cs

@@ -52,11 +52,13 @@ public static async Task<TransactionReceipt> ThirdwebWriteRawResult<TWFunction>(
             if (ThirdwebManager.Instance.SDK.nativeSession.options.gasless != null && ThirdwebManager.Instance.SDK.nativeSession.options.gasless.Value.openzeppelin != null)
             {
                 string relayerUrl = ThirdwebManager.Instance.SDK.nativeSession.options.gasless.Value.openzeppelin?.relayerUrl;
-                string relayerForwarderAddress = ThirdwebManager.Instance.SDK.nativeSession.options.gasless.Value.openzeppelin?.relayerForwarderAddress;
+                string forwarderAddress = ThirdwebManager.Instance.SDK.nativeSession.options.gasless.Value.openzeppelin?.relayerForwarderAddress;
+                string forwarderDomain = ThirdwebManager.Instance.SDK.nativeSession.options.gasless.Value.openzeppelin?.domainName;
+                string forwarderVersion = ThirdwebManager.Instance.SDK.nativeSession.options.gasless.Value.openzeppelin?.domainVersion;
 
                 functionMessage.Nonce = (
                     await ThirdwebRead<MinimalForwarder.GetNonceFunction, MinimalForwarder.GetNonceOutputDTO>(
-                        relayerForwarderAddress,
+                        forwarderAddress,
                         new MinimalForwarder.GetNonceFunction() { From = functionMessage.FromAddress }
                     )
                 ).ReturnValue1;
@@ -71,9 +73,9 @@ public static async Task<TransactionReceipt> ThirdwebWriteRawResult<TWFunction>(
                     Data = functionMessage.GetCallData().ByteArrayToHexString()
                 };
 
-                var signature = await EIP712.GenerateSignature_MinimalForwarder("GSNv2 Forwarder", "0.0.1", ThirdwebManager.Instance.SDK.nativeSession.lastChainId, relayerForwarderAddress, request);
+                var signature = await EIP712.GenerateSignature_MinimalForwarder(forwarderDomain, forwarderVersion, ThirdwebManager.Instance.SDK.nativeSession.lastChainId, forwarderAddress, request);
 
-                var postData = new RelayerRequest(request, signature, relayerForwarderAddress);
+                var postData = new RelayerRequest(request, signature, forwarderAddress);
 
                 string txHash = null;
 
@@ -87,7 +89,7 @@ public static async Task<TransactionReceipt> ThirdwebWriteRawResult<TWFunction>(
                     if (req.result != UnityWebRequest.Result.Success)
                     {
                         throw new UnityException(
-                            $"Forward Request Failed!\nError: {req.downloadHandler.text}\nRelayer URL: {relayerUrl}\nRelayer Forwarder Address: {relayerForwarderAddress}\nRequest: {request}\nSignature: {signature}\nPost Data: {postData}"
+                            $"Forward Request Failed!\nError: {req.downloadHandler.text}\nRelayer URL: {relayerUrl}\nRelayer Forwarder Address: {forwarderAddress}\nRequest: {request}\nSignature: {signature}\nPost Data: {postData}"
                         );
                     }
                     else

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

@@ -58,7 +58,13 @@ public class ThirdwebManager : MonoBehaviour
     public string relayerUrl = null;
 
     [Tooltip("Forwarders can be found here https://github.com/thirdweb-dev/ozdefender-autotask")]
-    public string relayerForwarderAddress = null;
+    public string forwarderAddress = null;
+
+    [Tooltip("Forwarder Domain Override (Defaults to GSNv2 Forwarder if left empty)")]
+    public string forwarderDomainOverride = null;
+
+    [Tooltip("Forwarder Version (Defaults to 0.0.1 if left empty)")]
+    public string forwaderVersionOverride = null;
 
     public ThirdwebSDK SDK;
 
@@ -124,11 +130,17 @@ private void Awake()
         {
             options.storage = new ThirdwebSDK.StorageOptions() { ipfsGatewayUrl = storageIpfsGatewayUrl };
         }
-        if (!string.IsNullOrEmpty(relayerUrl) && !string.IsNullOrEmpty(relayerForwarderAddress))
+        if (!string.IsNullOrEmpty(relayerUrl) && !string.IsNullOrEmpty(forwarderAddress))
         {
             options.gasless = new ThirdwebSDK.GaslessOptions()
             {
-                openzeppelin = new ThirdwebSDK.OZDefenderOptions() { relayerUrl = this.relayerUrl, relayerForwarderAddress = this.relayerForwarderAddress, }
+                openzeppelin = new ThirdwebSDK.OZDefenderOptions()
+                {
+                    relayerUrl = this.relayerUrl,
+                    relayerForwarderAddress = this.forwarderAddress,
+                    domainName = string.IsNullOrEmpty(this.forwarderDomainOverride) ? "GSNv2 Forwarder" : this.forwarderDomainOverride,
+                    domainVersion = string.IsNullOrEmpty(this.forwaderVersionOverride) ? "0.0.1" : this.forwaderVersionOverride
+                }
             };
         }