Sync neo changes

.github/workflows/main.yml

@@ -29,8 +29,8 @@ jobs:
       run: dotnet test tests/Neo.Compiler.MSIL.UnitTests /p:CollectCoverage=true /p:CoverletOutput=${GITHUB_WORKSPACE}/coverage/ /p:Exclude=\"[Neo.SmartContract.*]*,[Neo.Compiler.MSIL.UnitTests]*,[Neo.Compiler.MSIL.UnitTests.*]*\"
     - name: Test Neo.SmartContract.Framework.UnitTests
       run: dotnet test tests/Neo.SmartContract.Framework.UnitTests /p:CollectCoverage=true /p:CoverletOutput=${GITHUB_WORKSPACE}/coverage/lcov /p:MergeWith=${GITHUB_WORKSPACE}/coverage/coverage.json /p:Exclude=\"[Neo.SmartContract.*]*,[Neo.Compiler.MSIL.UnitTests]*,[Neo.Compiler.MSIL.UnitTests.*]*\" /p:CoverletOutputFormat=lcov
-    - name: Test Template.NEP5.UnitTests
-      run: dotnet test tests/Template.NEP5.UnitTests  /p:CollectCoverage=true /p:CoverletOutput=${GITHUB_WORKSPACE}/coverage/lcov /p:MergeWith=${GITHUB_WORKSPACE}/coverage/coverage.json /p:Exclude=\"[Neo.SmartContract.*]*,[Neo.Compiler.MSIL.UnitTests]*,[Neo.Compiler.MSIL.UnitTests.*]*\" /p:CoverletOutputFormat=lcov
+    - name: Test Template.NEP17.UnitTests
+      run: dotnet test tests/Template.NEP17.UnitTests  /p:CollectCoverage=true /p:CoverletOutput=${GITHUB_WORKSPACE}/coverage/lcov /p:MergeWith=${GITHUB_WORKSPACE}/coverage/coverage.json /p:Exclude=\"[Neo.SmartContract.*]*,[Neo.Compiler.MSIL.UnitTests]*,[Neo.Compiler.MSIL.UnitTests.*]*\" /p:CoverletOutputFormat=lcov
     - name: Coveralls
       uses: coverallsapp/github-action@master
       with:

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,29 +64,10 @@ 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)
+        public static JObject GenerateAbi(NeoModule module, Dictionary<int, int> addrConvTable)
         {
             var outjson = new JObject();
 
-            //hash
-            outjson["hash"] = ComputeHash(script);
-
             //functions
             var methods = new JArray();
             outjson["methods"] = methods;
@@ -217,10 +198,16 @@ public static string GenerateManifest(JObject abi, NeoModule module)
             var extra = BuildExtraAttributes(extraAttributes);
             var supportedStandards = BuildSupportedStandards(supportedStandardsAttribute);
 
+            var name = module.attributes
+                .Where(u => u.AttributeType.FullName == "System.ComponentModel.DisplayNameAttribute")
+                .Select(u => ScapeJson((string)u.ConstructorArguments.FirstOrDefault().Value))
+                .FirstOrDefault() ?? "";
+
             return
                 @"{""groups"":[],""abi"":" +
                 sbABI +
-                @",""permissions"":[{""contract"":""*"",""methods"":""*""}],""trusts"":[],""safemethods"":[],""supportedstandards"":" + supportedStandards + @",""extra"":" + extra + "}";
+                @",""permissions"":[{""contract"":""*"",""methods"":""*""}],""trusts"":[],""safemethods"":[],""name"":""" + name +
+                @""",""supportedstandards"":" + supportedStandards + @",""extra"":" + extra + "}";
         }
     }
 }

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

@@ -43,7 +43,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-CI01068" />
+    <PackageReference Include="Neo" Version="3.0.0-CI01089" />
   </ItemGroup>
 
   <ItemGroup>

src/Neo.Compiler.MSIL/Program.cs

@@ -180,7 +180,7 @@ public static int Compile(Options options, ILogger log = null)
 
                 try
                 {
-                    abi = FuncExport.Export(module, bytes, addrConvTable);
+                    abi = FuncExport.GenerateAbi(module, addrConvTable);
                     log.Log("gen abi succ");
                 }
                 catch (Exception err)
@@ -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");
                 }
@@ -215,9 +215,8 @@ public static int Compile(Options options, ILogger log = null)
                 {
                     Compiler = "neon",
                     Version = Version.Parse(((AssemblyFileVersionAttribute)Assembly.GetAssembly(typeof(Program))
-                        .GetCustomAttribute(typeof(AssemblyFileVersionAttribute))).Version),
-                    Script = bytes,
-                    ScriptHash = bytes.ToScriptHash()
+                        .GetCustomAttribute(typeof(AssemblyFileVersionAttribute))).Version).ToString(),
+                    Script = bytes
                 };
                 nef.CheckSum = NefFile.ComputeChecksum(nef);
 

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

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

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

@@ -2,11 +2,10 @@
 
 namespace Neo.SmartContract.Framework.Services.Neo
 {
-    [Contract("0x763afecf3ebba0a67568a2c8be06e8f068c62666")]
+    [Contract("0x7062149f9377e3a110a343f811b9e406f8ef7824")]
     public class Designation
     {
         public static extern UInt160 Hash { [ContractHash] get; }
-        public static extern string Name { get; }
         public static extern Cryptography.ECC.ECPoint[] GetDesignatedByRole(DesignationRole role, uint index);
     }
 }

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

@@ -4,15 +4,14 @@
 
 namespace Neo.SmartContract.Framework.Services.Neo
 {
-    [Contract("0x668e0c1f9d7b70a99dd9e06eadd4c784d641afbc")]
+    [Contract("0x36a019d836d964c438c573f78badf79b9e7eebdd")]
     public class GAS
     {
         public static extern UInt160 Hash { [ContractHash] get; }
-        public static extern string Name { get; }
         public static extern string Symbol { get; }
         public static extern byte Decimals { get; }
         public static extern BigInteger TotalSupply();
         public static extern BigInteger BalanceOf(UInt160 account);
-        public static extern bool Transfer(UInt160 from, UInt160 to, BigInteger amount);
+        public static extern bool Transfer(UInt160 from, UInt160 to, BigInteger amount, object data);
     }
 }

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

@@ -5,16 +5,15 @@
 
 namespace Neo.SmartContract.Framework.Services.Neo
 {
-    [Contract("0xde5f57d430d3dece511cf975a8d37848cb9e0525")]
+    [Contract("0xe22f9134cef8b03e53f71b3f960a20a65cddc972")]
     public class NEO
     {
         public static extern UInt160 Hash { [ContractHash] get; }
-        public static extern string Name { get; }
         public static extern string Symbol { get; }
         public static extern byte Decimals { get; }
         public static extern BigInteger TotalSupply();
         public static extern BigInteger BalanceOf(UInt160 account);
-        public static extern bool Transfer(UInt160 from, UInt160 to, BigInteger amount);
+        public static extern bool Transfer(UInt160 from, UInt160 to, BigInteger amount, object data);
 
         public static extern bool SetGasPerBlock(BigInteger gasPerBlock);
         public static extern BigInteger GetGasPerBlock();

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

@@ -2,12 +2,11 @@
 
 namespace Neo.SmartContract.Framework.Services.Neo
 {
-    [Contract("0x3c05b488bf4cf699d0631bf80190896ebbf38c3b")]
+    [Contract("0x35e4fc2e69a4d04d1db4d755c4150c50aff2e9a9")]
     public class Oracle
     {
         public static extern UInt160 Hash { [ContractHash] get; }
         public const uint MinimumResponseFee = 0_10000000;
-        public static extern string Name { get; }
         public static extern void Request(string url, string filter, string callback, object userData, long gasForResponse);
     }
 }

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

@@ -1,15 +1,13 @@
 #pragma warning disable CS0626
 
-using System;
 using System.Numerics;
 
 namespace Neo.SmartContract.Framework.Services.Neo
 {
-    [Contract("0xce06595079cd69583126dbfd1d2e25cca74cffe9")]
+    [Contract("0x1ca594b36b6b6b3f05efce8b106c824053d18713")]
     public class Policy
     {
         public static extern UInt160 Hash { [ContractHash] get; }
-        public static extern string Name();
         public static extern uint GetMaxTransactionsPerBlock();
         public static extern uint GetMaxBlockSize();
         public static extern long GetMaxBlockSystemFee();

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

@@ -0,0 +1,47 @@
+using Neo;
+using Neo.SmartContract.Framework;
+using Neo.SmartContract.Framework.Services.Neo;
+using Neo.SmartContract.Framework.Services.System;
+using System;
+using System.Numerics;
+
+namespace Template.NEP17.CSharp
+{
+    public partial class NEP17 : SmartContract
+    {
+        public static void OnPayment(UInt160 from, BigInteger amount, object data)
+        {
+            if (AssetStorage.GetPaymentStatus())
+            {
+                if (ExecutionEngine.CallingScriptHash == NEO.Hash)
+                    Mint(amount * TokensPerNEO);
+                else if (ExecutionEngine.CallingScriptHash == GAS.Hash && from != null)
+                    Mint(amount * TokensPerGAS);
+                else
+                    throw new Exception("Wrong calling script hash");
+            }
+            else
+            {
+                throw new Exception("Payment is disable on this contract!");
+            }
+        }
+
+        private static bool Mint(BigInteger amount)
+        {
+            var totalSupply = TotalSupplyStorage.Get();
+            if (totalSupply <= 0) throw new Exception("Contract not deployed.");
+
+            var avaliable_supply = MaxSupply - totalSupply;
+
+            if (amount <= 0) throw new Exception("Amount cannot be zero.");
+            if (amount > avaliable_supply) throw new Exception("Insufficient supply for mint tokens.");
+
+            Transaction tx = (Transaction)ExecutionEngine.ScriptContainer;
+            AssetStorage.Increase(tx.Sender, amount);
+            TotalSupplyStorage.Increase(amount);
+
+            OnTransfer(null, tx.Sender, amount);
+            return true;
+        }
+    }
+}

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 IsDeployed(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();
 
@@ -17,11 +17,10 @@ public static BigInteger BalanceOf(UInt160 account)
             return AssetStorage.Get(account);
         }
 
-        public static bool Transfer(UInt160 from, UInt160 to, BigInteger amount)
+        public static bool Transfer(UInt160 from, UInt160 to, BigInteger amount, object data)
         {
             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 (IsDeployed(to)) Contract.Call(to, "onPayment", new object[] { from, amount, data });
             return true;
         }
     }

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

@@ -1,11 +1,10 @@
 using Neo.SmartContract.Framework;
 using Neo.SmartContract.Framework.Services.Neo;
-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()
         {
@@ -19,10 +18,10 @@ public static bool Deploy()
             return true;
         }
 
-        public static void Update(byte[] script, string manifest)
+        public static void Update(byte[] nefFile, string manifest)
         {
             if (!IsOwner()) throw new Exception("No authorization.");
-            Contract.Update(script, manifest);
+            Contract.Update(nefFile, manifest);
         }
 
         public static void Destroy()
@@ -31,6 +30,18 @@ public static void Destroy()
             Contract.Destroy();
         }
 
+        public static void EnablePayment()
+        {
+            if (!IsOwner()) throw new Exception("No authorization.");
+            AssetStorage.Enable();
+        }
+
+        public static void DisablePayment()
+        {
+            if (!IsOwner()) throw new Exception("No authorization.");
+            AssetStorage.Disable();
+        }
+
         private static bool IsOwner() => Runtime.CheckWitness(Owner);
     }
 }