Merge dev into master

.devcontainer/devcontainer.dockerfile

@@ -1,6 +1,6 @@
 # https://github.com/dotnet/dotnet-docker/blob/main/README.sdk.md
 # https://mcr.microsoft.com/en-us/artifact/mar/dotnet/sdk/tags <-- this shows all images
-FROM mcr.microsoft.com/dotnet/sdk:9.0.102-noble
+FROM mcr.microsoft.com/dotnet/sdk:9.0.300-noble
 
 # Install the libleveldb-dev package 
 RUN apt-get update && apt-get install -y libleveldb-dev

.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

.github/PULL_REQUEST_TEMPLATE.md

@@ -2,6 +2,16 @@
 
 <!-- Please include a summary of the changes and the related issue. Please also include relevant motivation and context. List any dependencies that are required for this change. -->
 
+# Change Log
+<!-- Use a list
+
+- Add File 'filename here'
+- Removed File 'filename here'
+- Add Class 'class name here'
+- etc
+
+-->
+
 Fixes # (issue)
 
 ## Type of change
@@ -19,10 +29,10 @@ Fixes # (issue)
 
 <!-- Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration -->
 
-- [ ] Test A
-- [ ] Test B
-
-**Test Configuration**:
+- [ ] Unit Testing
+- [ ] Run Application
+- [ ] Local Computer Tests
+- [ ] No Testing
 
 
 # Checklist:

.github/workflows/docker.yml

@@ -75,9 +75,11 @@ jobs:
           -p:GITHUB_ACTIONS=true
 
     - name: Remove (junk)
+      working-directory: ${{ env.DIST_DIR }}/Plugins/LevelDBStore
       run: |
-        rm -v -R ${{ env.DIST_DIR }}/Plugins/LevelDBStore/runtimes
-        rm -v ${{ env.DIST_DIR }}/Plugins/LevelDBStore/Neo*
+        rm -v -R runtimes
+        rm -v Neo*
+        rm -v $(ls *.dll | grep -v "LevelDBStore.dll")
 
     - name: Docker Login
       run: |

.github/workflows/issue-metrics.yml

@@ -0,0 +1,40 @@
+name: Monthly issue metrics
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '3 2 1 * *'
+
+permissions:
+  issues: write
+  pull-requests: read
+
+jobs:
+  build:
+    name: issue metrics
+    runs-on: ubuntu-latest
+    steps:
+    - name: Get dates for last month
+      shell: bash
+      run: |
+        # Calculate the first day of the previous month
+        first_day=$(date -d "last month" +%Y-%m-01)
+
+        # Calculate the last day of the previous month
+        last_day=$(date -d "$first_day +1 month -1 day" +%Y-%m-%d)
+
+        #Set an environment variable with the date range
+        echo "$first_day..$last_day"
+        echo "last_month=$first_day..$last_day" >> "$GITHUB_ENV"
+
+    - name: Run issue-metrics tool
+      uses: github/[email protected]
+      env:
+        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        SEARCH_QUERY: 'repo:neo-project/neo is:issue created:${{ env.last_month }} -reason:"not planned" -reason:"duplicate"'
+
+    - name: Create issue
+      uses: peter-evans/[email protected]
+      with:
+        title: Monthly issue metrics report
+        token: ${{ secrets.GITHUB_TOKEN }}
+        content-filepath: ./issue_metrics.md

.github/workflows/main.yml

@@ -21,9 +21,37 @@ 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
 
+  Check-Vulnerable:
+    name: Scan for Vulnerable Dependencies
+    needs: [Format]
+    timeout-minutes: 15
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    steps:
+    - name: Checkout
+      uses: actions/[email protected]
+
+    - name: Setup .NET
+      uses: actions/[email protected]
+      with:
+        dotnet-version: ${{ env.DOTNET_VERSION }}
+
+    - name: Restore
+      run: dotnet restore
+
+    - name: Scan for Vulnerable Dependencies
+      run: dotnet list package --vulnerable --include-transitive
+
   Test-Everything:
     needs: [Format]
     timeout-minutes: 15
@@ -37,6 +65,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 +100,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: |
@@ -94,7 +136,7 @@ jobs:
 
     - name: Coveralls
       if: matrix.os == 'ubuntu-latest'
-      uses: coverallsapp/github-action@648a8eb78e6d50909eff900e4ec85cab4524a45b
+      uses: coverallsapp/github-action@v2.3.6
       with:
         github-token: ${{ secrets.GITHUB_TOKEN }}
         debug: false
@@ -108,11 +150,13 @@ jobs:
           ${{ github.workspace }}/TestResults/Neo.VM.Tests/coverage.info
           ${{ 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.RpcClient.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
           ${{ github.workspace }}/TestResults/Neo.Plugins.ApplicationLogs.Tests/coverage.info
+          ${{ github.workspace }}/TestResults/Neo.Plugins.StateService.Tests/coverage.info
           ${{ github.workspace }}/TestResults/Neo.Extensions.Tests/coverage.info
 
   PublishPackage:

.github/workflows/release.yml

@@ -102,6 +102,7 @@ jobs:
       run: |
         rm -v -R runtimes
         rm -v Neo*
+        rm -v $(ls *.dll | grep -v "LevelDBStore.dll") 
 
     # Create the distribution directory
     - name: Create Distribution Directory

.gitignore

@@ -266,3 +266,5 @@ launchSettings.json
 
 # Benchmarks
 **/BenchmarkDotNet.Artifacts/
+/src/Neo.CLI/neo-cli/
+**/localnet_nodes/

.neo/README.md

@@ -5,9 +5,8 @@ Visit the [documentation](https://docs.neo.org/docs/en-us/index.html) to get sta
 ## Related projects
 Code references are provided for all platform building blocks. That includes the base library, the VM, a command line application and the compiler. 
 
-- [neo:](https://github.com/neo-project/neo/) Neo core library, contains base classes, including ledger, p2p and IO modules.
-- [neo-modules:](https://github.com/neo-project/neo-modules/) Neo modules include additional tools and plugins to be used with Neo.
-- [neo-devpack-dotnet:](https://github.com/neo-project/neo-devpack-dotnet/) These are the official tools used to convert a C# smart-contract into a *neo executable file*.
+- [neo:](https://github.com/neo-project/neo/) Neo core library, contains base classes, including ledger, Peer-to-Peer, IO, plugins and more.
+- [neo-devpack-dotnet:](https://github.com/neo-project/neo-devpack-dotnet/) These are the official tools used to convert C# smart-contract into *neo vm executable file*.
 
 ## Opening a new issue
 Please feel free to create new issues to suggest features or ask questions.

README.md

@@ -94,14 +94,19 @@
   </a>
 </p>
 
+## Quick Start A Mainnet Node
+1. git clone https://github.com/neo-project/neo.git
+2. cd neo/src/Neo.CLI
+3. make build
 
 ## Table of Contents
 1. [Overview](#overview)
 2. [Project structure](#project-structure)
 3. [Related projects](#related-projects)
 4. [Opening a new issue](#opening-a-new-issue)
-5. [Bounty program](#bounty-program)
-6. [License](#license)
+5. [Contributing](#contributing)
+6. [Bounty program](#bounty-program)
+7. [License](#license)
 
 ## Overview
 This repository is a csharp implementation of the [neo](https://neo.org) blockchain. It is jointly maintained by the neo core developers and neo global development community.
@@ -146,6 +151,57 @@ Please feel free to create new issues to suggest features or ask questions.
 
 If you found a security issue, please refer to our [security policy](https://github.com/neo-project/neo/security/policy).
 
+## Contributing
+
+We welcome contributions to the Neo project! To ensure a smooth collaboration process, please follow these guidelines:
+
+### Branch Rules
+
+- **`master`** - Contains the latest stable release version. This branch reflects the current production state.
+- **`dev`** - The main development branch where all new features and improvements are integrated.
+
+### Pull Request Guidelines
+
+**Important**: All pull requests must be based on the `dev` branch, not `master`.
+
+1. **Fork the repository** and create your feature branch from `dev`:
+   ```bash
+   git checkout dev
+   git pull origin dev
+   git checkout -b feature/your-feature-name
+   ```
+
+2. **Make your changes** following the project's coding standards and conventions.
+
+3. **Test your changes** thoroughly to ensure they don't break existing functionality.
+
+4. **Commit your changes** with clear, descriptive commit messages:
+   ```bash
+   git commit -m "feat: add new feature description"
+   ```
+
+5. **Push to your fork** and create a pull request against the `dev` branch:
+   ```bash
+   git push origin feature/your-feature-name
+   ```
+
+6. **Create a Pull Request** targeting the `dev` branch with:
+   - Clear title and description
+   - Reference to any related issues
+   - Summary of changes made
+
+### Development Workflow
+
+```
+feature/bug-fix → dev → master (via release)
+```
+
+- Feature branches are merged into `dev`
+- `dev` is periodically merged into `master` for releases
+- Never create PRs directly against `master`
+
+For more detailed contribution guidelines, please check our documentation or reach out to the maintainers.
+
 ## Bounty program
 You can be rewarded by finding security issues. Please refer to our [bounty program page](https://neo.org/bounty) for more information.
 

benchmarks/Neo.Benchmarks/Neo.Benchmarks.csproj

@@ -5,14 +5,13 @@
     <TargetFrameworks>net9.0</TargetFrameworks>
     <RootNamespace>Neo</RootNamespace>
     <ImplicitUsings>enable</ImplicitUsings>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.IO.Hashing" Version="9.0.1" />
+    <PackageReference Include="System.IO.Hashing" Version="9.0.7" />
     <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>

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;
+        }
+    }
+}

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>