Extract func sig from more kinds of inputs (#56)

Author: 0xFirekeeper

Thirdweb.Tests/Thirdweb.Contracts/Thirdweb.Contracts.Tests.cs

@@ -78,6 +78,22 @@ public async Task ReadTest_Tuple()
         Assert.Equal(0, result.ReturnValue2);
     }
 
+    [Fact(Timeout = 120000)]
+    public async Task ReadTest_FullSig()
+    {
+        var contract = await GetContract();
+        var result = await ThirdwebContract.Read<string>(contract, "function name() view returns (string)");
+        Assert.Equal("Kitty DropERC20", result);
+    }
+
+    [Fact(Timeout = 120000)]
+    public async Task ReadTest_PartialSig()
+    {
+        var contract = await GetContract();
+        var result = await ThirdwebContract.Read<string>(contract, "name()");
+        Assert.Equal("Kitty DropERC20", result);
+    }
+
     private class AllowlistProof
     {
         public List<byte[]> Proof { get; set; } = new();
@@ -104,6 +120,35 @@ public async Task WriteTest_SmartAccount()
         Assert.Equal(result.TransactionHash, receipt.TransactionHash);
     }
 
+    [Fact(Timeout = 120000)]
+    public async Task WriteTest_SmartAccount_FullSig()
+    {
+        var contract = await GetContract();
+        var smartAccount = await GetAccount();
+        var receiver = await smartAccount.GetAddress();
+        var quantity = BigInteger.One;
+        var currency = Constants.NATIVE_TOKEN_ADDRESS;
+        var pricePerToken = BigInteger.Zero;
+        var allowlistProof = new object[] { new byte[] { }, BigInteger.Zero, BigInteger.Zero, Constants.ADDRESS_ZERO };
+        var data = new byte[] { };
+        var result = await ThirdwebContract.Write(
+            smartAccount,
+            contract,
+            "claim(address, uint256, address, uint256, (bytes32[], uint256, uint256, address), bytes)",
+            0,
+            receiver,
+            quantity,
+            currency,
+            pricePerToken,
+            allowlistProof,
+            data
+        );
+        Assert.NotNull(result);
+        var receipt = await ThirdwebTransaction.WaitForTransactionReceipt(contract.Client, contract.Chain, result.TransactionHash);
+        Assert.NotNull(receipt);
+        Assert.Equal(result.TransactionHash, receipt.TransactionHash);
+    }
+
     [Fact(Timeout = 120000)]
     public async Task WriteTest_PrivateKeyAccount()
     {

Thirdweb/Thirdweb.Contracts/ThirdwebContract.cs

@@ -99,11 +99,27 @@ public static async Task<string> FetchAbi(ThirdwebClient client, string address,
         public static async Task<T> Read<T>(ThirdwebContract contract, string method, params object[] parameters)
         {
             var rpc = ThirdwebRPC.GetRpcInstance(contract.Client, contract.Chain);
-
             var contractRaw = new Contract(null, contract.Abi, contract.Address);
+
             var function = GetFunctionMatchSignature(contractRaw, method, parameters);
-            var data = function.GetData(parameters);
+            if (function == null)
+            {
+                if (method.Contains("("))
+                {
+                    try
+                    {
+                        var canonicalSignature = ExtractCanonicalSignature(method);
+                        var selector = Nethereum.Util.Sha3Keccack.Current.CalculateHash(canonicalSignature)[..8];
+                        function = contractRaw.GetFunctionBySignature(selector);
+                    }
+                    catch
+                    {
+                        function = contractRaw.GetFunction(method);
+                    }
+                }
+            }
 
+            var data = function.GetData(parameters);
             var resultData = await rpc.SendRequestAsync<string>("eth_call", new { to = contract.Address, data = data }, "latest").ConfigureAwait(false);
 
             return function.DecodeTypeOutput<T>(resultData);
@@ -122,6 +138,23 @@ public static async Task<ThirdwebTransaction> Prepare(IThirdwebWallet wallet, Th
         {
             var contractRaw = new Contract(null, contract.Abi, contract.Address);
             var function = GetFunctionMatchSignature(contractRaw, method, parameters);
+            if (function == null)
+            {
+                if (method.Contains("("))
+                {
+                    try
+                    {
+                        var canonicalSignature = ExtractCanonicalSignature(method);
+                        var selector = Nethereum.Util.Sha3Keccack.Current.CalculateHash(canonicalSignature)[..8];
+                        function = contractRaw.GetFunctionBySignature(selector);
+                    }
+                    catch
+                    {
+                        function = contractRaw.GetFunction(method);
+                    }
+                }
+            }
+
             var data = function.GetData(parameters);
             var transaction = new ThirdwebTransactionInput
             {
@@ -171,5 +204,35 @@ private static Function GetFunctionMatchSignature(Contract contract, string func
             }
             return null;
         }
+
+        /// <summary>
+        /// Extracts the canonical signature from the specified method.
+        /// </summary>
+        /// <param name="method">The method to extract the signature from.</param>
+        /// <returns>The canonical signature.</returns>
+        /// <exception cref="ArgumentException"></exception>
+        private static string ExtractCanonicalSignature(string method)
+        {
+            method = method.Split("returns")[0];
+            var startOfParameters = method.IndexOf('(');
+            if (startOfParameters == -1)
+            {
+                throw new ArgumentException("Invalid function signature: Missing opening parenthesis.");
+            }
+
+            var endOfParameters = method.LastIndexOf(')');
+            if (endOfParameters == -1)
+            {
+                throw new ArgumentException("Invalid function signature: Missing closing parenthesis.");
+            }
+
+            var functionName = method.Substring(0, startOfParameters).Trim().Split(' ').Last(); // Get the last part after any spaces (in case of "function name(...)")
+            var parameters = method.Substring(startOfParameters + 1, endOfParameters - startOfParameters - 1);
+
+            var paramTypes = parameters.Split(',').Select(param => param.Trim().Split(' ')[0]).ToArray();
+
+            var canonicalSignature = $"{functionName}({string.Join(",", paramTypes)})";
+            return canonicalSignature;
+        }
     }
 }