Merge pull request #3581 from AElfProject/release/1.9.1

add a benchmark Github Action and add comments

.bettercodehub.yml

@@ -1,4 +1,6 @@
+# Depth of components to analyze (2 levels deep)
 component_depth: 2
 
+# Programming languages to analyze
 languages:
 - csharp

.github/workflows/benchmark_action.yml

@@ -0,0 +1,48 @@
+name: benchmark_action
+on:
+  push:
+    tags:
+      - '**'
+    branches:
+      - '**'
+
+
+
+env:
+  DOTNET_INSTALL_DIR: "./.dotnet"
+  Solution_Name: AElf.All.sln
+  Service_Name: AELF
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+      contents: write
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Setup dotnet
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: '6.0'
+
+      - name: 'Download AElf build tools'
+        run: bash scripts/download_binary.sh
+
+      - name: 'Install protobuf'
+        run: bash scripts/install_protobuf.sh
+
+      - name: Install dependencies
+        run: dotnet restore bench/AElf.Benchmark/AElf.Benchmark.csproj --verbosity quiet
+
+      - name: BenchMark
+        run: |
+          cd bench/AElf.Benchmark
+          dotnet run --filter '*MinerTests*'
+      - name: Upload build artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ env.Service_Name }}
+          path: bench/AElf.Benchmark/BenchmarkDotNet.Artifacts/results
+          retention-days: 30

.gitignore

@@ -312,4 +312,4 @@ tools
 .idea/.idea.AElf/.idea/projectSettingsUpdater.xml
 .idea/.idea.AElf/.idea/vcs.xml
 .idea/.idea.AElf/.idea/workspace.xml
-.idea/.idea.AElf/riderModule.iml
+.idea/.idea.AElf/riderModule.iml

.readthedocs.yml

@@ -14,7 +14,7 @@ sphinx:
 # Optionally build your docs in additional formats such as PDF and ePub
 formats: all
 
-# Optionally set the version of Python and requirements required to build your docs
+# Optionally set the version of python and requirements required to build your docs
 python:
   version: 3.7
   install:

AElf.ContractTools.targets

@@ -32,7 +32,8 @@
             </PropertyGroup>
         </Otherwise>
     </Choose>
-
+
+    <!-- Generate protobuf code before building and getting the target path -->
     <Target Name="GenerateProtobufCode" BeforeTargets="BeforeBuild;GetTargetPath">
         <PropertyGroup>
             <LocalProtobufDir>$(ProjectDir)/Protobuf</LocalProtobufDir>

AElf.Contracts.sln

@@ -1,5 +1,4 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
+Microsoft Visual Studio Solution File, Format Version 12.00
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "contract", "contract", "{651F0F6E-86CF-42D2-9110-5F3EAE5704F0}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{26990847-E0A2-4FCC-8C71-267CA77557CD}"

AElf.sln.DotSettings

@@ -1,14 +1,17 @@
-<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                        xmlns:s="clr-namespace:System;assembly=mscorlib"
+                        xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml"
+                        xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	<s:Boolean x:Key="/Default/CodeEditing/SuppressNullableWarningFix/Enabled/@EntryValue">False</s:Boolean>
-	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=JS/@EntryIndexedValue">JS</s:String>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=aelf/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=appsettings/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=blockchain/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Blockchains/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=DPOS/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=grpc/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=hangfire/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Merkle/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=pubkey/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Ssdb/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Xunit/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
+    <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=JS/@EntryIndexedValue">JS</s:String>
+    <s:Boolean x:Key="/Default/UserDictionary/Words/=aelf/@EntryIndexedValue">True</s:Boolean>
+    <s:Boolean x:Key="/Default/UserDictionary/Words/=appsettings/@EntryIndexedValue">True</s:Boolean>
+    <s:Boolean x:Key="/Default/UserDictionary/Words/=blockchain/@EntryIndexedValue">True</s:Boolean>
+    <s:Boolean x:Key="/Default/UserDictionary/Words/=Blockchains/@EntryIndexedValue">True</s:Boolean>
+    <s:Boolean x:Key="/Default/UserDictionary/Words/=DPOS/@EntryIndexedValue">True</s:Boolean>
+    <s:Boolean x:Key="/Default/UserDictionary/Words/=grpc/@EntryIndexedValue">True</s:Boolean>
+    <s:Boolean x:Key="/Default/UserDictionary/Words/=hangfire/@EntryIndexedValue">True</s:Boolean>
+    <s:Boolean x:Key="/Default/UserDictionary/Words/=Merkle/@EntryIndexedValue">True</s:Boolean>
+    <s:Boolean x:Key="/Default/UserDictionary/Words/=pubkey/@EntryIndexedValue">True</s:Boolean>
+    <s:Boolean x:Key="/Default/UserDictionary/Words/=Ssdb/@EntryIndexedValue">True</s:Boolean>
+    <s:Boolean x:Key="/Default/UserDictionary/Words/=Xunit/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

CodeCoverage.runsettings

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- This XML defines run settings for code coverage. -->
 <!-- File name extension must be .runsettings -->
 <RunSettings>
   <DataCollectionRunSettings>

appveyor.yml

@@ -1,3 +1,4 @@
+# appveyor configuration file
 version: 1.0.0.{build}
 skip_tags: true
 os: Windows Server 2012 R2

azure-myget-publish.yml

@@ -1,3 +1,4 @@
+  # Azure DevOps pipeline configuration for publishing NuGet packages to MyGet
   pool:
     vmImage: ubuntu-latest
   pr: none 

azure-pipelines.yml

@@ -1,4 +1,4 @@
-# File: azure-pipelines.yml
+# Azure Pipelines configuration file
 jobs:
   - template: templates/build-template-window.yml
     parameters:

bench/AElf.Benchmark/HtmlSummaryExporter.cs

@@ -0,0 +1,82 @@
+using BenchmarkDotNet.Exporters;
+using BenchmarkDotNet.Loggers;
+using BenchmarkDotNet.Reports;
+
+using System.Collections.Generic;
+using System.IO;
+
+
+public class HtmlSummaryExporter : IExporter
+{
+    public string Name => nameof(HtmlSummaryExporter);
+
+    public void ExportToLog(Summary summary, ILogger logger)
+    {
+
+    }
+
+    public IEnumerable<string> ExportToFiles(Summary summary, ILogger consoleLogger)
+    {
+        string directoryPath = summary.ResultsDirectoryPath;
+        string outputPath = Path.Combine(directoryPath, "Summary.html");
+
+        var htmlFiles = Directory.GetFiles(directoryPath, "*.html");
+
+        using (StreamWriter writer = new StreamWriter(outputPath))
+        {
+            writer.WriteLine("<html>");
+            writer.WriteLine("<head>");
+            writer.WriteLine("<title>Benchmark Summary</title>");
+
+            writer.WriteLine("<style>");
+            foreach (var file in htmlFiles)
+            {
+                string content = File.ReadAllText(file);
+                string styleContent = GetStyleContent(content);
+                writer.WriteLine(styleContent);
+            }
+            writer.WriteLine("</style>");
+
+            writer.WriteLine("</head>");
+            writer.WriteLine("<body>");
+
+            foreach (var file in htmlFiles)
+            {
+                string fileName = Path.GetFileName(file);
+                writer.WriteLine($"<h2>{fileName}</h2>"); 
+                string content = File.ReadAllText(file);
+                string bodyContent = GetBodyContent(content);
+                writer.WriteLine(bodyContent);
+            }
+
+            writer.WriteLine("</body>");
+            writer.WriteLine("</html>");
+        }
+
+        consoleLogger.WriteLine($"Summary HTML file created successfully at {outputPath}.");
+
+        return new[] { outputPath };
+    }
+
+    private string GetBodyContent(string html)
+    {
+        int bodyStartIndex = html.IndexOf("<body>") + "<body>".Length;
+        int bodyEndIndex = html.IndexOf("</body>");
+        if (bodyStartIndex >= 0 && bodyEndIndex >= 0)
+        {
+            return html.Substring(bodyStartIndex, bodyEndIndex - bodyStartIndex);
+        }
+        return string.Empty;
+    }
+
+    private string GetStyleContent(string html)
+    {
+        int styleStartIndex = html.IndexOf("<style>") + "<style>".Length;
+        int styleEndIndex = html.IndexOf("</style>");
+        if (styleStartIndex >= 0 && styleEndIndex >= 0)
+        {
+            return html.Substring(styleStartIndex, styleEndIndex - styleStartIndex);
+        }
+        return string.Empty;
+    }
+}

bench/AElf.Benchmark/Program.cs

@@ -2,6 +2,10 @@
 using System.IO;
 using System.Reflection;
 using BenchmarkDotNet.Configs;
+using BenchmarkDotNet.Exporters;
+using BenchmarkDotNet.Exporters.Csv;
+using BenchmarkDotNet.Exporters.Xml;
+using BenchmarkDotNet.Reports;
 using BenchmarkDotNet.Running;
 using Volo.Abp;
 
@@ -18,8 +22,13 @@ private static void Main(string[] args)
                }))
         {
             application.Initialize();
-            BenchmarkSwitcher.FromAssembly(typeof(Program).Assembly).Run(args, new DebugInProcessConfig());
-        }
+            var config = new DebugInProcessConfig()
+                .WithSummaryStyle(SummaryStyle.Default.WithMaxParameterColumnWidth(50))
+                .AddExporter(XmlExporter.Default)
+                .AddExporter(HtmlExporter.Default)
+                .AddExporter(new HtmlSummaryExporter())
+                .AddExporter(CsvExporter.Default); 
+            BenchmarkSwitcher.FromAssembly(typeof(Program).Assembly).Run(args, config);        }
     }
 
     private static void RegisterAssemblyResolveEvent()

build.cake

@@ -112,7 +112,6 @@ Task("Test-with-Codecov")
         actions.Add(action);
     }
 
-
     var options = new ParallelOptions {
         MaxDegreeOfParallelism = 1,
         //CancellationToken = cancellationToken

build.config

@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 CAKE_VERSION=0.37.0
-DOTNET_VERSION=6.0.300
+DOTNET_VERSION=6.0.300

build.ps1

@@ -6,6 +6,7 @@ $PSScriptRoot = Split-Path $MyInvocation.MyCommand.Path -Parent
 
 [string] $CakeVersion = ''
 [string] $DotNetVersion= ''
+
 foreach($line in Get-Content (Join-Path $PSScriptRoot 'build.config'))
 {
   if ($line -like 'CAKE_VERSION=*') {

build.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Define varibles
+# Define variables
 SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
 source $SCRIPT_DIR/build.config
 TOOLS_DIR=$SCRIPT_DIR/tools

common.props

@@ -11,4 +11,4 @@
     <None Include="../../LICENSE" Pack="true" PackagePath=""/>
   </ItemGroup>
 
-</Project>
+</Project>

docker/docker-compose.yml

@@ -9,4 +9,3 @@ services:
       - 8001:8000
     volumes:
       - /opt:/opt
-

docker/start-cli.sh

@@ -2,4 +2,3 @@
 BIND_VOLUME='-v /opt:/opt'
 CONFIGURE_PATH='-w /opt/aelf-node'
 docker run -it --rm   $BIND_VOLUME $CONFIGURE_PATH   aelf/node
-

docker/start-node.sh

@@ -2,4 +2,4 @@
 PUBLISH_PORT='-p 6800:6800 -p 8000:8000'
 BIND_VOLUME='-v /opt:/opt'
 CONfIGURE_PATH='/opt/aelf-node'
-docker run -itd $PUBLISH_PORT  $BIND_VOLUME -w  $CONfIGURE_PATH  aelf/node  dotnet /app/AElf.Launcher.dll  --config.path $CONfIGURE_PATH
+docker run -itd $PUBLISH_PORT  $BIND_VOLUME -w  $CONfIGURE_PATH  aelf/node  dotnet /app/AElf.Launcher.dll  --config.path $CONfIGURE_PATH

docs-sphinx/index.rst

@@ -78,4 +78,4 @@ Welcome to AElf's official documentation!
 
    tutorials/cross-chain/running-side-chain
    tutorials/__run-node
-   getting-started/smart-contract-development/developing-smart-contracts/index
+   getting-started/smart-contract-development/developing-smart-contracts/index

docs/main-structure.md

@@ -88,4 +88,4 @@
       * [Google cloud](resources/cloud/gcp/GCP.md)
     * [Browser Extension](resources/browser-extension.md)
     * [Joining AElf's testnet](resources/testnet.md)
-    * [Running a side chain](tutorials/cross-chain/running-side-chain.md)
+    * [Running a side chain](tutorials/cross-chain/running-side-chain.md)

scripts/build.sh

@@ -6,4 +6,4 @@ dotnet build /clp:ErrorsOnly /p:GeneratePackageOnBuild=false -v quiet "AElf.All.
 if [[ $? -ne 0 ]] ; then
   echo "Build failed."
   exit 1
-fi
+fi

scripts/deploy_docker.sh

@@ -13,4 +13,4 @@ docker build -t aelf/node:${TAG} ~/aelf/.
 docker tag aelf/node:${TAG} aelf/node:latest
 docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
 docker push aelf/node:${TAG}
-docker push aelf/node:latest
+docker push aelf/node:latest

scripts/deploy_myget.sh

@@ -31,4 +31,4 @@ do
         fi
     done
     cd ../
-done
+done

scripts/deploy_myget_daily.sh

@@ -34,4 +34,4 @@ do
         fi
     done
     cd ../
-done
+done

scripts/deploy_nuget.sh

@@ -31,4 +31,4 @@ do
         fi
     done
     cd ../
-done
+done

scripts/download_binary.bat

@@ -13,4 +13,4 @@ if not exist "%scriptdir%contract_csharp_plugin.exe" (
     )
     echo "unzip file: %file%"
     unzip %scriptdir%%filename% -d %scriptdir%
-)
+)

scripts/download_binary.sh

@@ -30,4 +30,4 @@ if [[ ! -f ${plugin} ]]; then
 
     # Unzip
     unzip -o ${filename} -d "${scriptdir}"
-fi
+fi

scripts/generate_contract_base.bat

@@ -8,4 +8,4 @@ protoc --proto_path=../../protobuf ^
 --contract_opt=%2,nocontract ^
 --contract_out=./Protobuf/Generated ^
 --plugin=protoc-gen-contract="%scriptdir%contract_csharp_plugin.exe" ^
-%1
+%1

scripts/generate_contract_base.sh

@@ -13,4 +13,4 @@ protoc --proto_path=${solutiondir}/protobuf \
 --contract_opt="$2",nocontract \
 --contract_out=./Protobuf/Generated \
 --plugin=protoc-gen-contract=${plugin} \
-$1
+$1

scripts/generate_contract_code.bat

@@ -7,4 +7,4 @@ protoc --proto_path=../../protobuf ^
 --csharp_opt=file_extension=.g.cs ^
 --contract_out=./Protobuf/Generated ^
 --plugin=protoc-gen-contract="%scriptdir%contract_csharp_plugin.exe" ^
-%*
+%*

scripts/generate_contract_code.sh

@@ -12,4 +12,4 @@ protoc --proto_path=${solutiondir}/protobuf \
 --csharp_opt=file_extension=.g.cs \
 --contract_out=./Protobuf/Generated \
 --plugin=protoc-gen-contract=${plugin} \
-$@
+$@