Write manifest file with storage and payable according the contract needs

src/Neo.Compiler.MSIL/MSIL/Conv_Multi.cs

@@ -991,7 +991,7 @@ private bool TryInsertMethod(NeoModule outModule, Mono.Cecil.MethodDefinition me
                     //continue;
                 }
 
-                NeoMethod nm = new NeoMethod(method);
+                NeoMethod nm = new NeoMethod(_method);
                 this.methodLink[_method] = nm;
                 outModule.mapMethods[nm.name] = nm;
                 ConvertMethod(_method, nm);

src/Neo.Compiler.MSIL/MSIL/Converter.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Numerics;
 using System.Text;
 
@@ -91,7 +92,7 @@ public NeoModule Convert(ILModule _in, ConvOption option = null)
                         continue;
                     }
                     if (m.Value.method.Is_ctor()) continue;
-                    NeoMethod nm = new NeoMethod(m.Value.method);
+                    NeoMethod nm = new NeoMethod(m.Value);
                     this.methodLink[m.Value] = nm;
                     outModule.mapMethods[nm.name] = nm;
                 }
@@ -185,7 +186,6 @@ public NeoModule Convert(ILModule _in, ConvOption option = null)
 
             foreach (var key in outModule.mapMethods.Keys)
             {
-
                 if (key.Contains("::Main("))
                 {
                     NeoMethod m = outModule.mapMethods[key];
@@ -201,7 +201,6 @@ public NeoModule Convert(ILModule _in, ConvOption option = null)
                             }
                         }
                     }
-
                 }
             }
             if (mainmethod == "")
@@ -214,7 +213,11 @@ public NeoModule Convert(ILModule _in, ConvOption option = null)
                 //单一默认入口
                 logger.Log("Find entrypoint:" + mainmethod);
             }
-
+            var attr = outModule.mapMethods.Values.Where(u => u.inSmartContract).Select(u => u.type.attributes.ToArray()).FirstOrDefault();
+            if (attr?.Length > 0)
+            {
+                outModule.attributes.AddRange(attr);
+            }
             outModule.mainMethod = mainmethod;
             this.LinkCode(mainmethod);
             //this.findFirstFunc();//得找到第一个函数

src/Neo.Compiler.MSIL/MSIL/ILModule.cs

@@ -64,9 +64,15 @@ public class ILType
     {
         public Dictionary<string, ILField> fields = new Dictionary<string, ILField>();
         public Dictionary<string, ILMethod> methods = new Dictionary<string, ILMethod>();
+        public List<Mono.Cecil.CustomAttribute> attributes = new List<Mono.Cecil.CustomAttribute>();
 
         public ILType(ILModule module, Mono.Cecil.TypeDefinition type, ILogger logger)
         {
+            if (type.HasCustomAttributes && type.IsClass)
+            {
+                attributes.AddRange(type.CustomAttributes);
+            }
+
             foreach (Mono.Cecil.FieldDefinition f in type.Fields)
             {
                 this.fields.Add(f.Name, new ILField(this, f));
@@ -196,17 +202,20 @@ public override string ToString()
 
     public class ILMethod
     {
+        public ILType type = null;
+        public Mono.Cecil.MethodDefinition method;
         public string returntype;
         public List<NeoParam> paramtypes = new List<NeoParam>();
         public bool hasParam = false;
-        public Mono.Cecil.MethodDefinition method;
         public List<NeoParam> body_Variables = new List<NeoParam>();
         public SortedDictionary<int, OpCode> body_Codes = new SortedDictionary<int, OpCode>();
         public string fail = null;
 
         public ILMethod(ILType type, Mono.Cecil.MethodDefinition method, ILogger logger = null)
         {
+            this.type = type;
             this.method = method;
+
             if (method != null)
             {
                 returntype = method.ReturnType.FullName;

src/Neo.Compiler.MSIL/NeoModule.cs

@@ -13,6 +13,7 @@ public NeoModule(ILogger logger) { }
 
         public string mainMethod;
         public ConvOption option;
+        public List<CustomAttribute> attributes = new List<CustomAttribute>();
         public Dictionary<string, NeoMethod> mapMethods = new Dictionary<string, NeoMethod>();
         public Dictionary<string, NeoEvent> mapEvents = new Dictionary<string, NeoEvent>();
         public Dictionary<string, NeoField> mapFields = new Dictionary<string, NeoField>();
@@ -95,6 +96,9 @@ public class NeoMethod
         public string returntype;
         public bool isPublic = true;
         public bool inSmartContract;
+        public ILMethod method;
+        public ILType type;
+
         //临时变量
         public List<NeoParam> body_Variables = new List<NeoParam>();
 
@@ -145,18 +149,20 @@ public NeoMethod() { }
         /// Constructor
         /// </summary>
         /// <param name="method">Method</param>
-        public NeoMethod(MethodDefinition method)
+        public NeoMethod(ILMethod method)
         {
-            _namespace = method.DeclaringType.FullName;
-            name = method.FullName;
-            displayName = method.Name;
-            inSmartContract = method.DeclaringType.BaseType.Name == "SmartContract";
-            isPublic = method.IsPublic;
+            this.method = method;
+            this.type = method.type;
 
-            foreach (var attr in method.CustomAttributes)
+            foreach (var attr in method.method.CustomAttributes)
             {
                 ProcessAttribute(attr);
             }
+            _namespace = method.method.DeclaringType.FullName;
+            name = method.method.FullName;
+            displayName = method.method.Name;
+            inSmartContract = method.method.DeclaringType.BaseType.Name == "SmartContract";
+            isPublic = method.method.IsPublic;
         }
 
         private void ProcessAttribute(CustomAttribute attr)

src/Neo.Compiler.MSIL/Program.cs

@@ -1,7 +1,9 @@
 using Neo.Compiler.MSIL;
 using Neo.SmartContract;
+using Neo.SmartContract.Manifest;
 using System;
 using System.IO;
+using System.Linq;
 using System.Reflection;
 using System.Text;
 
@@ -81,18 +83,19 @@ public static void Main(string[] args)
             byte[] bytes;
             int bSucc = 0;
             string jsonstr = null;
+            NeoModule module = null;
             //convert and build
             try
             {
                 var conv = new ModuleConverter(log);
                 ConvOption option = new ConvOption();
-                NeoModule am = conv.Convert(mod, option);
-                bytes = am.Build();
+                module = conv.Convert(mod, option);
+                bytes = module.Build();
                 log.Log("convert succ");
 
                 try
                 {
-                    var outjson = vmtool.FuncExport.Export(am, bytes);
+                    var outjson = vmtool.FuncExport.Export(module, bytes);
                     StringBuilder sb = new StringBuilder();
                     outjson.ConvertToStringWithFormat(sb, 0);
                     jsonstr = sb.ToString();
@@ -153,9 +156,17 @@ public static void Main(string[] args)
             }
             try
             {
+                var features = module == null ? ContractFeatures.NoProperty : module.attributes
+                    .Where(u => u.AttributeType.Name == "FeaturesAttribute")
+                    .Select(u => (ContractFeatures)u.ConstructorArguments.FirstOrDefault().Value)
+                    .FirstOrDefault();
+
+                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"":false,""payable"":false},""abi"":" +
+                    @"{""groups"":[],""features"":{""storage"":" + storage + @",""payable"":" + payable + @"},""abi"":" +
                     jsonstr +
                     @",""permissions"":[{""contract"":""*"",""methods"":""*""}],""trusts"":[],""safeMethods"":[]}";
 

src/Neo.SmartContract.Framework/ContractFeatures.cs

@@ -0,0 +1,13 @@
+using System;
+
+namespace Neo.SmartContract.Framework
+{
+    [Flags]
+    public enum ContractFeatures : byte
+    {
+        NoProperty = 0,
+
+        HasStorage = 1 << 0,
+        Payable = 1 << 2,
+    }
+}

src/Neo.SmartContract.Framework/FeaturesAttribute.cs

@@ -0,0 +1,22 @@
+using System;
+
+namespace Neo.SmartContract.Framework
+{
+    [AttributeUsage(AttributeTargets.Class, AllowMultiple = false)]
+    public class FeaturesAttribute : Attribute
+    {
+        /// <summary>
+        /// Smart contract features
+        /// </summary>
+        public ContractFeatures Features { get; }
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="features">Specify the smart contract features</param>
+        public FeaturesAttribute(ContractFeatures features)
+        {
+            Features = features;
+        }
+    }
+}

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

@@ -60,6 +60,11 @@ public void Init()
         {
             testengine = new TestEngine();
             testengine.AddEntryScript("./TestClasses/Contract_Storage.cs");
+            Assert.AreEqual(ContractFeatures.HasStorage, testengine.ScriptEntry.converterIL.outModule.attributes
+                .Where(u => u.AttributeType.Name == "FeaturesAttribute")
+                .Select(u => (ContractFeatures)u.ConstructorArguments.FirstOrDefault().Value)
+                .FirstOrDefault());
+
             testengine.Snapshot.Contracts.Add(testengine.EntryScriptHash, new Ledger.ContractState()
             {
                 Script = testengine.EntryContext.Script,

tests/Neo.SmartContract.Framework.UnitTests/TestClasses/Contract_Storage.cs

@@ -1,7 +1,9 @@
+using Neo.SmartContract.Framework;
 using Neo.SmartContract.Framework.Services.Neo;
 
 namespace Neo.Compiler.MSIL.TestClasses
 {
+    [Features(SmartContract.Framework.ContractFeatures.HasStorage)]
     class Contract_Storage : SmartContract.Framework.SmartContract
     {
         // There is no main here, it can be auto generation.