Merge branch 'master' into hash-writer-aristo

Author: bhartnett

.github/workflows/ci.yml

@@ -11,6 +11,8 @@
 name: Nimbus CI
 on:
   push:
+    branches:
+      - master
     paths-ignore:
       - 'doc/**'
       - 'portal/docs/**'
@@ -34,6 +36,10 @@ on:
 
   workflow_dispatch:
 
+concurrency: # Cancel stale PR builds (but not push builds)
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
+  cancel-in-progress: true
+
 jobs:
   matrix_config:
     uses: ./.github/workflows/matrix_config.yml
@@ -68,10 +74,7 @@ jobs:
         run: |
           gcc --version
           DEFAULT_MAKE_FLAGS="-j${ncpu} ENABLE_VMLOWMEM=${ENABLE_VMLOWMEM} ROCKSDB_CI_CACHE=RocksBinCache"
-          mingw32-make ${DEFAULT_MAKE_FLAGS} all test_import build_fuzzers
-          build/nimbus_execution_client.exe --help
-          # give us more space
-          # find . -type d -name ".git" -exec rm -rf {} +
+          mingw32-make ${DEFAULT_MAKE_FLAGS} all test_import build_fuzzers check_revision
           find . -type d -name "nimcache" -exec rm -rf {} +
           mingw32-make ${DEFAULT_MAKE_FLAGS} test t8n_test eest_full_test
 
@@ -80,29 +83,18 @@ jobs:
         run: |
           export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/usr/local/lib"
           DEFAULT_MAKE_FLAGS="-j${ncpu} ROCKSDB_CI_CACHE=RocksBinCache"
-          env CC=gcc make ${DEFAULT_MAKE_FLAGS} all test_import build_fuzzers
+          env CC=gcc make ${DEFAULT_MAKE_FLAGS} all test_import build_fuzzers check_revision
           build/nimbus_execution_client --help
           # CC, GOARCH, and CGO_ENABLED are needed to select correct compiler 32/64 bit
-          # pushd vendor/nimbus-eth2
-          # env NIMBUSEL_BINARY=../../build/nimbus_execution_client NIMBUSEL_GENESIS=scripts/nimbusel_genesis.json \
-          # ./scripts/launch_local_testnet.sh --nodes=3 --stop-at-epoch=7 \
-          # --disable-htop --reuse-binaries --run-nimbus-el --dl-eth2 --verbose --kill-old-processes
-          # popd
           env CC=gcc GOARCH=${GOARCH} CXX=g++ CGO_ENABLED=1 make ${DEFAULT_MAKE_FLAGS} test t8n_test eest_full_test
 
       - name: Run nimbus-eth1 tests (Macos)
         if: runner.os == 'Macos'
         run: |
           export ZERO_AR_DATE=1 # avoid timestamps in binaries
           DEFAULT_MAKE_FLAGS="-j${ncpu} ROCKSDB_CI_CACHE=RocksBinCache"
-          make ${DEFAULT_MAKE_FLAGS} all test_import build_fuzzers
-          build/nimbus_execution_client --help
+          make ${DEFAULT_MAKE_FLAGS} all test_import build_fuzzers check_revision
           # "-static" option will not work for osx unless static system libraries are provided
-          # pushd vendor/nimbus-eth2
-          # env NIMBUSEL_BINARY=../../build/nimbus_execution_client NIMBUSEL_GENESIS=scripts/nimbusel_genesis.json \
-          # ./scripts/launch_local_testnet.sh --nodes=3 --stop-at-epoch=7 \
-          # --disable-htop --reuse-binaries --run-nimbus-el --dl-eth2 --verbose --kill-old-processes
-          # popd
           make ${DEFAULT_MAKE_FLAGS} test t8n_test eest_full_test
 
   lint:

.github/workflows/kurtosis.yml

@@ -25,8 +25,6 @@ on:
       - 'docker/**'
 
   pull_request:
-    branches:
-      - master
     paths-ignore:
       - 'doc/**'
       - 'portal/docs/**'
@@ -37,6 +35,10 @@ on:
       - '.github/workflows/build_base_image.yml'
       - 'docker/**'
 
+concurrency: # Cancel stale PR builds (but not push builds)
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
+  cancel-in-progress: true
+
 jobs:
   build:
     name: Nimbus eth1 - eth2 interop check

.github/workflows/nimbus_verified_proxy.yml

@@ -11,6 +11,8 @@
 name: Nimbus verified proxy CI
 on:
   push:
+    branches:
+      - master
     paths:
       - '.github/workflows/nimbus_verified_proxy.yml'
       - 'nimbus_verified_proxy/**'
@@ -32,6 +34,10 @@ on:
       - 'Makefile'
       - 'nimbus.nimble'
 
+concurrency: # Cancel stale PR builds (but not push builds)
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
+  cancel-in-progress: true
+
 jobs:
   matrix_config:
     uses: ./.github/workflows/matrix_config.yml

.github/workflows/portal.yml

@@ -8,6 +8,8 @@
 name: Nimbus Portal CI
 on:
   push:
+    branches:
+      - master
     paths-ignore:
       - 'doc/**'
       - 'portal/docs/**'
@@ -29,6 +31,10 @@ on:
 
   workflow_dispatch:
 
+concurrency: # Cancel stale PR builds (but not push builds)
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
+  cancel-in-progress: true
+
 jobs:
   # separate job so it can run concurrently with other tests
   testutp:

.github/workflows/release.yml

@@ -60,21 +60,17 @@ jobs:
           make dist-${{ matrix.os }}-${{ matrix.cpu }}
           cd dist
           ARCHIVE=$(echo *.tar.gz)
+          ARCHIVE_DIR=$(basename -s .tar.gz -- *.tar.gz)
           tar -xzf ${ARCHIVE}
-          NEW_ARCHIVE_DIR="nimbus-eth1-${{ matrix.os }}-${{ matrix.cpu }}-${{ steps.extract_branch.outputs.tag_name }}-$(git rev-parse --short=8 HEAD)"
-          mv ${ARCHIVE%.tar.gz} ${NEW_ARCHIVE_DIR}
-          tar -czf ${NEW_ARCHIVE_DIR}.tar.gz ${NEW_ARCHIVE_DIR}
-          cp ${NEW_ARCHIVE_DIR}.tar.gz nimbus-eth1-${{ matrix.os }}-${{ matrix.cpu }}.tar.gz
-          echo "archive=${NEW_ARCHIVE_DIR}.tar.gz" >> $GITHUB_OUTPUT
-          echo "archive_dir=${NEW_ARCHIVE_DIR}" >> $GITHUB_OUTPUT
+          echo "archive=${ARCHIVE}" >> $GITHUB_OUTPUT
+          echo "archive_dir=${ARCHIVE_DIR}" >> $GITHUB_OUTPUT
 
       - name: Upload archive artefact
         uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.os }}-${{ matrix.cpu }}-archive
           path: |
             ./dist/${{ steps.make_dist.outputs.archive }}
-            ./dist/nimbus-eth1-${{ matrix.os }}-${{ matrix.cpu }}.tar.gz
           retention-days: 2
 
       - name: Upload checksum artefact
@@ -87,7 +83,7 @@ jobs:
       - name: Login to Docker Hub
         # This step runs only if the tag starts with 'v'
         if: matrix.os == 'linux' && startsWith(github.ref, 'refs/tags/v')
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -168,7 +164,7 @@ jobs:
             macos-arm64-checksum
 
       #- name: Login to Docker Hub
-      #  uses: docker/login-action@v1
+      #  uses: docker/login-action@v3
       #  with:
       #    username: ${{ secrets.DOCKERHUB_USERNAME }}
       #    password: ${{ secrets.DOCKERHUB_TOKEN }}

Dockerfile

@@ -8,7 +8,7 @@
 # at your option. This file may not be copied, modified, or distributed except
 # according to those terms.
 
-FROM debian:testing-slim AS build
+FROM debian:trixie-slim AS build
 
 SHELL ["/bin/bash", "-c"]
 
@@ -26,7 +26,7 @@ RUN cd /root/nimbus-eth1 \
 # --------------------------------- #
 # Starting new image to reduce size #
 # --------------------------------- #
-FROM debian:testing-slim AS deploy
+FROM debian:trixie-slim AS deploy
 
 SHELL ["/bin/bash", "-c"]
 RUN apt-get clean && apt update \

Makefile

@@ -122,7 +122,9 @@ VERIF_PROXY_OUT_PATH ?= build/libverifproxy/
 	dist-windows-amd64 \
 	dist-macos-arm64 \
 	dist \
-	eest
+	eest \
+	t8n \
+	t8n_test
 
 ifeq ($(NIM_PARAMS),)
 # "variables.mk" was not included, so we update the submodules.
@@ -211,6 +213,9 @@ nimbus_execution_client: | build deps rocksdb
 	echo -e $(BUILD_MSG) "build/nimbus_execution_client" && \
 		$(ENV_SCRIPT) nim c $(NIM_PARAMS) -d:chronicles_log_level=TRACE -o:build/nimbus_execution_client "execution_chain/nimbus_execution_client.nim"
 
+check_revision: nimbus_execution_client
+	scripts/check_revision.sh
+
 nimbus: nimbus_execution_client
 	echo "The nimbus target is deprecated and will soon change meaning, use 'nimbus_execution_client' instead"
 

docker/dist/entry_point.sh

@@ -205,6 +205,7 @@ mkdir "${DIST_PATH}/build"
 # copy and checksum binaries, copy docs
 EXT=""
 if [[ "${PLATFORM}" == "windows_amd64" ]]; then
+  cp -a vendor/nim-rocksdb/build/librocksdb.dll "${DIST_PATH}/build/"
   EXT=".exe"
 fi
 
@@ -230,13 +231,13 @@ done
 sed -e "s/GIT_COMMIT/${GIT_COMMIT}/" docker/dist/README.md.tpl > "${DIST_PATH}/README.md"
 
 if [[ "${PLATFORM}" == "linux_amd64" ]]; then
-  sed -i -e 's/^make dist$/make dist-amd64/' "${DIST_PATH}/README.md"
-elif [[ "${PLATFORM}" == "linux_arm64v8" ]]; then
-  sed -i -e 's/^make dist$/make dist-arm64/' "${DIST_PATH}/README.md"
+  sed -i -e 's/^make dist$/make dist-linux-amd64/' "${DIST_PATH}/README.md"
+elif [[ "${PLATFORM}" == "linux_arm64" ]]; then
+  sed -i -e 's/^make dist$/make dist-linux-arm64/' "${DIST_PATH}/README.md"
 elif [[ "${PLATFORM}" == "windows_amd64" ]]; then
-  sed -i -e 's/^make dist$/make dist-win64/' "${DIST_PATH}/README.md"
+  sed -i -e 's/^make dist$/make dist-windows-amd64/' "${DIST_PATH}/README.md"
   cp -a docker/dist/README-Windows.md.tpl "${DIST_PATH}/README-Windows.md"
-elif [[ "${PLATFORM}" == "macOS_arm64" ]]; then
+elif [[ "${PLATFORM}" == "macos_arm64" ]]; then
   sed -i -e 's/^make dist$/make dist-macos-arm64/' "${DIST_PATH}/README.md"
 fi
 

execution_chain/common/common.nim

@@ -140,7 +140,7 @@ proc initializeDb(com: CommonRef) =
     doAssert(canonicalHeadHashKey().toOpenArray in txFrame)
 
     txFrame.checkpoint(com.genesisHeader.number)
-    com.db.persist(txFrame, Opt.none(Hash32))
+    com.db.persist(txFrame)
 
   # The database must at least contain the base and head pointers - the base
   # is implicitly considered finalized