Merge branch 'master' into n4-dynamic-block

Author: ajara87

.editorconfig

@@ -55,15 +55,12 @@ indent_size = 2
 
 # Dotnet code style settings:
 [*.{cs,vb}]
-# Use block-scoped namespace
-csharp_style_namespace_declarations = block_scoped:error
-dotnet_diagnostic.IDE0160.severity = error
-dotnet_diagnostic.IDE0161.severity = error
+# Use file-scoped namespace
+csharp_style_namespace_declarations = file_scoped:warning
 
 # Member can be made 'readonly'
 csharp_style_prefer_readonly_struct_member = true
 dotnet_diagnostic.IDE0251.severity = warning
-dotnet_diagnostic.IDE0044.severity = warning
 
 dotnet_diagnostic.CS1591.severity = silent
 // Use primary constructor
@@ -89,6 +86,7 @@ dotnet_style_collection_initializer = true:warning
 dotnet_style_coalesce_expression = true:suggestion
 dotnet_style_null_propagation = true:suggestion
 dotnet_style_explicit_tuple_names = true:suggestion
+dotnet_style_prefer_collection_expression = never
 
 # Whitespace options
 dotnet_style_allow_multiple_blank_lines_experimental = false
@@ -115,46 +113,6 @@ dotnet_naming_symbols.non_private_readonly_fields.required_modifiers = readonly
 
 dotnet_naming_style.non_private_readonly_field_style.capitalization = pascal_case
 
-# Constants are PascalCase
-dotnet_naming_rule.constants_should_be_pascal_case.severity = suggestion
-dotnet_naming_rule.constants_should_be_pascal_case.symbols = constants
-dotnet_naming_rule.constants_should_be_pascal_case.style = constant_style
-
-dotnet_naming_symbols.constants.applicable_kinds = field, local
-dotnet_naming_symbols.constants.required_modifiers = const
-
-dotnet_naming_style.constant_style.capitalization = pascal_case
-
-# Static fields are camelCase and start with s_
-dotnet_naming_rule.static_fields_should_be_camel_case.severity = suggestion
-dotnet_naming_rule.static_fields_should_be_camel_case.symbols = static_fields
-dotnet_naming_rule.static_fields_should_be_camel_case.style = static_field_style
-
-dotnet_naming_symbols.static_fields.applicable_kinds = field
-dotnet_naming_symbols.static_fields.required_modifiers = static
-
-dotnet_naming_style.static_field_style.capitalization = camel_case
-dotnet_naming_style.static_field_style.required_prefix = s_
-
-# Instance fields are camelCase and start with _
-dotnet_naming_rule.instance_fields_should_be_camel_case.severity = suggestion
-dotnet_naming_rule.instance_fields_should_be_camel_case.symbols = instance_fields
-dotnet_naming_rule.instance_fields_should_be_camel_case.style = instance_field_style
-
-dotnet_naming_symbols.instance_fields.applicable_kinds = field
-
-dotnet_naming_style.instance_field_style.capitalization = camel_case
-dotnet_naming_style.instance_field_style.required_prefix = _
-
-# Locals and parameters are camelCase
-dotnet_naming_rule.locals_should_be_camel_case.severity = suggestion
-dotnet_naming_rule.locals_should_be_camel_case.symbols = locals_and_parameters
-dotnet_naming_rule.locals_should_be_camel_case.style = camel_case_style
-
-dotnet_naming_symbols.locals_and_parameters.applicable_kinds = parameter, local
-
-dotnet_naming_style.camel_case_style.capitalization = camel_case
-
 # Local functions are PascalCase
 dotnet_naming_rule.local_functions_should_be_pascal_case.severity = suggestion
 dotnet_naming_rule.local_functions_should_be_pascal_case.symbols = local_functions
@@ -164,19 +122,10 @@ dotnet_naming_symbols.local_functions.applicable_kinds = local_function
 
 dotnet_naming_style.local_function_style.capitalization = pascal_case
 
-# By default, name items with PascalCase
-dotnet_naming_rule.members_should_be_pascal_case.severity = suggestion
-dotnet_naming_rule.members_should_be_pascal_case.symbols = all_members
-dotnet_naming_rule.members_should_be_pascal_case.style = pascal_case_style
-
-dotnet_naming_symbols.all_members.applicable_kinds = *
-
-dotnet_naming_style.pascal_case_style.capitalization = pascal_case
-
 file_header_template = Copyright (C) 2015-2025 The Neo Project.\n\n{fileName} file belongs to the neo project and is free\nsoftware distributed under the MIT software license, see the\naccompanying file LICENSE in the main directory of the\nrepository or http://www.opensource.org/licenses/mit-license.php\nfor more details.\n\nRedistribution and use in source and binary forms with or without\nmodifications are permitted.
 
 # Require file header
-dotnet_diagnostic.IDE0073.severity = error
+dotnet_diagnostic.IDE0073.severity = warning
 
 # RS0016: Only enable if API files are present
 dotnet_public_api_analyzer.require_api_files = true
@@ -211,11 +160,6 @@ csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimenta
 csharp_style_allow_blank_line_after_token_in_conditional_expression_experimental = false
 csharp_style_allow_blank_line_after_token_in_arrow_expression_clause_experimental = false
 
-# Prefer "var" everywhere
-csharp_style_var_for_built_in_types = true:suggestion
-csharp_style_var_when_type_is_apparent = true:suggestion
-csharp_style_var_elsewhere = true:suggestion
-
 # Prefer method-like constructs to have a block body
 csharp_style_expression_bodied_methods = false:none
 csharp_style_expression_bodied_constructors = false:none
@@ -226,6 +170,9 @@ csharp_style_expression_bodied_properties = true:none
 csharp_style_expression_bodied_indexers = true:none
 csharp_style_expression_bodied_accessors = true:none
 
+# IDE0230: Use UTF-8 string literal
+csharp_style_prefer_utf8_string_literals = true:silent
+
 # Suggest more modern language features when available
 csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
 csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
@@ -268,9 +215,6 @@ dotnet_diagnostic.IDE0060.severity = none
 
 [src/{Analyzers,CodeStyle,Features,Workspaces,EditorFeatures,VisualStudio}/**/*.{cs,vb}]
 
-# Use collection expression for array
-dotnet_diagnostic.IDE0300.severity = warning
-
 # Avoid "this." and "Me." if not necessary
 dotnet_diagnostic.IDE0003.severity = warning
 dotnet_diagnostic.IDE0009.severity = warning
@@ -289,18 +233,15 @@ dotnet_diagnostic.IDE0052.severity = warning
 # IDE0059: Unnecessary assignment to a value
 dotnet_diagnostic.IDE0059.severity = warning
 
+# Use collection expression for array
+dotnet_diagnostic.IDE0300.severity = warning
+
 # CA1012: Abstract types should not have public constructors
 dotnet_diagnostic.CA1012.severity = warning
 
 # CA1822: Make member static
 dotnet_diagnostic.CA1822.severity = warning
 
-# Prefer "var" everywhere
-dotnet_diagnostic.IDE0007.severity = warning
-csharp_style_var_for_built_in_types = true:warning
-csharp_style_var_when_type_is_apparent = true:warning
-csharp_style_var_elsewhere = true:warning
-
 # csharp_style_allow_embedded_statements_on_same_line_experimental
 dotnet_diagnostic.IDE2001.severity = warning
 

.github/workflows/main.yml

@@ -83,7 +83,7 @@ jobs:
     - name: Set Version
       run: git rev-list --count HEAD | xargs printf 'CI%05d' | xargs -I{} echo 'VERSION_SUFFIX={}' >> $GITHUB_ENV
     - name : Pack (Everything)
-      run: dotnet pack src/Neo/Neo.csproj -c Debug -o out --include-source --version-suffix ${{ env.VERSION_SUFFIX }}
+      run: dotnet pack -c Debug -o out --include-source --version-suffix ${{ env.VERSION_SUFFIX }}
     - name: Publish to myGet
       run: dotnet nuget push out/*.nupkg -s https://www.myget.org/F/neo/api/v2/package -k ${MYGET_TOKEN} -ss https://www.myget.org/F/neo/symbols/api/v2/package -sk ${MYGET_TOKEN}
       env:
@@ -123,7 +123,7 @@ jobs:
     - name: Publish to NuGet
       if: steps.check_tag.outputs.statusCode == '404'
       run: |
-        dotnet pack src/Neo/Neo.csproj -o out -c Release
+        dotnet pack -o out -c Release
         dotnet nuget push out/*.nupkg -s https://api.nuget.org/v3/index.json -k ${NUGET_TOKEN}
       env:
         NUGET_TOKEN: ${{ secrets.NUGET_TOKEN }}

benchmarks/Directory.Build.props

@@ -2,11 +2,15 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
-    <LangVersion>latest</LangVersion>
+    <OutputType>Exe</OutputType>
+    <TargetFrameworks>net10.0</TargetFrameworks>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <AnalysisLevel>latest</AnalysisLevel>
   </PropertyGroup>
-  
+
+  <ItemGroup>
+    <PackageReference Include="BenchmarkDotNet" Version="0.15.6" />
+  </ItemGroup>
+
 </Project>

benchmarks/Neo.Benchmarks/Benchmarks.Hash.cs

@@ -11,47 +11,45 @@
 
 using BenchmarkDotNet.Attributes;
 using Neo.Cryptography;
-using Neo.Extensions;
 using System.Diagnostics;
 using System.IO.Hashing;
 using System.Text;
 
-namespace Neo.Benchmark
+namespace Neo.Benchmarks;
+
+public class Benchmarks_Hash
 {
-    public class Benchmarks_Hash
+    // 256 KiB
+    static readonly byte[] data = Encoding.ASCII.GetBytes(string.Concat(Enumerable.Repeat("Hello, World!^_^", 16 * 1024)));
+
+    static readonly byte[] hash = "9182abedfbb9b18d81a05d8bcb45489e7daa2858".HexToBytes();
+
+    [Benchmark]
+    public static void XxHash32_HashToUInt32()
+    {
+        var result = XxHash32.HashToUInt32(data);
+        Debug.Assert(result == 682967318u);
+    }
+
+    [Benchmark]
+    public static void XxHash3_HashToUInt64()
+    {
+        var result = (uint)XxHash3.HashToUInt64(data);
+        Debug.Assert(result == 1389469485u);
+    }
+
+    [Benchmark]
+    public static void Murmur32_HashToUInt32()
+    {
+        var result = data.Murmur32(0);
+        Debug.Assert(result == 3731881930u);
+    }
+
+    [Benchmark]
+    public static void Murmur128_ComputeHash()
     {
-        // 256 KiB
-        static readonly byte[] data = Encoding.ASCII.GetBytes(string.Concat(Enumerable.Repeat("Hello, World!^_^", 16 * 1024)));
-
-        static readonly byte[] hash = "9182abedfbb9b18d81a05d8bcb45489e7daa2858".HexToBytes();
-
-        [Benchmark]
-        public void XxHash32_HashToUInt32()
-        {
-            var result = XxHash32.HashToUInt32(data);
-            Debug.Assert(result == 682967318u);
-        }
-
-        [Benchmark]
-        public void XxHash3_HashToUInt64()
-        {
-            var result = (uint)XxHash3.HashToUInt64(data);
-            Debug.Assert(result == 1389469485u);
-        }
-
-        [Benchmark]
-        public void Murmur32_HashToUInt32()
-        {
-            var result = data.Murmur32(0);
-            Debug.Assert(result == 3731881930u);
-        }
-
-        [Benchmark]
-        public void Murmur128_ComputeHash()
-        {
-            var result = data.Murmur128(0);
-            if (result.Length != 16)
-                throw new InvalidOperationException($"Invalid hash length {result.Length}");
-        }
+        var result = data.Murmur128(0);
+        if (result.Length != 16)
+            throw new InvalidOperationException($"Invalid hash length {result.Length}");
     }
 }

benchmarks/Neo.Benchmarks/Benchmarks.POC.cs

@@ -15,65 +15,64 @@
 using Neo.VM;
 using System.Diagnostics;
 
-namespace Neo.Benchmark
+namespace Neo.Benchmarks;
+
+public class Benchmarks_PoCs
 {
-    public class Benchmarks_PoCs
-    {
-        private static readonly ProtocolSettings protocol = ProtocolSettings.Load("config.json");
-        private static readonly NeoSystem system = new(protocol, (string)null);
+    private static readonly ProtocolSettings protocol = ProtocolSettings.Load("config.json");
+    private static readonly NeoSystem system = new(protocol, (string?)null);
 
-        [Benchmark]
-        public void NeoIssue2725()
-        {
-            // https://github.com/neo-project/neo/issues/2725
-            // L00: INITSSLOT 1
-            // L01: NEWARRAY0
-            // L02: PUSHDATA1 6161616161 //"aaaaa"
-            // L03: PUSHINT16 500
-            // L04: STSFLD0
-            // L05: OVER
-            // L06: OVER
-            // L07: SYSCALL 95016f61 //System.Runtime.Notify
-            // L08: LDSFLD0
-            // L09: DEC
-            // L10: DUP
-            // L11: STSFLD0
-            // L12: JMPIF L05
-            // L13: CLEAR
-            // L14: SYSCALL dbfea874 //System.Runtime.GetExecutingScriptHash
-            // L15: PUSHINT16 8000
-            // L16: STSFLD0
-            // L17: DUP
-            // L18: SYSCALL 274335f1 //System.Runtime.GetNotifications
-            // L19: DROP
-            // L20: LDSFLD0
-            // L21: DEC
-            // L22: DUP
-            // L23: STSFLD0
-            // L24: JMPIF L17
-            Run(nameof(NeoIssue2725), "VgHCDAVhYWFhYQH0AWBLS0GVAW9hWJ1KYCT1SUHb/qh0AUAfYEpBJ0M18UVYnUpgJPU=");
-        }
+    [Benchmark]
+    public void NeoIssue2725()
+    {
+        // https://github.com/neo-project/neo/issues/2725
+        // L00: INITSSLOT 1
+        // L01: NEWARRAY0
+        // L02: PUSHDATA1 6161616161 //"aaaaa"
+        // L03: PUSHINT16 500
+        // L04: STSFLD0
+        // L05: OVER
+        // L06: OVER
+        // L07: SYSCALL 95016f61 //System.Runtime.Notify
+        // L08: LDSFLD0
+        // L09: DEC
+        // L10: DUP
+        // L11: STSFLD0
+        // L12: JMPIF L05
+        // L13: CLEAR
+        // L14: SYSCALL dbfea874 //System.Runtime.GetExecutingScriptHash
+        // L15: PUSHINT16 8000
+        // L16: STSFLD0
+        // L17: DUP
+        // L18: SYSCALL 274335f1 //System.Runtime.GetNotifications
+        // L19: DROP
+        // L20: LDSFLD0
+        // L21: DEC
+        // L22: DUP
+        // L23: STSFLD0
+        // L24: JMPIF L17
+        Run(nameof(NeoIssue2725), "VgHCDAVhYWFhYQH0AWBLS0GVAW9hWJ1KYCT1SUHb/qh0AUAfYEpBJ0M18UVYnUpgJPU=");
+    }
 
-        private static void Run(string name, string poc)
+    private static void Run(string name, string poc)
+    {
+        Random random = new();
+        Transaction tx = new()
         {
-            Random random = new();
-            Transaction tx = new()
-            {
-                Version = 0,
-                Nonce = (uint)random.Next(),
-                SystemFee = 20_00000000,
-                NetworkFee = 1_00000000,
-                ValidUntilBlock = ProtocolSettings.Default.MaxTraceableBlocks,
-                Signers = Array.Empty<Signer>(),
-                Attributes = Array.Empty<TransactionAttribute>(),
-                Script = Convert.FromBase64String(poc),
-                Witnesses = Array.Empty<Witness>()
-            };
-            using var snapshot = system.GetSnapshotCache();
-            using var engine = ApplicationEngine.Create(TriggerType.Application, tx, snapshot, system.GenesisBlock, protocol, tx.SystemFee);
-            engine.LoadScript(tx.Script);
-            engine.Execute();
-            Debug.Assert(engine.State == VMState.FAULT);
-        }
+            Version = 0,
+            Nonce = (uint)random.Next(),
+            SystemFee = 20_00000000,
+            NetworkFee = 1_00000000,
+            ValidUntilBlock = ProtocolSettings.Default.MaxTraceableBlocks,
+            Signers = Array.Empty<Signer>(),
+            Attributes = Array.Empty<TransactionAttribute>(),
+            Script = Convert.FromBase64String(poc),
+            Witnesses = Array.Empty<Witness>()
+        };
+        using var snapshot = system.GetSnapshotCache();
+        using var engine = ApplicationEngine.Create(TriggerType.Application, tx, snapshot, system.GenesisBlock, protocol, tx.SystemFee);
+        engine.LoadScript(tx.Script);
+        engine.Execute();
+        Debug.Assert(engine.State == VMState.FAULT);
     }
 }