From 8f0af7c4876f8d72fe8e1703916c35d6377f8e73 Mon Sep 17 00:00:00 2001 From: andrussal Date: Tue, 2 Dec 2025 14:51:34 +0100 Subject: [PATCH] Point KZG params to proving key file --- testing-framework/assets/stack/cfgsync.yaml | 2 +- .../configs/src/topology/configs/da.rs | 24 +++++++++++++++++-- .../core/src/scenario/cfgsync.rs | 2 +- 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/testing-framework/assets/stack/cfgsync.yaml b/testing-framework/assets/stack/cfgsync.yaml index 8cd48e5..a467f05 100644 --- a/testing-framework/assets/stack/cfgsync.yaml +++ b/testing-framework/assets/stack/cfgsync.yaml @@ -13,7 +13,7 @@ num_samples: 1 num_subnets: 2 old_blobs_check_interval: "5.0" blobs_validity_duration: "60.0" -global_params_path: "/kzgrs_test_params" +global_params_path: "/kzgrs_test_params/pol/proving_key.zkey" min_dispersal_peers: 1 min_replication_peers: 1 monitor_failure_time_window: "5.0" diff --git a/testing-framework/configs/src/topology/configs/da.rs b/testing-framework/configs/src/topology/configs/da.rs index d22d81e..6e20fb2 100644 --- a/testing-framework/configs/src/topology/configs/da.rs +++ b/testing-framework/configs/src/topology/configs/da.rs @@ -25,9 +25,27 @@ use crate::secret_key_to_peer_id; pub static GLOBAL_PARAMS_PATH: LazyLock = LazyLock::new(resolve_global_params_path); +fn canonicalize_params_path(mut path: PathBuf) -> PathBuf { + if path.is_dir() { + let candidates = [ + path.join("pol/proving_key.zkey"), + path.join("proving_key.zkey"), + ]; + if let Some(file) = candidates.iter().find(|p| p.is_file()) { + return file.clone(); + } + } + if let Ok(resolved) = path.canonicalize() { + path = resolved; + } + path +} + fn resolve_global_params_path() -> String { if let Ok(path) = env::var("NOMOS_KZGRS_PARAMS_PATH") { - return path; + return canonicalize_params_path(PathBuf::from(path)) + .to_string_lossy() + .to_string(); } let workspace_root = env::var("CARGO_WORKSPACE_DIR") @@ -41,7 +59,9 @@ fn resolve_global_params_path() -> String { }) .unwrap_or_else(|| PathBuf::from(env!("CARGO_MANIFEST_DIR"))); - let params_path = workspace_root.join("testing-framework/assets/stack/kzgrs_test_params"); + let params_path = canonicalize_params_path( + workspace_root.join("testing-framework/assets/stack/kzgrs_test_params"), + ); match params_path.canonicalize() { Ok(path) => path.to_string_lossy().to_string(), Err(err) => { diff --git a/testing-framework/core/src/scenario/cfgsync.rs b/testing-framework/core/src/scenario/cfgsync.rs index 6fdb7f3..8e91473 100644 --- a/testing-framework/core/src/scenario/cfgsync.rs +++ b/testing-framework/core/src/scenario/cfgsync.rs @@ -90,7 +90,7 @@ pub fn apply_topology_overrides( cfg.old_blobs_check_interval = da.old_blobs_check_interval; cfg.blobs_validity_duration = da.blobs_validity_duration; cfg.global_params_path = if use_kzg_mount { - "/kzgrs_test_params".into() + "/kzgrs_test_params/pol/proving_key.zkey".into() } else { da.global_params_path.clone() };