From a51e2a5811f4f183a5042ccaf54ee73689a81883 Mon Sep 17 00:00:00 2001
From: Shargon <shargon@gmail.com>
Date: Tue, 4 Aug 2020 14:21:19 +0200
Subject: [PATCH 1/2] Strict UTF8

---
 neo-cli/CLI/MainService.Tools.cs | 8 ++++----
 neo-cli/CLI/MainService.cs       | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/neo-cli/CLI/MainService.Tools.cs b/neo-cli/CLI/MainService.Tools.cs
index 0686ddb8d..eb7e4ce2a 100644
--- a/neo-cli/CLI/MainService.Tools.cs
+++ b/neo-cli/CLI/MainService.Tools.cs
@@ -70,7 +70,7 @@ private string HexToString(string hexString)
             {
                 var clearHexString = ClearHexString(hexString);
                 var bytes = clearHexString.HexToBytes();
-                var utf8String = Encoding.UTF8.GetString(bytes);
+                var utf8String = Utility.StrictUTF8.GetString(bytes);
 
                 if (!IsPrintable(utf8String))
                 {
@@ -170,7 +170,7 @@ private string StringToHex(string strParam)
         {
             try
             {
-                var bytesParam = Encoding.UTF8.GetBytes(strParam);
+                var bytesParam = Utility.StrictUTF8.GetBytes(strParam);
                 return bytesParam.ToHexString();
             }
             catch
@@ -196,7 +196,7 @@ private string StringToBase64(string strParam)
         {
             try
             {
-                byte[] bytearray = Encoding.UTF8.GetBytes(strParam);
+                byte[] bytearray = Utility.StrictUTF8.GetBytes(strParam);
                 string base64 = Convert.ToBase64String(bytearray.AsSpan());
                 return base64;
             }
@@ -407,7 +407,7 @@ private string Base64ToString(string bytearray)
             try
             {
                 byte[] result = Convert.FromBase64String(bytearray);
-                string utf8string = Encoding.UTF8.GetString(result);
+                string utf8string = Utility.StrictUTF8.GetString(result);
 
                 if (!IsPrintable(utf8string))
                 {
diff --git a/neo-cli/CLI/MainService.cs b/neo-cli/CLI/MainService.cs
index 2dc8de110..8b3d0bbaa 100644
--- a/neo-cli/CLI/MainService.cs
+++ b/neo-cli/CLI/MainService.cs
@@ -263,7 +263,7 @@ private byte[] LoadDeploymentScript(string nefFilePath, string manifestFilePath,
             }
 
             NefFile file;
-            using (var stream = new BinaryReader(File.OpenRead(nefFilePath), Encoding.UTF8, false))
+            using (var stream = new BinaryReader(File.OpenRead(nefFilePath), Utility.StrictUTF8, false))
             {
                 file = stream.ReadSerializable<NefFile>();
             }

From de25e16105129ccf95008c39116cea4db48b984d Mon Sep 17 00:00:00 2001
From: Shargon <shargon@gmail.com>
Date: Tue, 4 Aug 2020 14:22:54 +0200
Subject: [PATCH 2/2] Clean usings

---
 neo-cli/CLI/MainService.Tools.cs | 1 -
 neo-cli/CLI/MainService.cs       | 1 -
 2 files changed, 2 deletions(-)

diff --git a/neo-cli/CLI/MainService.Tools.cs b/neo-cli/CLI/MainService.Tools.cs
index eb7e4ce2a..6c8f27cc7 100644
--- a/neo-cli/CLI/MainService.Tools.cs
+++ b/neo-cli/CLI/MainService.Tools.cs
@@ -5,7 +5,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Numerics;
-using System.Text;
 
 namespace Neo.CLI
 {
diff --git a/neo-cli/CLI/MainService.cs b/neo-cli/CLI/MainService.cs
index 8b3d0bbaa..176151f57 100644
--- a/neo-cli/CLI/MainService.cs
+++ b/neo-cli/CLI/MainService.cs
@@ -24,7 +24,6 @@
 using System.Linq;
 using System.Net;
 using System.Reflection;
-using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading;