use guix to build

Author: willcl-ark

.github/workflows/benchmark.yml

@@ -31,9 +31,9 @@ jobs:
         run: |
           mkdir -p ${{ runner.temp }}/binaries/base
           mkdir -p ${{ runner.temp }}/binaries/head
-          nix-shell --command "just build-assumeutxo-binaries $BASE_SHA $CHECKOUT_COMMIT"
-          cp build-base/src/bitcoind ${{ runner.temp }}/binaries/base/bitcoind
-          cp build-head/src/bitcoind ${{ runner.temp }}/binaries/head/bitcoind
+          nix-shell --command "just build-assumeutxo-binaries-guix $BASE_SHA $CHECKOUT_COMMIT"
+          cp binaries/base/bitcoind ${{ runner.temp }}/binaries/base/bitcoind
+          cp binaries/head/bitcoind ${{ runner.temp }}/binaries/head/bitcoind
       - name: Upload binaries
         uses: actions/upload-artifact@v4
         with:
@@ -86,10 +86,14 @@ jobs:
           BINARIES_DIR: "${{ runner.temp }}/binaries"
         run: |
           env
+
+          # Patch binary shared object dependencies
+          nix-shell --command "patch-binary $BINARIES_DIR/head/bitcoind"
+          nix-shell --command "patch-binary $BINARIES_DIR/base/bitcoind"
+
+          # Run test
           mkdir -p "$TMP_DATADIR"
-          CMD="nix-shell --command \"just run-assumeutxo-${{ matrix.network }}-ci $BASE_SHA $CHECKOUT_COMMIT $TMP_DATADIR $UTXO_PATH ${{ runner.temp }}/results.json ${{ matrix.dbcache }} ${{ runner.temp }}/pngs $BINARIES_DIR\""
-          echo "Running command: $CMD"
-          eval "$CMD"
+          nix-shell --command "just run-assumeutxo-${{ matrix.network }}-ci $BASE_SHA $CHECKOUT_COMMIT $TMP_DATADIR $UTXO_PATH ${{ runner.temp }}/results.json ${{ matrix.dbcache }} ${{ runner.temp }}/pngs $BINARIES_DIR"
       - uses: actions/upload-artifact@v4
         with:
           name: result-${{ matrix.network }}

bench-ci/run-assumeutxo-bench.sh

@@ -63,6 +63,7 @@ prepare_assumeutxo_snapshot_run() {
   # Run the actual preparation steps
   clean_datadir "${TMP_DATADIR}"
   # Use the pre-built binaries from BINARIES_DIR
+  "${BINARIES_DIR}/${commit}/bitcoind" --help
   taskset -c 0-15 "${BINARIES_DIR}/${commit}/bitcoind" -datadir="${TMP_DATADIR}" -connect="${CONNECT_ADDRESS}" -daemon=0 -chain="${CHAIN}" -stopatheight=1 -printtoconsole=0
   taskset -c 0-15 "${BINARIES_DIR}/${commit}/bitcoind" -datadir="${TMP_DATADIR}" -connect="${CONNECT_ADDRESS}" -daemon=0 -chain="${CHAIN}" -dbcache="${DBCACHE}" -pausebackgroundsync=1 -loadutxosnapshot="${UTXO_PATH}" -printtoconsole=0 || true
   clean_logs "${TMP_DATADIR}"

contrib/guix/libexec/build.sh

@@ -4,6 +4,7 @@
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 export LC_ALL=C
 set -e -o pipefail
+set -x
 export TZ=UTC
 
 # Although Guix _does_ set umask when building its own packages (in our case,
@@ -171,6 +172,12 @@ make -C depends --jobs="$JOBS" HOST="$HOST" \
                                    ${SOURCES_PATH+SOURCES_PATH="$SOURCES_PATH"} \
                                    ${BASE_CACHE+BASE_CACHE="$BASE_CACHE"} \
                                    ${SDK_PATH+SDK_PATH="$SDK_PATH"} \
+                                   NO_QT=1 \
+                                   NO_QR=1 \
+                                   NO_ZMQ=1 \
+                                   NO_WALLET=1 \
+                                   NO_BDB=1 \
+                                   NO_USDT=1 \
                                    x86_64_linux_CC=x86_64-linux-gnu-gcc \
                                    x86_64_linux_CXX=x86_64-linux-gnu-g++ \
                                    x86_64_linux_AR=x86_64-linux-gnu-gcc-ar \
@@ -208,6 +215,9 @@ mkdir -p "$OUTDIR"
 # CONFIGFLAGS
 CONFIGFLAGS="-DREDUCE_EXPORTS=ON -DBUILD_BENCH=OFF -DBUILD_GUI_TESTS=OFF -DBUILD_FUZZ_BINARY=OFF"
 
+# BENCHCOINFLAGS
+BENCHCOINFLAGS="-DBUILD_CLI=OFF -DBUILD_TESTS=OFF -DCMAKE_CXX_FLAGS=-fno-omit-frame-pointer"
+
 # CFLAGS
 HOST_CFLAGS="-O2 -g"
 HOST_CFLAGS+=$(find /gnu/store -maxdepth 1 -mindepth 1 -type d -exec echo -n " -ffile-prefix-map={}=/usr" \;)
@@ -242,17 +252,18 @@ mkdir -p "$DISTSRC"
     cmake -S . -B build \
           --toolchain "${BASEPREFIX}/${HOST}/toolchain.cmake" \
           -DWITH_CCACHE=OFF \
-          ${CONFIGFLAGS}
+          ${CONFIGFLAGS} \
+          ${BENCHCOINFLAGS}
 
     # Build Bitcoin Core
     cmake --build build -j "$JOBS" ${V:+--verbose}
 
     # Check that symbol/security checks tools are sane.
-    cmake --build build --target test-security-check ${V:+--verbose}
+    # cmake --build build --target test-security-check ${V:+--verbose}
     # Perform basic security checks on a series of executables.
-    cmake --build build -j 1 --target check-security ${V:+--verbose}
+    # cmake --build build -j 1 --target check-security ${V:+--verbose}
     # Check that executables only contain allowed version symbols.
-    cmake --build build -j 1 --target check-symbols ${V:+--verbose}
+    # cmake --build build -j 1 --target check-symbols ${V:+--verbose}
 
     mkdir -p "$OUTDIR"
 
@@ -304,15 +315,15 @@ mkdir -p "$DISTSRC"
     (
         cd installed
 
-        case "$HOST" in
-            *darwin*) ;;
-            *)
-                # Split binaries from their debug symbols
-                {
-                    find "${DISTNAME}/bin" -type f -executable -print0
-                } | xargs -0 -P"$JOBS" -I{} "${DISTSRC}/build/split-debug.sh" {} {} {}.dbg
-                ;;
-        esac
+        # case "$HOST" in
+        #     *darwin*) ;;
+        #     *)
+        #         # Split binaries from their debug symbols
+        #         {
+        #             find "${DISTNAME}/bin" -type f -executable -print0
+        #         } | xargs -0 -P"$JOBS" -I{} "${DISTSRC}/build/split-debug.sh" {} {} {}.dbg
+        #         ;;
+        # esac
 
         case "$HOST" in
             *mingw*)

contrib/guix/libexec/prelude.bash

@@ -1,13 +1,22 @@
 #!/usr/bin/env bash
 export LC_ALL=C
 set -e -o pipefail
+set -x
 
 # shellcheck source=contrib/shell/realpath.bash
 source contrib/shell/realpath.bash
 
 # shellcheck source=contrib/shell/git-utils.bash
 source contrib/shell/git-utils.bash
 
+# Source guix profile from the runner home directory
+GUIX_PROFILE=/home/github-runner/.config/guix/current
+. "$GUIX_PROFILE/etc/profile"
+
+echo "Using the following guix command:"
+command -v guix
+guix describe
+
 ################
 # Required non-builtin commands should be invocable
 ################
@@ -48,9 +57,10 @@ fi
 ################
 # Execute "$@" in a pinned, possibly older version of Guix, for reproducibility
 # across time.
+
 time-machine() {
     # shellcheck disable=SC2086
-    guix time-machine --url=https://git.savannah.gnu.org/git/guix.git \
+    guix time-machine --url=https://github.com/fanquake/guix.git \
                       --commit=53396a22afc04536ddf75d8f82ad2eafa5082725 \
                       --cores="$JOBS" \
                       --keep-failed \

justfile

@@ -7,27 +7,30 @@ default:
 
 # Build base and head binaries for CI
 [group('ci')]
-build-assumeutxo-binaries base_commit head_commit:
+build-assumeutxo-binaries-guix base_commit head_commit:
     #!/usr/bin/env bash
     set -euxo pipefail
+
+    mkdir -p binaries/base
+    mkdir -p binaries/head
+
     for build in "base:{{ base_commit }}" "head:{{ head_commit }}"; do
         name="${build%%:*}"
         commit="${build#*:}"
         git checkout "$commit"
-        taskset -c 0-15 cmake -B "build-$name" \
-            -DBUILD_BENCH=OFF \
-            -DBUILD_CLI=OFF \
-            -DBUILD_TESTS=OFF \
-            -DBUILD_TX=OFF \
-            -DBUILD_UTIL=OFF \
-            -DENABLE_EXTERNAL_SIGNER=OFF \
-            -DENABLE_WALLET=OFF \
-            -DINSTALL_MAN=OFF \
-            -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-            -DCMAKE_C_COMPILER_LAUNCHER=ccache \
-            -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
-            -DCMAKE_CXX_FLAGS="-fno-omit-frame-pointer -g"
-        taskset -c 0-15 cmake --build "build-$name" -j {{ num_cpus() }}
+        HOSTS=x86_64-linux-gnu SOURCES_PATH=/data/SOURCES_PATH BASE_CACHE=/data/BASE_CACHE taskset -c 0-15 contrib/guix/guix-build
+
+        # Truncate commit hash to 12 characters
+        short_commit=$(echo "$commit" | cut -c 1-12)
+
+        # Extract the Guix output
+        tar -xzf "guix-build-${short_commit}/output/x86_64-linux-gnu/bitcoin-${short_commit}-x86_64-linux-gnu.tar.gz"
+
+        # Copy the binary to our binaries directory
+        cp "bitcoin-${short_commit}/bin/bitcoind" "binaries/${name}/bitcoind"
+
+        # Cleanup extracted files
+        rm -rf "bitcoin-${short_commit}"
     done
 
 # Run signet assumeutxo CI workflow

shell.nix

@@ -92,6 +92,13 @@ in pkgs.mkShell {
     linuxKernel.packages.linux_6_6.perf
     perf-tools
     util-linux
+
+    # Binary patching
+    patchelf
+
+    # Guix
+    curl
+    getent
   ];
 
   shellHook = ''
@@ -105,5 +112,15 @@ in pkgs.mkShell {
     uv venv --python 3.10
     source .venv/bin/activate
     uv pip install -r pyproject.toml
+
+    patch-binary() {
+      if [ -z "$1" ]; then
+        echo "Usage: patch-binary <binary-path>"
+        return 1
+      fi
+      patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$1"
+    }
+    echo "Added patch-binary command"
+    echo "    Usage: 'patch-binary <binary_path>'"
   '';
 }