iterate over copy

Author: 0xFirekeeper

Thirdweb.Tests/Thirdweb.Utils/Thirdweb.Utils.Tests.cs

@@ -1,4 +1,5 @@
 using System.Numerics;
+using Newtonsoft.Json.Linq;
 
 namespace Thirdweb.Tests.Utilities;
 
@@ -763,4 +764,104 @@ public async Task FetchGasFees_Celo()
         Assert.True(maxPrio > 0);
         Assert.Equal(maxFee, maxPrio);
     }
+
+    [Fact]
+    public void PreprocessTypedDataJson_FormatsBigIntegers()
+    {
+        // Arrange
+        var inputJson =
+            /*lang=json,strict*/
+            @"
+        {
+            ""from"": 973250616940336452028326648501327235277017847475,
+            ""data"": ""0x"",
+            ""nested"": {
+                ""value"": 4294967295
+            },
+            ""array"": [
+                123,
+                973250616940336452028326648501327235277017847475
+            ]
+        }";
+
+        var expectedJson =
+            /*lang=json,strict*/
+            @"
+        {
+            ""from"": ""973250616940336452028326648501327235277017847475"",
+            ""data"": ""0x"",
+            ""nested"": {
+                ""value"": 4294967295
+            },
+            ""array"": [
+                123,
+                ""973250616940336452028326648501327235277017847475""
+            ]
+        }";
+
+        // Act
+        var processedJson = Utils.PreprocessTypedDataJson(inputJson);
+
+        // Assert
+        var expectedJObject = JObject.Parse(expectedJson);
+        var processedJObject = JObject.Parse(processedJson);
+
+        Assert.Equal(expectedJObject, processedJObject);
+    }
+
+    [Fact]
+    public void PreprocessTypedDataJson_NoLargeNumbers_NoChange()
+    {
+        // Arrange
+        var inputJson =
+            /*lang=json,strict*/
+            @"
+        {
+            ""value"": 123,
+            ""nested"": {
+                ""value"": 456
+            },
+            ""array"": [1, 2, 3]
+        }";
+
+        // Act
+        var processedJson = Utils.PreprocessTypedDataJson(inputJson);
+
+        // Assert
+        Assert.Equal(inputJson.Replace("\r\n", "").Replace(" ", ""), processedJson.Replace("\r\n", "").Replace(" ", ""));
+    }
+
+    [Fact]
+    public void PreprocessTypedDataJson_NestedLargeNumbers()
+    {
+        // Arrange
+        var inputJson =
+            /*lang=json,strict*/
+            @"
+        {
+            ""nested"": {
+                ""value"": 973250616940336452028326648501327235277017847475
+            },
+            ""array"": [123, 973250616940336452028326648501327235277017847475]
+        }";
+
+        var expectedJson =
+            /*lang=json,strict*/
+            @"
+        {
+            ""nested"": {
+                ""value"": ""973250616940336452028326648501327235277017847475""
+            },
+            ""array"": [123, ""973250616940336452028326648501327235277017847475""]
+        }";
+
+        // Act
+        var processedJson = Utils.PreprocessTypedDataJson(inputJson);
+
+        // Assert
+        var expectedJObject = JObject.Parse(expectedJson);
+        var processedJObject = JObject.Parse(processedJson);
+
+        Assert.Equal(expectedJObject, processedJObject);
+    }
 }

Thirdweb/Thirdweb.Utils/Utils.cs

@@ -967,14 +967,14 @@ static void StringifyLargeNumbers(JToken token)
         {
             if (token is JObject obj)
             {
-                foreach (var property in obj.Properties())
+                foreach (var property in obj.Properties().ToList())
                 {
                     StringifyLargeNumbers(property.Value);
                 }
             }
             else if (token is JArray array)
             {
-                foreach (var item in array)
+                foreach (var item in array.ToList())
                 {
                     StringifyLargeNumbers(item);
                 }