chore: release 4.1.6 (#2169)

Author: jtguibas

Cargo.lock

@@ -1,5 +1,5 @@
 [workspace.package]
-version = "4.1.4"
+version = "4.1.6"
 edition = "2021"
 license = "MIT OR Apache-2.0"
 rust-version = "1.79"
@@ -50,51 +50,51 @@ debug-assertions = true
 
 [workspace.dependencies]
 # sp1
-sp1-build = { path = "crates/build", version = "4.1.4" }
-sp1-cli = { path = "crates/cli", version = "4.1.4", default-features = false }
-sp1-core-machine = { path = "crates/core/machine", version = "4.1.4" }
-sp1-core-executor = { path = "crates/core/executor", version = "4.1.4" }
-sp1-curves = { path = "crates/curves", version = "4.1.4" }
-sp1-derive = { path = "crates/derive", version = "4.1.4" }
-sp1-eval = { path = "crates/eval", version = "4.1.4" }
-sp1-helper = { path = "crates/helper", version = "4.1.4", default-features = false }
-sp1-primitives = { path = "crates/primitives", version = "4.1.4" }
-sp1-prover = { path = "crates/prover", version = "4.1.4" }
-sp1-recursion-compiler = { path = "crates/recursion/compiler", version = "4.1.4" }
-sp1-recursion-core = { path = "crates/recursion/core", version = "4.1.4" }
-sp1-recursion-derive = { path = "crates/recursion/derive", version = "4.1.4", default-features = false }
-sp1-recursion-gnark-ffi = { path = "crates/recursion/gnark-ffi", version = "4.1.4", default-features = false }
-sp1-recursion-circuit = { path = "crates/recursion/circuit", version = "4.1.4", default-features = false }
-sp1-sdk = { path = "crates/sdk", version = "4.1.4" }
-sp1-cuda = { path = "crates/cuda", version = "4.1.4" }
-sp1-stark = { path = "crates/stark", version = "4.1.4" }
-sp1-lib = { path = "crates/zkvm/lib", version = "4.1.4", default-features = false }
-sp1-zkvm = { path = "crates/zkvm/entrypoint", version = "4.1.4", default-features = false }
+sp1-build = { path = "crates/build", version = "4.1.6" }
+sp1-cli = { path = "crates/cli", version = "4.1.6", default-features = false }
+sp1-core-machine = { path = "crates/core/machine", version = "4.1.6" }
+sp1-core-executor = { path = "crates/core/executor", version = "4.1.6" }
+sp1-curves = { path = "crates/curves", version = "4.1.6" }
+sp1-derive = { path = "crates/derive", version = "4.1.6" }
+sp1-eval = { path = "crates/eval", version = "4.1.6" }
+sp1-helper = { path = "crates/helper", version = "4.1.6", default-features = false }
+sp1-primitives = { path = "crates/primitives", version = "4.1.6" }
+sp1-prover = { path = "crates/prover", version = "4.1.6" }
+sp1-recursion-compiler = { path = "crates/recursion/compiler", version = "4.1.6" }
+sp1-recursion-core = { path = "crates/recursion/core", version = "4.1.6" }
+sp1-recursion-derive = { path = "crates/recursion/derive", version = "4.1.6", default-features = false }
+sp1-recursion-gnark-ffi = { path = "crates/recursion/gnark-ffi", version = "4.1.6", default-features = false }
+sp1-recursion-circuit = { path = "crates/recursion/circuit", version = "4.1.6", default-features = false }
+sp1-sdk = { path = "crates/sdk", version = "4.1.6" }
+sp1-cuda = { path = "crates/cuda", version = "4.1.6" }
+sp1-stark = { path = "crates/stark", version = "4.1.6" }
+sp1-lib = { path = "crates/zkvm/lib", version = "4.1.6", default-features = false }
+sp1-zkvm = { path = "crates/zkvm/entrypoint", version = "4.1.6", default-features = false }
 
 # For testing.
 test-artifacts = { path = "crates/test-artifacts" }
 
 # p3
-p3-air = "=0.2.1-succinct"
-p3-field = "=0.2.1-succinct"
-p3-commit = "=0.2.1-succinct"
-p3-matrix = "=0.2.1-succinct"
-p3-baby-bear = { version = "=0.2.1-succinct", features = ["nightly-features"] }
-p3-util = "=0.2.1-succinct"
-p3-challenger = "=0.2.1-succinct"
-p3-dft = "=0.2.1-succinct"
-p3-fri = "=0.2.1-succinct"
-p3-goldilocks = "=0.2.1-succinct"
-p3-keccak = "=0.2.1-succinct"
-p3-keccak-air = "=0.2.1-succinct"
-p3-blake3 = "=0.2.1-succinct"
-p3-mds = "=0.2.1-succinct"
-p3-merkle-tree = "=0.2.1-succinct"
-p3-poseidon2 = "=0.2.1-succinct"
-p3-symmetric = "=0.2.1-succinct"
-p3-uni-stark = "=0.2.1-succinct"
-p3-maybe-rayon = "=0.2.1-succinct"
-p3-bn254-fr = "=0.2.1-succinct"
+p3-air = "=0.2.2-succinct"
+p3-field = "=0.2.2-succinct"
+p3-commit = "=0.2.2-succinct"
+p3-matrix = "=0.2.2-succinct"
+p3-baby-bear = { version = "=0.2.2-succinct", features = ["nightly-features"] }
+p3-util = "=0.2.2-succinct"
+p3-challenger = "=0.2.2-succinct"
+p3-dft = "=0.2.2-succinct"
+p3-fri = "=0.2.2-succinct"
+p3-goldilocks = "=0.2.2-succinct"
+p3-keccak = "=0.2.2-succinct"
+p3-keccak-air = "=0.2.2-succinct"
+p3-blake3 = "=0.2.2-succinct"
+p3-mds = "=0.2.2-succinct"
+p3-merkle-tree = "=0.2.2-succinct"
+p3-poseidon2 = "=0.2.2-succinct"
+p3-symmetric = "=0.2.2-succinct"
+p3-uni-stark = "=0.2.2-succinct"
+p3-maybe-rayon = "=0.2.2-succinct"
+p3-bn254-fr = "=0.2.2-succinct"
 
 # misc
 hashbrown = "0.14.5"

Cargo.toml

@@ -18,60 +18,60 @@ const HELPER_TARGET_SUBDIR: &str = "elf-compilation";
 /// features.
 #[derive(Clone, Parser, Debug)]
 pub struct BuildArgs {
-    #[clap(
+    #[arg(
         long,
         action,
         help = "Run compilation using a Docker container for reproducible builds."
     )]
     pub docker: bool,
-    #[clap(
+    #[arg(
         long,
         help = "The ghcr.io/succinctlabs/sp1 image tag to use when building with Docker.",
         default_value = DEFAULT_DOCKER_TAG
     )]
     pub tag: String,
-    #[clap(
+    #[arg(
         long,
         action,
         value_delimiter = ',',
         help = "Space or comma separated list of features to activate"
     )]
     pub features: Vec<String>,
-    #[clap(
+    #[arg(
         long,
         action,
         value_delimiter = ',',
         help = "Space or comma separated list of extra flags to invokes `rustc` with"
     )]
     pub rustflags: Vec<String>,
-    #[clap(long, action, help = "Do not activate the `default` feature")]
+    #[arg(long, action, help = "Do not activate the `default` feature")]
     pub no_default_features: bool,
-    #[clap(long, action, help = "Ignore `rust-version` specification in packages")]
+    #[arg(long, action, help = "Ignore `rust-version` specification in packages")]
     pub ignore_rust_version: bool,
-    #[clap(long, action, help = "Assert that `Cargo.lock` will remain unchanged")]
+    #[arg(long, action, help = "Assert that `Cargo.lock` will remain unchanged")]
     pub locked: bool,
-    #[clap(
+    #[arg(
         short,
         long,
         action,
         help = "Build only the specified packages",
         num_args = 1..
     )]
     pub packages: Vec<String>,
-    #[clap(
+    #[arg(
         alias = "bin",
         long,
         action,
         help = "Build only the specified binaries",
         num_args = 1..
     )]
     pub binaries: Vec<String>,
-    #[clap(long, action, requires = "output_directory", help = "ELF binary name")]
+    #[arg(long, action, requires = "output_directory", help = "ELF binary name")]
     pub elf_name: Option<String>,
-    #[clap(alias = "out-dir", long, action, help = "Copy the compiled ELF to this directory")]
+    #[arg(alias = "out-dir", long, action, help = "Copy the compiled ELF to this directory")]
     pub output_directory: Option<String>,
 
-    #[clap(
+    #[arg(
         alias = "workspace-dir",
         long,
         action,

crates/build/src/lib.rs

@@ -6,6 +6,7 @@ use elf::{
     file::Class,
     ElfBytes,
 };
+use eyre::OptionExt;
 use hashbrown::HashMap;
 use sp1_primitives::consts::{MAXIMUM_MEMORY_SIZE, WORD_SIZE};
 
@@ -82,6 +83,11 @@ impl Elf {
         let mut instructions: Vec<u32> = Vec::new();
         let mut base_address = u32::MAX;
 
+        // Data about the last segment.
+        let mut prev_segment_end_addr = None;
+
+        // Check that the segments are sorted and disjoint.
+
         // Only read segments that are executable instructions that are also PT_LOAD.
         for segment in segments.iter().filter(|x| x.p_type == PT_LOAD) {
             // Get the file size of the segment as an u32.
@@ -102,10 +108,30 @@ impl Elf {
                 eyre::bail!("vaddr {vaddr:08x} is unaligned");
             }
 
-            // If the virtual address is less than the first memory address, then update the first
-            // memory address.
-            if (segment.p_flags & PF_X) != 0 && base_address > vaddr {
-                base_address = vaddr;
+            // Check that the ELF structure is supported.
+            if let Some(last_addr) = prev_segment_end_addr {
+                eyre::ensure!(last_addr <= vaddr, "unsupported elf structure");
+            }
+            prev_segment_end_addr =
+                Some(vaddr.checked_add(mem_size).ok_or_eyre("last addr overflow")?);
+
+            if (segment.p_flags & PF_X) != 0 {
+                if base_address == u32::MAX {
+                    base_address = vaddr;
+                    eyre::ensure!(
+                        base_address > 0x20,
+                        "base address {base_address} should be greater than 0x20"
+                    );
+                } else {
+                    let instr_len: u32 = WORD_SIZE
+                        .checked_mul(instructions.len())
+                        .ok_or_eyre("instructions length overflow")?
+                        .try_into()?;
+                    let last_instruction_addr = base_address
+                        .checked_add(instr_len)
+                        .ok_or_eyre("instruction addr overflow")?;
+                    eyre::ensure!(vaddr == last_instruction_addr, "unsupported elf structure");
+                }
             }
 
             // Get the offset to the segment.

crates/core/executor/src/disassembler/elf.rs

@@ -7,15 +7,15 @@ use sp1_core_machine::{io::SP1Stdin, riscv::RiscvAir, utils::setup_logger};
 use sp1_stark::{shape::Shape, SP1CoreOpts};
 
 #[derive(Parser, Debug)]
-#[clap(author, version, about, long_about = None)]
+#[command(author, version, about, long_about = None)]
 struct Args {
-    #[clap(short, long, value_delimiter = ' ')]
+    #[arg(short, long, value_delimiter = ' ')]
     list: Vec<String>,
-    #[clap(short, long, value_delimiter = ' ')]
+    #[arg(short, long, value_delimiter = ' ')]
     shard_sizes: Vec<usize>,
-    #[clap(short, long)]
+    #[arg(short, long)]
     initial: Option<PathBuf>,
-    #[clap(short, long, default_value = "maximal_shapes.json")]
+    #[arg(short, long, default_value = "maximal_shapes.json")]
     output: Option<PathBuf>,
 }
 

crates/prover/scripts/find_maximal_shapes.rs

@@ -8,13 +8,13 @@ use sp1_core_machine::utils::setup_logger;
 use sp1_stark::shape::Shape;
 
 #[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)]
     maximal_shapes_json: Option<PathBuf>,
-    #[clap(short, long)]
+    #[arg(short, long)]
     small_shapes_json: Option<PathBuf>,
-    #[clap(short, long)]
+    #[arg(short, long)]
     lde_threshold_bytes: usize,
 }
 

crates/prover/scripts/find_oom_shapes.rs

@@ -14,19 +14,19 @@ use sp1_recursion_core::shape::RecursionShapeConfig;
 use sp1_stark::{shape::OrderedShape, MachineProver};
 
 #[derive(Parser, Debug)]
-#[clap(author, version, about, long_about = None)]
+#[command(author, version, about, long_about = None)]
 struct Args {
-    #[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)]
     recursion_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<usize>,
-    #[clap(short, long)]
+    #[arg(short, long)]
     end: Option<usize>,
 }
 

crates/prover/scripts/find_recursion_shapes.rs

@@ -6,13 +6,13 @@ use sp1_core_machine::utils::setup_logger;
 use sp1_stark::shape::Shape;
 
 #[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)]
     maximal_shapes_json: PathBuf,
-    #[clap(short, long, value_delimiter = ' ')]
+    #[arg(short, long, value_delimiter = ' ')]
     log2_memory_heights: Vec<usize>,
-    #[clap(short, long)]
+    #[arg(short, long)]
     output: PathBuf,
 }
 

crates/prover/scripts/find_small_shapes.rs

@@ -10,11 +10,11 @@ use sp1_core_machine::{
 use sp1_stark::SP1CoreOpts;
 
 #[derive(Parser, Debug)]
-#[clap(author, version, about, long_about = None)]
+#[command(author, version, about, long_about = None)]
 struct Args {
-    #[clap(short, long, value_delimiter = ' ')]
+    #[arg(short, long, value_delimiter = ' ')]
     list: Vec<String>,
-    #[clap(short, long, value_delimiter = ' ')]
+    #[arg(short, long, value_delimiter = ' ')]
     shard_size: usize,
 }
 

crates/prover/scripts/test_shape_fixing.rs

@@ -339,13 +339,25 @@ impl NetworkClient {
     }
 
     pub(crate) async fn prover_network_client(&self) -> Result<ProverNetworkClient<Channel>> {
-        let channel = grpc::configure_endpoint(&self.rpc_url)?.connect().await?;
-        Ok(ProverNetworkClient::new(channel))
+        self.with_retry(
+            || async {
+                let channel = grpc::configure_endpoint(&self.rpc_url)?.connect().await?;
+                Ok(ProverNetworkClient::new(channel))
+            },
+            "creating network client",
+        )
+        .await
     }
 
     pub(crate) async fn artifact_store_client(&self) -> Result<ArtifactStoreClient<Channel>> {
-        let channel = grpc::configure_endpoint(&self.rpc_url)?.connect().await?;
-        Ok(ArtifactStoreClient::new(channel))
+        self.with_retry(
+            || async {
+                let channel = grpc::configure_endpoint(&self.rpc_url)?.connect().await?;
+                Ok(ArtifactStoreClient::new(channel))
+            },
+            "creating artifact client",
+        )
+        .await
     }
 
     pub(crate) async fn create_artifact_with_content<T: Serialize + Send + Sync>(