From 90f9a8447083de3cb63a007c74b63159c2c9a28a Mon Sep 17 00:00:00 2001 From: andrussal Date: Tue, 9 Dec 2025 16:03:19 +0100 Subject: [PATCH] Centralize KZG/circuits paths via paths.env --- paths.env | 15 +++++++++++ scripts/build-linux-binaries.sh | 7 ++++- scripts/run-examples.sh | 27 +++++++++++++------ scripts/setup-circuits-stack.sh | 13 ++++++--- .../assets/stack/scripts/build_test_image.sh | 7 ++++- .../stack/scripts/run_nomos_executor.sh | 4 ++- .../assets/stack/scripts/run_nomos_node.sh | 4 ++- 7 files changed, 62 insertions(+), 15 deletions(-) create mode 100644 paths.env diff --git a/paths.env b/paths.env new file mode 100644 index 0000000..8beeddd --- /dev/null +++ b/paths.env @@ -0,0 +1,15 @@ +# Paths used by demo scripts and runners. +# Relative paths are resolved from the repo root. + +# Directory containing the KZG test parameters on the host. +NOMOS_KZG_DIR_REL="testing-framework/assets/stack/kzgrs_test_params" + +# The KZG parameters filename (repeated inside the directory). +NOMOS_KZG_FILE="kzgrs_test_params" + +# Path to the KZG params inside containers. +NOMOS_KZG_CONTAINER_PATH="/kzgrs_test_params/kzgrs_test_params" + +# Host-side circuit bundle locations used by helper scripts. +NOMOS_CIRCUITS_HOST_DIR_REL=".tmp/nomos-circuits-host" +NOMOS_CIRCUITS_LINUX_DIR_REL=".tmp/nomos-circuits-linux" diff --git a/scripts/build-linux-binaries.sh b/scripts/build-linux-binaries.sh index 8fc9e76..c91030d 100755 --- a/scripts/build-linux-binaries.sh +++ b/scripts/build-linux-binaries.sh @@ -5,6 +5,10 @@ set -euo pipefail ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)" +if [ -f "${ROOT_DIR}/paths.env" ]; then + # shellcheck disable=SC1091 + . "${ROOT_DIR}/paths.env" +fi NOMOS_NODE_REV="${NOMOS_NODE_REV:-d2dd5a5084e1daef4032562c77d41de5e4d495f8}" NOMOS_CIRCUITS_VERSION="${NOMOS_CIRCUITS_VERSION:-v0.3.1}" NOMOS_BIN_PLATFORM="${NOMOS_BIN_PLATFORM:-linux/amd64}" @@ -20,7 +24,8 @@ echo "Nomos node rev: ${NOMOS_NODE_REV}" echo "Circuits version: ${NOMOS_CIRCUITS_VERSION}" BIN_OUT="${ROOT_DIR}/testing-framework/assets/stack/bin" -CIRCUITS_OUT="${ROOT_DIR}/testing-framework/assets/stack/kzgrs_test_params" +KZG_DIR_REL="${NOMOS_KZG_DIR_REL:-testing-framework/assets/stack/kzgrs_test_params}" +CIRCUITS_OUT="${ROOT_DIR}/${KZG_DIR_REL}" SRC_DIR="${ROOT_DIR}/.tmp/nomos-node-src" CIRCUITS_DIR="${ROOT_DIR}/.tmp/nomos-circuits" diff --git a/scripts/run-examples.sh b/scripts/run-examples.sh index 0522c21..40a87f1 100755 --- a/scripts/run-examples.sh +++ b/scripts/run-examples.sh @@ -58,8 +58,19 @@ if [ -f "${ROOT_DIR}/versions.env" ]; then # shellcheck disable=SC1091 . "${ROOT_DIR}/versions.env" fi +if [ -f "${ROOT_DIR}/paths.env" ]; then + # shellcheck disable=SC1091 + . "${ROOT_DIR}/paths.env" +fi readonly DEFAULT_VERSION="${VERSION:-v0.3.1}" readonly DEFAULT_NODE_REV="${NOMOS_NODE_REV:-d2dd5a5084e1daef4032562c77d41de5e4d495f8}" +readonly KZG_DIR_REL="${NOMOS_KZG_DIR_REL:-testing-framework/assets/stack/kzgrs_test_params}" +readonly KZG_FILE="${NOMOS_KZG_FILE:-kzgrs_test_params}" +readonly KZG_CONTAINER_PATH="${NOMOS_KZG_CONTAINER_PATH:-/kzgrs_test_params/kzgrs_test_params}" +readonly HOST_KZG_DIR="${ROOT_DIR}/${KZG_DIR_REL}" +readonly HOST_KZG_FILE="${HOST_KZG_DIR}/${KZG_FILE}" +readonly HOST_CIRCUITS_DIR="${ROOT_DIR}/${NOMOS_CIRCUITS_HOST_DIR_REL:-.tmp/nomos-circuits-host}" +readonly LINUX_CIRCUITS_DIR="${ROOT_DIR}/${NOMOS_CIRCUITS_LINUX_DIR_REL:-.tmp/nomos-circuits-linux}" MODE="compose" RUN_SECS_RAW="" VERSION="${VERSION:-${DEFAULT_VERSION}}" @@ -147,7 +158,7 @@ restore_binaries_from_tar() { local src="${extract_dir}/artifacts" local bin_dst="${ROOT_DIR}/testing-framework/assets/stack/bin" local circuits_src="${src}/circuits" - local circuits_dst="${ROOT_DIR}/testing-framework/assets/stack/kzgrs_test_params" + local circuits_dst="${HOST_KZG_DIR}" if [ -f "${src}/nomos-node" ] && [ -f "${src}/nomos-executor" ] && [ -f "${src}/nomos-cli" ]; then mkdir -p "${bin_dst}" cp "${src}/nomos-node" "${src}/nomos-executor" "${src}/nomos-cli" "${bin_dst}/" @@ -155,7 +166,7 @@ restore_binaries_from_tar() { echo "Binaries missing in ${tar_path}; fallback to build-from-source path (run build-binaries workflow to populate)" >&2 return 1 fi - if [ -d "${circuits_src}" ] && [ -f "${circuits_src}/kzgrs_test_params" ]; then + if [ -d "${circuits_src}" ] && [ -f "${circuits_src}/${KZG_FILE}" ]; then rm -rf "${circuits_dst}" mkdir -p "${circuits_dst}" if command -v rsync >/dev/null 2>&1; then @@ -268,12 +279,12 @@ fi # Prefer host-native bundle for host tooling when available; otherwise fall back # to the restored circuits location. -if [ "$(uname -s)" != "Linux" ] && [ -d "${ROOT_DIR}/.tmp/nomos-circuits-host" ]; then - HOST_BUNDLE_PATH="${ROOT_DIR}/.tmp/nomos-circuits-host" +if [ "$(uname -s)" != "Linux" ] && [ -d "${HOST_CIRCUITS_DIR}" ]; then + HOST_BUNDLE_PATH="${HOST_CIRCUITS_DIR}" elif [ "${RESTORED_BINARIES}" -eq 1 ]; then - HOST_BUNDLE_PATH="${ROOT_DIR}/testing-framework/assets/stack/kzgrs_test_params" + HOST_BUNDLE_PATH="${HOST_KZG_DIR}" else - HOST_BUNDLE_PATH="${ROOT_DIR}/testing-framework/assets/stack/kzgrs_test_params" + HOST_BUNDLE_PATH="${HOST_KZG_DIR}" fi # If the host bundle was somehow pruned, repair it once more. @@ -281,7 +292,7 @@ if [ ! -x "${HOST_BUNDLE_PATH}/zksign/witness_generator" ]; then echo "Host circuits missing zksign/witness_generator; repairing..." "${ROOT_DIR}/scripts/setup-circuits-stack.sh" "${VERSION}" fi -KZG_HOST_PATH="${HOST_BUNDLE_PATH}/kzgrs_test_params" +KZG_HOST_PATH="${HOST_BUNDLE_PATH}/${KZG_FILE}" if [ ! -f "${KZG_HOST_PATH}" ]; then echo "KZG params missing at ${KZG_HOST_PATH}; rebuilding circuits bundle" "${ROOT_DIR}/scripts/setup-circuits-stack.sh" "${VERSION}" @@ -320,7 +331,7 @@ fi echo "==> Running ${BIN} for ${RUN_SECS}s" cd "${ROOT_DIR}" if [ "$MODE" = "compose" ] || [ "$MODE" = "k8s" ]; then - KZG_PATH="/kzgrs_test_params/kzgrs_test_params" + KZG_PATH="${KZG_CONTAINER_PATH}" else KZG_PATH="${KZG_HOST_PATH}" fi diff --git a/scripts/setup-circuits-stack.sh b/scripts/setup-circuits-stack.sh index a62179d..c0e661c 100755 --- a/scripts/setup-circuits-stack.sh +++ b/scripts/setup-circuits-stack.sh @@ -21,9 +21,16 @@ if [ -f "${ROOT_DIR}/versions.env" ]; then # shellcheck disable=SC1091 . "${ROOT_DIR}/versions.env" fi +if [ -f "${ROOT_DIR}/paths.env" ]; then + # shellcheck disable=SC1091 + . "${ROOT_DIR}/paths.env" +fi +KZG_DIR_REL="${NOMOS_KZG_DIR_REL:-testing-framework/assets/stack/kzgrs_test_params}" +KZG_FILE="${NOMOS_KZG_FILE:-kzgrs_test_params}" +HOST_DIR_REL_DEFAULT="${NOMOS_CIRCUITS_HOST_DIR_REL:-.tmp/nomos-circuits-host}" VERSION="${1:-${VERSION:-v0.3.1}}" -STACK_DIR="${STACK_DIR:-${ROOT_DIR}/testing-framework/assets/stack/kzgrs_test_params}" -HOST_DIR="${HOST_DIR:-${ROOT_DIR}/.tmp/nomos-circuits-host}" +STACK_DIR="${STACK_DIR:-${ROOT_DIR}/${KZG_DIR_REL}}" +HOST_DIR="${HOST_DIR:-${ROOT_DIR}/${HOST_DIR_REL_DEFAULT}}" NOMOS_NODE_REV="${NOMOS_NODE_REV:-d2dd5a5084e1daef4032562c77d41de5e4d495f8}" detect_platform() { @@ -59,7 +66,7 @@ fetch_bundle() { fetch_kzg_params() { local dest_dir="$1" - local dest_file="${dest_dir}/kzgrs_test_params" + local dest_file="${dest_dir}/${KZG_FILE}" local url="https://raw.githubusercontent.com/logos-co/nomos-node/${NOMOS_NODE_REV}/tests/kzgrs/kzgrs_test_params" echo "Fetching KZG parameters from ${url}" diff --git a/testing-framework/assets/stack/scripts/build_test_image.sh b/testing-framework/assets/stack/scripts/build_test_image.sh index 10aeb5e..f13ec1e 100755 --- a/testing-framework/assets/stack/scripts/build_test_image.sh +++ b/testing-framework/assets/stack/scripts/build_test_image.sh @@ -10,10 +10,15 @@ if [ -f "${ROOT_DIR}/versions.env" ]; then # shellcheck disable=SC1091 . "${ROOT_DIR}/versions.env" fi +if [ -f "${ROOT_DIR}/paths.env" ]; then + # shellcheck disable=SC1091 + . "${ROOT_DIR}/paths.env" +fi DOCKERFILE_PATH="${ROOT_DIR}/testing-framework/assets/stack/Dockerfile" IMAGE_TAG="${IMAGE_TAG:-nomos-testnet:local}" VERSION="${VERSION:-v0.3.1}" -CIRCUITS_OVERRIDE="${CIRCUITS_OVERRIDE:-testing-framework/assets/stack/kzgrs_test_params}" +KZG_DIR_REL="${NOMOS_KZG_DIR_REL:-testing-framework/assets/stack/kzgrs_test_params}" +CIRCUITS_OVERRIDE="${CIRCUITS_OVERRIDE:-${KZG_DIR_REL}}" NOMOS_NODE_REV="${NOMOS_NODE_REV:-d2dd5a5084e1daef4032562c77d41de5e4d495f8}" echo "Workspace root: ${ROOT_DIR}" diff --git a/testing-framework/assets/stack/scripts/run_nomos_executor.sh b/testing-framework/assets/stack/scripts/run_nomos_executor.sh index 05344f5..f2b3002 100755 --- a/testing-framework/assets/stack/scripts/run_nomos_executor.sh +++ b/testing-framework/assets/stack/scripts/run_nomos_executor.sh @@ -27,12 +27,14 @@ check_binary_arch() { check_binary_arch +KZG_CONTAINER_PATH="${NOMOS_KZG_CONTAINER_PATH:-/kzgrs_test_params/kzgrs_test_params}" + export CFG_FILE_PATH="/config.yaml" \ CFG_SERVER_ADDR="${CFG_SERVER_ADDR:-http://cfgsync:4400}" \ CFG_HOST_IP=$(hostname -i) \ CFG_HOST_KIND="${CFG_HOST_KIND:-executor}" \ CFG_HOST_IDENTIFIER="${CFG_HOST_IDENTIFIER:-executor-$(hostname -i)}" \ - NOMOS_KZGRS_PARAMS_PATH="${NOMOS_KZGRS_PARAMS_PATH:-/kzgrs_test_params/kzgrs_test_params}" \ + NOMOS_KZGRS_PARAMS_PATH="${NOMOS_KZGRS_PARAMS_PATH:-${KZG_CONTAINER_PATH}}" \ NOMOS_TIME_BACKEND="${NOMOS_TIME_BACKEND:-monotonic}" \ LOG_LEVEL="INFO" \ POL_PROOF_DEV_MODE="${POL_PROOF_DEV_MODE:-true}" diff --git a/testing-framework/assets/stack/scripts/run_nomos_node.sh b/testing-framework/assets/stack/scripts/run_nomos_node.sh index fedceec..9cdc72f 100755 --- a/testing-framework/assets/stack/scripts/run_nomos_node.sh +++ b/testing-framework/assets/stack/scripts/run_nomos_node.sh @@ -27,12 +27,14 @@ check_binary_arch() { check_binary_arch +KZG_CONTAINER_PATH="${NOMOS_KZG_CONTAINER_PATH:-/kzgrs_test_params/kzgrs_test_params}" + export CFG_FILE_PATH="/config.yaml" \ CFG_SERVER_ADDR="${CFG_SERVER_ADDR:-http://cfgsync:4400}" \ CFG_HOST_IP=$(hostname -i) \ CFG_HOST_KIND="${CFG_HOST_KIND:-validator}" \ CFG_HOST_IDENTIFIER="${CFG_HOST_IDENTIFIER:-validator-$(hostname -i)}" \ - NOMOS_KZGRS_PARAMS_PATH="${NOMOS_KZGRS_PARAMS_PATH:-/kzgrs_test_params/kzgrs_test_params}" \ + NOMOS_KZGRS_PARAMS_PATH="${NOMOS_KZGRS_PARAMS_PATH:-${KZG_CONTAINER_PATH}}" \ NOMOS_TIME_BACKEND="${NOMOS_TIME_BACKEND:-monotonic}" \ LOG_LEVEL="INFO" \ POL_PROOF_DEV_MODE="${POL_PROOF_DEV_MODE:-true}"