feat: Forward ports

Cargo.toml

@@ -31,26 +31,26 @@ debug = true
 debug-assertions = true
 
 [workspace.dependencies]
-p3-air = { git = "https://github.com/argumentcomputer/Plonky3.git", branch = "sp1-new" }
-p3-field = { git = "https://github.com/argumentcomputer/Plonky3.git", branch = "sp1-new" }
-p3-commit = { git = "https://github.com/argumentcomputer/Plonky3.git", branch = "sp1-new" }
-p3-matrix = { git = "https://github.com/argumentcomputer/Plonky3.git", branch = "sp1-new" }
-p3-baby-bear = { git = "https://github.com/argumentcomputer/Plonky3.git", branch = "sp1-new", features = [
+p3-air = { git = "https://github.com/argumentcomputer/Plonky3.git", branch = "sp1" }
+p3-field = { git = "https://github.com/argumentcomputer/Plonky3.git", branch = "sp1" }
+p3-commit = { git = "https://github.com/argumentcomputer/Plonky3.git", branch = "sp1" }
+p3-matrix = { git = "https://github.com/argumentcomputer/Plonky3.git", branch = "sp1" }
+p3-baby-bear = { git = "https://github.com/argumentcomputer/Plonky3.git", branch = "sp1", features = [
   "nightly-features",
 ]}
-p3-util = { git = "https://github.com/argumentcomputer/Plonky3.git", branch = "sp1-new" }
-p3-challenger = { git = "https://github.com/argumentcomputer/Plonky3.git", branch = "sp1-new" }
-p3-dft = { git = "https://github.com/argumentcomputer/Plonky3.git", branch = "sp1-new" }
-p3-fri = { git = "https://github.com/argumentcomputer/Plonky3.git", branch = "sp1-new" }
-p3-keccak = { git = "https://github.com/argumentcomputer/Plonky3.git", branch = "sp1-new" }
-p3-keccak-air = { git = "https://github.com/argumentcomputer/Plonky3.git", branch = "sp1-new" }
-p3-blake3 = { git = "https://github.com/argumentcomputer/Plonky3.git", branch = "sp1-new" }
-p3-merkle-tree = { git = "https://github.com/argumentcomputer/Plonky3.git", branch = "sp1-new" }
-p3-poseidon2 = { git = "https://github.com/argumentcomputer/Plonky3.git", branch = "sp1-new" }
-p3-symmetric = { git = "https://github.com/argumentcomputer/Plonky3.git", branch = "sp1-new" }
-p3-uni-stark = { git = "https://github.com/argumentcomputer/Plonky3.git", branch = "sp1-new" }
-p3-maybe-rayon = { git = "https://github.com/argumentcomputer/Plonky3.git", branch = "sp1-new" }
-p3-bn254-fr = { git = "https://github.com/argumentcomputer/Plonky3.git", branch = "sp1-new" }
+p3-util = { git = "https://github.com/argumentcomputer/Plonky3.git", branch = "sp1" }
+p3-challenger = { git = "https://github.com/argumentcomputer/Plonky3.git", branch = "sp1" }
+p3-dft = { git = "https://github.com/argumentcomputer/Plonky3.git", branch = "sp1" }
+p3-fri = { git = "https://github.com/argumentcomputer/Plonky3.git", branch = "sp1" }
+p3-keccak = { git = "https://github.com/argumentcomputer/Plonky3.git", branch = "sp1" }
+p3-keccak-air = { git = "https://github.com/argumentcomputer/Plonky3.git", branch = "sp1" }
+p3-blake3 = { git = "https://github.com/argumentcomputer/Plonky3.git", branch = "sp1" }
+p3-merkle-tree = { git = "https://github.com/argumentcomputer/Plonky3.git", branch = "sp1" }
+p3-poseidon2 = { git = "https://github.com/argumentcomputer/Plonky3.git", branch = "sp1" }
+p3-symmetric = { git = "https://github.com/argumentcomputer/Plonky3.git", branch = "sp1" }
+p3-uni-stark = { git = "https://github.com/argumentcomputer/Plonky3.git", branch = "sp1" }
+p3-maybe-rayon = { git = "https://github.com/argumentcomputer/Plonky3.git", branch = "sp1" }
+p3-bn254-fr = { git = "https://github.com/argumentcomputer/Plonky3.git", branch = "sp1" }
 alloy = { git = "https://github.com/alloy-rs/alloy", rev = "bfd0fda" }
 anstyle = "1.0.8"
 anyhow = "1.0.86"

cli/src/commands/install_toolchain.rs

@@ -24,6 +24,19 @@ pub struct InstallToolchainCmd {}
 
 impl InstallToolchainCmd {
     pub fn run(&self) -> Result<()> {
+        // Check if rust is installed.
+        if Command::new("rustup")
+            .arg("--version")
+            .stdout(std::process::Stdio::null())
+            .stderr(std::process::Stdio::null())
+            .status()
+            .is_err()
+        {
+            return Err(anyhow::anyhow!(
+                "Rust is not installed. Please install Rust from https://rustup.rs/ and try again."
+            ));
+        }
+
         // Setup client.
         let client = Client::builder().user_agent("Mozilla/5.0").build()?;
 

cli/src/commands/new.rs

@@ -6,7 +6,12 @@ use yansi::Paint;
 #[derive(Parser)]
 #[command(name = "new", about = "Setup a new project that runs inside the SP1.")]
 pub struct NewCmd {
+    /// The name of the project.
     name: String,
+
+    /// Whether to create the project with template EVM contracts.
+    #[arg(long, action)]
+    evm: bool,
 }
 
 const TEMPLATE_REPOSITORY_URL: &str = "https://github.com/succinctlabs/sp1-project-template";
@@ -37,12 +42,20 @@ impl NewCmd {
         // Remove the .git directory.
         fs::remove_dir_all(root.join(".git"))?;
 
-        // Check if the user has `foundry` installed.
-        if Command::new("foundry").arg("--version").output().is_err() {
-            println!(
-                "    \x1b[1m{}\x1b[0m Make sure to install Foundry to use contracts: https://book.getfoundry.sh/getting-started/installation.",
+        if self.evm {
+            // Check if the user has `foundry` installed.
+            if Command::new("foundry").arg("--version").output().is_err() {
+                println!(
+                "    \x1b[1m{}\x1b[0m Make sure to install Foundry to use contracts: https://book.getfoundry.sh/getting-started/installation",
                 Paint::yellow("Warning:"),
             );
+            }
+        } else {
+            // Remove the `contracts` directory.
+            fs::remove_dir_all(root.join("contracts"))?;
+
+            // Remove the `.gitmodules` file.
+            fs::remove_file(root.join(".gitmodules"))?;
         }
 
         println!(

cli/src/commands/prove.rs

@@ -115,7 +115,7 @@ impl ProveCmd {
         let start_time = Instant::now();
         let client = ProverClient::new();
         let (pk, _) = client.setup(&elf);
-        let proof = client.prove(&pk, stdin).unwrap();
+        let proof = client.prove(&pk, stdin).run().unwrap();
 
         if let Some(ref path) = self.output {
             proof

cli/src/lib.rs

@@ -70,7 +70,7 @@ pub async fn get_toolchain_download_url(client: &Client, target: String) -> Stri
         .json::<serde_json::Value>()
         .await
         .unwrap();
-    let tag = json["tag_name"].as_str().unwrap();
+    let tag = json["tag_name"].as_str().expect("Failed to download Succinct toolchain. Likely caused by GitHub rate limiting. Please try again.");
 
     let url = format!(
         "https://github.com/succinctlabs/rust/releases/download/{}/rust-toolchain-{}.tar.gz",

core/src/air/builder.rs

@@ -51,6 +51,11 @@ pub trait BaseAirBuilder: AirBuilder + MessageBuilder<AirInteraction<Self::Expr>
         }
     }
 
+    /// Asserts that an iterator of expressions are all zero.
+    fn assert_all_zero<I: Into<Self::Expr>>(&mut self, iter: impl IntoIterator<Item = I>) {
+        iter.into_iter().for_each(|expr| self.assert_zero(expr));
+    }
+
     /// Will return `a` if `condition` is 1, else `b`.  This assumes that `condition` is already
     /// checked to be a boolean.
     #[inline]

core/src/alu/divrem/mod.rs

@@ -394,7 +394,7 @@ impl<F: PrimeField> MachineAir<F> for DivRemChip {
                         }
                         let mut alu_events = HashMap::new();
                         alu_events.insert(Opcode::ADD, add_events);
-                        output.add_alu_events(&mut alu_events);
+                        output.add_alu_events(alu_events);
                     }
 
                     let mut lower_word = 0;