Merge branch 'master' into convert-statement

* master: fix error message (neo-project#854) Updated Templates (neo-project#853) Fix: ban notify from contract developer (neo-project#845)
Jim8y · Jan 12, 2024 · 0d30893 · 0d30893
2 parents e164cef + 8fdc94d
commit 0d30893
Show file tree

Hide file tree

Showing 29 changed files with 649 additions and 47 deletions.
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -6,6 +6,13 @@
     <VersionPrefix>3.6.2</VersionPrefix>
     <TargetFramework>net7.0</TargetFramework>
     <Authors>The Neo Project</Authors>
+    <PackageProjectUrl>https://github.com/neo-project/neo-devpack-dotnet</PackageProjectUrl>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <RepositoryType>git</RepositoryType>
+    <RepositoryUrl>https://github.com/neo-project/neo-devpack-dotnet.git</RepositoryUrl>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Include="../neo.png" Pack="true" Visible="false" PackagePath=""/>
+  </ItemGroup>
 </Project>
diff --git a/src/Neo.Compiler.CSharp/DiagnosticId.cs b/src/Neo.Compiler.CSharp/DiagnosticId.cs
@@ -33,5 +33,6 @@ static class DiagnosticId
         public const string InvalidMethodName = "NC3002";
         public const string MethodNameConflict = "NC3003";
         public const string EventNameConflict = "NC3004";
+        public const string InvalidInitialValue = "NC3005";
     }
 }
diff --git a/src/Neo.Compiler.CSharp/MethodConvert/MethodConvert.cs b/src/Neo.Compiler.CSharp/MethodConvert/MethodConvert.cs
@@ -339,22 +339,29 @@ private void ProcessFieldInitializer(SemanticModel model, IFieldSymbol field, Ac
                 preInitialize?.Invoke();
                 string value = (string)initialValue.ConstructorArguments[0].Value!;
                 ContractParameterType type = (ContractParameterType)initialValue.ConstructorArguments[1].Value!;
-                switch (type)
+                try
                 {
-                    case ContractParameterType.String:
-                        Push(value);
-                        break;
-                    case ContractParameterType.ByteArray:
-                        Push(value.HexToBytes(true));
-                        break;
-                    case ContractParameterType.Hash160:
-                        Push((UInt160.TryParse(value, out var hash) ? hash : value.ToScriptHash(context.Options.AddressVersion)).ToArray());
-                        break;
-                    case ContractParameterType.PublicKey:
-                        Push(ECPoint.Parse(value, ECCurve.Secp256r1).EncodePoint(true));
-                        break;
-                    default:
-                        throw new CompilationException(field, DiagnosticId.InvalidInitialValueType, $"Unsupported initial value type: {type}");
+                    switch (type)
+                    {
+                        case ContractParameterType.String:
+                            Push(value);
+                            break;
+                        case ContractParameterType.ByteArray:
+                            Push(value.HexToBytes(true));
+                            break;
+                        case ContractParameterType.Hash160:
+                            Push((UInt160.TryParse(value, out var hash) ? hash : value.ToScriptHash(context.Options.AddressVersion)).ToArray());
+                            break;
+                        case ContractParameterType.PublicKey:
+                            Push(ECPoint.Parse(value, ECCurve.Secp256r1).EncodePoint(true));
+                            break;
+                        default:
+                            throw new CompilationException(field, DiagnosticId.InvalidInitialValueType, $"Unsupported initial value type: {type}");
+                    }
+                }
+                catch (Exception ex) when (ex is not CompilationException)
+                {
+                    throw new CompilationException(field, DiagnosticId.InvalidInitialValue, $"Invalid initial value: {value} of type: {type}");
                 }
                 postInitialize?.Invoke();
             }

diff --git a/src/Neo.Compiler.CSharp/Neo.Compiler.CSharp.csproj b/src/Neo.Compiler.CSharp/Neo.Compiler.CSharp.csproj
@@ -9,13 +9,11 @@
     <RootNamespace>Neo.Compiler</RootNamespace>
     <Nullable>enable</Nullable>
     <PackageTags>NEO;Blockchain;Smart Contract;Compiler</PackageTags>
-    <PackageProjectUrl>https://github.com/neo-project/neo-devpack-dotnet</PackageProjectUrl>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <RepositoryType>git</RepositoryType>
-    <RepositoryUrl>https://github.com/neo-project/neo-devpack-dotnet.git</RepositoryUrl>
     <Company>The Neo Project</Company>
     <Product>Neo.Compiler.CSharp</Product>
     <Description>Neo.Compiler.CSharp</Description>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Neo.SmartContract.Framework/Neo.SmartContract.Framework.csproj b/src/Neo.SmartContract.Framework/Neo.SmartContract.Framework.csproj
@@ -4,14 +4,9 @@
     <AssemblyTitle>Neo.SmartContract.Framework</AssemblyTitle>
     <AssemblyName>Neo.SmartContract.Framework</AssemblyName>
     <PackageId>Neo.SmartContract.Framework</PackageId>
-    <PackageTags>NEO;Blockchain</PackageTags>
-    <PackageProjectUrl>https://github.com/neo-project/neo-devpack-dotnet</PackageProjectUrl>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <RepositoryType>git</RepositoryType>
-    <RepositoryUrl>https://github.com/neo-project/neo-devpack-dotnet.git</RepositoryUrl>
+    <Description>Neo.SmartContract.Framework</Description>
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-    <Description>Neo.SmartContract.Framework</Description>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Neo.SmartContract.Framework/Services/Runtime.cs b/src/Neo.SmartContract.Framework/Services/Runtime.cs
@@ -95,8 +95,9 @@ public static extern byte AddressVersion
         [Syscall("System.Runtime.Log")]
         public static extern void Log(string message);
 
-        [Syscall("System.Runtime.Notify")]
-        public static extern void Notify(string eventName, object[] state);
+        // Events not present in the ABI were disabled in HF_Basilisk
+        // [Syscall("System.Runtime.Notify")]
+        // public static extern void Notify(string eventName, object[] state);
 
         [Syscall("System.Runtime.BurnGas")]
         public static extern void BurnGas(long gas);

diff --git a/src/Neo.SmartContract.Template/Neo.SmartContract.Template.csproj b/src/Neo.SmartContract.Template/Neo.SmartContract.Template.csproj
@@ -5,10 +5,6 @@
     <PackageType>Template</PackageType>
     <PackageId>Neo.SmartContract.Template</PackageId>
     <PackageTags>NEO;Blockchain;Smart Contract</PackageTags>
-    <PackageProjectUrl>https://github.com/neo-project/neo-devpack-dotnet</PackageProjectUrl>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <RepositoryType>git</RepositoryType>
-    <RepositoryUrl>https://github.com/neo-project/neo-devpack-dotnet.git</RepositoryUrl>
     <Description>Templates to use when creating a smart contract for NEO.</Description>
     <IncludeContentInPack>true</IncludeContentInPack>
     <IncludeBuildOutput>false</IncludeBuildOutput>

diff --git a/src/Neo.SmartContract.Template/templates/neocontract/.config/dotnet-tools.json b/src/Neo.SmartContract.Template/templates/neocontract/.config/dotnet-tools.json
@@ -0,0 +1,12 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "neo.compiler.csharp": {
+      "version": "TemplateNeoVersion",
+      "commands": [
+        "nccs"
+      ]
+    }
+  }
+}
diff --git a/src/Neo.SmartContract.Template/templates/neocontract/.template.config/icon.png b/src/Neo.SmartContract.Template/templates/neocontract/.template.config/icon.png
diff --git a/src/Neo.SmartContract.Template/templates/neocontract/.template.config/template.json b/src/Neo.SmartContract.Template/templates/neocontract/.template.config/template.json
@@ -1,14 +1,30 @@
 {
   "$schema": "http://json.schemastore.org/template",
   "author": "The Neo Project",
-  "classifications": [ "NEO", "Blockchain", "Smart Contract" ],
-  "identity": "Neo.SmartContract.Template",
-  "name": "Neo.SmartContract.Template",
+  "classifications": [ "NEO", "Blockchain", "Smart Contract", "Basic" ],
+  "identity": "Neo.SmartContract.Template.Basic",
+  "name": "Neo Smart Contract - Basic",
   "shortName": "neocontract",
   "preferNameDirectory": true,
   "tags": {
     "language": "C#",
     "type": "project"
   },
-  "sourceName": "ProjectName"
+  "sourceName": "ProjectName",
+  "symbols": {
+    "NeoVersion": {
+      "type": "parameter",
+      "datatype": "choice",
+      "choices": [
+        {
+          "choice": "3.6.0"
+        },
+        {
+          "choice": "3.6.2"
+        }
+      ],
+      "defaultValue": "3.6.2",
+      "replaces": "TemplateNeoVersion"
+    }
+  }
 }
diff --git a/src/Neo.SmartContract.Template/templates/neocontract/Contract1.cs b/src/Neo.SmartContract.Template/templates/neocontract/Contract1.cs
@@ -4,26 +4,31 @@
 using Neo.SmartContract.Framework.Attributes;
 using Neo.SmartContract.Framework.Native;
 using Neo.SmartContract.Framework.Services;
+
 using System;
-using System.Numerics;
+using System.ComponentModel;
 
 namespace ProjectName
 {
-    [ManifestExtra("Author", "Neo")]
-    [ManifestExtra("Email", "dev@neo.org")]
-    [ManifestExtra("Description", "This is a contract example")]
+    [DisplayName(nameof(Contract1))]
+    [ManifestExtra("Author", "<Your Name Or Company Here>")]
+    [ManifestExtra("Description", "<Description Here>")]
+    [ManifestExtra("Email", "<Your Public Email Here>")]
+    [ManifestExtra("Version", "<Version String Here>")]
     [ContractSourceCode("https://github.com/neo-project/neo-devpack-dotnet/tree/master/src/Neo.SmartContract.Template")]
+    [ContractPermission("*", "*")]
     public class Contract1 : SmartContract
     {
-        //TODO: Replace it with your own address.
-        [InitialValue("NiNmXL8FjEUEs1nfX9uHFBNaenxDHJtmuB", ContractParameterType.Hash160)]
+        // TODO: Replace it with your own address.
+        [InitialValue("<Your Address Here>", ContractParameterType.Hash160)]
         static readonly UInt160 Owner = default;
 
         private static bool IsOwner() => Runtime.CheckWitness(Owner);
 
         // When this contract address is included in the transaction signature,
         // this method will be triggered as a VerificationTrigger to verify that the signature is correct.
         // For example, this method needs to be called when withdrawing token from the contract.
+        [Safe]
         public static bool Verify() => IsOwner();
 
         // TODO: Replace it with your methods.
@@ -34,9 +39,13 @@ public static string MyMethod()
 
         public static void _deploy(object data, bool update)
         {
-            if (update) return;
+            if (update)
+            {
+                // This will be executed during update
+                return;
+            }
 
-            // It will be executed during deploy
+            // This will be executed during deploy
             Storage.Put(Storage.CurrentContext, "Hello", "World");
         }
 

diff --git a/src/Neo.SmartContract.Template/templates/neocontract/ProjectName.csproj b/src/Neo.SmartContract.Template/templates/neocontract/ProjectName.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Neo.SmartContract.Framework" Version="3.6.0" />
+    <PackageReference Include="Neo.SmartContract.Framework" Version="TemplateNeoVersion" />
   </ItemGroup>
 
   <PropertyGroup>
@@ -17,9 +17,9 @@
   </PropertyGroup>
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-    <Message Text="Start NeoContract converter, Source File: $(ProjectPath)" Importance="high">
+    <Message Text="Start NeoContract converter, Source File: &quot;$(ProjectPath)&quot;" Importance="high">
     </Message>
-    <Exec Command="nccs $(BaseNameArgument) $(NullableArgument) $(CheckedArgument) $(DebugArgument) &quot;$(ProjectPath)&quot;" />
+    <Exec Command="dotnet nccs $(BaseNameArgument) $(NullableArgument) $(CheckedArgument) $(DebugArgument) &quot;$(ProjectPath)&quot;" />
   </Target>
 
 </Project>
diff --git a/src/Neo.SmartContract.Template/templates/neocontractnep17/.config/dotnet-tools.json b/src/Neo.SmartContract.Template/templates/neocontractnep17/.config/dotnet-tools.json
@@ -0,0 +1,12 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "neo.compiler.csharp": {
+      "version": "TemplateNeoVersion",
+      "commands": [
+        "nccs"
+      ]
+    }
+  }
+}
diff --git a/...Neo.SmartContract.Template/templates/neocontractnep17/.template.config/icon.png b/...Neo.SmartContract.Template/templates/neocontractnep17/.template.config/icon.png
diff --git a/src/Neo.SmartContract.Template/templates/neocontractnep17/.template.config/template.json b/src/Neo.SmartContract.Template/templates/neocontractnep17/.template.config/template.json
@@ -0,0 +1,30 @@
+{
+  "$schema": "http://json.schemastore.org/template",
+  "author": "The Neo Project",
+  "classifications": [ "NEO", "Blockchain", "Smart Contract", "NEP-17" ],
+  "identity": "Neo.SmartContract.Template.Nep17",
+  "name": "Neo Smart Contract - NEP-17",
+  "shortName": "neocontractnep17",
+  "preferNameDirectory": true,
+  "tags": {
+    "language": "C#",
+    "type": "project"
+  },
+  "sourceName": "ProjectName",
+  "symbols": {
+    "NeoVersion": {
+      "type": "parameter",
+      "datatype": "choice",
+      "choices": [
+        {
+          "choice": "3.6.0"
+        },
+        {
+          "choice": "3.6.2"
+        }
+      ],
+      "defaultValue": "3.6.2",
+      "replaces": "TemplateNeoVersion"
+    }
+  }
+}