merge master

.github/workflows/docker.yml

@@ -0,0 +1,77 @@
+name: Publish (docker-image)
+
+on:
+  release:
+    types: [published]
+
+env:
+  DOTNET_VERSION: 8.0.x
+  DIST_DIR: ./dist
+
+jobs:
+  neo-cli-build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Set Application Version (Environment Variable)
+      run: |
+        APP_VERSION=$(echo '${{ github.event.release.tag_name }}' | cut -d 'v' -f 2)
+        echo "APP_VERSION=$APP_VERSION" >> $GITHUB_ENV
+
+    - name: Checkout (GitHub)
+      uses: actions/checkout@v4
+
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: ${{ env.DOTNET_VERSION }}
+
+    - name: Build (neo-cli)
+      run: |
+        dotnet publish ./src/Neo.CLI \
+          --framework net8.0 \
+          --configuration Release \
+          --runtime linux-x64 \
+          --self-contained true \
+          --output ${{ env.DIST_DIR }} \
+          --verbosity normal \
+          -p:VersionPrefix=${{ env.APP_VERSION }} \
+          -p:RuntimeIdentifier=linux-x64 \
+          -p:SelfContained=true \
+          -p:IncludeNativeLibrariesForSelfExtract=false \
+          -p:PublishTrimmed=false \
+          -p:PublishSingleFile=true \
+          -p:PublishReadyToRun=true \
+          -p:EnableCompressionInSingleFile=true \
+          -p:DebugType=embedded \
+          -p:ServerGarbageCollection=true
+
+    - name: Build (LevelDbStore)
+      run: |
+        dotnet build ./src/Plugins/LevelDBStore \
+          --framework net8.0 \
+          --configuration Release \
+          --output ${{ env.DIST_DIR }}/Plugins/LevelDBStore \
+          --verbosity normal \
+          -p:VersionPrefix=${{ env.APP_VERSION }}
+
+    - name: Remove (junk)
+      run: |
+        rm -v ${{ env.DIST_DIR }}/Plugins/LevelDBStore/Neo*
+        rm -v ${{ env.DIST_DIR }}/Plugins/LevelDBStore/*.pdb
+        rm -v ${{ env.DIST_DIR }}/Plugins/LevelDBStore/*.xml
+        rm -v ${{ env.DIST_DIR }}/*.xml
+
+    - name: Docker Login
+      run: |
+        docker login ghcr.io \
+          --username ${{ github.repository_owner }} \
+          --password ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Docker Build
+      run: |
+        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:${{ env.APP_VERSION }} \
+          --push

.github/workflows/main.yml

@@ -89,6 +89,7 @@ jobs:
         dotnet test ./tests/Neo.Plugins.OracleService.Tests --output ./bin/tests/Neo.Plugins.OracleService.Tests
         dotnet test ./tests/Neo.Plugins.RpcServer.Tests --output ./bin/tests/Neo.Plugins.RpcServer.Tests
         dotnet test ./tests/Neo.Plugins.Storage.Tests --output ./bin/tests/Neo.Plugins.Storage.Tests
+        dotnet test ./tests/Neo.Plugins.ApplicationLogs.Tests --output ./bin/tests/Neo.Plugins.ApplicationLogs.Tests
 
     - name: Coveralls
       if: matrix.os == 'ubuntu-latest'
@@ -106,6 +107,7 @@ jobs:
           ${{ github.workspace }}/tests/Neo.Plugins.OracleService.Tests/TestResults/coverage.info
           ${{ github.workspace }}/tests/Neo.Plugins.RpcServer.Tests/TestResults/coverage.info
           ${{ github.workspace }}/tests/Neo.Plugins.Storage.Tests/TestResults/coverage.info
+          ${{ github.workspace }}/tests/Neo.Plugins.ApplicationLogs.Tests/TestResults/coverage.info
           ${{ github.workspace }}/tests/Neo.Extensions.Tests/TestResults/coverage.info
 
   PublishPackage:

.github/workflows/pkgs-delete.yml

@@ -102,14 +102,24 @@ jobs:
         delete-only-pre-release-versions: "true"
         token: "${{ secrets.GITHUB_TOKEN }}"
 
-    - name: Delete Neo Package
+    - name: Delete Neo Package (nuget)
       uses: actions/delete-package-versions@v4
       with:
         package-name: Neo
         package-type: nuget
         min-versions-to-keep: 3
         delete-only-pre-release-versions: "true"
         token: "${{ secrets.GITHUB_TOKEN }}"
+
+    - name: Delete Neo Package (docker)
+      uses: actions/delete-package-versions@v4
+      with:
+        package-name: Neo
+        package-type: docker
+        min-versions-to-keep: 1
+        delete-only-pre-release-versions: "true"
+        token: "${{ secrets.GITHUB_TOKEN }}"
+
     - name: Delete Neo.ConsoleService Package
       uses: actions/delete-package-versions@v4
       with:
@@ -118,6 +128,7 @@ jobs:
         min-versions-to-keep: 3
         delete-only-pre-release-versions: "true"
         token: "${{ secrets.GITHUB_TOKEN }}"
+
     - name: Delete Neo.Extensions Package
       uses: actions/delete-package-versions@v4
       with:

.neo/docker/neo-cli/Dockerfile

@@ -0,0 +1,8 @@
+FROM debian:stable-slim
+
+# Install the apt-get packages
+RUN apt-get update
+RUN apt-get install -y libicu-dev libleveldb-dev screen
+
+COPY ./dist /opt/neo-cli
+RUN ln -s /opt/neo-cli/neo-cli /usr/bin

benchmarks/Neo.Benchmarks/Benchmarks.cs → benchmarks/Neo.Benchmarks/Benchmarks.POC.cs

@@ -1,6 +1,6 @@
 // Copyright (C) 2015-2024 The Neo Project.
 //
-// Benchmarks.cs file belongs to the neo project and is free
+// Benchmarks.POC.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
@@ -9,19 +9,21 @@
 // Redistribution and use in source and binary forms with or without
 // modifications are permitted.
 
+using BenchmarkDotNet.Attributes;
 using Neo.Network.P2P.Payloads;
 using Neo.SmartContract;
 using Neo.VM;
 using System.Diagnostics;
 
-namespace Neo;
+namespace Neo.Benchmark;
 
-static class Benchmarks
+public class Benchmarks_PoCs
 {
     private static readonly ProtocolSettings protocol = ProtocolSettings.Load("config.json");
     private static readonly NeoSystem system = new(protocol, (string)null);
 
-    public static void NeoIssue2725()
+    [Benchmark]
+    public void NeoIssue2725()
     {
         // https://github.com/neo-project/neo/issues/2725
         // L00: INITSSLOT 1
@@ -70,10 +72,7 @@ private static void Run(string name, string poc)
         using var snapshot = system.GetSnapshotCache();
         using var engine = ApplicationEngine.Create(TriggerType.Application, tx, snapshot, system.GenesisBlock, protocol, tx.SystemFee);
         engine.LoadScript(tx.Script);
-        Stopwatch stopwatch = Stopwatch.StartNew();
         engine.Execute();
-        stopwatch.Stop();
         Debug.Assert(engine.State == VMState.FAULT);
-        Console.WriteLine($"Benchmark: {name},\tTime: {stopwatch.Elapsed}");
     }
 }

benchmarks/Neo.Benchmarks/Neo.Benchmarks.csproj

@@ -9,6 +9,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\Neo\Neo.csproj" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.12" />
   </ItemGroup>
 
   <ItemGroup>

benchmarks/Neo.Benchmarks/Program.cs

@@ -9,10 +9,7 @@
 // Redistribution and use in source and binary forms with or without
 // modifications are permitted.
 
-using Neo;
-using System.Reflection;
+using BenchmarkDotNet.Running;
+using Neo.Benchmark;
 
-foreach (var method in typeof(Benchmarks).GetMethods(BindingFlags.Public | BindingFlags.Static))
-{
-    method.CreateDelegate<Action>().Invoke();
-}
+BenchmarkRunner.Run<Benchmarks_PoCs>();

benchmarks/Neo.VM.Benchmarks/Benchmarks.cs → benchmarks/Neo.VM.Benchmarks/Benchmarks.POC.cs

@@ -1,6 +1,6 @@
 // Copyright (C) 2015-2024 The Neo Project.
 //
-// Benchmarks.cs file belongs to the neo project and is free
+// Benchmarks.POC.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
@@ -9,13 +9,15 @@
 // Redistribution and use in source and binary forms with or without
 // modifications are permitted.
 
+using BenchmarkDotNet.Attributes;
 using System.Diagnostics;
 
-namespace Neo.VM
+namespace Neo.VM.Benchmark
 {
-    public static class Benchmarks
+    public class Benchmarks_PoCs
     {
-        public static void NeoIssue2528()
+        [Benchmark]
+        public void NeoIssue2528()
         {
             // https://github.com/neo-project/neo/issues/2528
             // L01: INITSLOT 1, 0
@@ -47,7 +49,8 @@ public static void NeoIssue2528()
             Run(nameof(NeoIssue2528), "VwEAwkpKAfsHdwARwG8AnXcAbwAl9////xHAzwJwlAAAdwAQzm8AnXcAbwAl9////0U=");
         }
 
-        public static void NeoVMIssue418()
+        [Benchmark]
+        public void NeoVMIssue418()
         {
             // https://github.com/neo-project/neo-vm/issues/418
             // L00: NEWARRAY0
@@ -81,7 +84,8 @@ public static void NeoVMIssue418()
             Run(nameof(NeoVMIssue418), "whBNEcARTRHAVgEB/gGdYBFNEU0SwFMSwFhKJPNFUUU=");
         }
 
-        public static void NeoIssue2723()
+        [Benchmark]
+        public void NeoIssue2723()
         {
             // L00: INITSSLOT 1
             // L01: PUSHINT32 130000
@@ -102,11 +106,8 @@ private static void Run(string name, string poc)
             byte[] script = Convert.FromBase64String(poc);
             using ExecutionEngine engine = new();
             engine.LoadScript(script);
-            Stopwatch stopwatch = Stopwatch.StartNew();
             engine.Execute();
-            stopwatch.Stop();
             Debug.Assert(engine.State == VMState.HALT);
-            Console.WriteLine($"Benchmark: {name},\tTime: {stopwatch.Elapsed}");
         }
     }
 }

benchmarks/Neo.VM.Benchmarks/Neo.VM.Benchmarks.csproj

@@ -10,6 +10,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\Neo.VM\Neo.VM.csproj" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.12" />
   </ItemGroup>
 
 </Project>

benchmarks/Neo.VM.Benchmarks/Program.cs

@@ -9,10 +9,7 @@
 // Redistribution and use in source and binary forms with or without
 // modifications are permitted.
 
-using Neo.VM;
-using System.Reflection;
+using BenchmarkDotNet.Running;
+using Neo.VM.Benchmark;
 
-foreach (var method in typeof(Benchmarks).GetMethods(BindingFlags.Public | BindingFlags.Static))
-{
-    method.CreateDelegate<Action>().Invoke();
-}
+BenchmarkRunner.Run<Benchmarks_PoCs>();

neo.sln

@@ -78,6 +78,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TokensTracker", "src\Plugin
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RpcClient", "src\Plugins\RpcClient\RpcClient.csproj", "{185ADAFC-BFC6-413D-BC2E-97F9FB0A8AF0}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Neo.Plugins.ApplicationLogs.Tests", "tests\Neo.Plugins.ApplicationLogs.Tests\Neo.Plugins.ApplicationLogs.Tests.csproj", "{8C866DC8-2E55-4399-9563-2F47FD4602EC}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Neo.Extensions.Tests", "tests\Neo.Extensions.Tests\Neo.Extensions.Tests.csproj", "{77FDEE2E-9381-4BFC-B9E6-741EDBD6B90F}"
 EndProject
 Global
@@ -218,6 +220,10 @@ Global
 		{185ADAFC-BFC6-413D-BC2E-97F9FB0A8AF0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{185ADAFC-BFC6-413D-BC2E-97F9FB0A8AF0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{185ADAFC-BFC6-413D-BC2E-97F9FB0A8AF0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8C866DC8-2E55-4399-9563-2F47FD4602EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8C866DC8-2E55-4399-9563-2F47FD4602EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8C866DC8-2E55-4399-9563-2F47FD4602EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8C866DC8-2E55-4399-9563-2F47FD4602EC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{77FDEE2E-9381-4BFC-B9E6-741EDBD6B90F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{77FDEE2E-9381-4BFC-B9E6-741EDBD6B90F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{77FDEE2E-9381-4BFC-B9E6-741EDBD6B90F}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -261,6 +267,7 @@ Global
 		{FF76D8A4-356B-461A-8471-BC1B83E57BBC} = {C2DC830A-327A-42A7-807D-295216D30DBB}
 		{5E4947F3-05D3-4806-B0F3-30DAC71B5986} = {C2DC830A-327A-42A7-807D-295216D30DBB}
 		{185ADAFC-BFC6-413D-BC2E-97F9FB0A8AF0} = {C2DC830A-327A-42A7-807D-295216D30DBB}
+		{8C866DC8-2E55-4399-9563-2F47FD4602EC} = {7F257712-D033-47FF-B439-9D4320D06599}
 		{77FDEE2E-9381-4BFC-B9E6-741EDBD6B90F} = {EDE05FA8-8E73-4924-BC63-DD117127EEE1}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution

src/Neo.CLI/CLI/MainService.Blockchain.cs

@@ -82,7 +82,7 @@ private void OnShowBlockCommand(string indexOrHash)
                 ConsoleHelper.Info("", "       PrevHash: ", $"{block.PrevHash}");
                 ConsoleHelper.Info("", "  NextConsensus: ", $"{block.NextConsensus}");
                 ConsoleHelper.Info("", "   PrimaryIndex: ", $"{block.PrimaryIndex}");
-                ConsoleHelper.Info("", "  PrimaryPubKey: ", $"{NativeContract.NEO.GetCommittee(NeoSystem.GetSnapshot())[block.PrimaryIndex]}");
+                ConsoleHelper.Info("", "  PrimaryPubKey: ", $"{NativeContract.NEO.GetCommittee(NeoSystem.GetSnapshotCache())[block.PrimaryIndex]}");
                 ConsoleHelper.Info("", "        Version: ", $"{block.Version}");
                 ConsoleHelper.Info("", "           Size: ", $"{block.Size} Byte(s)");
                 ConsoleHelper.Info();

src/Neo.CLI/CLI/MainService.Network.cs

@@ -118,7 +118,7 @@ private void OnBroadcastInvCommand(InventoryType type, UInt256[] payload)
         [ConsoleCommand("broadcast transaction", Category = "Network Commands")]
         private void OnBroadcastTransactionCommand(UInt256 hash)
         {
-            if (NeoSystem.MemPool.TryGetValue(hash, out Transaction tx))
+            if (NeoSystem.MemPool.TryGetValue(hash, out var tx))
                 OnBroadcastCommand(MessageCommand.Transaction, tx);
         }