3.4.0

src/ApplicationLogs/LogReader.cs

@@ -10,7 +10,7 @@
 
 using Neo.IO;
 using Neo.IO.Data.LevelDB;
-using Neo.IO.Json;
+using Neo.Json;
 using Neo.Ledger;
 using Neo.Network.P2P.Payloads;
 using Neo.Persistence;
@@ -57,14 +57,14 @@ protected override void OnSystemLoaded(NeoSystem system)
         }
 
         [RpcMethod]
-        public JObject GetApplicationLog(JArray _params)
+        public JToken GetApplicationLog(JArray _params)
         {
             UInt256 hash = UInt256.Parse(_params[0].AsString());
             byte[] value = db.Get(ReadOptions.Default, hash.ToArray());
             if (value is null)
                 throw new RpcException(-100, "Unknown transaction/blockhash");
 
-            var raw = JObject.Parse(Neo.Utility.StrictUTF8.GetString(value));
+            var raw = JToken.Parse(Neo.Utility.StrictUTF8.GetString(value));
             //Additional optional "trigger" parameter to getapplicationlog for clients to be able to get just one execution result for a block.
             if (_params.Count >= 2 && Enum.TryParse(_params[1].AsString(), true, out TriggerType trigger))
             {
@@ -80,13 +80,13 @@ public JObject GetApplicationLog(JArray _params)
             return raw;
         }
 
-        public static JObject TxLogToJson(Blockchain.ApplicationExecuted appExec)
+        public static JToken TxLogToJson(Blockchain.ApplicationExecuted appExec)
         {
             global::System.Diagnostics.Debug.Assert(appExec.Transaction != null);
 
             var txJson = new JObject();
             txJson["txid"] = appExec.Transaction.Hash.ToString();
-            JObject trigger = new JObject();
+            JToken trigger = new JObject();
             trigger["trigger"] = appExec.Trigger;
             trigger["vmstate"] = appExec.VMState;
             trigger["exception"] = GetExceptionMessage(appExec.Exception);
@@ -101,7 +101,7 @@ public static JObject TxLogToJson(Blockchain.ApplicationExecuted appExec)
             }
             trigger["notifications"] = appExec.Notifications.Select(q =>
             {
-                JObject notification = new JObject();
+                JToken notification = new JObject();
                 notification["contract"] = q.ScriptHash.ToString();
                 notification["eventname"] = q.EventName;
                 try
@@ -115,22 +115,22 @@ public static JObject TxLogToJson(Blockchain.ApplicationExecuted appExec)
                 return notification;
             }).ToArray();
 
-            txJson["executions"] = new List<JObject>() { trigger }.ToArray();
+            txJson["executions"] = new List<JToken>() { trigger }.ToArray();
             return txJson;
         }
 
-        public static JObject BlockLogToJson(Block block, IReadOnlyList<Blockchain.ApplicationExecuted> applicationExecutedList)
+        public static JToken BlockLogToJson(Block block, IReadOnlyList<Blockchain.ApplicationExecuted> applicationExecutedList)
         {
             var blocks = applicationExecutedList.Where(p => p.Transaction is null).ToArray();
             if (blocks.Length > 0)
             {
                 var blockJson = new JObject();
                 var blockHash = block.Hash.ToArray();
                 blockJson["blockhash"] = block.Hash.ToString();
-                var triggerList = new List<JObject>();
+                var triggerList = new List<JToken>();
                 foreach (var appExec in blocks)
                 {
-                    JObject trigger = new JObject();
+                    JToken trigger = new JObject();
                     trigger["trigger"] = appExec.Trigger;
                     trigger["vmstate"] = appExec.VMState;
                     trigger["gasconsumed"] = appExec.GasConsumed.ToString();
@@ -144,7 +144,7 @@ public static JObject BlockLogToJson(Block block, IReadOnlyList<Blockchain.Appli
                     }
                     trigger["notifications"] = appExec.Notifications.Select(q =>
                     {
-                        JObject notification = new JObject();
+                        JToken notification = new JObject();
                         notification["contract"] = q.ScriptHash.ToString();
                         notification["eventname"] = q.EventName;
                         try

src/Directory.Build.props

@@ -21,7 +21,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Neo" Version="3.3.1" />
+    <PackageReference Include="Neo" Version="3.3.1-CI01380" />
   </ItemGroup>
 
 </Project>

src/OracleService/OracleService.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <PackageId>Neo.Plugins.OracleService</PackageId>
@@ -7,6 +7,7 @@
   <ItemGroup>
     <PackageReference Include="Neo.ConsoleService" Version="1.2.0" />
     <PackageReference Include="NeoFS.API" Version="3.3.1" />
+    <PackageReference Include="Neo" Version="3.3.1" />
   </ItemGroup>
 
   <ItemGroup>

src/RpcClient/Models/RpcAccount.cs

@@ -8,7 +8,7 @@
 // Redistribution and use in source and binary forms with or without
 // modifications are permitted.
 
-using Neo.IO.Json;
+using Neo.Json;
 
 namespace Neo.Network.RPC.Models
 {
@@ -22,7 +22,7 @@ public class RpcAccount
 
         public bool WatchOnly { get; set; }
 
-        public JObject ToJson()
+        public JToken ToJson()
         {
             return new JObject
             {
@@ -33,7 +33,7 @@ public JObject ToJson()
             };
         }
 
-        public static RpcAccount FromJson(JObject json)
+        public static RpcAccount FromJson(JToken json)
         {
             return new RpcAccount
             {

src/RpcClient/Models/RpcApplicationLog.cs

@@ -8,7 +8,7 @@
 // Redistribution and use in source and binary forms with or without
 // modifications are permitted.
 
-using Neo.IO.Json;
+using Neo.Json;
 using Neo.SmartContract;
 using Neo.VM;
 using Neo.VM.Types;
@@ -25,9 +25,9 @@ public class RpcApplicationLog
 
         public List<Execution> Executions { get; set; }
 
-        public JObject ToJson()
+        public JToken ToJson()
         {
-            JObject json = new JObject();
+            JToken json = new JObject();
             if (TxId != null)
                 json["txid"] = TxId.ToString();
             if (BlockHash != null)
@@ -36,7 +36,7 @@ public JObject ToJson()
             return json;
         }
 
-        public static RpcApplicationLog FromJson(JObject json, ProtocolSettings protocolSettings)
+        public static RpcApplicationLog FromJson(JToken json, ProtocolSettings protocolSettings)
         {
             return new RpcApplicationLog
             {
@@ -61,9 +61,9 @@ public class Execution
 
         public List<RpcNotifyEventArgs> Notifications { get; set; }
 
-        public JObject ToJson()
+        public JToken ToJson()
         {
-            JObject json = new();
+            var json = new JObject();
             json["trigger"] = Trigger;
             json["vmstate"] = VMState;
             json["gasconsumed"] = GasConsumed.ToString();
@@ -73,12 +73,12 @@ public JObject ToJson()
             return json;
         }
 
-        public static Execution FromJson(JObject json, ProtocolSettings protocolSettings)
+        public static Execution FromJson(JToken json, ProtocolSettings protocolSettings)
         {
             return new Execution
             {
-                Trigger = json["trigger"].TryGetEnum<TriggerType>(),
-                VMState = json["vmstate"].TryGetEnum<VMState>(),
+                Trigger = json["trigger"].AsEnum<TriggerType>(),
+                VMState = json["vmstate"].AsEnum<VMState>(),
                 GasConsumed = long.Parse(json["gasconsumed"].AsString()),
                 ExceptionMessage = json["exception"]?.AsString(),
                 Stack = ((JArray)json["stack"]).Select(p => Utility.StackItemFromJson(p)).ToList(),
@@ -95,16 +95,16 @@ public class RpcNotifyEventArgs
 
         public StackItem State { get; set; }
 
-        public JObject ToJson()
+        public JToken ToJson()
         {
-            JObject json = new();
+            var json = new JObject();
             json["contract"] = Contract.ToString();
             json["eventname"] = EventName;
             json["state"] = State.ToJson();
             return json;
         }
 
-        public static RpcNotifyEventArgs FromJson(JObject json, ProtocolSettings protocolSettings)
+        public static RpcNotifyEventArgs FromJson(JToken json, ProtocolSettings protocolSettings)
         {
             return new RpcNotifyEventArgs
             {

src/RpcClient/Models/RpcBlock.cs

@@ -8,7 +8,7 @@
 // Redistribution and use in source and binary forms with or without
 // modifications are permitted.
 
-using Neo.IO.Json;
+using Neo.Json;
 using Neo.Network.P2P.Payloads;
 
 namespace Neo.Network.RPC.Models
@@ -21,15 +21,15 @@ public class RpcBlock
 
         public UInt256 NextBlockHash { get; set; }
 
-        public JObject ToJson(ProtocolSettings protocolSettings)
+        public JToken ToJson(ProtocolSettings protocolSettings)
         {
-            JObject json = Utility.BlockToJson(Block, protocolSettings);
+            JToken json = Utility.BlockToJson(Block, protocolSettings);
             json["confirmations"] = Confirmations;
             json["nextblockhash"] = NextBlockHash?.ToString();
             return json;
         }
 
-        public static RpcBlock FromJson(JObject json, ProtocolSettings protocolSettings)
+        public static RpcBlock FromJson(JToken json, ProtocolSettings protocolSettings)
         {
             return new RpcBlock
             {

src/RpcClient/Models/RpcBlockHeader.cs

@@ -8,7 +8,7 @@
 // Redistribution and use in source and binary forms with or without
 // modifications are permitted.
 
-using Neo.IO.Json;
+using Neo.Json;
 using Neo.Network.P2P.Payloads;
 
 namespace Neo.Network.RPC.Models
@@ -21,15 +21,15 @@ public class RpcBlockHeader
 
         public UInt256 NextBlockHash { get; set; }
 
-        public JObject ToJson(ProtocolSettings protocolSettings)
+        public JToken ToJson(ProtocolSettings protocolSettings)
         {
-            JObject json = Header.ToJson(protocolSettings);
+            JToken json = Header.ToJson(protocolSettings);
             json["confirmations"] = Confirmations;
             json["nextblockhash"] = NextBlockHash?.ToString();
             return json;
         }
 
-        public static RpcBlockHeader FromJson(JObject json, ProtocolSettings protocolSettings)
+        public static RpcBlockHeader FromJson(JToken json, ProtocolSettings protocolSettings)
         {
             return new RpcBlockHeader
             {

src/RpcClient/Models/RpcContractState.cs

@@ -8,7 +8,7 @@
 // Redistribution and use in source and binary forms with or without
 // modifications are permitted.
 
-using Neo.IO.Json;
+using Neo.Json;
 using Neo.SmartContract;
 using Neo.SmartContract.Manifest;
 
@@ -18,12 +18,12 @@ public class RpcContractState
     {
         public ContractState ContractState { get; set; }
 
-        public JObject ToJson()
+        public JToken ToJson()
         {
             return ContractState.ToJson();
         }
 
-        public static RpcContractState FromJson(JObject json)
+        public static RpcContractState FromJson(JToken json)
         {
             return new RpcContractState
             {
@@ -33,7 +33,7 @@ public static RpcContractState FromJson(JObject json)
                     UpdateCounter = (ushort)json["updatecounter"].AsNumber(),
                     Hash = UInt160.Parse(json["hash"].AsString()),
                     Nef = RpcNefFile.FromJson(json["nef"]),
-                    Manifest = ContractManifest.FromJson(json["manifest"])
+                    Manifest = ContractManifest.FromJson((JObject)json["manifest"])
                 }
             };
         }

src/RpcClient/Models/RpcFoundStates.cs

@@ -10,7 +10,7 @@
 
 using System;
 using System.Linq;
-using Neo.IO.Json;
+using Neo.Json;
 
 namespace Neo.Network.RPC.Models
 {
@@ -21,7 +21,7 @@ public class RpcFoundStates
         public byte[] FirstProof;
         public byte[] LastProof;
 
-        public static RpcFoundStates FromJson(JObject json)
+        public static RpcFoundStates FromJson(JToken json)
         {
             return new RpcFoundStates
             {
@@ -37,7 +37,7 @@ public static RpcFoundStates FromJson(JObject json)
             };
         }
 
-        static byte[] ProofFromJson(JObject json)
+        static byte[] ProofFromJson(JToken json)
             => json == null ? null : Convert.FromBase64String(json.AsString());
     }
 }

src/RpcClient/Models/RpcInvokeResult.cs

@@ -8,7 +8,7 @@
 // Redistribution and use in source and binary forms with or without
 // modifications are permitted.
 
-using Neo.IO.Json;
+using Neo.Json;
 using Neo.VM;
 using Neo.VM.Types;
 using System;
@@ -32,9 +32,9 @@ public class RpcInvokeResult
 
         public string Session { get; set; }
 
-        public JObject ToJson()
+        public JToken ToJson()
         {
-            JObject json = new();
+            var json = new JObject();
             json["script"] = Script;
             json["state"] = State;
             json["gasconsumed"] = GasConsumed.ToString();
@@ -53,12 +53,12 @@ public JObject ToJson()
             return json;
         }
 
-        public static RpcInvokeResult FromJson(JObject json)
+        public static RpcInvokeResult FromJson(JToken json)
         {
             RpcInvokeResult invokeScriptResult = new()
             {
                 Script = json["script"].AsString(),
-                State = json["state"].TryGetEnum<VMState>(),
+                State = json["state"].AsEnum<VMState>(),
                 GasConsumed = long.Parse(json["gasconsumed"].AsString()),
             };
             invokeScriptResult.Exception = json["exception"]?.AsString();
@@ -79,15 +79,15 @@ public class RpcStack
 
         public string Value { get; set; }
 
-        public JObject ToJson()
+        public JToken ToJson()
         {
-            JObject json = new();
+            var json = new JObject();
             json["type"] = Type;
             json["value"] = Value;
             return json;
         }
 
-        public static RpcStack FromJson(JObject json)
+        public static RpcStack FromJson(JToken json)
         {
             return new RpcStack
             {