Merge branch 'neo-project:master' into check

Author: Jimmy

.github/workflows/nuget.yml

@@ -9,6 +9,7 @@ on:
 env:
   DOTNET_VERSION: 9.0.x
   CONFIGURATION: Release
+  NEO_NUGET_DIR: ./pkgs
 
 jobs:
   nuget-release:
@@ -34,7 +35,7 @@ jobs:
       run: |
         dotnet pack ./neo.sln \
         --configuration Release \
-        --output ./sbin \
+        --output ${{ env.NEO_NUGET_DIR }} \
         --verbosity normal \
         -p:VersionPrefix=${{ env.APP_VERSION }} \
         -p:DebugSymbols=false \
@@ -47,7 +48,7 @@ jobs:
 
     - name: Publish to NuGet.org
       run: |
-        dotnet nuget push ./sbin/*.nupkg \
+        dotnet nuget push ${{ env.NEO_NUGET_DIR }}/*.nupkg \
         --source https://api.nuget.org/v3/index.json \
         --api-key ${{ secrets.NUGET_TOKEN }} \
         --skip-duplicate

.gitignore

@@ -153,10 +153,14 @@ PublishScripts/
 
 # NuGet Packages
 *.nupkg
+*.snupkg
+
 # The packages folder can be ignored because of Package Restore
 **/packages/*
+
 # except build/, which is used as an MSBuild target.
 !**/packages/build/
+
 # Uncomment if necessary however generally it will be regenerated when needed
 #!**/packages/repositories.config
 # NuGet v3's project.json files produces more ignoreable files

benchmarks/Neo.Benchmarks/Benchmarks.SignData.cs

@@ -0,0 +1,57 @@
+// Copyright (C) 2015-2025 The Neo Project.
+//
+// Benchmarks.SignData.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;
+using Neo.Extensions;
+using Neo.Network.P2P;
+using Neo.Network.P2P.Payloads;
+
+namespace Neo.Benchmark
+{
+    public class Benchmarks_SignData
+    {
+        private static readonly Transaction s_tx = new()
+        {
+            Attributes = [],
+            Script = Array.Empty<byte>(),
+            Signers = [new Signer() { Account = UInt160.Zero, AllowedContracts = [], AllowedGroups = [], Rules = [], Scopes = WitnessScope.Global }],
+            Witnesses = []
+        };
+
+        /// <summary>
+        /// Gets the data of a <see cref="IVerifiable"/> object to be hashed.
+        /// </summary>
+        /// <param name="verifiable">The <see cref="IVerifiable"/> object to hash.</param>
+        /// <param name="network">The magic number of the network.</param>
+        /// <returns>The data to hash.</returns>
+        public static byte[] GetSignDataV1(IVerifiable verifiable, uint network)
+        {
+            using MemoryStream ms = new();
+            using BinaryWriter writer = new(ms);
+            writer.Write(network);
+            writer.Write(verifiable.Hash);
+            writer.Flush();
+            return ms.ToArray();
+        }
+
+        [Benchmark]
+        public void TestOld()
+        {
+            GetSignDataV1(s_tx, 0);
+        }
+
+        [Benchmark]
+        public void TestNew()
+        {
+            s_tx.GetSignData(0);
+        }
+    }
+}

benchmarks/Neo.Benchmarks/Program.cs

@@ -10,17 +10,14 @@
 // modifications are permitted.
 
 using BenchmarkDotNet.Running;
-using Neo.Benchmark;
-using Neo.Benchmarks.Persistence.Benchmarks;
-using Neo.SmartContract.Benchmark;
 
-// List all bencharks:
+// 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 bencharks of a class:
+// 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);

benchmarks/Neo.Extensions.Benchmarks/Program.cs

@@ -10,15 +10,14 @@
 // modifications are permitted.
 
 using BenchmarkDotNet.Running;
-using Neo.Extensions;
 
-// List all bencharks:
+// 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 bencharks of a class:
+// 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);

benchmarks/Neo.Json.Benchmarks/Program.cs

@@ -10,15 +10,14 @@
 // modifications are permitted.
 
 using BenchmarkDotNet.Running;
-using Neo.Json.Benchmarks;
 
-// List all bencharks:
+// 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 bencharks of a class:
+// 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);

benchmarks/Neo.VM.Benchmarks/InstructionBuilder/InstructionBuilder.cs

@@ -9,6 +9,7 @@
 // Redistribution and use in source and binary forms with or without
 // modifications are permitted.
 
+using Neo.Extensions;
 using System.Buffers.Binary;
 using System.Numerics;
 
@@ -96,7 +97,7 @@ internal Instruction Push(BigInteger number)
 
         internal Instruction Push(string s)
         {
-            return Push(Utility.StrictUTF8.GetBytes(s));
+            return Push(s.ToStrictUtf8Bytes());
         }
 
         internal Instruction Push(byte[] data)

benchmarks/Neo.VM.Benchmarks/Program.cs

@@ -14,56 +14,23 @@
 using Neo.VM.Benchmark;
 using System.Reflection;
 
-// Flag to determine if running benchmark or running methods
-// If `NEO_VM_BENCHMARK` environment variable is set, run benchmark no matter.
-var runBenchmark = true;
-
 // Define the benchmark or execute class
-var benchmarkType = typeof(Benchmarks_PoCs);
-
-/*
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- |                                                                           |
- |                    DO NOT MODIFY THE CODE BELOW                           |
- |                                                                           |
- |              All configuration should be done above this line             |
- |                                                                           |
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-*/
-
-// Explanation:
-// Benchmark methods must contain no parameters to be valid.
-// This is because we need to be able to invoke these methods repeatedly
-// without any external input. All necessary data should be set up in the Setup method
-// or as properties of the benchmark class.
-
-// Example:
-
-// [Benchmark]
-// public void BenchmarkMethod()
-// {
-//     // Benchmark code here
-// }
-if (Environment.GetEnvironmentVariable("NEO_VM_BENCHMARK") != null || runBenchmark)
+if (Environment.GetEnvironmentVariable("NEO_VM_BENCHMARK") != null)
 {
-    BenchmarkRunner.Run(benchmarkType);
+    BenchmarkSwitcher.FromAssembly(typeof(Program).Assembly).Run(args);
 }
 else
 {
+    var benchmarkType = typeof(Benchmarks_PoCs);
     var instance = Activator.CreateInstance(benchmarkType);
-    var setupMethod = benchmarkType.GetMethods(BindingFlags.Public | BindingFlags.Instance)
-        .FirstOrDefault(m => m.GetCustomAttribute<GlobalSetupAttribute>() != null);
-    if (setupMethod != null)
-    {
-        setupMethod.Invoke(instance, null);
-    }
+    benchmarkType.GetMethods(BindingFlags.Public | BindingFlags.Instance)
+        .FirstOrDefault(m => m.GetCustomAttribute<GlobalSetupAttribute>() != null)?
+        .Invoke(instance, null); // setup
 
-    var methods = benchmarkType.GetMethods(BindingFlags.Public | BindingFlags.Instance);
+    var methods = benchmarkType.GetMethods(BindingFlags.Public | BindingFlags.Instance)
+        .Where(m => m.DeclaringType == benchmarkType && !m.GetCustomAttributes<GlobalSetupAttribute>().Any());
     foreach (var method in methods)
     {
-        if (method.DeclaringType == benchmarkType && !method.GetCustomAttributes<GlobalSetupAttribute>().Any())
-        {
-            method.Invoke(instance, null);
-        }
+        method.Invoke(instance, null);
     }
 }

nuget.config

@@ -3,6 +3,7 @@
   <packageSources>
     <clear />
     <!-- <add key="github" value="https://nuget.pkg.github.com/neo-project/index.json" /> -->
+    <add key="Local" value="./pkgs/" />
     <add key="MyGet-neo" value="https://www.myget.org/F/neo/api/v3/index.json" />
     <add key="NuGet.org" value="https://api.nuget.org/v3/index.json" />
   </packageSources>