fixes and litns

Author: prajwolrg

.vscode/settings.json

@@ -1,16 +1,19 @@
 {
     "editor.formatOnSave": true,
     "rust-analyzer.checkOnSave": true,
-    "rust-analyzer.check.overrideCommand": [
-        "cargo",
-        "clippy",
-        "--workspace",
+    "rust-analyzer.check.command": "clippy",
+    "rust-analyzer.check.extraArgs": [
         "--all-features",
-        "--benches",
         "--tests",
+        "--benches",
         "--examples",
-        "--message-format=json"
+        "--no-deps"
     ],
+    "rust-analyzer.server.extraEnv": {
+        "RISC0_SKIP_BUILD": "1",
+        "RISC0_SKIP_BUILD_KERNELS": "1",
+        "CARGO_TARGET_DIR": "target/analyzer"
+    },
     "rust-analyzer.linkedProjects": [
         "Cargo.toml",
         "artifacts/sp1/Cargo.toml",

artifacts/sp1/schnorr-sig-verify/Cargo.toml

@@ -15,5 +15,4 @@ mock = ["strata-sp1-adapter/mock"]
 
 [patch.crates-io]
 sha2-v0-10-8 = { git = "https://github.com/sp1-patches/RustCrypto-hashes", package = "sha2", branch = "patch-sha2-v0.10.8" }
-# k256 = { path = "../../../../../../playground/elliptic-curves/k256" }
 secp256k1 = { git = "https://github.com/sp1-patches/rust-secp256k1", branch = "patch-secp256k1-v0.29.1" }

perf/src/main.rs

@@ -84,26 +84,22 @@ impl From<ProofReport> for PerformanceReport {
 ///
 /// Generates [`PerformanceReport`] for each invocation.
 fn run_sp1_programs() -> Vec<PerformanceReport> {
-    let mut reports = vec![];
-
-    reports.push(sp1_fib_report().into());
-    reports.push(sp1_sha_report().into());
-    reports.push(sp1_schnorr_sig_verify_report().into());
-
-    reports
+    vec![
+        sp1_fib_report().into(),
+        sp1_sha_report().into(),
+        sp1_schnorr_sig_verify_report().into(),
+    ]
 }
 
-/// Runs SP1 programs to generate reports.
+/// Runs Risc0 programs to generate reports.
 ///
 /// Generates [`PerformanceReport`] for each invocation.
 fn run_risc0_programs() -> Vec<PerformanceReport> {
-    let mut reports = vec![];
-
-    reports.push(risc0_fib_report().into());
-    reports.push(risc0_sha_report().into());
-    reports.push(risc0_schnorr_sig_verify_report().into());
-
-    reports
+    vec![
+        risc0_fib_report().into(),
+        risc0_sha_report().into(),
+        risc0_schnorr_sig_verify_report().into(),
+    ]
 }
 
 /// Returns a formatted header for the performance report with basic PR data.

runner/src/programs/fibonacci.rs

@@ -11,15 +11,15 @@ fn fib_prover_perf_report(host: &impl ZkVmHostPerf) -> ProofReport {
 pub fn sp1_fib_report() -> ProofReport {
     use strata_sp1_adapter::SP1Host;
     use strata_sp1_artifacts::FIBONACCI_ELF;
-    let host = SP1Host::init(&FIBONACCI_ELF);
+    let host = SP1Host::init(FIBONACCI_ELF);
     fib_prover_perf_report(&host)
 }
 
 #[cfg(feature = "risc0")]
 pub fn risc0_fib_report() -> ProofReport {
     use strata_risc0_adapter::Risc0Host;
     use strata_risc0_artifacts::GUEST_RISC0_FIBONACCI_ELF;
-    let host = Risc0Host::init(&GUEST_RISC0_FIBONACCI_ELF);
+    let host = Risc0Host::init(GUEST_RISC0_FIBONACCI_ELF);
     fib_prover_perf_report(&host)
 }
 

runner/src/programs/schnorr.rs

@@ -1,5 +1,5 @@
 use schnorr_sig_verify::{SchnorrSigInput, SchnorrSigProver};
-use strata_zkvm::{ProofReceipt, ProofReport, ZkVmHost, ZkVmHostPerf, ZkVmProver, ZkVmProverPerf};
+use strata_zkvm::{ProofReport, ZkVmHostPerf, ZkVmProverPerf};
 
 fn perf_report(host: &impl ZkVmHostPerf) -> ProofReport {
     let input = SchnorrSigInput::new_random();
@@ -11,24 +11,25 @@ fn perf_report(host: &impl ZkVmHostPerf) -> ProofReport {
 pub fn sp1_schnorr_sig_verify_report() -> ProofReport {
     use strata_sp1_adapter::SP1Host;
     use strata_sp1_artifacts::SCHNORR_SIG_VERIFY_ELF;
-    let host = SP1Host::init(&SCHNORR_SIG_VERIFY_ELF);
+    let host = SP1Host::init(SCHNORR_SIG_VERIFY_ELF);
     perf_report(&host)
 }
 
 #[cfg(feature = "risc0")]
 pub fn risc0_schnorr_sig_verify_report() -> ProofReport {
     use strata_risc0_adapter::Risc0Host;
     use strata_risc0_artifacts::GUEST_RISC0_SCHNORR_SIG_VERIFY_ELF;
-    let host = Risc0Host::init(&GUEST_RISC0_SCHNORR_SIG_VERIFY_ELF);
+    let host = Risc0Host::init(GUEST_RISC0_SCHNORR_SIG_VERIFY_ELF);
     perf_report(&host)
 }
 
+#[allow(dead_code)]
 pub fn make_proofs() {
     #[cfg(feature = "sp1")]
-    let report = sp1_proof_report();
+    let report = sp1_schnorr_sig_verify_report();
     println!("{}", report.cycles);
 
     #[cfg(feature = "risc0")]
-    let report = risc0_proof_report();
+    let report = risc0_schnorr_sig_verify_report();
     println!("{}", report.cycles);
 }

runner/src/programs/sha2.rs

@@ -11,15 +11,15 @@ fn sha2_prover_perf_report(host: &impl ZkVmHostPerf) -> ProofReport {
 pub fn sp1_sha_report() -> ProofReport {
     use strata_sp1_adapter::SP1Host;
     use strata_sp1_artifacts::SHA2_CHAIN_ELF;
-    let host = SP1Host::init(&SHA2_CHAIN_ELF);
+    let host = SP1Host::init(SHA2_CHAIN_ELF);
     sha2_prover_perf_report(&host)
 }
 
 #[cfg(feature = "risc0")]
 pub fn risc0_sha_report() -> ProofReport {
     use strata_risc0_adapter::Risc0Host;
     use strata_risc0_artifacts::GUEST_RISC0_SHA2_CHAIN_ELF;
-    let host = Risc0Host::init(&GUEST_RISC0_SHA2_CHAIN_ELF);
+    let host = Risc0Host::init(GUEST_RISC0_SHA2_CHAIN_ELF);
     sha2_prover_perf_report(&host)
 }