Replace submodules with packages (#4374)

.gitignore

@@ -1,29 +1,36 @@
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
 ##
-## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
+## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore
 
 # User-specific files
+*.rsuser
 *.suo
 *.user
 *.userosscache
 *.sln.docstates
-network_diag.txt
 
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs
 
+# Mono auto generated files
+mono_crash.*
+
 # Build results
 [Dd]ebug/
 [Dd]ebugPublic/
 [Rr]elease/
 [Rr]eleases/
 x64/
 x86/
+[Ww][Ii][Nn]32/
+[Aa][Rr][Mm]/
+[Aa][Rr][Mm]64/
 bld/
 [Bb]in/
 [Oo]bj/
 [Ll]og/
+[Ll]ogs/
 
 # Visual Studio 2015/2017 cache/options directory
 .vs/
@@ -37,9 +44,10 @@ Generated\ Files/
 [Tt]est[Rr]esult*/
 [Bb]uild[Ll]og.*
 
-# NUNIT
+# NUnit
 *.VisualState.xml
 TestResult.xml
+nunit-*.xml
 
 # Build Results of an ATL Project
 [Dd]ebugPS/
@@ -53,15 +61,17 @@ BenchmarkDotNet.Artifacts/
 project.lock.json
 project.fragment.lock.json
 artifacts/
-**/Properties/launchSettings.json
+
+# ASP.NET Scaffolding
+ScaffoldingReadMe.txt
 
 # StyleCop
 StyleCopReport.xml
 
 # Files built by Visual Studio
 *_i.c
 *_p.c
-*_i.h
+*_h.h
 *.ilk
 *.meta
 *.obj
@@ -78,7 +88,9 @@ StyleCopReport.xml
 *.tlh
 *.tmp
 *.tmp_proj
+*_wpftmp.csproj
 *.log
+*.tlog
 *.vspscc
 *.vssscc
 .builds
@@ -119,9 +131,7 @@ $tf/
 _ReSharper*/
 *.[Rr]e[Ss]harper
 *.DotSettings.user
-
-# JustCode is a .NET coding add-in
-.JustCode
+*.DotSettings
 
 # TeamCity is a build add-in
 _TeamCity*
@@ -133,6 +143,11 @@ _TeamCity*
 .axoCover/*
 !.axoCover/settings.json
 
+# Coverlet is a free, cross platform Code Coverage Tool
+coverage*.json
+coverage*.xml
+coverage*.info
+
 # Visual Studio code coverage results
 *.coverage
 *.coveragexml
@@ -180,6 +195,8 @@ PublishScripts/
 
 # NuGet Packages
 *.nupkg
+# NuGet Symbol Packages
+*.snupkg
 # The packages folder can be ignored because of Package Restore
 **/[Pp]ackages/*
 # except build/, which is used as an MSBuild target.
@@ -204,12 +221,14 @@ BundleArtifacts/
 Package.StoreAssociation.xml
 _pkginfo.txt
 *.appx
+*.appxbundle
+*.appxupload
 
 # Visual Studio cache files
 # files ending in .cache can be ignored
 *.[Cc]ache
 # but keep track of directories ending in .cache
-!*.[Cc]ache/
+!?*.[Cc]ache/
 
 # Others
 ClientBin/
@@ -253,6 +272,9 @@ ServiceFabricBackup/
 *.bim.layout
 *.bim_*.settings
 *.rptproj.rsuser
+*- [Bb]ackup.rdl
+*- [Bb]ackup ([0-9]).rdl
+*- [Bb]ackup ([0-9][0-9]).rdl
 
 # Microsoft Fakes
 FakesAssemblies/
@@ -273,6 +295,17 @@ node_modules/
 # Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
 *.vbw
 
+# Visual Studio 6 auto-generated project file (contains which files were open etc.)
+*.vbp
+
+# Visual Studio 6 workspace and project file (working project files containing files to include in project)
+*.dsw
+*.dsp
+
+# Visual Studio 6 technical files
+*.ncb
+*.aps
+
 # Visual Studio LightSwitch build output
 **/*.HTMLClient/GeneratedArtifacts
 **/*.DesktopClient/GeneratedArtifacts
@@ -288,12 +321,8 @@ paket-files/
 # FAKE - F# Make
 .fake/
 
-# JetBrains Rider
-.idea/
-*.sln.iml
-
-# CodeRush
-.cr/
+# CodeRush personal settings
+.cr/personal
 
 # Python Tools for Visual Studio (PTVS)
 __pycache__/
@@ -330,45 +359,52 @@ ASALocalRun/
 # MFractors (Xamarin productivity tool) working folder
 .mfractor/
 
-# Visual Studio Code configuration
-.vscode/
+# Local History for Visual Studio
+.localhistory/
+
+# Visual Studio History (VSHistory) files
+.vshistory/
 
+# BeatPulse healthcheck temp database
+healthchecksdb
 
-#######################################
-#                                     #
-#  Custom additional gitignore specs  #
-#                                     #
-#######################################
+# Backup folder for Package Reference Convert tool in Visual Studio 2017
+MigrationBackup/
 
-# Local History for Visual Studio
-.localhistory/
+# Ionide (cross platform F# VS Code tools) working folder
+.ionide/
 
-ndm/
-ndm_db/
-nethermind_db/
-keystore/
-spaceneth_db/
-docs/build/
-out/
-db/
-plugins/
-logs/
-reports/
-src/Nethermind/Nethermind.Runner/git-hash
-src/Nethermind/Nethermind.Runner/network
-src/Nethermind/Nethermind.Runner/node.key.plain
+# Fody - auto-generated XML schema
+FodyWeavers.xsd
 
-# Console history
+# VS Code files for those working on multiple tools
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+*.code-workspace
 
-src/Nethermind/**/cli.cmd.history
+# Local History for Visual Studio Code
+.history/
 
-# Output files
-src/Nethermind/Nethermind.BeaconNode.Host/configuration/Output
-src/Nethermind/Nethermind.BeaconNode.Host/release
+# Windows Installer files from build outputs
+*.cab
+*.msi
+*.msix
+*.msm
+*.msp
 
-# Memory dumps
-mono_crash.mem.*.blob
+# JetBrains Rider
+.idea/
+*.sln.iml
+
+# macOS
 .DS_Store
 
-# Include development self-signed certificate 
-!src/Nethermind/Nethermind.BeaconNode.Host/Certificates/nethermind_dotnet_dev_cert.pfx
+# Nethermind
+!src/Nethermind/Nethermind.BeaconNode.Host/Certificates/*.pfx
+src/Nethermind/Nethermind.BeaconNode.Host/configuration/Output
+src/Nethermind/Nethermind.BeaconNode.Host/release
+src/Nethermind/Nethermind.Runner/git-hash
+keystore/

.gitmodules

@@ -1,19 +1,9 @@
 [submodule "src/tests"]
 	path = src/tests
 	url = https://github.com/ethereum/tests.git
-[submodule "src/Dirichlet"]
-	path = src/Dirichlet
-	url = https://github.com/tkstanczak/Dirichlet.git
 [submodule "src/bench_precompiles"]
 	path = src/bench_precompiles
 	url = https://github.com/shamatar/bench_precompiles.git
 [submodule "gitbook/docs"]
 	path = gitbook/docs
 	url = https://github.com/NethermindEth/docs.git
-[submodule "src/int256"]
-	path = src/int256
-	url = https://github.com/NethermindEth/int256.git
-[submodule "src/Math.Gmp.Native"]
-	path = src/Math.Gmp.Native
-	url = https://github.com/NethermindEth/Math.Gmp.Native.git
-	branch = master

Dockerfile

@@ -8,10 +8,8 @@ ARG BUILDPLATFORM
 COPY . .
 
 RUN if [ "$TARGETARCH" = "amd64" ] ; \
-    then git submodule update --init src/Dirichlet src/int256 src/Math.Gmp.Native && \
-    dotnet publish src/Nethermind/Nethermind.Runner -r $TARGETOS-x64 -c release -o out ; \
-    else git submodule update --init src/Dirichlet src/int256 src/Math.Gmp.Native && \
-    dotnet publish src/Nethermind/Nethermind.Runner -r $TARGETOS-$TARGETARCH -c release -o out ; \
+    then dotnet publish src/Nethermind/Nethermind.Runner -r $TARGETOS-x64 -c release -o out ; \
+    else dotnet publish src/Nethermind/Nethermind.Runner -r $TARGETOS-$TARGETARCH -c release -o out ; \
     fi
 
 FROM --platform=$TARGETPLATFORM mcr.microsoft.com/dotnet/aspnet:6.0-jammy

Dockerfile.dev

@@ -8,12 +8,10 @@ ARG BUILDPLATFORM
 COPY . .
 
 RUN if [ "$TARGETARCH" = "amd64" ] ; \
-    then git submodule update --init src/Dirichlet src/int256 src/Math.Gmp.Native && \
-    dotnet tool install JetBrains.dotTrace.GlobalTools --version 2021.3.2 --tool-path /tmp/ && \
+    then dotnet tool install JetBrains.dotTrace.GlobalTools --version 2021.3.2 --tool-path /tmp/ && \
     dotnet add src/Nethermind/Nethermind.Runner package JetBrains.dotMemory.Console.$TARGETOS-x64 --version 2021.3.2 --package-directory /tmp/ && \
     dotnet publish src/Nethermind/Nethermind.Runner -r $TARGETOS-x64 -c release -o out ; \
-    else git submodule update --init src/Dirichlet src/int256 src/Math.Gmp.Native && \
-    dotnet tool install JetBrains.dotTrace.GlobalTools --version 2021.3.2 --tool-path /tmp/ && \
+    else dotnet tool install JetBrains.dotTrace.GlobalTools --version 2021.3.2 --tool-path /tmp/ && \
     dotnet add src/Nethermind/Nethermind.Runner package JetBrains.dotMemory.Console.$TARGETOS-$TARGETARCH --version 2021.3.2 --package-directory /tmp/ && \
     dotnet publish src/Nethermind/Nethermind.Runner -r $TARGETOS-$TARGETARCH -c release -o out ; \
     fi

Dockerfile.stateRunner

@@ -3,11 +3,10 @@ FROM mcr.microsoft.com/dotnet/sdk:6.0-alpine 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:6.0-alpine
 
 COPY --from=build /out .
 
-ENTRYPOINT [ "./nethtest" ]
+ENTRYPOINT [ "./nethtest" ]

scripts/deployment/build-runner.sh

@@ -8,16 +8,15 @@ OUT=out
 cd $RUNNER_PATH
 
 echo =======================================================
-echo Publishing Nethermind Runner for different platforms
-echo with v$1+$2
+echo Publishing Nethermind Runner for different platforms...
 echo =======================================================
 echo Nethermind Runner path: $RUNNER_PATH
 
-dotnet publish -c release -r $LINUX --self-contained true -p:Version=$1 -p:Commit=$2 -p:BuildTimestamp=$3 -p:PublishSingleFile=true -p:IncludeAllContentForSelfExtract=true -o $OUT/$LIN_RELEASE
-dotnet publish -c release -r $LINUX_ARM64 -p:PublishSingleFile=true -p:Version=$1 -p:Commit=$2 -p:BuildTimestamp=$3 -p:IncludeAllContentForSelfExtract=true -o $OUT/$LIN_ARM64_RELEASE
-dotnet publish -c release -r $OSX --self-contained true -p:Version=$1 -p:Commit=$2 -p:BuildTimestamp=$3 -p:PublishSingleFile=true -p:IncludeAllContentForSelfExtract=true -o $OUT/$OSX_RELEASE
-dotnet publish -c release -r $OSX_ARM64 --self-contained true -p:Version=$1 -p:Commit=$2 -p:BuildTimestamp=$3 -p:PublishSingleFile=true -p:IncludeAllContentForSelfExtract=true -o $OUT/$OSX_ARM64_RELEASE
-dotnet publish -c release -r $WIN10 --self-contained true -p:Version=$1 -p:Commit=$2 -p:BuildTimestamp=$3 -p:PublishSingleFile=true -p:IncludeAllContentForSelfExtract=true -o $OUT/$WIN_RELEASE
+dotnet publish -c release -r $LINUX --self-contained true -p:PublishSingleFile=true -p:IncludeAllContentForSelfExtract=true -o $OUT/$LIN_RELEASE
+dotnet publish -c release -r $LINUX_ARM64 -p:PublishSingleFile=true -p:IncludeAllContentForSelfExtract=true -o $OUT/$LIN_ARM64_RELEASE
+dotnet publish -c release -r $OSX --self-contained true -p:PublishSingleFile=true -p:IncludeAllContentForSelfExtract=true -o $OUT/$OSX_RELEASE
+dotnet publish -c release -r $OSX_ARM64 --self-contained true -p:PublishSingleFile=true -p:IncludeAllContentForSelfExtract=true -o $OUT/$OSX_ARM64_RELEASE
+dotnet publish -c release -r $WIN10 --self-contained true -p:PublishSingleFile=true -p:IncludeAllContentForSelfExtract=true -o $OUT/$WIN_RELEASE
 
 rm -rf $OUT/$LIN_RELEASE/Data
 rm -rf $OUT/$LIN_RELEASE/Hive