feature gate RV on CI

.github/workflows/rust.yml

@@ -564,7 +564,7 @@ jobs:
         run: |
           wasm-pack build --target nodejs --out-dir ./tests/wasm/nodejs . -- -Z build-std="panic_abort,std"
       - name: KZG prove and verify tests (EVM + reusable verifier + col-overflow)
-        run: cargo nextest run --verbose tests_evm::kzg_evm_prove_and_verify_reusable_verifier --test-threads 1
+        run: cargo nextest run --verbose tests_evm::kzg_evm_prove_and_verify_reusable_verifier --features reusable-verifier --test-threads 1
       - name: KZG prove and verify tests (EVM + kzg all)
         run: cargo nextest run --verbose tests_evm::kzg_evm_kzg_all_prove_and_verify --test-threads 1
       - name: KZG prove and verify tests (EVM + kzg inputs)

Cargo.toml

@@ -281,6 +281,7 @@ macos-metal = ["halo2_proofs/macos"]
 ios-metal = ["halo2_proofs/ios"]
 jemalloc = ["dep:jemallocator"]
 mimalloc = ["dep:mimalloc"]
+reusable-verifier = []
 
 
 [patch.crates-io]

src/commands.rs

@@ -713,7 +713,7 @@ pub enum Commands {
         #[arg(long, default_value = DEFAULT_CALLDATA, value_hint = clap::ValueHint::FilePath)]
         calldata_path: Option<PathBuf>,
         /// The path to the serialized VKA file
-        #[arg(long, value_hint = clap::ValueHint::Other)]
+        #[cfg_attr(all(feature = "reusable-verifier", not(target_arch = "wasm32")), arg(long, value_hint = clap::ValueHint::Other))]
         vka_path: Option<PathBuf>,
     },
     /// Creates an Evm verifier for a single proof
@@ -735,13 +735,13 @@ pub enum Commands {
         /// The path to output the Solidity verifier ABI
         #[arg(long, default_value = DEFAULT_VERIFIER_ABI, value_hint = clap::ValueHint::FilePath)]
         abi_path: Option<PathBuf>,
-        /// Whether the to render the verifier as reusable or not. If true, you will need to deploy a VK artifact, passing it as part of the calldata to the verifier.
-        #[arg(long, default_value = DEFAULT_RENDER_REUSABLE, action = clap::ArgAction::SetTrue)]
+        /// Whether to render the verifier as reusable or not. If true, you will need to deploy a VK artifact, passing it as part of the calldata to the verifier.
+        #[cfg_attr(all(feature = "reusable-verifier", not(target_arch = "wasm32")), arg(short = 'R', long, default_value = DEFAULT_RENDER_REUSABLE, action = clap::ArgAction::SetTrue))]
         reusable: Option<bool>,
     },
     /// Creates an evm verifier artifact to be used by the reusable verifier
     #[command(name = "create-evm-vka")]
-    #[cfg(all(feature = "eth", not(target_arch = "wasm32")))]
+    #[cfg(feature = "reusable-verifier")]
     CreateEvmVka {
         /// The path to SRS, if None will use ~/.ezkl/srs/kzg{logrows}.srs
         #[arg(long, value_hint = clap::ValueHint::FilePath)]
@@ -783,8 +783,8 @@ pub enum Commands {
         // logrows used for aggregation circuit
         #[arg(long, default_value = DEFAULT_AGGREGATED_LOGROWS, value_hint = clap::ValueHint::Other)]
         logrows: Option<u32>,
-        /// Whether the to render the verifier as reusable or not. If true, you will need to deploy a VK artifact, passing it as part of the calldata to the verifier.
-        #[arg(long, default_value = DEFAULT_RENDER_REUSABLE, action = clap::ArgAction::SetTrue)]
+        /// Whether to render the verifier as reusable or not. If true, you will need to deploy a VK artifact, passing it as part of the calldata to the verifier.
+        #[cfg_attr(all(feature = "reusable-verifier", not(target_arch = "wasm32")), arg(short = 'R', long, action = clap::ArgAction::SetTrue))]
         reusable: Option<bool>,
     },
     /// Verifies a proof, returning accept or reject
@@ -845,7 +845,7 @@ pub enum Commands {
         #[arg(short = 'P', long, value_hint = clap::ValueHint::Other)]
         private_key: Option<String>,
         /// Contract type to be deployed
-        #[arg(long = "contract-type", short = 'C', default_value = DEFAULT_CONTRACT_DEPLOYMENT_TYPE, value_hint = clap::ValueHint::Other)]
+        #[cfg_attr(all(feature = "reusable-verifier", not(target_arch = "wasm32")), arg(short = 'R', long, action = clap::ArgAction::SetTrue))]
         contract: ContractType,
     },
     /// Verifies a proof using a local Evm executor, returning accept or reject
@@ -862,7 +862,7 @@ pub enum Commands {
         #[arg(short = 'U', long, value_hint = clap::ValueHint::Url)]
         rpc_url: String,
         /// The path to the serialized vka file
-        #[arg(long, value_hint = clap::ValueHint::FilePath)]
+        #[cfg_attr(all(feature = "reusable-verifier", not(target_arch = "wasm32")), arg(long, value_hint = clap::ValueHint::FilePath))]
         vka_path: Option<PathBuf>,
         /// The path to the serialized encoded calldata file generated via the encode_calldata command
         #[arg(long, value_hint = clap::ValueHint::FilePath)]
@@ -870,7 +870,7 @@ pub enum Commands {
     },
     /// Registers a VKA, returning the its digest used to identify it on-chain.
     #[command(name = "register-vka")]
-    #[cfg(all(feature = "eth", not(target_arch = "wasm32")))]
+    #[cfg(feature = "reusable-verifier")]
     RegisterVka {
         /// RPC URL for an Ethereum node, if None will use Anvil but WON'T persist state
         #[arg(short = 'U', long, value_hint = clap::ValueHint::Url)]

src/execute.rs

@@ -2,7 +2,9 @@ use crate::circuit::region::RegionSettings;
 use crate::circuit::CheckMode;
 use crate::commands::CalibrationTarget;
 #[cfg(all(feature = "eth", not(target_arch = "wasm32")))]
-use crate::eth::{deploy_contract_via_solidity, register_vka_via_rv};
+use crate::eth::deploy_contract_via_solidity;
+#[cfg(all(feature = "reusable-verifier", not(target_arch = "wasm32")))]
+use crate::eth::register_vka_via_rv;
 #[allow(unused_imports)]
 #[cfg(all(feature = "eth", not(target_arch = "wasm32")))]
 use crate::eth::{get_contract_artifacts, verify_proof_via_solidity};
@@ -220,7 +222,7 @@ pub async fn run(command: Commands) -> Result<String, EZKLError> {
             vka_path,
         )
         .map(|e| serde_json::to_string(&e).unwrap()),
-        #[cfg(all(feature = "eth", not(target_arch = "wasm32")))]
+        #[cfg(feature = "reusable-verifier")]
         Commands::CreateEvmVka {
             vk_path,
             srs_path,
@@ -427,7 +429,7 @@ pub async fn run(command: Commands) -> Result<String, EZKLError> {
             )
             .await
         }
-        #[cfg(all(feature = "eth", not(target_arch = "wasm32")))]
+        #[cfg(feature = "reusable-verifier")]
         Commands::RegisterVka {
             addr_verifier,
             vka_path,
@@ -1460,7 +1462,7 @@ pub(crate) async fn create_evm_verifier(
     Ok(String::new())
 }
 
-#[cfg(all(feature = "eth", not(target_arch = "wasm32")))]
+#[cfg(feature = "reusable-verifier")]
 pub(crate) async fn create_evm_vka(
     vk_path: PathBuf,
     srs_path: Option<PathBuf>,
@@ -1550,7 +1552,7 @@ pub(crate) async fn deploy_evm(
     Ok(String::new())
 }
 
-#[cfg(all(feature = "eth", not(target_arch = "wasm32")))]
+#[cfg(all(feature = "reusable-verifier", not(target_arch = "wasm32")))]
 pub(crate) async fn register_vka(
     rpc_url: String,
     rv_addr: H160Flag,

tests/integration_tests.rs

@@ -2078,7 +2078,7 @@ mod native_tests {
                     &vk_arg,
                     &settings_arg,
                     &sol_arg,
-                    "--reusable",
+                    "true",
                 ];
 
                 let status = Command::new(format!("{}/{}", *CARGO_TARGET_DIR, TEST_BINARY))
@@ -2093,7 +2093,7 @@ mod native_tests {
                     rpc_arg.as_str(),
                     addr_path_arg.as_str(),
                     sol_arg.as_str(),
-                    "-C=verifier/reusable",
+                    "verifier/reusable",
                 ];
 
                 let status = Command::new(format!("{}/{}", *CARGO_TARGET_DIR, TEST_BINARY))