Introduce .NET 6.0

.github/workflows/build-nethermind-packages.yml

@@ -10,10 +10,12 @@ jobs:
       RELEASE_DIRECTORY: /home/runner/work/nethermind/nethermind
       LIN_RELEASE: nethermind-lin-x64
       OSX_RELEASE: nethermind-osx-x64
+      OSX_ARM64_RELEASE: nethermind-osx-arm64
       WIN_RELEASE: nethermind-win-x64
       LIN_ARM64_RELEASE: nethermind-lin-arm64
       LINUX: linux-x64
       OSX: osx-x64
+      OSX_ARM64: osx-arm64
       WIN10: win10-x64
       LINUX_ARM64: linux-arm64
     steps:
@@ -35,6 +37,10 @@ jobs:
     - name: Setting up Build Environment
       run: |
         npm i pkg @vercel/ncc -g
+    - name: Setting up dotnet
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: '6.0.x'
     - name: Setting up QEMU
       uses: docker/setup-qemu-action@v1
     - name: Setting up Docker Buildx
@@ -61,6 +67,11 @@ jobs:
       with:
         name: nethermind-darwin-package
         path: ${{ env.RELEASE_DIRECTORY }}/${{ env.OSX_RELEASE }}/nethermind-darwin-amd64-*
+    - uses: actions/upload-artifact@master
+      name: Uploading Nethermind darwin arm64 package
+      with:
+        name: nethermind-darwin-package
+        path: ${{ env.RELEASE_DIRECTORY }}/${{ env.OSX_ARM64_RELEASE }}/nethermind-darwin-arm64-*
     - uses: actions/upload-artifact@master
       name: Uploading Nethermind linux package
       with:

.github/workflows/release-nethermind.yml

@@ -18,10 +18,12 @@ jobs:
       OSX_RELEASE: nethermind-osx-x64
       WIN_RELEASE: nethermind-win-x64
       LIN_ARM64_RELEASE: nethermind-lin-arm64
+      OSX_ARM64_RELEASE: nethermind-osx-arm64
       LINUX: linux-x64
       OSX: osx-x64
       WIN10: win10-x64
       LINUX_ARM64: linux-arm64
+      OSX_ARM64: osx-arm64
     steps:
     - name: Checking out Nethermind repository
       uses: actions/checkout@master
@@ -42,6 +44,10 @@ jobs:
     - name: Setting up Build Environment
       run: |
         npm i pkg @vercel/ncc -g
+    - name: Setting up dotnet
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: '6.0.x'
     - name: Setting up QEMU
       uses: docker/setup-qemu-action@v1
     - name: Setting up Docker Buildx
@@ -84,10 +90,10 @@ jobs:
         name: nethermind-linux-arm64-package
         path: ${{ env.RELEASE_DIRECTORY }}/${{ env.LIN_ARM64_RELEASE }}/nethermind-linux-arm64-*
     - uses: actions/upload-artifact@master
-      name: Uploading plugins package
+      name: Uploading Nethermind darwin arm64 package
       with:
-        name: plugins
-        path: ${{ env.RELEASE_DIRECTORY }}/plugins/plugins-*
+        name: nethermind-darwin-arm64-package
+        path: ${{ env.RELEASE_DIRECTORY }}/${{ env.OSX_ARM64_RELEASE }}/nethermind-darwin-arm64-*
 
   trigger-publish:
     name: Triggering publish event to different sources
@@ -110,6 +116,7 @@ jobs:
       OSX_RELEASE: nethermind-osx-x64
       WIN_RELEASE: nethermind-win-x64
       LIN_ARM64_RELEASE: nethermind-lin-arm64
+      OSX_ARM64_RELEASE: nethermind-osx-arm64
     steps:
     - name: Checking out Nethermind repository
       uses: actions/checkout@master
@@ -138,10 +145,10 @@ jobs:
         name: nethermind-linux-arm64-package
         path: ${{ env.RELEASE_DIRECTORY }}/${{ env.LIN_ARM64_RELEASE }}/
     - uses: actions/download-artifact@master
-      name: Downloading plugins package
+      name: Downloading Nethermind darwin arm64 package
       with:
-        name: plugins
-        path: ${{ env.RELEASE_DIRECTORY }}/plugins/
+        name: nethermind-darwin-arm64-package
+        path: ${{ env.RELEASE_DIRECTORY }}/${{ env.OSX_ARM64_RELEASE }}/
     - name: Creating Release
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -158,6 +165,7 @@ jobs:
       OSX_RELEASE: nethermind-osx-x64
       WIN_RELEASE: nethermind-win-x64
       LIN_ARM64_RELEASE: nethermind-lin-arm64
+      OSX_ARM64_RELEASE: nethermind-darwin-arm64
     steps:
     - name: Checking out Nethermind repository
       uses: actions/checkout@master
@@ -184,6 +192,11 @@ jobs:
       with:
         name: nethermind-linux-arm64-package
         path: ${{ env.RELEASE_DIRECTORY }}/${{ env.LIN_ARM64_RELEASE }}/
+    - uses: actions/download-artifact@master
+      name: Downloading Nethermind darwin arm64 package
+      with:
+        name: nethermind-darwin-arm64-package
+        path: ${{ env.RELEASE_DIRECTORY }}/${{ env.OSX_ARM64_RELEASE }}/
     - name: Configuring GPG Key
       run: |
         mkdir -p ~/.gnupg/

.github/workflows/run-codeql-code-analysis.yml

@@ -24,6 +24,10 @@ jobs:
       uses: github/codeql-action/init@v1
       with:
         languages: ${{ matrix.language }}
+    - name: Setting up dotnet
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: '6.0.x'
     - name: Building Nethermind solution
       run: |
         cd src/Nethermind

.github/workflows/run-consesus-legacy-tests.yml

@@ -13,6 +13,10 @@ jobs:
     - uses: actions/checkout@v2
       with:
         submodules: recursive
+    - name: Setting up dotnet
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: '6.0.x'
     - name: Installing Linux packages
       if: matrix.os == 'ubuntu-latest'
       run: |
@@ -29,6 +33,10 @@ jobs:
     - uses: actions/checkout@v2
       with:
         submodules: recursive
+    - name: Setting up dotnet
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: '6.0.x'
     - name: Updating submodules
       run: git submodule update --init
     - name: Ethereum.Blockchain.Legacy

.github/workflows/run-nethermind-tests-with-code-coverage.yml

@@ -19,6 +19,10 @@ jobs:
       with: 
         submodules: true
         fetch-depth: 0
+    - name: Setting up dotnet
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: '6.0.x'
     - name: Installing Linux packages
       if: matrix.os == 'ubuntu-latest'
       run: |
@@ -141,24 +145,6 @@ jobs:
     - name: Nethermind.Sockets.Test
       run: |
         dotnet test -c Release $EXCLUDE_TEST_PROJECTS src/Nethermind/Nethermind.Sockets.Test
-    - name: Nethermind.DataMarketplace.Test
-      run: |
-        dotnet test -c Release $EXCLUDE_TEST_PROJECTS src/Nethermind/Nethermind.DataMarketplace.Test
-    - name: Nethermind.DataMarketplace.Channels.Test
-      run: |
-        dotnet test -c Release $EXCLUDE_TEST_PROJECTS src/Nethermind/Nethermind.DataMarketplace.Channels.Test
-    - name: Nethermind.DataMarketplace.Consumers.Test
-      run: |
-        dotnet test -c Release $EXCLUDE_TEST_PROJECTS src/Nethermind/Nethermind.DataMarketplace.Consumers.Test
-    - name: Nethermind.DataMarketplace.Infrastructure.Test
-      run: |
-        dotnet test -c Release $EXCLUDE_TEST_PROJECTS src/Nethermind/Nethermind.DataMarketplace.Infrastructure.Test
-    - name: Nethermind.DataMarketplace.Subprotocols.Test
-      run: |
-        dotnet test -c Release $EXCLUDE_TEST_PROJECTS src/Nethermind/Nethermind.DataMarketplace.Subprotocols.Test
-    - name: Nethermind.DataMarketplace.WebSockets.Test
-      run: |
-        dotnet test -c Release $EXCLUDE_TEST_PROJECTS src/Nethermind/Nethermind.DataMarketplace.WebSockets.Test
     - name: MathGmp.Native
       run: |
         dotnet test -c Release $EXCLUDE_TEST_PROJECTS src/Math.Gmp.Native/MathGmp.Native.UnitTests                
@@ -183,7 +169,7 @@ jobs:
       run: git -c submodule."src/eth2.0-spec-tests".update=none submodule update --init
     - name: Set environment variable to exclude specific test projects
       if: matrix.os == 'ubuntu-latest'
-      run: echo 'EXCLUDE_TEST_PROJECTS=/p:CollectCoverage=true /p:CoverletOutputFormat=opencover /p:Exclude="[Nethermind.HashLib]*%2c[Nethermind.Core.Test]*%2c[Nethermind.Blockchain.Test]*%2c[Nethermind.DataMarketplace.Test]*%2c[Ethereum.Test.Base]*"' >> "$GITHUB_ENV"
+      run: echo 'EXCLUDE_TEST_PROJECTS=/p:CollectCoverage=true /p:CoverletOutputFormat=opencover /p:Exclude="[Nethermind.HashLib]*%2c[Nethermind.Core.Test]*%2c[Nethermind.Blockchain.Test]*%2c[Ethereum.Test.Base]*"' >> "$GITHUB_ENV"
     - name: Ethereum.Abi.Test
       run: |
         dotnet test -c Release $EXCLUDE_TEST_PROJECTS src/Nethermind/Ethereum.Abi.Test

.github/workflows/run-nethermind-tests.yml

@@ -16,6 +16,10 @@ jobs:
     - uses: actions/checkout@v2
       with:
         submodules: true
+    - name: Setting up dotnet
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: '6.0.x'
     - name: Installing Linux packages
       run: |
         sudo apt-get update
@@ -54,6 +58,10 @@ jobs:
     - uses: actions/checkout@v2
       with:
         submodules: true
+    - name: Setting up dotnet
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: '6.0.x'
     - name: Installing Linux packages
       run: |
         sudo apt-get update
@@ -98,6 +106,10 @@ jobs:
     - uses: actions/checkout@v2
       with:
         submodules: true
+    - name: Setting up dotnet
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: '6.0.x'
     - name: Installing Linux packages
       run: |
         sudo apt-get update
@@ -139,6 +151,10 @@ jobs:
     - uses: actions/checkout@v2
       with:
         submodules: true
+    - name: Setting up dotnet
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: '6.0.x'
     - name: Installing Linux packages
       run: |
         sudo apt-get update
@@ -168,6 +184,10 @@ jobs:
     - uses: actions/checkout@v2
       with:
         submodules: true
+    - name: Setting up dotnet
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: '6.0.x'
     - name: Installing Linux packages
       run: |
         sudo apt-get update
@@ -181,37 +201,17 @@ jobs:
     - name: Nethermind.Sockets.Test
       run: |
         dotnet test -c Release src/Nethermind/Nethermind.Sockets.Test
-    - name: Nethermind.DataMarketplace.Test
-      run: |
-        dotnet test -c Release src/Nethermind/Nethermind.DataMarketplace.Test
-    - name: Nethermind.DataMarketplace.Channels.Test
-      run: |
-        dotnet test -c Release src/Nethermind/Nethermind.DataMarketplace.Channels.Test
-    - name: Nethermind.DataMarketplace.Consumers.Test
-      run: |
-        dotnet test -c Release src/Nethermind/Nethermind.DataMarketplace.Consumers.Test
-    - name: Nethermind.DataMarketplace.Providers.Infrastructure.Tests
-      run: |
-        dotnet test -c Release src/Nethermind/Nethermind.DataMarketplace.Providers.Infrastructure.Tests
-    - name: Nethermind.DataMarketplace.Providers.Test
-      run: |
-        dotnet test -c Release src/Nethermind/Nethermind.DataMarketplace.Providers.Test
-    - name: Nethermind.DataMarketplace.Infrastructure.Test
-      run: |
-        dotnet test -c Release src/Nethermind/Nethermind.DataMarketplace.Infrastructure.Test
-    - name: Nethermind.DataMarketplace.Subprotocols.Test
-      run: |
-        dotnet test -c Release src/Nethermind/Nethermind.DataMarketplace.Subprotocols.Test
-    - name: Nethermind.DataMarketplace.WebSockets.Test
-      run: |
-        dotnet test -c Release src/Nethermind/Nethermind.DataMarketplace.WebSockets.Test
   neth-runner:
     name: Nethermind Runner Tests
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
       with:
         submodules: true
+    - name: Setting up dotnet
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: '6.0.x'
     - name: Installing Linux packages
       run: |
         sudo apt-get update
@@ -227,6 +227,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
+    - name: Setting up dotnet
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: '6.0.x'
     - name: Unshallow fetching
       run: git fetch --unshallow
     - name: Updating submodules

.github/workflows/run-posdao-tests.yml

@@ -25,6 +25,10 @@ jobs:
       run: |
         sudo apt-get update
         sudo apt-get install libsnappy-dev libc6-dev libc6
+    - name: Setting up dotnet
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: '6.0.x'
     - name: Cloning Nethermind repo
       uses: actions/checkout@v2
       with:

.github/workflows/run-vault-integration-tests.yml

@@ -11,7 +11,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - name: Updating submodules 
+    - name: Setting up dotnet
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: '6.0.x'
+    - name: Updating submodules
       run: git submodule update --init src/Dirichlet src/int256 src/rocksdb-sharp src/Math.Gmp.Native
     - name: Installing Linux packages
       run: |

Dockerfile

@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk@sha256:fa19559201c43bc8191c1a095670e242de80a23697d24f5a3460019958637c63 AS build
+FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:6.0 AS build
 
 ARG TARGETPLATFORM
 ARG TARGETOS
@@ -14,7 +14,7 @@ RUN if [ "$TARGETARCH" = "amd64" ] ; \
     dotnet publish src/Nethermind/Nethermind.Runner -r $TARGETOS-$TARGETARCH -c release -o out ; \
     fi
 
-FROM --platform=$TARGETPLATFORM mcr.microsoft.com/dotnet/aspnet@sha256:1d75db770c7ce82b128744770271bd87dc9d119f0ef15b94cab0f84477abfaec 
+FROM --platform=$TARGETPLATFORM mcr.microsoft.com/dotnet/aspnet:6.0 
 RUN apt-get update && apt-get -y install libsnappy-dev libc6-dev libc6
 
 WORKDIR /nethermind

Dockerfile.stateRunner

@@ -1,12 +1,12 @@
-FROM mcr.microsoft.com/dotnet/sdk@sha256:6edc3ea5eb689712b9ec6ad5777e32c5bfa51db94a3e5fb069278ccf3b74b7c1 AS build
+FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
 
 COPY . .
 
 RUN apk add git && \
  git submodule update --init src/Dirichlet src/int256 src/Math.Gmp.Native && \
  dotnet publish src/Nethermind/Nethermind.State.Test.Runner -c release -o out
 
-FROM mcr.microsoft.com/dotnet/sdk@sha256:6edc3ea5eb689712b9ec6ad5777e32c5bfa51db94a3e5fb069278ccf3b74b7c1
+FROM mcr.microsoft.com/dotnet/sdk:6.0
 
 COPY --from=build /out .
 

README.md

@@ -54,7 +54,7 @@ It syncs fully on:
 
 ## Prerequisites :construction:
 
-**.NET 5.0** SDK
+**.NET 6.0** SDK
 
 ### Windows