Skip to content

Commit 969dd1d

Browse files
authored
fix (batcher): work on linux (#309)
1 parent 066c526 commit 969dd1d

18 files changed

Lines changed: 67 additions & 65 deletions

File tree

Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,9 @@ batcher_start: ./batcher/.env
134134
@echo "Starting Batcher..."
135135
@cargo +nightly-2024-04-17 run --manifest-path ./batcher/Cargo.toml --release -- --config ./config-files/config.yaml --env-file ./batcher/.env
136136

137+
install_batcher:
138+
@cargo +nightly-2024-04-17 install --path batcher
139+
137140
install_batcher_client:
138141
@cargo +nightly-2024-04-17 install --path batcher/client
139142

batcher/Cargo.lock

Lines changed: 13 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

batcher/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ env_logger = "0.11.3"
2323
serde_json = "1.0.117"
2424
serde = { version = "1.0.201", features = ["derive"] }
2525
clap = { version = "4.5.4", features = ["derive"] }
26-
sp1-sdk = { git = "https://github.com/succinctlabs/sp1.git", rev = "v1.0.4-testnet" }
26+
sp1-sdk = { git = "https://github.com/succinctlabs/sp1.git", rev = "v1.0.5-testnet" }
2727
halo2curves = { version = "0.6.0", default-features = false }
2828
halo2_backend = { git = "https://github.com/yetanotherco/yet-another-halo2-fork.git", branch = "feat/serde_constraint_system"}
2929
halo2_proofs = { git = "https://github.com/yetanotherco/yet-another-halo2-fork.git", branch = "feat/serde_constraint_system" }

batcher/build.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,6 @@ fn main() {
2323
);
2424

2525
if cfg!(target_os = "linux") {
26-
println!("cargo:rustc-link-lib=dylib=dl");
27-
println!("cargo:rustc-link-lib=dylib=rt");
28-
println!("cargo:rustc-link-lib=dylib=m");
29-
println!("cargo:rustc-link-lib=dylib=ssl");
30-
println!("cargo:rustc-link-lib=dylib=crypto");
3126
println!("cargo:rustc-link-arg=-Wl,--allow-multiple-definition");
3227
}
3328

batcher/client/Cargo.lock

Lines changed: 13 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
-4 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.

operator/sp1/lib/Cargo.lock

Lines changed: 13 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

operator/sp1/lib/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ edition = "2021"
66
[dependencies]
77
bincode = "1.3.3"
88
lazy_static = "1.4.0"
9-
sp1-sdk = { git = "https://github.com/succinctlabs/sp1.git", rev = "v1.0.4-testnet" }
9+
sp1-sdk = { git = "https://github.com/succinctlabs/sp1.git", rev = "v1.0.5-testnet" }
1010

1111
[lib]
1212
crate-type = ["cdylib"]

operator/sp1/lib/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ mod tests {
3636
use super::*;
3737

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

4343
#[test]
4444
fn verify_sp1_proof_with_elf_works() {

0 commit comments

Comments
 (0)