Merge pull request #2044 from skalenetwork/feature/1855-ubuntu22

Feature/1855 ubuntu22
skalenetwork · Dec 13, 2024 · 626921d · 626921d
2 parents b6df294 + 8a42875
commit 626921d
Show file tree

Hide file tree

Showing 22 changed files with 103 additions and 86 deletions.
diff --git a/.github/workflows/functional-tests.yml b/.github/workflows/functional-tests.yml
@@ -14,7 +14,7 @@
  jobs:
   functional-tests:
     name: Functional tests for ${{ inputs.version }}
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     env:
       ACTIONS_ALLOW_UNSECURE_COMMANDS: true
       SKALED_RELEASE: ${{ inputs.version }}

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -27,16 +27,16 @@ jobs:
       - name: install packages
         run: |
           sudo apt-get -y remove libzmq* || true
-          sudo apt-get -y install software-properties-common gcc-9 g++-9 || true
+          sudo apt-get -y install software-properties-common gcc-11 g++-11 || true
 
-      - name: Use g++-9 and gcov-9 by default
+      - name: Use g++-11 and gcov-11 by default
         run: |
           echo "Updating all needed alternatives"
-          sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 9
-          sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-9 9
-          sudo update-alternatives --install /usr/bin/gcov gcov /usr/bin/gcov-9 9
-          sudo update-alternatives --install /usr/bin/gcov-dump gcov-dump /usr/bin/gcov-dump-9 9
-          sudo update-alternatives --install /usr/bin/gcov-tool gcov-tool /usr/bin/gcov-tool-9 9
+          sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 11
+          sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-11 11
+          sudo update-alternatives --install /usr/bin/gcov gcov /usr/bin/gcov-11 11
+          sudo update-alternatives --install /usr/bin/gcov-dump gcov-dump /usr/bin/gcov-dump-11 11
+          sudo update-alternatives --install /usr/bin/gcov-tool gcov-tool /usr/bin/gcov-tool-11 11
           echo "Checking alternative for gcc"
           which gcc
           gcc --version
@@ -88,8 +88,8 @@ jobs:
             ${ { matrix.config.name } }-ccache-
       - name: Build dependencies
         run: |
-          export CC=gcc-9
-          export CXX=g++-9
+          export CC=gcc-11
+          export CXX=g++-11
           export TARGET=all
           export CMAKE_BUILD_TYPE=RelWithDebInfo
           cd deps
@@ -99,8 +99,8 @@ jobs:
           cd ..
       - name: Configure all
         run: |
-          export CC=gcc-9
-          export CXX=g++-9
+          export CC=gcc-11
+          export CXX=g++-11
           export TARGET=all
           export CMAKE_BUILD_TYPE=RelWithDebInfo
           mkdir -p build
@@ -110,8 +110,8 @@ jobs:
           cd ..
       - name: Build all
         run: |
-          export CC=gcc-9
-          export CXX=g++-9
+          export CC=gcc-11
+          export CXX=g++-11
           export TARGET=all
           export CMAKE_BUILD_TYPE=RelWithDebInfo
           cd build
@@ -122,8 +122,8 @@ jobs:
           cd ..
       - name: Configure historic state build
         run: |
-          export CC=gcc-9
-          export CXX=g++-9
+          export CC=gcc-11
+          export CXX=g++-11
           export TARGET=all
           export CMAKE_BUILD_TYPE=RelWithDebInfo
           mkdir -p build-historic
@@ -133,8 +133,8 @@ jobs:
           cd ..
       - name: Build historic state version
         run: |
-          export CC=gcc-9
-          export CXX=g++-9
+          export CC=gcc-11
+          export CXX=g++-11
           export TARGET=all
           export CMAKE_BUILD_TYPE=RelWithDebInfo
           cd build-historic

diff --git a/.github/workflows/setup-build-publish.yml b/.github/workflows/setup-build-publish.yml
@@ -60,16 +60,16 @@ jobs:
       - name: install packages
         run: |
           sudo apt-get -y remove libzmq* || true
-          sudo apt-get -y install software-properties-common gcc-9 g++-9 || true
+          sudo apt-get -y install software-properties-common gcc-11 g++-11 || true
   
-      - name: Use g++-9 and gcov-9 by default
+      - name: Use g++-11 and gcov-11 by default
         run: |
           echo "Updating all needed alternatives"
-          sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 9
-          sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-9 9
-          sudo update-alternatives --install /usr/bin/gcov gcov /usr/bin/gcov-9 9
-          sudo update-alternatives --install /usr/bin/gcov-dump gcov-dump /usr/bin/gcov-dump-9 9
-          sudo update-alternatives --install /usr/bin/gcov-tool gcov-tool /usr/bin/gcov-tool-9 9
+          sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 11
+          sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-11 11
+          sudo update-alternatives --install /usr/bin/gcov gcov /usr/bin/gcov-11 11
+          sudo update-alternatives --install /usr/bin/gcov-dump gcov-dump /usr/bin/gcov-dump-11 11
+          sudo update-alternatives --install /usr/bin/gcov-tool gcov-tool /usr/bin/gcov-tool-11 11
           echo "Checking alternative for gcc"
           which gcc
           gcc --version
@@ -120,8 +120,8 @@ jobs:
             ${ { matrix.config.name } }-ccache-
       - name: Build dependencies
         run: |
-          export CC=gcc-9
-          export CXX=g++-9
+          export CC=gcc-11
+          export CXX=g++-11
           export TARGET=all
           export CMAKE_BUILD_TYPE=$BUILD_TYPE
           [[ $CMAKE_BUILD_TYPE = "Debug" ]] && export DEBUG_FLAG=1 || export DEBUG_FLAG=0
@@ -134,8 +134,8 @@ jobs:
         env:
           CMAKE_OPTS: ${{ env.CMAKE_OPTS }}
         run: |
-          export CC=gcc-9
-          export CXX=g++-9
+          export CC=gcc-11
+          export CXX=g++-11
           export TARGET=all
           export CMAKE_BUILD_TYPE=$BUILD_TYPE
           mkdir -p build
@@ -144,8 +144,8 @@ jobs:
           cd ..
       - name: Build all
         run: |
-          export CC=gcc-9
-          export CXX=g++-9
+          export CC=gcc-11
+          export CXX=g++-11
           export TARGET=all
           export CMAKE_BUILD_TYPE=$BUILD_TYPE
           cd build

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -44,16 +44,16 @@ jobs:
       - name: install packages
         run: |
           sudo apt-get -y remove libzmq* || true
-          sudo apt-get -y install software-properties-common gcc-9 g++-9 || true
+          sudo apt-get -y install software-properties-common gcc-11 g++-11 || true
 
-      - name: Use g++-9 and gcov-9 by default
+      - name: Use g++-11 and gcov-11 by default
         run: |
           echo "Updating all needed alternatives"
-          sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 9
-          sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-9 9
-          sudo update-alternatives --install /usr/bin/gcov gcov /usr/bin/gcov-9 9
-          sudo update-alternatives --install /usr/bin/gcov-dump gcov-dump /usr/bin/gcov-dump-9 9
-          sudo update-alternatives --install /usr/bin/gcov-tool gcov-tool /usr/bin/gcov-tool-9 9
+          sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 11
+          sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-11 11
+          sudo update-alternatives --install /usr/bin/gcov gcov /usr/bin/gcov-11 11
+          sudo update-alternatives --install /usr/bin/gcov-dump gcov-dump /usr/bin/gcov-dump-11 11
+          sudo update-alternatives --install /usr/bin/gcov-tool gcov-tool /usr/bin/gcov-tool-11 11
           echo "Checking alternative for gcc"
           which gcc
           gcc --version
@@ -108,10 +108,10 @@ jobs:
           key: ${ { matrix.config.name } }-ccache-${ { steps.ccache_cache_timestamp.outputs.timestamp } }
           restore-keys: |
             ${ { matrix.config.name } }-ccache-
-      - name: Update gcc-9
+      - name: Update gcc-11
         run: |
-          sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 9
-          sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-9 9
+          sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 11
+          sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-11 11
       - name: Configure ccache cache size, zero ccache counters and print ccache stats before start
         run: |
           ccache --max-size=15G
@@ -120,8 +120,8 @@ jobs:
       - name: Build dependencies
         run: |
           export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
-          export CC=gcc-9
-          export CXX=g++-9
+          export CC=gcc-11
+          export CXX=g++-11
           export TARGET=all
           export CMAKE_BUILD_TYPE=Debug
           export CODE_COVERAGE=ON
@@ -134,8 +134,8 @@ jobs:
       - name: Configure all
         run: |
           export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
-          export CC=gcc-9
-          export CXX=g++-9
+          export CC=gcc-11
+          export CXX=g++-11
           export TARGET=all
           export CMAKE_BUILD_TYPE=Debug
           export CODE_COVERAGE=ON
@@ -150,8 +150,8 @@ jobs:
       - name: Build all
         run: |
           export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
-          export CC=gcc-9
-          export CXX=g++-9
+          export CC=gcc-11
+          export CXX=g++-11
           export TARGET=all
           export CMAKE_BUILD_TYPE=Debug
           export CODE_COVERAGE=ON
@@ -211,9 +211,9 @@ jobs:
           run_test JsonRpcSuite   
           run_test SingleConsensusTests  
           run_test ConsensusTests
-          sudo ./testeth -t BtrfsTestSuite -- --all && touch /tmp/tests/BtrfsTestSuitePassed
-          sudo ./testeth -t HashSnapshotTestSuite -- --all && touch /tmp/tests/HashSnapshotTestSuitePassed
-          sudo ./testeth -t ClientSnapshotsSuite -- --all && touch /tmp/tests/ClientSnapshotsSuitePassed
+          sudo NO_ULIMIT_CHECK=1 NO_NTP_CHECK=1 ./testeth -t BtrfsTestSuite -- --all && touch /tmp/tests/BtrfsTestSuitePassed
+          sudo NO_ULIMIT_CHECK=1 NO_NTP_CHECK=1 ./testeth -t HashSnapshotTestSuite -- --all && touch /tmp/tests/HashSnapshotTestSuitePassed
+          sudo NO_ULIMIT_CHECK=1 NO_NTP_CHECK=1 ./testeth -t ClientSnapshotsSuite -- --all && touch /tmp/tests/ClientSnapshotsSuitePassed
           cd ..
       - name: Testeth verbosity 4
         run : |
@@ -270,8 +270,8 @@ jobs:
       - name: Configure all as historic
         run: |
           export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
-          export CC=gcc-9
-          export CXX=g++-9
+          export CC=gcc-11
+          export CXX=g++-11
           export TARGET=all
           export CMAKE_BUILD_TYPE=Debug
           export CODE_COVERAGE=ON
@@ -283,8 +283,8 @@ jobs:
       - name: Build all historic
         run: |
           export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
-          export CC=gcc-9
-          export CXX=g++-9
+          export CC=gcc-11
+          export CXX=g++-11
           export TARGET=all
           export CMAKE_BUILD_TYPE=Debug
           export CODE_COVERAGE=ON

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -185,7 +185,6 @@ if( TESTS )
     include( ProjectBinaryen )
 endif()
 
-
 if (HISTORIC_STATE)
 add_definitions(-DHISTORIC_STATE=1)
 endif (HISTORIC_STATE)

diff --git a/cmake/EthCompilerSettings.cmake b/cmake/EthCompilerSettings.cmake
@@ -50,11 +50,6 @@ if( SKALED_HATE_WARNINGS )
     add_compile_options( -Wno-error=non-virtual-dtor )
     add_compile_options( -Werror -Wno-deprecated-declarations)
     add_compile_options( -Wno-error=sign-compare )
-    #add_compile_options( -Wno-error=reorder )
-    #add_compile_options( -Wno-error=deprecated )
-    #add_compile_options( -Wno-error=unused-variable )
-    #add_compile_options( -Wno-error=unused-parameter )
-    #add_compile_options( -Wno-error=unused-but-set-variable )
     add_compile_options(-Wno-error=int-in-bool-context)
     add_compile_options(-Wno-error=address)
     add_compile_options(-Wno-error=nonnull-compare)

diff --git a/cmake/ProjectBinaryen.cmake b/cmake/ProjectBinaryen.cmake
@@ -37,6 +37,8 @@ set(binaryen_other_libraries
 
 set(BINARYEN_VERSION 1.37.35)
 
+set(BINARYEN_CMAKE_CXX_FLAGS "-Wno-implicit-fallthrough -Wno-maybe-uninitialized -Wno-range-loop-construct ${CMAKE_CXX_FLAGS}")
+
 ExternalProject_Add(binaryen
     PREFIX ${prefix}
     DOWNLOAD_NAME binaryen-${BINARYEN_VERSION}.tar.gz
@@ -46,13 +48,13 @@ ExternalProject_Add(binaryen
     URL https://github.com/WebAssembly/binaryen/archive/${BINARYEN_VERSION}.tar.gz
     URL_HASH SHA256=19439e41dc576446eaae0c4a8e07d4cd4c40aea7dfb0a6475b925686852f8006
     CMAKE_ARGS
-    -DCMAKE_INSTALL_PREFIX=${prefix}
-    -DCMAKE_INSTALL_LIBDIR=lib
-    -DCMAKE_BUILD_TYPE=Release
-    -DBUILD_STATIC_LIB=ON
-    -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
-    -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-    -DCMAKE_CXX_FLAGS=-Wno-implicit-fallthrough ${CMAKE_CXX_FLAGS}
+        -DCMAKE_INSTALL_PREFIX=${prefix}
+        -DCMAKE_INSTALL_LIBDIR=lib
+        -DCMAKE_BUILD_TYPE=Release
+        -DBUILD_STATIC_LIB=ON
+        -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+        -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
+        -DCMAKE_CXX_FLAGS=${BINARYEN_CMAKE_CXX_FLAGS}
     ${build_command}
     ${install_command}
     BUILD_BYPRODUCTS ${binaryen_library} ${binaryen_other_libraries}

diff --git a/deps/build.sh b/deps/build.sh
@@ -332,9 +332,6 @@ export TOOLCHAINS_DOWNLOADED_PATH=$TOOLCHAINS_PATH/downloads
 export ARM_TOOLCHAIN_NAME=gcc7.2-arm
 export ARM_GCC_VER=7.2.0
 
-#export ARM_TOOLCHAIN_NAME=gcc4.8-arm
-#export ARM_GCC_VER=4.8.4
-
 export ARM_TOOLCHAIN_PATH=$TOOLCHAINS_PATH/$ARM_TOOLCHAIN_NAME
 
 export ADDITIONAL_INCLUDES="-I$INSTALL_ROOT/include"
@@ -378,12 +375,12 @@ then
 	else
 		if [ "$UNIX_SYSTEM_NAME" = "Linux" ];
 		then
-			export CC=$(which gcc-9)
+                        export CC=$(which gcc-11)
 			if [ -z "${CC}" ];
 			then
 				export CC=$(which gcc)
 			fi
-			export CXX=$(which g++-9)
+                        export CXX=$(which g++-11)
 			if [ -z "${CXX}" ];
 			then
 				export CXX=$(which g++)
@@ -2101,18 +2098,20 @@ then
 			eval mkdir -p build2
                         cd build2
 			eval "$CMAKE" "${CMAKE_CROSSCOMPILING_OPTS}" -DCMAKE_INSTALL_PREFIX="$INSTALL_ROOT" -DCMAKE_BUILD_TYPE="$TOP_CMAKE_BUILD_TYPE" \
-                                -DBOOST_ROOT="$INSTALL_ROOT" -DBOOST_LIBRARYDIR="$INSTALL_ROOT/lib" -DBoost_NO_WARN_NEW_VERSIONS=1 -DBoost_DEBUG=ON \
+                                -DBOOST_ROOT="$INSTALL_ROOT" -DBOOST_INCLUDEDIR="${INSTALL_ROOT}/include" -DBOOST_LIBRARYDIR="$INSTALL_ROOT/lib" \
+                                -DBoost_NO_BOOST_CMAKE=ON -DBoost_NO_WARN_NEW_VERSIONS=1 -DBoost_DEBUG=ON \
 				-DBUILD_SHARED_LIBS=OFF \
 				-DBUILD_TESTS=OFF -DBUILD_BROKEN_TESTS=OFF -DBUILD_HANGING_TESTS=OFF -DBUILD_SLOW_TESTS=OFF \
-                -DCMAKE_INCLUDE_PATH="${INSTALL_ROOT}/include" \
-                -DCMAKE_LIBRARY_PATH="${INSTALL_ROOT}/lib" \
+                                -DCMAKE_INCLUDE_PATH="${INSTALL_ROOT}/include" \
+                                -DCMAKE_LIBRARY_PATH="${INSTALL_ROOT}/lib" \
+                                -DCMAKE_PREFIX_PATH=${INSTALL_ROOT} \
 				..
 			cd ..
 		else
 			cd folly
 		fi
 		echo -e "${COLOR_INFO}building it${COLOR_DOTS}...${COLOR_RESET}"
-		cd build2
+                cd build2
 		eval "$MAKE" "${PARALLEL_MAKE_OPTIONS}"
 		eval "$MAKE" "${PARALLEL_MAKE_OPTIONS}" install
 		if [ "$DEBUG" = "0" ]; then
@@ -2235,7 +2234,11 @@ then
 			eval mkdir -p build2
 			cd build2
 			eval "$CMAKE" "${CMAKE_CROSSCOMPILING_OPTS}" -DCMAKE_INSTALL_PREFIX="$INSTALL_ROOT" -DCMAKE_BUILD_TYPE="$TOP_CMAKE_BUILD_TYPE" \
-				-DBUILD_TESTS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF \
+                                -DBUILD_TESTS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF \
+                                -DBOOST_ROOT="$INSTALL_ROOT" -DBOOST_INCLUDEDIR="${INSTALL_ROOT}/include" -DBOOST_LIBRARYDIR="$INSTALL_ROOT/lib" \
+                                -DBoost_NO_BOOST_CMAKE=ON -DCMAKE_INCLUDE_PATH="${INSTALL_ROOT}/include" \
+                                -DCMAKE_LIBRARY_PATH="${INSTALL_ROOT}/lib" \
+                                -DCMAKE_PREFIX_PATH=${INSTALL_ROOT} \
 				..
 			cd ..
 		else
@@ -2280,7 +2283,12 @@ then
 			eval mkdir -p build2
 			cd build2
 			eval "$CMAKE" "${CMAKE_CROSSCOMPILING_OPTS}" -DCMAKE_INSTALL_PREFIX="$INSTALL_ROOT" -DCMAKE_BUILD_TYPE="$TOP_CMAKE_BUILD_TYPE" \
-				-DBUILD_TESTS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF ..
+                                -DBUILD_TESTS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF \
+                                -DBOOST_ROOT="$INSTALL_ROOT" -DBOOST_INCLUDEDIR="${INSTALL_ROOT}/include" -DBOOST_LIBRARYDIR="$INSTALL_ROOT/lib" \
+                                -DBoost_NO_BOOST_CMAKE=ON -DCMAKE_INCLUDE_PATH="${INSTALL_ROOT}/include" \
+                                -DCMAKE_LIBRARY_PATH="${INSTALL_ROOT}/lib" \
+                                -DCMAKE_PREFIX_PATH=${INSTALL_ROOT} \
+                                ..
 			cd ..
 		else
 			cd wangle/wangle
@@ -2326,7 +2334,12 @@ then
 			eval mkdir -p build2
 			cd build2
 			eval "$CMAKE" "${CMAKE_CROSSCOMPILING_OPTS}" -DCMAKE_INSTALL_PREFIX="$INSTALL_ROOT" -DCMAKE_BUILD_TYPE="$TOP_CMAKE_BUILD_TYPE" \
-                -DBUILD_TESTS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_SAMPLES=OFF -DBUILD_SHARED_LIBS=OFF ..
+                                -DBUILD_TESTS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_SAMPLES=OFF -DBUILD_SHARED_LIBS=OFF \
+                                -DBOOST_ROOT="$INSTALL_ROOT" -DBOOST_INCLUDEDIR="${INSTALL_ROOT}/include" -DBOOST_LIBRARYDIR="$INSTALL_ROOT/lib" \
+                                -DBoost_NO_BOOST_CMAKE=ON -DCMAKE_INCLUDE_PATH="${INSTALL_ROOT}/include" \
+                                -DCMAKE_LIBRARY_PATH="${INSTALL_ROOT}/lib" \
+                                -DCMAKE_PREFIX_PATH=${INSTALL_ROOT} \
+                                ..
 			cd ..
 		else
 			cd proxygen

diff --git a/libconsensus b/libconsensus
+26 −21		.github/workflows/build.yml
+12 −13		.github/workflows/dockerimage.yml
+24 −75		.github/workflows/dockerimagebase.yml
+12 −13		Dockerfile
+23 −17		DockerfileBase
+3 −3		README.md
+2 −2		deps/build.sh
+1 −1		libBLS
+5 −2		scripts/build.py