BigInteger in Neo.Json

src/Neo.Json/JNumber.cs

@@ -10,6 +10,7 @@
 // modifications are permitted.
 
 using System.Globalization;
+using System.Numerics;
 using System.Text.Json;
 
 namespace Neo.Json
@@ -40,7 +41,13 @@ public class JNumber : JToken
         /// <param name="value">The value of the JSON token.</param>
         public JNumber(double value = 0)
         {
-            if (!double.IsFinite(value)) throw new FormatException();
+            if (!double.IsFinite(value))
+                throw new ArgumentException("value is not finite", nameof(value));
+            if (value > MAX_SAFE_INTEGER)
+                throw new ArgumentException("value is higher than MAX_SAFE_INTEGER", nameof(value));
+            if (value < MIN_SAFE_INTEGER)
+                throw new ArgumentException("value is lower than MIN_SAFE_INTEGER", nameof(value));
+
             this.Value = value;
         }
 
@@ -119,9 +126,9 @@ public static implicit operator JNumber(double value)
             return new JNumber(value);
         }
 
-        public static implicit operator JNumber(long value)
+        public static implicit operator JNumber(BigInteger value)
         {
-            return new JNumber(value);
+            return new JNumber((long)value);
         }
 
         public static bool operator ==(JNumber left, JNumber? right)

src/Neo.Json/JToken.cs

@@ -9,6 +9,7 @@
 // Redistribution and use in source and binary forms with or without
 // modifications are permitted.
 
+using System.Numerics;
 using System.Text.Json;
 using static Neo.Json.Utility;
 
@@ -298,6 +299,11 @@ public static implicit operator JToken(double value)
         return (JNumber)value;
     }
 
+    public static implicit operator JToken(BigInteger value)
+    {
+        return (JNumber)value;
+    }
+
     public static implicit operator JToken?(string? value)
     {
         return (JString?)value;

src/Neo/SmartContract/JsonSerializer.cs

@@ -51,10 +51,7 @@ public static JToken Serialize(StackItem item)
                     }
                 case Integer num:
                     {
-                        var integer = num.GetInteger();
-                        if (integer > JNumber.MAX_SAFE_INTEGER || integer < JNumber.MIN_SAFE_INTEGER)
-                            throw new InvalidOperationException();
-                        return (double)integer;
+                        return num.GetInteger();
                     }
                 case Boolean boolean:
                     {
@@ -66,7 +63,7 @@ public static JToken Serialize(StackItem item)
 
                         foreach (var entry in map)
                         {
-                            if (!(entry.Key is ByteString)) throw new FormatException();
+                            if (entry.Key is not ByteString) throw new FormatException();
 
                             var key = entry.Key.GetString();
                             var value = Serialize(entry.Value);

tests/Neo.Json.UnitTests/UT_JNumber.cs

@@ -9,6 +9,8 @@
 // Redistribution and use in source and binary forms with or without
 // modifications are permitted.
 
+using System.Numerics;
+
 namespace Neo.Json.UnitTests
 {
     enum Woo
@@ -37,20 +39,29 @@ public void SetUp()
         public void TestAsBoolean()
         {
             maxInt.AsBoolean().Should().BeTrue();
+            minInt.AsBoolean().Should().BeTrue();
             zero.AsBoolean().Should().BeFalse();
         }
 
+        [TestMethod]
+        public void TestBigInteger()
+        {
+            ((JNumber)BigInteger.One).AsNumber().Should().Be(1);
+            ((JNumber)BigInteger.Zero).AsNumber().Should().Be(0);
+            ((JNumber)BigInteger.MinusOne).AsNumber().Should().Be(-1);
+        }
+
         [TestMethod]
         public void TestAsString()
         {
             Action action1 = () => new JNumber(double.PositiveInfinity).AsString();
-            action1.Should().Throw<FormatException>();
+            action1.Should().Throw<ArgumentException>();
 
             Action action2 = () => new JNumber(double.NegativeInfinity).AsString();
-            action2.Should().Throw<FormatException>();
+            action2.Should().Throw<ArgumentException>();
 
             Action action3 = () => new JNumber(double.NaN).AsString();
-            action3.Should().Throw<FormatException>();
+            action3.Should().Throw<ArgumentException>();
         }
 
         [TestMethod]

tests/Neo.UnitTests/SmartContract/UT_JsonSerializer.cs

@@ -43,7 +43,7 @@ public void JsonTest_WrongJson()
             Assert.ThrowsException<FormatException>(() => JObject.Parse(json));
 
             json = @"{""length"":99999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999}";
-            Assert.ThrowsException<FormatException>(() => JObject.Parse(json));
+            Assert.ThrowsException<ArgumentException>(() => JObject.Parse(json));
         }
 
         [TestMethod]
@@ -91,10 +91,10 @@ public void JsonTest_Numbers()
 
             Assert.AreEqual("[1,-2,3.5]", parsed.ToString());
 
-            json = "[200.500000E+005,200.500000e+5,-1.1234e-100,9.05E+28]";
+            json = "[200.500000E+005,200.500000e+5,-1.1234e-100,9.05E+8]";
             parsed = JObject.Parse(json);
 
-            Assert.AreEqual("[20050000,20050000,-1.1234E-100,9.05E+28]", parsed.ToString());
+            Assert.AreEqual("[20050000,20050000,-1.1234E-100,905000000]", parsed.ToString());
 
             json = "[-]";
             Assert.ThrowsException<FormatException>(() => JObject.Parse(json));
@@ -216,7 +216,7 @@ public void Serialize_EmptyObject()
         public void Serialize_Number()
         {
             var entry = new VM.Types.Array { 1, 9007199254740992 };
-            Assert.ThrowsException<InvalidOperationException>(() => JsonSerializer.Serialize(entry));
+            Assert.ThrowsException<ArgumentException>(() => JsonSerializer.Serialize(entry));
         }
 
         [TestMethod]
@@ -303,7 +303,7 @@ public void Serialize_Array_Bool_Str_Num()
         public void Deserialize_Array_Bool_Str_Num()
         {
             ApplicationEngine engine = ApplicationEngine.Create(TriggerType.Application, null, null);
-            var items = JsonSerializer.Deserialize(engine, JObject.Parse("[true,\"test\",123,9.05E+28]"), ExecutionEngineLimits.Default);
+            var items = JsonSerializer.Deserialize(engine, JObject.Parse("[true,\"test\",123,1.05E+4]"), ExecutionEngineLimits.Default);
 
             Assert.IsInstanceOfType(items, typeof(VM.Types.Array));
             Assert.AreEqual(((VM.Types.Array)items).Count, 4);
@@ -313,7 +313,7 @@ public void Deserialize_Array_Bool_Str_Num()
             Assert.IsTrue(array[0].GetBoolean());
             Assert.AreEqual(array[1].GetString(), "test");
             Assert.AreEqual(array[2].GetInteger(), 123);
-            Assert.AreEqual(array[3].GetInteger(), BigInteger.Parse("90500000000000000000000000000"));
+            Assert.AreEqual(array[3].GetInteger(), BigInteger.Parse("10500"));
         }
 
         [TestMethod]