Merge master to neo-build branch

.gitattributes

@@ -2,10 +2,11 @@
 # Set default behavior to automatically normalize line endings.
 ###############################################################################
 * text eol=lf
-*.cs eol=lf
-*.csproj eol=lf
-*.props eol=lf
-*.json eol=lf
+*.cs text eol=lf
+*.csproj text eol=lf
+*.props text eol=lf
+*.json text eol=lf
+*.targets text eol=lf
 
 ###############################################################################
 # Set default behavior for command prompt diff.
@@ -21,7 +22,7 @@
 #
 # Merging from the command prompt will add diff markers to the files if there
 # are conflicts (Merging from VS is not affected by the settings below, in VS
-# the diff markers are never inserted). Diff markers may cause the following 
+# the diff markers are never inserted). Diff markers may cause the following
 # file extensions to fail to load in VS. An alternative would be to treat
 # these files as binary and thus will always conflict and require user
 # intervention with every merge. To do so, just uncomment the entries below
@@ -52,9 +53,9 @@
 
 ###############################################################################
 # diff behavior for common document formats
-# 
+#
 # Convert binary document formats to text before diffing them. This feature
-# is only available from the command line. Turn it on by uncommenting the 
+# is only available from the command line. Turn it on by uncommenting the
 # entries below.
 ###############################################################################
 #*.doc   diff=astextplain

.github/workflows/docker.yml

@@ -73,5 +73,6 @@ jobs:
         docker build . \
           --file ./.neo/docker/neo-cli/Dockerfile \
           --tag ghcr.io/${{ github.repository_owner }}/neo-cli:latest \
+          --tag ghcr.io/${{ github.repository_owner }}/neo-cli:mainnet \
           --tag ghcr.io/${{ github.repository_owner }}/neo-cli:${{ env.APP_VERSION }} \
           --push

.neo/docker/neo-cli/Dockerfile

@@ -1,8 +1,12 @@
 FROM debian:stable-slim
 
+LABEL org.opencontainers.image.description "neo-cli -- full node, no plugins"
+
 # Install the apt-get packages
 RUN apt-get update
-RUN apt-get install -y libicu-dev libleveldb-dev screen
+RUN apt-get install -y libicu-dev libleveldb-dev screen sqlite3
 
 COPY ./dist /opt/neo-cli
 RUN ln -s /opt/neo-cli/neo-cli /usr/bin
+
+CMD ["neo-cli"]

README.md

@@ -6,7 +6,7 @@
   </a>
 </p>
 
-<h3 align="center">Neo Blockchain</h3>
+<h3 align="center">CSharp implementation of the neo blockchain protocol.</h3>
 
 <p align="center">
    A modern distributed network for the Smart Economy.
@@ -38,7 +38,7 @@
       src=".github/images/nnt-logo.jpg"
       width="23px">
   </a>
-  &nbsp;  
+  &nbsp;
   <a href="https://t.me/NEO_EN">
       <img
       src=".github/images/telegram-logo.png"
@@ -99,13 +99,12 @@
 1. [Overview](#overview)
 2. [Project structure](#project-structure)
 3. [Related projects](#related-projects)
-4. [Opening a new issue](#opening-a-new-issue)  
+4. [Opening a new issue](#opening-a-new-issue)
 5. [Bounty program](#bounty-program)
 6. [License](#license)
 
 ## Overview
-This repository contain main classes of the 
-[Neo](https://neo.org) blockchain.   
+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.
 Visit the [tutorials](https://docs.neo.org) to get started.
 
 
@@ -131,7 +130,7 @@ An overview of the project folders can be seen below.
 |[/tests/](https://github.com/neo-project/neo/tree/master/tests)|All unit tests.|
 
 ## 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. 
+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/) Included libraries are Neo, Neo-CLI, Neo-GUI, Neo-VM, test and plugin modules.
 * [neo-express:](https://github.com/neo-project/neo-express/) A private net optimized for development scenarios.

benchmarks/Neo.Benchmarks/Persistence/Bechmarks_LevelDB.cs

@@ -13,7 +13,6 @@
 using Neo.Persistence;
 using Neo.Plugins.Storage;
 using Neo.SmartContract;
-using System.Diagnostics;
 
 namespace Neo.Benchmarks.Persistence.Benchmarks
 {
@@ -26,7 +25,7 @@ public class Bechmarks_LevelDB
         private const string PathLevelDB = "Data_LevelDB_Benchmarks";
 
         private static readonly LevelDBStore levelDb = new();
-        private static ISnapshot snapshot;
+        private static IStoreSnapshot snapshot;
 
         [GlobalSetup]
         public void Setup()

benchmarks/Neo.Benchmarks/Persistence/Bechmarks_ReadOnlyStoreView.cs

@@ -50,7 +50,7 @@ public void Cleanup()
         [Benchmark]
         public void ReadOnlyStoreView_LevelDB()
         {
-            var view = new ReadOnlyStoreView(levelDbStore);
+            var view = (IReadOnlyStore)levelDbStore;
             var ok = view.TryGet(key1, out var _);
             Debug.Assert(ok);
 
@@ -61,7 +61,7 @@ public void ReadOnlyStoreView_LevelDB()
         [Benchmark]
         public void SnapshotCache_LevelDB()
         {
-            var snapshot = new SnapshotCache(levelDbStore);
+            var snapshot = new StoreCache(levelDbStore);
             var ok = snapshot.TryGet(key1, out var _);
             Debug.Assert(ok);
 

benchmarks/Neo.Json.Benchmarks/Benchmark_JsonDeserialize.cs

@@ -138,7 +138,7 @@ private JToken[] ConvertToJTokenArray(JToken? token)
                 result.Add(token);
             }
 
-            return [.. result];  // Converting a List to an Array of JTokens
+            return [.. result!];  // Converting a List to an Array of JTokens
         }
     }
 }

src/Directory.Build.props

@@ -2,10 +2,11 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
-    <Copyright>2015-2024 The Neo Project</Copyright>
+    <Copyright>2015-2025 The Neo Project</Copyright>
     <LangVersion>latest</LangVersion>
     <Authors>The Neo Project</Authors>
     <IsPackable>true</IsPackable>
+    <PackageId>$(MSBuildProjectName)</PackageId>
     <PackageIcon>neo.png</PackageIcon>
     <PackageProjectUrl>https://github.com/neo-project/neo</PackageProjectUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
@@ -20,6 +21,7 @@
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <WarningLevel>4</WarningLevel>
     <AnalysisLevel>latest</AnalysisLevel>
+    <OutputPath>../../bin/$(PackageId)</OutputPath>
   </PropertyGroup>
 
   <ItemGroup>

src/Neo.CLI/CLI/Helper.cs

@@ -25,7 +25,7 @@ public static bool IsYes(this string input)
             return input == "yes" || input == "y";
         }
 
-        public static string ToBase64String(this byte[] input) => System.Convert.ToBase64String(input);
+        public static string ToBase64String(this byte[] input) => Convert.ToBase64String(input);
 
         public static void IsScriptValid(this ReadOnlyMemory<byte> script, ContractAbi abi)
         {

src/Neo.CLI/CLI/MainService.Tools.cs

@@ -12,7 +12,6 @@
 using Neo.ConsoleService;
 using Neo.Cryptography.ECC;
 using Neo.Extensions;
-using Neo.IO;
 using Neo.SmartContract;
 using Neo.VM;
 using Neo.Wallets;

src/Neo.CLI/CLI/MainService.Vote.cs

@@ -20,6 +20,7 @@
 using Neo.Wallets;
 using System;
 using System.Numerics;
+using Array = Neo.VM.Types.Array;
 
 namespace Neo.CLI
 {
@@ -141,7 +142,7 @@ private void OnGetCandidatesCommand()
         {
             if (!OnInvokeWithResult(NativeContract.NEO.Hash, "getCandidates", out StackItem result, null, null, false)) return;
 
-            var resJArray = (VM.Types.Array)result;
+            var resJArray = (Array)result;
 
             if (resJArray.Count > 0)
             {
@@ -150,7 +151,7 @@ private void OnGetCandidatesCommand()
 
                 foreach (var item in resJArray)
                 {
-                    var value = (VM.Types.Array)item;
+                    var value = (Array)item;
                     if (value is null) continue;
 
                     Console.Write(((ByteString)value[0])?.GetSpan().ToHexString() + "\t");
@@ -167,7 +168,7 @@ private void OnGetCommitteeCommand()
         {
             if (!OnInvokeWithResult(NativeContract.NEO.Hash, "getCommittee", out StackItem result, null, null, false)) return;
 
-            var resJArray = (VM.Types.Array)result;
+            var resJArray = (Array)result;
 
             if (resJArray.Count > 0)
             {
@@ -189,7 +190,7 @@ private void OnGetNextBlockValidatorsCommand()
         {
             if (!OnInvokeWithResult(NativeContract.NEO.Hash, "getNextBlockValidators", out StackItem result, null, null, false)) return;
 
-            var resJArray = (VM.Types.Array)result;
+            var resJArray = (Array)result;
 
             if (resJArray.Count > 0)
             {
@@ -223,7 +224,7 @@ private void OnGetAccountState(UInt160 address)
                 ConsoleHelper.Warning(notice);
                 return;
             }
-            var resJArray = (VM.Types.Array)result;
+            var resJArray = (Array)result;
             if (resJArray is null)
             {
                 ConsoleHelper.Warning(notice);

src/Neo.CLI/CLI/MainService.Wallet.cs

@@ -11,7 +11,6 @@
 
 using Akka.Actor;
 using Neo.ConsoleService;
-using Neo.Cryptography.ECC;
 using Neo.Extensions;
 using Neo.Json;
 using Neo.Network.P2P.Payloads;
@@ -26,8 +25,10 @@
 using System.IO;
 using System.Linq;
 using System.Numerics;
+using System.Security.Cryptography;
 using System.Threading.Tasks;
 using static Neo.SmartContract.Helper;
+using ECPoint = Neo.Cryptography.ECC.ECPoint;
 
 namespace Neo.CLI
 {
@@ -55,7 +56,7 @@ private void OnOpenWallet(string path)
             {
                 OpenWallet(path, password);
             }
-            catch (System.Security.Cryptography.CryptographicException)
+            catch (CryptographicException)
             {
                 ConsoleHelper.Error($"Failed to open file \"{path}\"");
             }
@@ -634,7 +635,7 @@ private void OnCancelCommand(UInt256 txid, UInt160? sender = null, UInt160[]? si
                     return;
                 }
                 tx.NetworkFee += (long)decimalExtraFee.Value;
-            };
+            }
 
             ConsoleHelper.Info("Network fee: ",
                 $"{new BigDecimal((BigInteger)tx.NetworkFee, NativeContract.GAS.Decimals)} GAS\t",

src/Neo.CLI/CLI/MainService.cs

@@ -11,7 +11,6 @@
 
 using Akka.Actor;
 using Neo.ConsoleService;
-using Neo.Cryptography.ECC;
 using Neo.Extensions;
 using Neo.Json;
 using Neo.Ledger;
@@ -33,10 +32,13 @@
 using System.Net;
 using System.Numerics;
 using System.Reflection;
+using System.Security.Cryptography;
 using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
 using Array = System.Array;
+using ECCurve = Neo.Cryptography.ECC.ECCurve;
+using ECPoint = Neo.Cryptography.ECC.ECPoint;
 
 namespace Neo.CLI
 {
@@ -483,7 +485,7 @@ public async void Start(CommandLineOptions options)
                 {
                     ConsoleHelper.Warning($"wallet file \"{Settings.Default.UnlockWallet.Path}\" not found.");
                 }
-                catch (System.Security.Cryptography.CryptographicException)
+                catch (CryptographicException)
                 {
                     ConsoleHelper.Error($"Failed to open file \"{Settings.Default.UnlockWallet.Path}\"");
                 }

src/Neo.CLI/Neo.CLI.csproj

@@ -5,12 +5,9 @@
     <AssemblyTitle>Neo.CLI</AssemblyTitle>
     <AssemblyName>neo-cli</AssemblyName>
     <OutputType>Exe</OutputType>
-    <PackageId>Neo.CLI</PackageId>
-    <RootNamespace>Neo</RootNamespace>
     <Product>Neo.CLI</Product>
     <ApplicationIcon>neo.ico</ApplicationIcon>
     <Nullable>enable</Nullable>
-    <OutputPath>../../bin/$(AssemblyTitle)</OutputPath>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 

src/Neo.CLI/Settings.cs

@@ -11,9 +11,8 @@
 
 using Microsoft.Extensions.Configuration;
 using Neo.Network.P2P;
-using Neo.Persistence;
+using Neo.Persistence.Providers;
 using System;
-using System.Linq;
 using System.Reflection;
 using System.Threading;
 

src/Neo.ConsoleService/Neo.ConsoleService.csproj

@@ -2,9 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.1;net9.0</TargetFrameworks>
-    <PackageId>Neo.ConsoleService</PackageId>
     <Nullable>enable</Nullable>
-    <OutputPath>../../bin/$(PackageId)</OutputPath>
   </PropertyGroup>
 
   <ItemGroup>

src/Neo.Cryptography.BLS12_381/Bls12.Adder.cs

@@ -56,14 +56,14 @@ public static Fp12 One
             }
 
             [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            Fp12 IMillerLoopDriver<Fp12>.Square(in Fp12 f) => Adder.Square(f);
+            Fp12 IMillerLoopDriver<Fp12>.Square(in Fp12 f) => Square(f);
 
             [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            Fp12 IMillerLoopDriver<Fp12>.Conjugate(in Fp12 f) => Adder.Conjugate(f);
+            Fp12 IMillerLoopDriver<Fp12>.Conjugate(in Fp12 f) => Conjugate(f);
             Fp12 IMillerLoopDriver<Fp12>.One
             {
                 [MethodImpl(MethodImplOptions.AggressiveInlining)]
-                get => Adder.One;
+                get => One;
             }
 
             #endregion

src/Neo.Cryptography.BLS12_381/Neo.Cryptography.BLS12_381.csproj

@@ -5,8 +5,6 @@
     <TargetFrameworks>netstandard2.1;net9.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <PackageId>Neo.Cryptography.BLS12_381</PackageId>
-    <OutputPath>../../bin/$(PackageId)</OutputPath>
   </PropertyGroup>
 
   <ItemGroup>

src/Neo.Extensions/Collections/CollectionExtensions.cs

@@ -13,7 +13,6 @@
 using System;
 using System.Collections.Generic;
 
-
 namespace Neo.Extensions
 {
     public static class CollectionExtensions

src/Neo.Extensions/Neo.Extensions.csproj

@@ -4,9 +4,7 @@
     <TargetFrameworks>netstandard2.1;net9.0</TargetFrameworks>
     <Nullable>enable</Nullable>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <PackageId>Neo.Extensions</PackageId>
     <PackageTags>NEO;Blockchain;Extensions</PackageTags>
-    <OutputPath>../../bin/$(PackageId)</OutputPath>
   </PropertyGroup>
 
   <ItemGroup>

src/Neo.Extensions/StringExtensions.cs

@@ -10,10 +10,10 @@
 // modifications are permitted.
 
 using System;
+using System.Runtime.CompilerServices;
 #if !NET9_0_OR_GREATER
 using System.Globalization;
 #endif
-using System.Runtime.CompilerServices;
 
 namespace Neo.Extensions
 {