Sync Neo

neo-cli/CLI/MainService.Contracts.cs

@@ -9,7 +9,7 @@
 // modifications are permitted.
 
 using Neo.ConsoleService;
-using Neo.IO.Json;
+using Neo.Json;
 using Neo.Network.P2P.Payloads;
 using Neo.SmartContract;
 using Neo.SmartContract.Native;

neo-cli/CLI/MainService.NEP17.cs

@@ -9,7 +9,7 @@
 // modifications are permitted.
 
 using Neo.ConsoleService;
-using Neo.IO.Json;
+using Neo.Json;
 using Neo.Network.P2P.Payloads;
 using Neo.SmartContract;
 using Neo.SmartContract.Native;

neo-cli/CLI/MainService.Network.cs

@@ -11,7 +11,7 @@
 using Akka.Actor;
 using Neo.ConsoleService;
 using Neo.IO;
-using Neo.IO.Json;
+using Neo.Json;
 using Neo.Network.P2P;
 using Neo.Network.P2P.Capabilities;
 using Neo.Network.P2P.Payloads;

neo-cli/CLI/MainService.Plugins.cs

@@ -9,7 +9,7 @@
 
 using Microsoft.Extensions.Configuration;
 using Neo.ConsoleService;
-using Neo.IO.Json;
+using Neo.Json;
 using Neo.Plugins;
 using System;
 using System.Collections.Generic;
@@ -79,13 +79,13 @@ private async Task<MemoryStream> DownloadPluginAsync(string pluginName)
                     $"{GetType().Assembly.GetName().Name}/{GetType().Assembly.GetVersion()}");
                 using HttpResponseMessage responseApi = await http.SendAsync(request);
                 byte[] buffer = await responseApi.Content.ReadAsByteArrayAsync();
-                JObject releases = JObject.Parse(buffer);
-                JObject asset = releases.GetArray()
+                var releases = JObject.Parse(buffer);
+                var asset = ((JArray)releases)
                     .Where(p => !p["tag_name"].GetString().Contains('-'))
                     .Select(p => new
                     {
                         Version = Version.Parse(p["tag_name"].GetString().TrimStart('v')),
-                        Assets = p["assets"].GetArray()
+                        Assets = (JArray)p["assets"]
                     })
                     .OrderByDescending(p => p.Version)
                     .First(p => p.Version <= versionCore).Assets

neo-cli/CLI/MainService.Vote.cs

@@ -10,7 +10,7 @@
 
 using Neo.ConsoleService;
 using Neo.Cryptography.ECC;
-using Neo.IO.Json;
+using Neo.Json;
 using Neo.SmartContract;
 using Neo.SmartContract.Native;
 using Neo.VM;

neo-cli/CLI/MainService.Wallet.cs

@@ -11,7 +11,7 @@
 using Akka.Actor;
 using Neo.ConsoleService;
 using Neo.Cryptography.ECC;
-using Neo.IO.Json;
+using Neo.Json;
 using Neo.Network.P2P.Payloads;
 using Neo.Persistence;
 using Neo.SmartContract;

neo-cli/CLI/MainService.cs

@@ -12,7 +12,7 @@
 using Neo.ConsoleService;
 using Neo.Cryptography.ECC;
 using Neo.IO;
-using Neo.IO.Json;
+using Neo.Json;
 using Neo.Ledger;
 using Neo.Network.P2P;
 using Neo.Network.P2P.Payloads;
@@ -80,7 +80,7 @@ public MainService() : base()
             RegisterCommandHandler<string[], ECPoint[]>(str => str.Select(u => ECPoint.Parse(u.Trim(), ECCurve.Secp256r1)).ToArray());
             RegisterCommandHandler<string, JObject>(str => JObject.Parse(str));
             RegisterCommandHandler<string, decimal>(str => decimal.Parse(str, CultureInfo.InvariantCulture));
-            RegisterCommandHandler<JObject, JArray>(obj => (JArray)obj);
+            RegisterCommandHandler<JToken, JArray>(obj => (JArray)obj);
 
             RegisterCommand(this);
 
@@ -565,7 +565,7 @@ private bool OnInvokeWithResult(UInt160 scriptHash, string operation, out StackI
             {
                 foreach (var contractParameter in contractParameters)
                 {
-                    parameters.Add(ContractParameter.FromJson(contractParameter));
+                    parameters.Add(ContractParameter.FromJson((JObject)contractParameter));
                 }
             }
 

neo-cli/neo-cli.csproj

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

neo-gui/GUI/InvokeContractDialog.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;
 using Neo.Properties;
 using Neo.SmartContract;
@@ -112,7 +112,7 @@ private void button6_Click(object sender, EventArgs e)
         private void button7_Click(object sender, EventArgs e)
         {
             if (openFileDialog2.ShowDialog() != DialogResult.OK) return;
-            abi = JObject.Parse(File.ReadAllText(openFileDialog2.FileName));
+            abi = (JObject)JToken.Parse(File.ReadAllText(openFileDialog2.FileName));
             script_hash = UInt160.Parse(abi["hash"].AsString());
             textBox8.Text = script_hash.ToString();
             comboBox1.Items.Clear();
@@ -134,9 +134,9 @@ private void comboBox1_SelectedIndexChanged(object sender, EventArgs e)
         {
             if (!(comboBox1.SelectedItem is string method)) return;
             JArray functions = (JArray)abi["functions"];
-            JObject function = functions.First(p => p["name"].AsString() == method);
+            var function = functions.First(p => p["name"].AsString() == method);
             JArray _params = (JArray)function["parameters"];
-            parameters = _params.Select(p => new ContractParameter(p["type"].TryGetEnum<ContractParameterType>())).ToArray();
+            parameters = _params.Select(p => new ContractParameter(p["type"].AsEnum<ContractParameterType>())).ToArray();
             textBox9.Text = string.Join(", ", _params.Select(p => p["name"].AsString()));
             button8.Enabled = parameters.Length > 0;
             UpdateScript();