Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,9 @@ batcher_start: ./batcher/.env
@echo "Starting Batcher..."
@cargo +nightly-2024-04-17 run --manifest-path ./batcher/Cargo.toml --release -- --config ./config-files/config.yaml --env-file ./batcher/.env

install_batcher:
@cargo +nightly-2024-04-17 install --path batcher

install_batcher_client:
@cargo +nightly-2024-04-17 install --path batcher/client

Expand Down
25 changes: 13 additions & 12 deletions batcher/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion batcher/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ env_logger = "0.11.3"
serde_json = "1.0.117"
serde = { version = "1.0.201", features = ["derive"] }
clap = { version = "4.5.4", features = ["derive"] }
sp1-sdk = { git = "https://github.com/succinctlabs/sp1.git", rev = "v1.0.4-testnet" }
sp1-sdk = { git = "https://github.com/succinctlabs/sp1.git", rev = "v1.0.5-testnet" }
halo2curves = { version = "0.6.0", default-features = false }
halo2_backend = { git = "https://github.com/yetanotherco/yet-another-halo2-fork.git", branch = "feat/serde_constraint_system"}
halo2_proofs = { git = "https://github.com/yetanotherco/yet-another-halo2-fork.git", branch = "feat/serde_constraint_system" }
Expand Down
5 changes: 0 additions & 5 deletions batcher/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,6 @@ fn main() {
);

if cfg!(target_os = "linux") {
println!("cargo:rustc-link-lib=dylib=dl");
println!("cargo:rustc-link-lib=dylib=rt");
println!("cargo:rustc-link-lib=dylib=m");
println!("cargo:rustc-link-lib=dylib=ssl");
println!("cargo:rustc-link-lib=dylib=crypto");
println!("cargo:rustc-link-arg=-Wl,--allow-multiple-definition");
}

Expand Down
25 changes: 13 additions & 12 deletions batcher/client/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified batcher/client/test_files/sp1/sp1_fibonacci-elf
Binary file not shown.
Binary file modified batcher/client/test_files/sp1/sp1_fibonacci.proof
Binary file not shown.
25 changes: 13 additions & 12 deletions operator/sp1/lib/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion operator/sp1/lib/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ edition = "2021"
[dependencies]
bincode = "1.3.3"
lazy_static = "1.4.0"
sp1-sdk = { git = "https://github.com/succinctlabs/sp1.git", rev = "v1.0.4-testnet" }
sp1-sdk = { git = "https://github.com/succinctlabs/sp1.git", rev = "v1.0.5-testnet" }

[lib]
crate-type = ["cdylib"]
4 changes: 2 additions & 2 deletions operator/sp1/lib/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ mod tests {
use super::*;

const PROOF: &[u8] =
include_bytes!("../../../../task_sender/test_examples/sp1/fibonacci_proof_generator/script/sp1_fibonacci.proof");
include_bytes!("../../../../task_sender/test_examples/sp1/sp1_fibonacci.proof");
const ELF: &[u8] =
include_bytes!("../../../../task_sender/test_examples/sp1/fibonacci_proof_generator/program/elf/riscv32im-succinct-zkvm-elf");
include_bytes!("../../../../task_sender/test_examples/sp1/elf");

#[test]
fn verify_sp1_proof_with_elf_works() {
Expand Down
4 changes: 2 additions & 2 deletions operator/sp1/sp1_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const MaxProofSize = 2 * 1024 * 1024
const MaxElfSize = 2 * 1024 * 1024

func TestFibonacciSp1ProofVerifies(t *testing.T) {
proofFile, err := os.Open("../../task_sender/test_examples/sp1/fibonacci_proof_generator/script/sp1_fibonacci.proof")
proofFile, err := os.Open("../../task_sender/test_examples/sp1/sp1_fibonacci.proof")
if err != nil {
t.Errorf("could not open proof file: %s", err)
}
Expand All @@ -21,7 +21,7 @@ func TestFibonacciSp1ProofVerifies(t *testing.T) {
t.Errorf("could not read bytes from file")
}

elfFile, err := os.Open("../../task_sender/test_examples/sp1/fibonacci_proof_generator/program/elf/riscv32im-succinct-zkvm-elf")
elfFile, err := os.Open("../../task_sender/test_examples/sp1/elf")
if err != nil {
t.Errorf("could not open proof file: %s", err)
}
Expand Down
Binary file not shown.
Loading