Update Neo nuget

src/Neo.Compiler.MSIL/FuncExport.cs

@@ -2,6 +2,7 @@
 using Neo.SmartContract.Framework;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Text;
 
 namespace Neo.Compiler
@@ -155,5 +156,73 @@ public static MyJson.JsonNode_Object Export(NeoModule module, byte[] script, Dic
 
             return outjson;
         }
+
+        private static object BuildSupportedStandards(Mono.Collections.Generic.Collection<CustomAttributeArgument> supportedStandardsAttribute)
+        {
+            if (supportedStandardsAttribute == null || supportedStandardsAttribute.Count == 0)
+            {
+                return "[]";
+            }
+
+            var entry = supportedStandardsAttribute.First();
+            string extra = "[";
+            foreach (var item in entry.Value as CustomAttributeArgument[])
+            {
+                extra += ($"\"{ScapeJson(item.Value.ToString())}\",");
+            }
+            extra = extra[0..^1];
+            extra += "]";
+
+            return extra;
+        }
+
+        private static string BuildExtraAttributes(List<Mono.Collections.Generic.Collection<CustomAttributeArgument>> extraAttributes)
+        {
+            if (extraAttributes == null || extraAttributes.Count == 0)
+            {
+                return "null";
+            }
+
+            string extra = "{";
+            foreach (var extraAttribute in extraAttributes)
+            {
+                var key = ScapeJson(extraAttribute[0].Value.ToString());
+                var value = ScapeJson(extraAttribute[1].Value.ToString());
+                extra += ($"\"{key}\":\"{value}\",");
+            }
+            extra = extra[0..^1];
+            extra += "}";
+
+            return extra;
+        }
+
+        private static string ScapeJson(string value)
+        {
+            return value.Replace("\"", "");
+        }
+
+        public static string GenerateManifest(MyJson.JsonNode_Object abi, NeoModule module)
+        {
+            StringBuilder sbABI = new StringBuilder();
+            abi.ConvertToStringWithFormat(sbABI, 0);
+
+            var features = module == null ? ContractFeatures.NoProperty : module.attributes
+                .Where(u => u.AttributeType.Name == "FeaturesAttribute")
+                .Select(u => (ContractFeatures)u.ConstructorArguments.FirstOrDefault().Value)
+                .FirstOrDefault();
+
+            var extraAttributes = module == null ? new List<Mono.Collections.Generic.Collection<CustomAttributeArgument>>() : module.attributes.Where(u => u.AttributeType.Name == "ManifestExtraAttribute").Select(attribute => attribute.ConstructorArguments).ToList();
+            var supportedStandardsAttribute = module?.attributes.Where(u => u.AttributeType.Name == "SupportedStandardsAttribute").Select(attribute => attribute.ConstructorArguments).FirstOrDefault();
+
+            var extra = BuildExtraAttributes(extraAttributes);
+            var supportedStandards = BuildSupportedStandards(supportedStandardsAttribute);
+            var storage = features.HasFlag(ContractFeatures.HasStorage).ToString().ToLowerInvariant();
+            var payable = features.HasFlag(ContractFeatures.Payable).ToString().ToLowerInvariant();
+
+            return
+                @"{""groups"":[],""features"":{""storage"":" + storage + @",""payable"":" + payable + @"},""abi"":" +
+                sbABI.ToString() +
+                @",""permissions"":[{""contract"":""*"",""methods"":""*""}],""trusts"":[],""safemethods"":[],""supportedstandards"":" + supportedStandards + @",""extra"":" + extra + "}";
+        }
     }
 }

src/Neo.Compiler.MSIL/Neo.Compiler.MSIL.csproj

@@ -42,7 +42,7 @@
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.4.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="3.4.0" />
     <PackageReference Include="Mono.Cecil" Version="0.11.2" />
-    <PackageReference Include="Neo" Version="3.0.0-CI00962" />
+    <PackageReference Include="Neo" Version="3.0.0-CI00971" />
   </ItemGroup>
 
   <ItemGroup>

src/Neo.Compiler.MSIL/Program.cs

@@ -152,7 +152,7 @@ public static int Compile(Options options)
             }
             byte[] bytes;
             int bSucc = 0;
-            string jsonstr = null;
+            MyJson.JsonNode_Object abi = null;
             string debugstr = null;
             NeoModule module = null;
 
@@ -183,10 +183,7 @@ public static int Compile(Options options)
 
                 try
                 {
-                    var outjson = FuncExport.Export(module, bytes, addrConvTable);
-                    StringBuilder sb = new StringBuilder();
-                    outjson.ConvertToStringWithFormat(sb, 0);
-                    jsonstr = sb.ToString();
+                    abi = FuncExport.Export(module, bytes, addrConvTable);
                     log.Log("gen abi succ");
                 }
                 catch (Exception err)
@@ -246,10 +243,12 @@ public static int Compile(Options options)
 
             try
             {
+                StringBuilder sbABI = new StringBuilder();
+                abi.ConvertToStringWithFormat(sbABI, 0);
                 string abiname = onlyname + ".abi.json";
 
                 File.Delete(abiname);
-                File.WriteAllText(abiname, jsonstr);
+                File.WriteAllText(abiname, sbABI.ToString());
                 log.Log("write:" + abiname);
                 bSucc++;
             }
@@ -267,7 +266,6 @@ public static int Compile(Options options)
                 var tempName = Path.GetTempFileName();
                 File.Delete(tempName);
                 File.WriteAllText(tempName, debugstr);
-
                 File.Delete(debugzip);
                 using (var archive = ZipFile.Open(debugzip, ZipArchiveMode.Create))
                 {
@@ -285,24 +283,8 @@ public static int Compile(Options options)
 
             try
             {
-                var features = module == null ? ContractFeatures.NoProperty : module.attributes
-                    .Where(u => u.AttributeType.Name == "FeaturesAttribute")
-                    .Select(u => (ContractFeatures)u.ConstructorArguments.FirstOrDefault().Value)
-                    .FirstOrDefault();
-
-                var extraAttributes = module == null ? new List<Mono.Collections.Generic.Collection<CustomAttributeArgument>>() : module.attributes.Where(u => u.AttributeType.Name == "ManifestExtraAttribute").Select(attribute => attribute.ConstructorArguments).ToList();
-                var supportedStandardsAttribute = module?.attributes.Where(u => u.AttributeType.Name == "SupportedStandardsAttribute").Select(attribute => attribute.ConstructorArguments).FirstOrDefault();
-
-                var extra = BuildExtraAttributes(extraAttributes);
-                var supportedStandards = BuildSupportedStandards(supportedStandardsAttribute);
-                var storage = features.HasFlag(ContractFeatures.HasStorage).ToString().ToLowerInvariant();
-                var payable = features.HasFlag(ContractFeatures.Payable).ToString().ToLowerInvariant();
-
                 string manifest = onlyname + ".manifest.json";
-                string defManifest =
-                    @"{""groups"":[],""features"":{""storage"":" + storage + @",""payable"":" + payable + @"},""abi"":" +
-                    jsonstr +
-                    @",""permissions"":[{""contract"":""*"",""methods"":""*""}],""trusts"":[],""safemethods"":[],""supportedstandards"":" + supportedStandards + @",""extra"":" + extra + "}";
+                var defManifest = FuncExport.GenerateManifest(abi, module);
 
                 File.Delete(manifest);
                 File.WriteAllText(manifest, defManifest);
@@ -333,49 +315,5 @@ public static int Compile(Options options)
 
             return -1;
         }
-
-        private static object BuildSupportedStandards(Mono.Collections.Generic.Collection<CustomAttributeArgument> supportedStandardsAttribute)
-        {
-            if (supportedStandardsAttribute == null || supportedStandardsAttribute.Count == 0)
-            {
-                return "[]";
-            }
-
-            var entry = supportedStandardsAttribute.First();
-            string extra = "[";
-            foreach (var item in entry.Value as CustomAttributeArgument[])
-            {
-                extra += ($"\"{ScapeJson(item.Value.ToString())}\",");
-            }
-            extra = extra[0..^1];
-            extra += "]";
-
-            return extra;
-        }
-
-        private static string BuildExtraAttributes(List<Mono.Collections.Generic.Collection<CustomAttributeArgument>> extraAttributes)
-        {
-            if (extraAttributes == null || extraAttributes.Count == 0)
-            {
-                return "null";
-            }
-
-            string extra = "{";
-            foreach (var extraAttribute in extraAttributes)
-            {
-                var key = ScapeJson(extraAttribute[0].Value.ToString());
-                var value = ScapeJson(extraAttribute[1].Value.ToString());
-                extra += ($"\"{key}\":\"{value}\",");
-            }
-            extra = extra[0..^1];
-            extra += "}";
-
-            return extra;
-        }
-
-        private static string ScapeJson(string value)
-        {
-            return value.Replace("\"", "");
-        }
     }
 }

src/Neo.SmartContract.Framework/Services/Neo/Contract.cs

@@ -7,6 +7,11 @@ public class Contract
         /// </summary>
         public readonly byte[] Script;
 
+        /// <summary>
+        /// Manifest
+        /// </summary>
+        public readonly string Manifest;
+
         /// <summary>
         /// Has storage
         /// </summary>

tests/Neo.Compiler.MSIL.UnitTests/UnitTest_ABI_Event.cs

@@ -12,7 +12,7 @@ public void Test_Good()
         {
             var testengine = new TestEngine();
             testengine.AddEntryScript("./TestClasses/Contract_Event.cs");
-            var abi = testengine.ScriptEntry.finialABI;
+            var abi = testengine.ScriptEntry.finalABI;
             Console.WriteLine("abi=" + abi.ToString());
             var events = abi["events"].AsList()[0].ToString();
             Console.WriteLine("event abi info =" + events);

tests/Neo.Compiler.MSIL.UnitTests/UnitTest_ABI_Offset.cs

@@ -12,7 +12,7 @@ public class UnitTest_ABI_Offset
         public void UnitTest_TestABIOffsetWithoutOptimizer()
         {
             var buildScript = NeonTestTool.BuildScript("./TestClasses/Contract_ABIOffset.cs", true, false);
-            var abi = buildScript.finialABI;
+            var abi = buildScript.finalABI;
 
             var methodsABI = abi["methods"].AsList();
             Assert.AreEqual("0", methodsABI[0].GetDictItem("offset").ToString());
@@ -26,7 +26,7 @@ public void UnitTest_TestABIOffsetWithoutOptimizer()
         public void UnitTest_TestABIOffsetWithOptimizer()
         {
             var buildScript = NeonTestTool.BuildScript("./TestClasses/Contract_ABIOffset.cs", true, true);
-            var abi = buildScript.finialABI;
+            var abi = buildScript.finalABI;
 
             var methodsABI = abi["methods"].AsList();
             Assert.AreEqual("0", methodsABI[0].GetDictItem("offset").ToString());

tests/Neo.Compiler.MSIL.UnitTests/Utils/BuildNEF.cs

@@ -16,7 +16,7 @@ public BuildNEF(NefFile nefFile, string manifestFile) : base()
             finalNEF = nefFile.Script;
             MyJson.JsonNode_Object manifestAbi = MyJson.Parse(manifestFile) as MyJson.JsonNode_Object;
             var abi = manifestAbi.GetDictItem("abi") as MyJson.JsonNode_Object;
-            finialABI = abi;
+            finalABI = abi;
             finalManifest = manifestFile;
         }
     }

tests/Neo.Compiler.MSIL.UnitTests/Utils/BuildScript.cs

@@ -1,10 +1,7 @@
-using Mono.Cecil;
 using Neo.Compiler.Optimizer;
-using Neo.SmartContract.Manifest;
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 
 namespace Neo.Compiler.MSIL.UnitTests.Utils
 {
@@ -16,7 +13,7 @@ public class BuildScript
         public ILModule modIL { get; private set; }
         public ModuleConverter converterIL { get; private set; }
         public byte[] finalNEF { get; protected set; }
-        public MyJson.JsonNode_Object finialABI { get; protected set; }
+        public MyJson.JsonNode_Object finalABI { get; protected set; }
         public string finalManifest { get; protected set; }
         public MyJson.JsonNode_Object debugInfo { get; private set; }
 
@@ -78,7 +75,7 @@ public void Build(Stream fs, Stream fspdb, bool optimizer)
 #endif
             try
             {
-                finialABI = FuncExport.Export(converterIL.outModule, finalNEF, addrConvTable);
+                finalABI = FuncExport.Export(converterIL.outModule, finalNEF, addrConvTable);
             }
             catch (Exception err)
             {
@@ -100,23 +97,13 @@ public void Build(Stream fs, Stream fspdb, bool optimizer)
 
             try
             {
-                var features = converterIL.outModule == null ? ContractFeatures.NoProperty : converterIL.outModule.attributes
-                    .Where(u => u.AttributeType.Name == "FeaturesAttribute")
-                    .Select(u => (ContractFeatures)u.ConstructorArguments.FirstOrDefault().Value)
-                    .FirstOrDefault();
-
-                var extraAttributes = converterIL.outModule == null ? new List<Mono.Collections.Generic.Collection<CustomAttributeArgument>>()
-                    : converterIL.outModule.attributes.Where(u => u.AttributeType.Name == "ManifestExtraAttribute").Select(attribute => attribute.ConstructorArguments).ToList();
-                var storage = features.HasFlag(ContractFeatures.HasStorage).ToString().ToLowerInvariant();
-                var payable = features.HasFlag(ContractFeatures.Payable).ToString().ToLowerInvariant();
-
-                finalManifest =
-                    @"{""groups"":[],""features"":{""storage"":" + storage + @",""payable"":" + payable + @"},""abi"":" +
-                    finialABI +
-                    @",""permissions"":[{""contract"":""*"",""methods"":""*""}],""trusts"":[],""safemethods"":[],""extra"":[]" + "}";
+                finalManifest = FuncExport.GenerateManifest(finalABI, converterIL.outModule);
             }
-            catch
+            catch (Exception err)
             {
+                log.Log("Gen Manifest Error:" + err.ToString());
+                this.Error = err;
+                return;
             }
         }
 

tests/Neo.Compiler.MSIL.UnitTests/Utils/TestEngine.cs

@@ -7,7 +7,6 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 
 namespace Neo.Compiler.MSIL.UnitTests.Utils
 {
@@ -128,7 +127,7 @@ public ContractMethod GetMethod(string methodname)
         public int GetMethodEntryOffset(string methodname)
         {
             if (this.ScriptEntry is null) return -1;
-            var methods = this.ScriptEntry.finialABI.GetDictItem("methods") as MyJson.JsonNode_Array;
+            var methods = this.ScriptEntry.finalABI.GetDictItem("methods") as MyJson.JsonNode_Array;
             foreach (var item in methods)
             {
                 var method = item as MyJson.JsonNode_Object;
@@ -200,8 +199,19 @@ public EvaluationStack ExecuteTestCase(params StackItem[] args)
             return this.ResultStack;
         }
 
+        public void SendNotification(UInt160 hash, string eventName, VM.Types.Array state)
+        {
+            typeof(ApplicationEngine).GetMethod("SendNotification", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)
+                .Invoke(this, new object[] { hash, eventName, state });
+        }
+
         static Dictionary<uint, InteropDescriptor> callmethod;
 
+        public void ClearNotifications()
+        {
+            typeof(ApplicationEngine).GetField("notifications", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance).SetValue(this, null);
+        }
+
         protected override void OnSysCall(uint method)
         {
             if (callmethod == null)

tests/Neo.SmartContract.Framework.UnitTests/Services/Neo/AccountTest.cs

@@ -37,7 +37,7 @@ public void Test_AccountIsStandard()
             Assert.AreEqual(VM.VMState.FAULT, _engine.State);
             Assert.AreEqual(0, result.Count);
 
-            // Standard
+            // No standard
 
             _engine.Reset();
             result = _engine.ExecuteTestCaseStandard("accountIsStandard", new ByteString(new byte[20]));
@@ -46,9 +46,7 @@ public void Test_AccountIsStandard()
 
             var item = result.Pop();
             Assert.IsInstanceOfType(item, typeof(Boolean));
-            Assert.AreEqual(true, item.GetBoolean());
-
-            // No standard
+            Assert.AreEqual(false, item.GetBoolean());
 
             _engine.Reset();
             result = _engine.ExecuteTestCaseStandard("accountIsStandard", new ByteString(noStandard));