Sync neo changes

neo-devpack-dotnet.sln

@@ -22,12 +22,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "templates", "templates", "{
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{D5266066-0AFD-44D5-A83E-2F73668A63C8}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Template.NEP5.CSharp", "templates\Template.NEP5.CSharp\Template.NEP5.CSharp.csproj", "{ADD05222-DC45-4FDC-A41A-30A97BACC95F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Template.NEP17.CSharp", "templates\Template.NEP17.CSharp\Template.NEP17.CSharp.csproj", "{ADD05222-DC45-4FDC-A41A-30A97BACC95F}"
 	ProjectSection(ProjectDependencies) = postProject
 		{42C0FF0F-0A7C-4166-A773-1F944642C209} = {42C0FF0F-0A7C-4166-A773-1F944642C209}
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Template.NEP5.UnitTests", "tests\Template.NEP5.UnitTests\Template.NEP5.UnitTests.csproj", "{780141EE-D6E9-4591-8470-8F91B12027CA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Template.NEP17.UnitTests", "tests\Template.NEP17.UnitTests\Template.NEP17.UnitTests.csproj", "{780141EE-D6E9-4591-8470-8F91B12027CA}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

src/Neo.Compiler.MSIL/DebugExport.cs

@@ -117,13 +117,12 @@ private static JArray GetDocuments(IReadOnlyDictionary<string, int> docMap)
             return outjson;
         }
 
-        public static JObject Export(NeoModule module, byte[] script, IReadOnlyDictionary<int, int> addrConvTable)
+        public static JObject Export(NeoModule module, IReadOnlyDictionary<int, int> addrConvTable)
         {
             var docMap = GetDocumentMap(module);
             addrConvTable ??= ImmutableDictionary<int, int>.Empty;
 
             var outjson = new JObject();
-            outjson["hash"] = FuncExport.ComputeHash(script);
             // outjson["entrypoint"]= module.mainMethod;
             outjson["documents"] = GetDocuments(docMap);
             outjson["methods"] = GetMethods(module, docMap, addrConvTable);

src/Neo.Compiler.MSIL/FuncExport.cs

@@ -64,28 +64,15 @@ internal static string ConvType(TypeReference t)
             return "Unknown:" + type;
         }
 
-        public static string ComputeHash(byte[] script)
-        {
-            var sha256 = System.Security.Cryptography.SHA256.Create();
-            byte[] hash256 = sha256.ComputeHash(script);
-            var ripemd160 = new Neo.Cryptography.RIPEMD160Managed();
-            var hash = ripemd160.ComputeHash(hash256);
-
-            StringBuilder sb = new StringBuilder();
-            sb.Append("0x");
-            for (int i = hash.Length - 1; i >= 0; i--)
-            {
-                sb.Append(hash[i].ToString("x02"));
-            }
-            return sb.ToString();
-        }
-
         public static JObject Export(NeoModule module, byte[] script, Dictionary<int, int> addrConvTable)
         {
             var outjson = new JObject();
 
-            //hash
-            outjson["hash"] = ComputeHash(script);
+            //name
+            outjson["name"] = module.attributes
+                .Where(u => u.AttributeType.FullName == "Neo.SmartContract.Framework.ManifestNameAttribute")
+                .Select(u => (string)u.ConstructorArguments.FirstOrDefault().Value)
+                .FirstOrDefault() ?? "";
 
             //functions
             var methods = new JArray();

src/Neo.Compiler.MSIL/Program.cs

@@ -191,7 +191,7 @@ public static int Compile(Options options, ILogger log = null)
 
                 try
                 {
-                    var outjson = DebugExport.Export(module, bytes, addrConvTable);
+                    var outjson = DebugExport.Export(module, addrConvTable);
                     debugstr = outjson.ToString(false);
                     log.Log("gen debug succ");
                 }

src/Neo.SmartContract.Framework/ManifestNameAttribute.cs

@@ -0,0 +1,15 @@
+using System;
+
+namespace Neo.SmartContract.Framework
+{
+    [AttributeUsage(AttributeTargets.Class, AllowMultiple = false)]
+    public class ManifestNameAttribute : Attribute
+    {
+        public string Value { get; set; }
+
+        public ManifestNameAttribute(string value)
+        {
+            Value = value;
+        }
+    }
+}

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

@@ -3,24 +3,24 @@ namespace Neo.SmartContract.Framework.Services.Neo
     public class Contract
     {
         /// <summary>
-        /// Script
+        /// Id
         /// </summary>
-        public readonly byte[] Script;
+        public readonly int Id;
 
         /// <summary>
-        /// Manifest
+        /// Version
         /// </summary>
-        public readonly string Manifest;
+        public readonly int Version;
 
         /// <summary>
-        /// Has storage
+        /// Script
         /// </summary>
-        public readonly bool HasStorage;
+        public readonly byte[] Script;
 
         /// <summary>
-        /// Is payable
+        /// Manifest
         /// </summary>
-        public readonly bool IsPayable;
+        public readonly string Manifest;
 
         [Syscall("System.Contract.Call")]
         public static extern object Call(UInt160 scriptHash, string method, object[] arguments);

templates/Template.NEP5.CSharp/NEP5.Crowdsale.cs → templates/Template.NEP17.CSharp/NEP17.Crowdsale.cs

@@ -4,9 +4,9 @@
 using System;
 using System.Numerics;
 
-namespace Template.NEP5.CSharp
+namespace Template.NEP17.CSharp
 {
-    public partial class NEP5 : SmartContract
+    public partial class NEP17 : SmartContract
     {
         private static BigInteger GetTransactionAmount(Notification notification)
         {

templates/Template.NEP5.CSharp/NEP5.Helpers.cs → templates/Template.NEP17.CSharp/NEP17.Helpers.cs

@@ -2,11 +2,11 @@
 using Neo.SmartContract.Framework;
 using Neo.SmartContract.Framework.Services.Neo;
 
-namespace Template.NEP5.CSharp
+namespace Template.NEP17.CSharp
 {
-    public partial class NEP5 : SmartContract
+    public partial class NEP17 : SmartContract
     {
         private static bool ValidateAddress(UInt160 address) => !address.IsZero;
-        private static bool IsPayable(UInt160 address) => Blockchain.GetContract(address)?.IsPayable ?? true;
+        private static bool IsContract(UInt160 address) => Blockchain.GetContract(address) != null;
     }
 }

templates/Template.NEP5.CSharp/NEP5.Methods.cs → templates/Template.NEP17.CSharp/NEP17.Methods.cs

@@ -5,9 +5,9 @@
 using System;
 using System.Numerics;
 
-namespace Template.NEP5.CSharp
+namespace Template.NEP17.CSharp
 {
-    public partial class NEP5 : SmartContract
+    public partial class NEP17 : SmartContract
     {
         public static BigInteger TotalSupply() => TotalSupplyStorage.Get();
 
@@ -21,7 +21,6 @@ public static bool Transfer(UInt160 from, UInt160 to, BigInteger amount)
         {
             if (!ValidateAddress(from) || !ValidateAddress(to)) throw new Exception("The parameters from and to SHOULD be 20-byte non-zero addresses.");
             if (amount <= 0) throw new Exception("The parameter amount MUST be greater than 0.");
-            if (!IsPayable(to)) throw new Exception("Receiver cannot receive.");
             if (!Runtime.CheckWitness(from) && !from.Equals(ExecutionEngine.CallingScriptHash)) throw new Exception("No authorization.");
             if (AssetStorage.Get(from) < amount) throw new Exception("Insufficient balance.");
             if (from == to) return true;
@@ -30,6 +29,9 @@ public static bool Transfer(UInt160 from, UInt160 to, BigInteger amount)
             AssetStorage.Increase(to, amount);
 
             OnTransfer(from, to, amount);
+
+            // Validate payable
+            if (IsContract(to)) Contract.Call(to, "onPayment", new object[] { amount });
             return true;
         }
     }

templates/Template.NEP5.CSharp/NEP5.Owner.cs → templates/Template.NEP17.CSharp/NEP17.Owner.cs

@@ -3,9 +3,9 @@
 using Neo.SmartContract.Framework.Services.System;
 using System;
 
-namespace Template.NEP5.CSharp
+namespace Template.NEP17.CSharp
 {
-    public partial class NEP5 : SmartContract
+    public partial class NEP17 : SmartContract
     {
         public static bool Deploy()
         {

templates/Template.NEP5.CSharp/NEP5.cs → templates/Template.NEP17.CSharp/NEP17.cs

@@ -4,13 +4,14 @@
 using System.ComponentModel;
 using System.Numerics;
 
-namespace Template.NEP5.CSharp
+namespace Template.NEP17.CSharp
 {
+    [ManifestName("Token Name")]
     [ManifestExtra("Author", "Neo")]
     [ManifestExtra("Email", "dev@neo.org")]
     [ManifestExtra("Description", "This is a NEP5 example")]
-    [SupportedStandards("NEP5", "NEP10")]
-    public partial class NEP5 : SmartContract
+    [SupportedStandards("NEP17", "NEP10")]
+    public partial class NEP17 : SmartContract
     {
         #region Token Settings
         static readonly ulong MaxSupply = 10_000_000_000_000_000;

templates/Template.NEP5.CSharp/Storage/AssetStorage.cs → templates/Template.NEP17.CSharp/Storage/AssetStorage.cs

@@ -3,7 +3,7 @@
 using Neo.SmartContract.Framework.Services.Neo;
 using System.Numerics;
 
-namespace Template.NEP5.CSharp
+namespace Template.NEP17.CSharp
 {
     public static class AssetStorage
     {

templates/Template.NEP5.CSharp/Storage/TotalSupplyStorage.cs → templates/Template.NEP17.CSharp/Storage/TotalSupplyStorage.cs

@@ -2,7 +2,7 @@
 using Neo.SmartContract.Framework.Services.Neo;
 using System.Numerics;
 
-namespace Template.NEP5.CSharp
+namespace Template.NEP17.CSharp
 {
     public static class TotalSupplyStorage
     {

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

@@ -87,7 +87,7 @@ public void Build(Stream fs, Stream fspdb, bool optimizer)
 
             try
             {
-                debugInfo = DebugExport.Export(converterIL.outModule, finalNEF, addrConvTable);
+                debugInfo = DebugExport.Export(converterIL.outModule, addrConvTable);
             }
             catch (Exception err)
             {

tests/Template.NEP5.UnitTests/UnitTest_NEP5.cs → tests/Template.NEP17.UnitTests/UnitTest_NEP17.cs

@@ -5,7 +5,7 @@
 using System.Numerics;
 using System.Text;
 
-namespace Template.NEP5.UnitTests
+namespace Template.NEP17.UnitTests
 {
     [TestClass]
     public class UnitTest_NEP5
@@ -26,13 +26,13 @@ TestEngine CreateEngine()
             var engine = new TestEngine();
             engine.AddEntryScript(new string[]
             {
-                "../../../../../templates/Template.NEP5.CSharp/NEP5.cs",
-                "../../../../../templates/Template.NEP5.CSharp/Storage/TotalSupplyStorage.cs",
-                "../../../../../templates/Template.NEP5.CSharp/Storage/AssetStorage.cs",
-                "../../../../../templates/Template.NEP5.CSharp/NEP5.Owner.cs",
-                "../../../../../templates/Template.NEP5.CSharp/NEP5.Crowdsale.cs",
-                "../../../../../templates/Template.NEP5.CSharp/NEP5.Helpers.cs",
-                "../../../../../templates/Template.NEP5.CSharp/NEP5.Methods.cs"
+                "../../../../../templates/Template.NEP17.CSharp/NEP17.cs",
+                "../../../../../templates/Template.NEP17.CSharp/Storage/TotalSupplyStorage.cs",
+                "../../../../../templates/Template.NEP17.CSharp/Storage/AssetStorage.cs",
+                "../../../../../templates/Template.NEP17.CSharp/NEP17.Owner.cs",
+                "../../../../../templates/Template.NEP17.CSharp/NEP17.Crowdsale.cs",
+                "../../../../../templates/Template.NEP17.CSharp/NEP17.Helpers.cs",
+                "../../../../../templates/Template.NEP17.CSharp/NEP17.Methods.cs"
             });
 
             return engine;
@@ -47,6 +47,7 @@ public void Test_name()
             var item = result.Pop();
             Assert.IsInstanceOfType(item, typeof(ByteString));
             Assert.AreEqual("Token Name", item.GetString());
+            Assert.AreEqual("Token Name", _engine.ScriptEntry.finalABI["name"].AsString());
         }
 
         [TestMethod]