clean

.github/workflows/pr.yml

@@ -15,7 +15,7 @@ on:
       - "sdk/**"
       - ".github/workflows/**"
   merge_group:
-      
+
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
@@ -132,7 +132,7 @@ jobs:
       - name: Install SP1 CLI
         run: |
           cd cli
-          cargo install --locked --path .
+          cargo install --force --locked --path .
           cd ~
 
       - name: Run cargo check
@@ -161,17 +161,18 @@ jobs:
       - name: Install SP1 CLI
         run: |
           cd cli
-          cargo install --locked --path .
+          cargo install --force --locked --path .
           cd ~
 
       - name: Run cargo prove new
         run: |
           cargo prove new fibonacci
-      
+
       - name: Build program and run script
         run: |
           cd fibonacci
           cd program
           cargo prove build
           cd ../script
-          SP1_DEV=1 RUST_LOG=info cargo run --release 
+          cargo add sp1-sdk --path $GITHUB_WORKSPACE/sdk
+          SP1_DEV=1 RUST_LOG=info cargo run --release

cli/src/assets/program/Cargo.toml

@@ -5,4 +5,4 @@ name = "unnamed-program"
 edition = "2021"
 
 [dependencies]
-sp1-zkvm = { git = "https://github.com/succinctlabs/sp1.git", rev = "v1.0.0-testnet" }
+sp1-zkvm = { git = "https://github.com/succinctlabs/sp1.git", branch = "main" }

cli/src/assets/script/Cargo.toml

@@ -5,7 +5,7 @@ name = "unnamed-script"
 edition = "2021"
 
 [dependencies]
-sp1-sdk = { git = "https://github.com/succinctlabs/sp1.git", rev = "v1.0.0-testnet" }
+sp1-sdk = { git = "https://github.com/succinctlabs/sp1.git", branch = "main" }
 
 [build-dependencies]
-sp1-helper = { git = "https://github.com/succinctlabs/sp1.git", rev = "v1.0.0-testnet"  }
+sp1-helper = { git = "https://github.com/succinctlabs/sp1.git", branch = "main"  }

cli/src/assets/script/main.rs

@@ -11,7 +11,7 @@ fn main() {
     stdin.write(&n);
     let client = ProverClient::new();
     let (pk, vk) = client.setup(ELF);
-    let mut proof = client.prove(&pk, stdin).expect("proving failed");
+    let mut proof = client.prove_compressed(&pk, stdin).expect("proving failed");
 
     // Read output.
     let a = proof.public_values.read::<u128>();
@@ -20,7 +20,9 @@ fn main() {
     println!("b: {}", b);
 
     // Verify proof.
-    client.verify(&proof, &vk).expect("verification failed");
+    client
+        .verify_compressed(&proof, &vk)
+        .expect("verification failed");
 
     // Save proof.
     proof

core/Cargo.toml

@@ -58,6 +58,7 @@ strum = "0.26"
 web-time = "1.1.0"
 rayon-scan = "0.1.1"
 serial_test = "3.1.1"
+thiserror = "1.0.60"
 
 [dev-dependencies]
 tiny-keccak = { version = "2.0.2", features = ["keccak"] }

core/benches/main.rs

@@ -1,7 +1,7 @@
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
 use sp1_core::io::SP1Stdin;
 use sp1_core::runtime::{Program, Runtime};
-use sp1_core::utils::{run_and_prove, BabyBearPoseidon2};
+use sp1_core::utils::{prove, BabyBearPoseidon2};
 
 #[allow(unreachable_code)]
 pub fn criterion_benchmark(c: &mut Criterion) {
@@ -13,14 +13,14 @@ pub fn criterion_benchmark(c: &mut Criterion) {
         let program = Program::from_elf(&elf_path);
         let cycles = {
             let mut runtime = Runtime::new(program.clone());
-            runtime.run();
+            runtime.run().unwrap();
             runtime.state.global_clk
         };
         group.bench_function(
             format!("main:{}:{}", p.split('/').last().unwrap(), cycles),
             |b| {
                 b.iter(|| {
-                    run_and_prove(
+                    prove(
                         black_box(program.clone()),
                         &SP1Stdin::new(),
                         BabyBearPoseidon2::new(),

core/src/cpu/trace.rs

@@ -662,7 +662,7 @@ mod tests {
     fn generate_trace_simple_program() {
         let program = simple_program();
         let mut runtime = Runtime::new(program);
-        runtime.run();
+        runtime.run().unwrap();
         let chip = CpuChip::default();
         let trace: RowMajorMatrix<BabyBear> =
             chip.generate_trace(&runtime.record, &mut ExecutionRecord::default());

core/src/lookup/debug.rs

@@ -223,7 +223,7 @@ mod test {
         let machine = RiscvAir::machine(config);
         let (pk, _) = machine.setup(&program);
         let mut runtime = Runtime::new(program);
-        runtime.run();
+        runtime.run().unwrap();
         let shards = machine.shard(runtime.record, &ShardingConfig::default());
         let ok =
             debug_interactions_with_all_chips(&machine, &pk, &shards, InteractionKind::all_kinds());

core/src/memory/global.rs

@@ -185,7 +185,7 @@ mod tests {
     fn test_memory_generate_trace() {
         let program = simple_program();
         let mut runtime = Runtime::new(program);
-        runtime.run();
+        runtime.run().unwrap();
         let shard = runtime.record.clone();
 
         let chip: MemoryChip = MemoryChip::new(MemoryChipType::Initialize);
@@ -211,7 +211,7 @@ mod tests {
 
         let program = simple_program();
         let mut runtime = Runtime::new(program);
-        runtime.run();
+        runtime.run().unwrap();
 
         let chip = MemoryChip::new(MemoryChipType::Initialize);
 
@@ -229,7 +229,7 @@ mod tests {
         let program = sha_extend_program();
         let program_clone = program.clone();
         let mut runtime = Runtime::new(program);
-        runtime.run();
+        runtime.run().unwrap();
         let machine: crate::stark::StarkMachine<BabyBearPoseidon2, RiscvAir<BabyBear>> =
             RiscvAir::machine(BabyBearPoseidon2::new());
         let (pkey, _) = machine.setup(&program_clone);
@@ -252,7 +252,7 @@ mod tests {
         let program = sha_extend_program();
         let program_clone = program.clone();
         let mut runtime = Runtime::new(program);
-        runtime.run();
+        runtime.run().unwrap();
         let machine = RiscvAir::machine(BabyBearPoseidon2::new());
         let (pkey, _) = machine.setup(&program_clone);
         let shards = machine.shard(

core/src/runtime/io.rs

@@ -60,7 +60,7 @@ pub mod tests {
     use super::*;
     use crate::runtime::Program;
     use crate::utils::tests::IO_ELF;
-    use crate::utils::{self, prove_core, BabyBearBlake3};
+    use crate::utils::{self, prove_simple, BabyBearBlake3};
     use serde::Deserialize;
 
     #[derive(Serialize, Deserialize, Debug, PartialEq)]
@@ -93,7 +93,7 @@ pub mod tests {
         let points = points();
         runtime.write_stdin(&points.0);
         runtime.write_stdin(&points.1);
-        runtime.run();
+        runtime.run().unwrap();
         let added_point = runtime.read_public_values::<MyPointUnaligned>();
         assert_eq!(
             added_point,
@@ -113,8 +113,8 @@ pub mod tests {
         let points = points();
         runtime.write_stdin(&points.0);
         runtime.write_stdin(&points.1);
-        runtime.run();
+        runtime.run().unwrap();
         let config = BabyBearBlake3::new();
-        prove_core(config, runtime);
+        prove_simple(config, runtime).unwrap();
     }
 }