refactor: flag renaming

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 --activate-zkvm flag set.
+            // If the chain spec enables zkVM, the node must have --zk-attester flag set.
             return Err(AvailabilityCheckError::ProofVerificationError(
                 "Node is receiving execution proofs but zkVM verification is not enabled. \
-                 Use --activate-zkvm flag to enable proof verification."
+                 Use --zk-attester flag to enable proof verification."
                     .to_string(),
             ));
         };

beacon_node/src/cli.rs

@@ -946,8 +946,8 @@ pub fn cli_app() -> Command {
         )
         /* ZK-VM Execution Layer settings */
         .arg(
-            Arg::new("activate-zkvm")
-                .long("activate-zkvm")
+            Arg::new("zk-attester")
+                .long("zk-attester")
                 .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. \
@@ -963,7 +963,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("activate-zkvm")
+                .requires("zk-attester")
                 .action(ArgAction::Set)
                 .display_order(0)
         )

beacon_node/src/config.rs

@@ -270,7 +270,13 @@ pub fn get_config<E: EthSpec>(
     }
 
     // Check if --dummy-el flag is set
-    let use_dummy_el = cli_args.get_flag("dummy-el");
+    let mut use_dummy_el = cli_args.get_flag("dummy-el");
+
+    // Auto-enable --dummy-el if --zk-attester is set without --zkvm-generation-proof-types
+    if cli_args.get_flag("zk-attester") && cli_args.get_one::<String>("zkvm-generation-proof-types").is_none() {
+        use_dummy_el = true;
+    }
+
     client_config.use_dummy_el = use_dummy_el;
 
     // Either `--execution-endpoint` or `--dummy-el` must be supplied.
@@ -351,7 +357,7 @@ pub fn get_config<E: EthSpec>(
     }
 
     // Parse ZK-VM execution layer config if provided
-    if cli_args.get_flag("activate-zkvm") {
+    if cli_args.get_flag("zk-attester") {
         let gen_types_provided = cli_args.get_one::<String>("zkvm-generation-proof-types").is_some();
 
         let generation_proof_types = if let Some(gen_types_str) =
@@ -372,11 +378,9 @@ pub fn get_config<E: EthSpec>(
                 .collect::<Result<HashSet<_>, _>>()
                 .map_err(|e| format!("Invalid subnet ID: {}", e))?
         } else {
-            // If --activate-zkvm is set without --zkvm-generation-proof-types,
-            // automatically enable --dummy-el for proof verification mode
-            if !gen_types_provided {
-                client_config.use_dummy_el = true;
-                info!("--activate-zkvm set without --zkvm-generation-proof-types: automatically enabling --dummy-el for proof verification mode");
+            // 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");
             }
             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 --activate-zkvm.
+    /// Whether zkVM mode is enabled via CLI flag --zk-attester.
     /// 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:
-      - --activate-zkvm
+      - --zk-attester
       - --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:
-      - --activate-zkvm
+      - --zk-attester
       - --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:
-      - --activate-zkvm
+      - --zk-attester
       - --zkvm-generation-proof-types=0,1
       - --target-peers=3
     count: 4