decode reverts too and return raw data if fail

thirdweb-dev · Apr 10, 2024 · f8c4d6a · f8c4d6a
1 parent 567e25a
commit f8c4d6a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Thirdweb/Thirdweb.RPC/RpcError.cs b/Thirdweb/Thirdweb.RPC/RpcError.cs
@@ -11,6 +11,6 @@ public class RpcError
         public string Message { get; set; }
 
         [JsonProperty("data")]
-        public object Data { get; set; }
+        public string Data { get; set; }
     }
 }
diff --git a/Thirdweb/Thirdweb.RPC/ThirdwebRPC.cs b/Thirdweb/Thirdweb.RPC/ThirdwebRPC.cs
@@ -175,11 +175,12 @@ private async Task SendBatchAsync(List<RpcRequest> batch)
                             {
                                 try
                                 {
-                                    revertMsg = new Nethereum.ABI.FunctionEncoding.FunctionCallDecoder().DecodeFunctionErrorMessage(Utils.StringToHex(rpcResponse.Error.Data.ToString()));
+                                    revertMsg = new Nethereum.ABI.FunctionEncoding.FunctionCallDecoder().DecodeFunctionErrorMessage(rpcResponse.Error.Data);
+                                    revertMsg = string.IsNullOrWhiteSpace(revertMsg) ? rpcResponse.Error.Data : revertMsg;
                                 }
                                 catch
                                 {
-                                    revertMsg = rpcResponse.Error.Data.ToString();
+                                    revertMsg = rpcResponse.Error.Data;
                                 }
                             }
                             tcs.SetException(new Exception($"RPC Error for request {rpcResponse.Id}: {rpcResponse.Error.Message} {revertMsg}"));