refactor: rename flag to zkevm validation

Author: fbwoolf

beacon_node/beacon_chain/src/data_availability_checker.rs

@@ -284,10 +284,10 @@ impl<T: BeaconChainTypes> DataAvailabilityChecker<T> {
     ) -> Result<bool, AvailabilityCheckError> {
         let Some(verifier_registry) = &self.verifier_registry else {
             // No verifier configured but receiving proofs - this is a configuration error.
-            // If the chain spec enables zkVM, the node must have --zk-attester flag set.
+            // If the chain spec enables zkVM, the node must have --zkevm-validation flag set.
             return Err(AvailabilityCheckError::ProofVerificationError(
                 "Node is receiving execution proofs but zkVM verification is not enabled. \
-                 Use --zk-attester flag to enable proof verification."
+                 Use --zkevm-validation flag to enable proof verification."
                     .to_string(),
             ));
         };

beacon_node/client/src/builder.rs

@@ -20,12 +20,12 @@ use beacon_chain::{
 use beacon_chain::{Kzg, LightClientProducerEvent};
 use beacon_processor::{BeaconProcessor, BeaconProcessorChannels};
 use beacon_processor::{BeaconProcessorConfig, BeaconProcessorQueueLengths};
+use dummy_el;
 use environment::RuntimeContext;
 use eth2::{
     BeaconNodeHttpClient, Error as ApiError, Timeouts,
     types::{BlockId, StateId},
 };
-use dummy_el;
 use execution_layer::ExecutionLayer;
 use execution_layer::test_utils::generate_genesis_header;
 use futures::channel::mpsc::Receiver;
@@ -191,9 +191,9 @@ where
             None
         };
 
-        // Spawn the dummy execution layer if --dummy-el flag is set
+        // Spawn the dummy execution layer
         if config.use_dummy_el {
-            info!("Spawning in-process dummy execution layer (--dummy-el)");
+            info!("--zkevm-validation: spawning in-process execution layer");
 
             let dummy_el_config = dummy_el::DummyElConfig {
                 host: "127.0.0.1".to_string(),

beacon_node/src/cli.rs

@@ -828,7 +828,7 @@ pub fn cli_app() -> Command {
                 .alias("jwt-secrets")
                 .help("File path which contains the hex-encoded JWT secret for the \
                        execution endpoint provided in the --execution-endpoint flag.")
-                .requires_one_of(["execution-endpoint", "zk-attester"])
+                .requires("execution-source")
                 .action(ArgAction::Set)
                 .display_order(0)
         )
@@ -839,7 +839,7 @@ pub fn cli_app() -> Command {
                 .alias("jwt-secret-key")
                 .help("Hex-encoded JWT secret for the \
                        execution endpoint provided in the --execution-endpoint flag.")
-                .requires_one_of(["execution-endpoint", "zk-attester"])
+                .requires("execution-source")
                 .conflicts_with("execution-jwt")
                 .action(ArgAction::Set)
                 .display_order(0)
@@ -875,7 +875,7 @@ pub fn cli_app() -> Command {
                 .help("Emergency fallback fee recipient for use in case the validator client does \
                        not have one configured. You should set this flag on the validator \
                        client instead of (or in addition to) setting it here.")
-                .requires_one_of(["execution-endpoint", "zk-attester"])
+                .requires("execution-source")
                 .action(ArgAction::Set)
                 .display_order(0)
         )
@@ -885,7 +885,7 @@ pub fn cli_app() -> Command {
                 .alias("payload-builder")
                 .alias("payload-builders")
                 .help("The URL of a service compatible with the MEV-boost API.")
-                .requires_one_of(["execution-endpoint", "zk-attester"])
+                .requires("execution-source")
                 .action(ArgAction::Set)
                 .display_order(0)
         )
@@ -934,8 +934,8 @@ pub fn cli_app() -> Command {
         )
         /* ZK-VM Execution Layer settings */
         .arg(
-            Arg::new("zk-attester")
-                .long("zk-attester")
+            Arg::new("zkevm-validation")
+                .long("zkevm-validation")
                 .help("Activates ZKVM execution proof mode. Enables the node to subscribe to the \
                        execution_proof gossip topic, receive and verify execution proofs from peers, \
                        and advertise zkVM support in its ENR for peer discovery. \
@@ -951,7 +951,7 @@ pub fn cli_app() -> Command {
                 .help("Comma-separated list of proof type IDs to generate \
                        (e.g., '0,1' where 0=SP1+Reth, 1=Risc0+Geth). \
                        Optional - nodes can verify proofs without generating them.")
-                .requires("zk-attester")
+                .requires("zkevm-validation")
                 .action(ArgAction::Set)
                 .display_order(0)
         )
@@ -1655,5 +1655,8 @@ pub fn cli_app() -> Command {
                 .action(ArgAction::Set)
                 .hide(true)
         )
+        .group(ArgGroup::new("execution-source")
+            .args(["execution-endpoint", "zkevm-validation"])
+            .required(true))
         .group(ArgGroup::new("enable_http").args(["http", "gui", "staking"]).multiple(true))
 }

beacon_node/src/config.rs

@@ -269,23 +269,21 @@ pub fn get_config<E: EthSpec>(
         client_config.http_metrics.allocator_metrics_enabled = false;
     }
 
-    // Auto-enable in-process dummy execution layer if --zk-attester is set without
+    // Auto-enable in-process dummy execution layer if --zkevm-validation is set without
     // --zkvm-generation-proof-types and no explicit --execution-endpoint is provided.
-    let use_dummy_el = cli_args.get_flag("zk-attester")
+    let use_dummy_el = cli_args.get_flag("zkevm-validation")
         && cli_args
             .get_one::<String>("zkvm-generation-proof-types")
             .is_none()
-        && cli_args
-            .get_one::<String>("execution-endpoint")
-            .is_none();
+        && cli_args.get_one::<String>("execution-endpoint").is_none();
 
     client_config.use_dummy_el = use_dummy_el;
 
-    // Configure execution layer: either use provided endpoint or dummy EL (auto-enabled with --zk-attester)
+    // Configure execution layer: either use provided endpoint or dummy EL (auto-enabled with --zkevm-validation)
     if !use_dummy_el {
         let endpoints: Option<String> = clap_utils::parse_optional(cli_args, "execution-endpoint")?;
-        let endpoints =
-            endpoints.ok_or("Error! Either --execution-endpoint or --zk-attester must be provided")?;
+        let endpoints = endpoints
+            .ok_or("Error! Either --execution-endpoint or --zkevm-validation must be provided")?;
 
         let mut el_config = execution_layer::Config::default();
 
@@ -355,9 +353,8 @@ pub fn get_config<E: EthSpec>(
         // Store the EL config in the client config.
         client_config.execution_layer = Some(el_config);
     } else {
-        // When using --dummy-el, create an execution_layer config pointing to localhost
-        // The dummy EL server will be spawned in-process by the client builder
-        info!("Using in-process dummy execution layer (--dummy-el)");
+        // Create an execution_layer config pointing to localhost
+        info!("Using in-process dummy execution layer (--zkevm-validation)");
 
         let mut el_config = execution_layer::Config::default();
 
@@ -369,13 +366,15 @@ pub fn get_config<E: EthSpec>(
 
         // For dummy EL, let ExecutionLayer handle JWT as usual
         // Dummy EL will not validate JWT (no need for local testing)
-        el_config.default_datadir.clone_from(client_config.data_dir());
+        el_config
+            .default_datadir
+            .clone_from(client_config.data_dir());
 
         client_config.execution_layer = Some(el_config);
     }
 
     // Parse ZK-VM execution layer config if provided
-    if cli_args.get_flag("zk-attester") {
+    if cli_args.get_flag("zkevm-validation") {
         let generation_proof_types = if let Some(gen_types_str) =
             clap_utils::parse_optional::<String>(cli_args, "zkvm-generation-proof-types")?
         {
@@ -396,9 +395,7 @@ pub fn get_config<E: EthSpec>(
         } else {
             // No generation proof types provided - running in verification-only mode
             if client_config.use_dummy_el {
-                info!(
-                    "--zk-attester set without --zkvm-generation-proof-types: automatically enabled --dummy-el for proof verification mode"
-                );
+                info!("--zkevm-validation: no EL needed for proof verification");
             }
             HashSet::new()
         };

consensus/types/src/chain_spec.rs

@@ -224,7 +224,7 @@ pub struct ChainSpec {
     /*
      * zkVM execution proof params
      */
-    /// Whether zkVM mode is enabled via CLI flag --zk-attester.
+    /// Whether zkVM mode is enabled via CLI flag --zkevm-validation.
     /// When true, the node will subscribe to execution proof gossip, verify proofs,
     /// TODO(ethproofs): Changed to Electra fork for demo.
     /// and optionally generate proofs. zkVM activates at the Fulu fork.

scripts/local_testnet/network_params_mixed_proof_gen_verify.yaml

@@ -6,7 +6,7 @@ participants:
     cl_type: lighthouse
     cl_image: lighthouse:local
     cl_extra_params:
-      - --zk-attester
+      - --zkevm-validation
       - --zkvm-generation-proof-types=0,1
       - --target-peers=3
     count: 3
@@ -18,7 +18,7 @@ participants:
     cl_type: lighthouse
     cl_image: lighthouse:local
     cl_extra_params:
-      - --zk-attester
+      - --zkevm-validation
       - --target-peers=3
     count: 1
 network_params:

scripts/local_testnet/network_params_proof_gen_only.yaml

@@ -6,7 +6,7 @@ participants:
     cl_type: lighthouse
     cl_image: lighthouse:local
     cl_extra_params:
-      - --zk-attester
+      - --zkevm-validation
       - --zkvm-generation-proof-types=0,1
       - --target-peers=3
     count: 4