From b1d0bc474c9a5a8c7b93cbc7661defce71c7da20 Mon Sep 17 00:00:00 2001 From: crStiv Date: Tue, 24 Dec 2024 19:35:36 +0100 Subject: [PATCH 1/7] Update build_compress_vks.rs --- crates/prover/scripts/build_compress_vks.rs | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/crates/prover/scripts/build_compress_vks.rs b/crates/prover/scripts/build_compress_vks.rs index 0f8c5a0d08..e17faaff02 100644 --- a/crates/prover/scripts/build_compress_vks.rs +++ b/crates/prover/scripts/build_compress_vks.rs @@ -3,25 +3,25 @@ use std::path::PathBuf; use clap::Parser; use sp1_core_machine::utils::setup_logger; use sp1_prover::{ - components::DefaultProverComponents, shapes::build_vk_map_to_file, REDUCE_BATCH_SIZE, + components::CpuProverComponents, shapes::build_vk_map_to_file, REDUCE_BATCH_SIZE, }; #[derive(Parser, Debug)] -#[clap(author, version, about, long_about = None)] +#[command(author, version, about, long_about = None)] struct Args { - #[clap(short, long)] + #[arg(short, long)] build_dir: PathBuf, - #[clap(short, long, default_value_t = false)] + #[arg(short, long, default_value_t = false)] dummy: bool, - #[clap(short, long, default_value_t = REDUCE_BATCH_SIZE)] + #[arg(short, long, default_value_t = REDUCE_BATCH_SIZE)] reduce_batch_size: usize, - #[clap(short, long, default_value_t = 1)] + #[arg(short, long, default_value_t = 1)] num_compiler_workers: usize, - #[clap(short, long, default_value_t = 1)] + #[arg(short, long, default_value_t = 1)] num_setup_workers: usize, - #[clap(short, long)] + #[arg(short, long)] start: Option, - #[clap(short, long)] + #[arg(short, long)] end: Option, } @@ -37,7 +37,7 @@ fn main() { let range_start = args.start; let range_end = args.end; - build_vk_map_to_file::( + build_vk_map_to_file::( build_dir, reduce_batch_size, dummy, From d2794d953341b3551d3cca90661c478cb1694ba8 Mon Sep 17 00:00:00 2001 From: crStiv Date: Tue, 24 Dec 2024 19:36:01 +0100 Subject: [PATCH 2/7] Update build_groth16_bn254.rs --- crates/prover/scripts/build_groth16_bn254.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/prover/scripts/build_groth16_bn254.rs b/crates/prover/scripts/build_groth16_bn254.rs index e7b5e1e61f..90dbedd4c2 100644 --- a/crates/prover/scripts/build_groth16_bn254.rs +++ b/crates/prover/scripts/build_groth16_bn254.rs @@ -5,9 +5,9 @@ use sp1_core_machine::utils::setup_logger; use sp1_prover::build::build_groth16_bn254_artifacts_with_dummy; #[derive(Parser, Debug)] -#[clap(author, version, about, long_about = None)] +#[command(author, version, about, long_about = None)] struct Args { - #[clap(short, long)] + #[arg(short, long)] build_dir: PathBuf, } From 36660d4b5340e7eb361ba8269909524095fd041f Mon Sep 17 00:00:00 2001 From: crStiv Date: Tue, 24 Dec 2024 19:37:40 +0100 Subject: [PATCH 3/7] Update build_plonk_bn254.rs --- crates/prover/scripts/build_plonk_bn254.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/prover/scripts/build_plonk_bn254.rs b/crates/prover/scripts/build_plonk_bn254.rs index 17d1f9ba19..915539fb47 100644 --- a/crates/prover/scripts/build_plonk_bn254.rs +++ b/crates/prover/scripts/build_plonk_bn254.rs @@ -5,9 +5,9 @@ use sp1_core_machine::utils::setup_logger; use sp1_prover::build::build_plonk_bn254_artifacts_with_dummy; #[derive(Parser, Debug)] -#[clap(author, version, about, long_about = None)] +#[command(author, version, about, long_about = None)] struct Args { - #[clap(short, long)] + #[arg(short, long)] build_dir: PathBuf, } From 01154a3766f643817a8535d4f3508ba6a45b2a6d Mon Sep 17 00:00:00 2001 From: crStiv Date: Tue, 24 Dec 2024 19:38:02 +0100 Subject: [PATCH 4/7] Update post_trusted_setup.rs --- crates/prover/scripts/post_trusted_setup.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/prover/scripts/post_trusted_setup.rs b/crates/prover/scripts/post_trusted_setup.rs index 303d8fb762..1f21dcde46 100644 --- a/crates/prover/scripts/post_trusted_setup.rs +++ b/crates/prover/scripts/post_trusted_setup.rs @@ -5,9 +5,9 @@ use sp1_core_machine::utils::setup_logger; use sp1_recursion_gnark_ffi::Groth16Bn254Prover; #[derive(Parser, Debug)] -#[clap(author, version, about, long_about = None)] +#[command(author, version, about, long_about = None)] struct Args { - #[clap(short, long)] + #[arg(short, long)] build_dir: PathBuf, } From a54748d8a5ef1b613a626cd7819ada7ae3379019 Mon Sep 17 00:00:00 2001 From: crStiv Date: Tue, 24 Dec 2024 19:38:16 +0100 Subject: [PATCH 5/7] Update cargo-prove.rs --- crates/cli/src/bin/cargo-prove.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/cli/src/bin/cargo-prove.rs b/crates/cli/src/bin/cargo-prove.rs index bb84ea02ca..b84c6162d0 100644 --- a/crates/cli/src/bin/cargo-prove.rs +++ b/crates/cli/src/bin/cargo-prove.rs @@ -17,7 +17,7 @@ pub enum Cargo { #[derive(clap::Args)] #[command(author, about, long_about = None, args_conflicts_with_subcommands = true, version = SP1_VERSION_MESSAGE)] pub struct ProveCli { - #[clap(subcommand)] + #[command(subcommand)] pub command: ProveCliCommands, } From cb203f629e36869e64f27c512898539fc0ee230a Mon Sep 17 00:00:00 2001 From: crStiv Date: Tue, 24 Dec 2024 19:38:52 +0100 Subject: [PATCH 6/7] Update build.rs --- crates/cli/src/commands/build.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/cli/src/commands/build.rs b/crates/cli/src/commands/build.rs index e5f539e429..d8f8d749cd 100644 --- a/crates/cli/src/commands/build.rs +++ b/crates/cli/src/commands/build.rs @@ -5,7 +5,7 @@ use sp1_build::{execute_build_program, BuildArgs}; #[derive(Parser)] #[command(name = "build", about = "Compile an SP1 program")] pub struct BuildCmd { - #[clap(flatten)] + #[command(flatten)] build_args: BuildArgs, } From c1c76f87c89fccf4eb36c28e0c0a5da285c2b259 Mon Sep 17 00:00:00 2001 From: crStiv Date: Tue, 24 Dec 2024 19:39:24 +0100 Subject: [PATCH 7/7] Update vkey.rs --- crates/cli/src/commands/vkey.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/cli/src/commands/vkey.rs b/crates/cli/src/commands/vkey.rs index 734b470970..c09a60f9c3 100644 --- a/crates/cli/src/commands/vkey.rs +++ b/crates/cli/src/commands/vkey.rs @@ -9,7 +9,7 @@ use sp1_sdk::{HashableKey, ProverClient}; #[command(name = "vkey", about = "View the verification key hash for a program.")] pub struct VkeyCmd { /// Path to the ELF. - #[clap(flatten)] + #[command(flatten)] elf: Elf, } @@ -48,7 +48,7 @@ impl VkeyCmd { file.read_to_end(&mut elf)?; // Get the verification key - let prover = ProverClient::new(); + let prover = ProverClient::from_env(); let (_, vk) = prover.setup(&elf); // Print the verification key hash