refactor: rename flags to execution-proofs

fbwoolf · fbwoolf · commit bcb3cf4b67dc · 2025-11-21T15:03:32.000-03:00
diff --git a/beacon_node/beacon_chain/src/data_availability_checker.rs b/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 --zkevm-validation flag set.
+            // If the chain spec enables execution proofs, the node must have --execution-proofs flag set.
             return Err(AvailabilityCheckError::ProofVerificationError(
-                "Node is receiving execution proofs but zkVM verification is not enabled. \
-                 Use --zkevm-validation flag to enable proof verification."
+                "Node is receiving execution proofs but proof verification is not enabled. \
+                 Use --execution-proofs flag to enable proof verification."
                     .to_string(),
             ));
         };
diff --git a/beacon_node/client/src/builder.rs b/beacon_node/client/src/builder.rs
@@ -193,7 +193,7 @@ where
 
         // Spawn the dummy execution layer
         if config.use_dummy_el {
-            info!("--zkevm-validation: spawning in-process execution layer");
+            info!("--execution-proofs: spawning in-process execution layer");
 
             let dummy_el_config = dummy_el::DummyElConfig {
                 host: "127.0.0.1".to_string(),
diff --git a/beacon_node/src/cli.rs b/beacon_node/src/cli.rs
@@ -932,26 +932,26 @@ pub fn cli_app() -> Command {
                 .action(ArgAction::Set)
                 .display_order(0)
         )
-        /* ZK-VM Execution Layer settings */
+        /* Execution Proofs settings */
         .arg(
-            Arg::new("zkevm-validation")
-                .long("zkevm-validation")
-                .help("Activates ZKVM execution proof mode. Enables the node to subscribe to the \
+            Arg::new("execution-proofs")
+                .long("execution-proofs")
+                .help("Activates 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. \
-                       Use --zkvm-generation-proof-types to specify which proof types this node \
+                       and advertise execution proof support in its ENR for peer discovery. \
+                       Use --execution-proof-types to specify which proof types this node \
                        should generate (optional - nodes can verify without generating).")
                 .action(ArgAction::SetTrue)
                 .display_order(0)
         )
         .arg(
-            Arg::new("zkvm-generation-proof-types")
-                .long("zkvm-generation-proof-types")
+            Arg::new("execution-proof-types")
+                .long("execution-proof-types")
                 .value_name("PROOF_TYPE_IDS")
                 .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("zkevm-validation")
+                .requires("execution-proofs")
                 .action(ArgAction::Set)
                 .display_order(0)
         )
@@ -1656,7 +1656,7 @@ pub fn cli_app() -> Command {
                 .hide(true)
         )
         .group(ArgGroup::new("execution-source")
-            .args(&["execution-endpoint", "zkevm-validation"])
+            .args(&["execution-endpoint", "execution-proofs"])
             .required(true)
             .multiple(true))
         .group(ArgGroup::new("enable_http").args(["http", "gui", "staking"]).multiple(true))
diff --git a/beacon_node/src/config.rs b/beacon_node/src/config.rs
@@ -269,21 +269,21 @@ pub fn get_config<E: EthSpec>(
         client_config.http_metrics.allocator_metrics_enabled = false;
     }
 
-    // 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("zkevm-validation")
+    // Auto-enable in-process dummy execution layer if --execution-proofs is set without
+    // --execution-proof-types and no explicit --execution-endpoint is provided.
+    let use_dummy_el = cli_args.get_flag("execution-proofs")
         && cli_args
-            .get_one::<String>("zkvm-generation-proof-types")
+            .get_one::<String>("execution-proof-types")
             .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 --zkevm-validation)
+    // Configure execution layer: either use provided endpoint or dummy EL (auto-enabled with --execution-proofs)
     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 --zkevm-validation must be provided")?;
+            .ok_or("Error! Either --execution-endpoint or --execution-proofs must be provided")?;
 
         let mut el_config = execution_layer::Config::default();
 
@@ -354,7 +354,7 @@ pub fn get_config<E: EthSpec>(
         client_config.execution_layer = Some(el_config);
     } else {
         // Create an execution_layer config pointing to localhost
-        info!("Using in-process dummy execution layer (--zkevm-validation)");
+        info!("Using in-process dummy execution layer (--execution-proofs)");
 
         let mut el_config = execution_layer::Config::default();
 
@@ -373,18 +373,18 @@ pub fn get_config<E: EthSpec>(
         client_config.execution_layer = Some(el_config);
     }
 
-    // Parse ZK-VM execution layer config if provided
-    if cli_args.get_flag("zkevm-validation") {
+    // Parse execution proofs config if provided
+    if cli_args.get_flag("execution-proofs") {
         let generation_proof_types = if let Some(gen_types_str) =
-            clap_utils::parse_optional::<String>(cli_args, "zkvm-generation-proof-types")?
+            clap_utils::parse_optional::<String>(cli_args, "execution-proof-types")?
         {
             gen_types_str
                 .split(',')
                 .map(|s| s.trim().parse::<u8>())
                 .collect::<Result<Vec<u8>, _>>()
                 .map_err(|e| {
                     format!(
-                        "Invalid proof type ID in --zkvm-generation-proof-types: {}",
+                        "Invalid proof type ID in --execution-proof-types: {}",
                         e
                     )
                 })?
@@ -395,7 +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!("--zkevm-validation: no EL needed for proof verification");
+                info!("--execution-proofs: no EL needed for proof verification");
             }
             HashSet::new()
         };
diff --git a/consensus/types/src/chain_spec.rs b/consensus/types/src/chain_spec.rs
@@ -222,9 +222,9 @@ pub struct ChainSpec {
     pub gloas_fork_epoch: Option<Epoch>,
 
     /*
-     * zkVM execution proof params
+     * Execution proof params
      */
-    /// Whether zkVM mode is enabled via CLI flag --zkevm-validation.
+    /// Whether execution proofs are enabled via CLI flag --execution-proofs.
     /// 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.
diff --git a/scripts/local_testnet/network_params_mixed_proof_gen_verify.yaml b/scripts/local_testnet/network_params_mixed_proof_gen_verify.yaml
@@ -6,8 +6,8 @@ participants:
     cl_type: lighthouse
     cl_image: lighthouse:local
     cl_extra_params:
-      - --zkevm-validation
-      - --zkvm-generation-proof-types=0,1
+      - --execution-proofs
+      - --execution-proof-types=0,1
       - --target-peers=3
     count: 3
   # Proof verifying only node (node 4)
@@ -18,7 +18,7 @@ participants:
     cl_type: lighthouse
     cl_image: lighthouse:local
     cl_extra_params:
-      - --zkevm-validation
+      - --execution-proofs
       - --target-peers=3
     count: 1
 network_params:
diff --git a/scripts/local_testnet/network_params_proof_gen_only.yaml b/scripts/local_testnet/network_params_proof_gen_only.yaml
@@ -6,8 +6,8 @@ participants:
     cl_type: lighthouse
     cl_image: lighthouse:local
     cl_extra_params:
-      - --zkevm-validation
-      - --zkvm-generation-proof-types=0,1
+      - --execution-proofs
+      - --execution-proof-types=0,1
       - --target-peers=3
     count: 4
 network_params:
