neo-project · cschuchardt88 · Jun 16, 2025 · Jun 18, 2025 · Jun 18, 2025 · Jun 18, 2025
diff --git a/.editorconfig b/.editorconfig
@@ -66,6 +66,8 @@ dotnet_diagnostic.IDE0251.severity = warning
 dotnet_diagnostic.IDE0044.severity = warning
 
 dotnet_diagnostic.CS1591.severity = silent
+// Use primary constructor
+csharp_style_prefer_primary_constructors = false
 
 # Sort using and Import directives with System.* appearing first
 dotnet_sort_system_directives_first = false

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -21,6 +21,13 @@ jobs:
       with:
         dotnet-version: ${{ env.DOTNET_VERSION }}
 
+    - name: Cache NuGet packages
+      uses: actions/cache@v4
+      with:
+        path: ~/.nuget/packages
+        key         : ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}
+        restore-keys: ${{ runner.os }}-nuget-
+
     - name: Check Format (*.cs)
       run: dotnet format --verify-no-changes --verbosity diagnostic
 
@@ -37,6 +44,13 @@ jobs:
       with:
         dotnet-version: ${{ env.DOTNET_VERSION }} 
 
+    - name: Cache NuGet packages
+      uses: actions/cache@v4
+      with:
+        path: ~/.nuget/packages
+        key         : ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}
+        restore-keys: ${{ runner.os }}-nuget-
+
     - name: Build (Everything)
       run: dotnet build --disable-parallel -p:GITHUB_ACTIONS=true
 
@@ -65,6 +79,13 @@ jobs:
       with:
         dotnet-version: ${{ env.DOTNET_VERSION }}
 
+    - name: Cache NuGet packages
+      uses: actions/cache@v4
+      with:
+        path: ~/.nuget/packages
+        key         : ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}
+        restore-keys: ${{ runner.os }}-nuget-
+
     - name: Test (MacOS)
       if: matrix.os == 'macos-latest'
       run: |
@@ -109,6 +130,7 @@ jobs:
           ${{ github.workspace }}/TestResults/Neo.Json.UnitTests/coverage.info
           ${{ github.workspace }}/TestResults/Neo.Cryptography.MPTTrie.Tests/coverage.info
           ${{ github.workspace }}/TestResults/Neo.Network.RPC.Tests/coverage.info
+          ${{ github.workspace }}/TestResults/Neo.Plugins.DBFTPlugin.Tests/coverage.info
           ${{ github.workspace }}/TestResults/Neo.Plugins.OracleService.Tests/coverage.info
           ${{ github.workspace }}/TestResults/Neo.Plugins.RpcServer.Tests/coverage.info
           ${{ github.workspace }}/TestResults/Neo.Plugins.Storage.Tests/coverage.info

diff --git a/benchmarks/Neo.Benchmarks/Neo.Benchmarks.csproj b/benchmarks/Neo.Benchmarks/Neo.Benchmarks.csproj
@@ -9,10 +9,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.IO.Hashing" Version="9.0.1" />
+    <PackageReference Include="System.IO.Hashing" Version="9.0.6" />
     <ProjectReference Include="..\..\src\Neo\Neo.csproj" />
     <ProjectReference Include="..\..\src\Plugins\LevelDBStore\LevelDBStore.csproj" />
-    <PackageReference Include="BenchmarkDotNet" Version="0.14.0" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.15.2" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/benchmarks/Neo.Cryptography.MPTTrie.Benchmarks/Benchmarks.Cache.cs b/benchmarks/Neo.Cryptography.MPTTrie.Benchmarks/Benchmarks.Cache.cs
@@ -0,0 +1,50 @@
+// Copyright (C) 2015-2025 The Neo Project.
+//
+// Benchmarks.Cache.cs file belongs to the neo project and is free
+// software distributed under the MIT software license, see the
+// accompanying file LICENSE in the main directory of the
+// repository or http://www.opensource.org/licenses/mit-license.php
+// for more details.
+//
+// Redistribution and use in source and binary forms with or without
+// modifications are permitted.
+
+using BenchmarkDotNet.Attributes;
+
+namespace Neo.Cryptography.MPTTrie.Benchmarks
+{
+    public class Benchmarks_Cache
+    {
+        private readonly byte _prefix = 0x01;
+        private readonly UInt256 _hash;
+
+        public Benchmarks_Cache()
+        {
+            var randomBytes = new byte[UInt256.Length];
+            new Random(42).NextBytes(randomBytes);
+            _hash = new UInt256(randomBytes);
+        }
+
+        [Benchmark]
+        public byte[] Key_Original()
+        {
+            var buffer = new byte[UInt256.Length + 1];
+            using (var ms = new MemoryStream(buffer, true))
+            using (var writer = new BinaryWriter(ms))
+            {
+                writer.Write(_prefix);
+                _hash.Serialize(writer);
+            }
+            return buffer;
+        }
+
+        [Benchmark]
+        public byte[] Key_Optimized()
+        {
+            var buffer = new byte[UInt256.Length + 1];
+            buffer[0] = _prefix;
+            _hash.GetSpan().CopyTo(buffer.AsSpan(1));
+            return buffer;
+        }
+    }
+}
diff --git a/benchmarks/Neo.Cryptography.MPTTrie.Benchmarks/Neo.Cryptography.MPTTrie.Benchmarks.csproj b/benchmarks/Neo.Cryptography.MPTTrie.Benchmarks/Neo.Cryptography.MPTTrie.Benchmarks.csproj
@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net9.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="BenchmarkDotNet" Version="0.15.2" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Neo\Neo.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/benchmarks/Neo.Cryptography.MPTTrie.Benchmarks/Program.cs b/benchmarks/Neo.Cryptography.MPTTrie.Benchmarks/Program.cs
@@ -0,0 +1,23 @@
+// Copyright (C) 2015-2025 The Neo Project.
+//
+// Program.cs file belongs to the neo project and is free
+// software distributed under the MIT software license, see the
+// accompanying file LICENSE in the main directory of the
+// repository or http://www.opensource.org/licenses/mit-license.php
+// for more details.
+//
+// Redistribution and use in source and binary forms with or without
+// modifications are permitted.
+
+using BenchmarkDotNet.Running;
+
+// List all benchmarks:
+//  dotnet run -c Release --framework [for example: net9.0] -- --list flat(or tree)
+// Run a specific benchmark:
+//  dotnet run -c Release --framework [for example: net9.0] -- -f [benchmark name]
+// Run all benchmarks:
+//  dotnet run -c Release --framework [for example: net9.0] -- -f *
+// Run all benchmarks of a class:
+//  dotnet run -c Release --framework [for example: net9.0] -- -f '*Class*'
+// More options: https://benchmarkdotnet.org/articles/guides/console-args.html
+BenchmarkSwitcher.FromAssembly(typeof(Program).Assembly).Run(args);
diff --git a/benchmarks/Neo.Extensions.Benchmarks/Neo.Extensions.Benchmarks.csproj b/benchmarks/Neo.Extensions.Benchmarks/Neo.Extensions.Benchmarks.csproj
@@ -10,7 +10,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\Neo.Extensions\Neo.Extensions.csproj" />
-    <PackageReference Include="BenchmarkDotNet" Version="0.14.0" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.15.2" />
   </ItemGroup>
 
 </Project>
diff --git a/benchmarks/Neo.Json.Benchmarks/Data/RpcTestCases.json b/benchmarks/Neo.Json.Benchmarks/Data/RpcTestCases.json
@@ -3628,7 +3628,7 @@
         "netfee": "1272390",
         "validuntilblock": 2105487,
         "attributes": [],
-        "cosigners": [
+        "signers": [
           {
             "account": "0xcadb3dc2faa3ef14a13b619c9a43124755aa2569",
             "scopes": "CalledByEntry"
@@ -3679,7 +3679,7 @@
         "netfee": "2483780",
         "validuntilblock": 2105494,
         "attributes": [],
-        "cosigners": [
+        "signers": [
           {
             "account": "0x36d6200fb4c9737c7b552d2b5530ab43605c5869",
             "scopes": "CalledByEntry"
@@ -3724,7 +3724,7 @@
         "netfee": "2381780",
         "validuntilblock": 2105500,
         "attributes": [],
-        "cosigners": [
+        "signers": [
           {
             "account": "0xcadb3dc2faa3ef14a13b619c9a43124755aa2569",
             "scopes": "CalledByEntry"

diff --git a/benchmarks/Neo.Json.Benchmarks/Neo.Json.Benchmarks.csproj b/benchmarks/Neo.Json.Benchmarks/Neo.Json.Benchmarks.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.14.0" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.15.2" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 

diff --git a/benchmarks/Neo.VM.Benchmarks/Neo.VM.Benchmarks.csproj b/benchmarks/Neo.VM.Benchmarks/Neo.VM.Benchmarks.csproj
@@ -12,7 +12,7 @@
     <ProjectReference Include="..\..\src\Neo.Extensions\Neo.Extensions.csproj" />
     <ProjectReference Include="..\..\src\Neo.Json\Neo.Json.csproj" />
     <ProjectReference Include="..\..\src\Neo.VM\Neo.VM.csproj" />
-    <PackageReference Include="BenchmarkDotNet" Version="0.14.0" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.15.2" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Neo.Network.RpcClient/API_REFERENCE.md → docs/RpcClient/API_REFERENCE.md b/src/Neo.Network.RpcClient/API_REFERENCE.md → docs/RpcClient/API_REFERENCE.md