Check binary revision vs repo revision (#3668)

* Check binary revision vs repo revision

* Update check_revision.sh executable permission

* Fix Makefile

* Fix script path

Author: jangko

.github/workflows/ci.yml

@@ -68,10 +68,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 +77,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:

Makefile

@@ -213,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"
 

scripts/check_revision.sh

@@ -0,0 +1,36 @@
+#!/usr/bin/env bash
+
+# Copyright (c) 2025 Status Research & Development GmbH.
+# Licensed under either of:
+# - Apache License, version 2.0
+# - MIT license
+# at your option.
+
+# prevent issue https://github.com/status-im/nimbus-eth1/issues/3661
+
+set -e
+
+cd "$(dirname "${BASH_SOURCE[0]}")"/..
+
+REPO_DIR="${PWD}"
+EL=build/nimbus_execution_client
+
+$EL --help
+REPO_REVISION=$(git -C $REPO_DIR rev-parse --short=8 HEAD)
+
+# nimbus-eth1/v0.2.0-f10349dc/windows-amd64/Nim-2.2.4
+# Copyright (c) 2019-2025 Status Research & Development GmbH
+
+# From `EL --version` output above,
+# Get first line and then second field after split by '/'
+VERSION=$(echo "$($EL --version | head -n 1)" | cut -d '/' -f 2)
+
+# Get second field after split by '-'
+BINARY_REVISION=$(echo $VERSION | cut -d '-' -f 2)
+
+if [[ $REPO_REVISION -ne $BINARY_REVISION ]]; then
+  echo "Binary revision differ from repository revision. Expect $REPO_REVISION, get $BINARY_REVISION."
+  exit 1 # Exit the script with an error code
+fi
+
+# TODO: check copyright year start from 2018, the current 2019 is from nimbus-eth2