Skip to content

Commit 395a970

Browse files
author
Ubuntu
committed
chore: merge ethproof update
1 parent 395b380 commit 395a970

File tree

28 files changed

+227
-782
lines changed

28 files changed

+227
-782
lines changed

.github/workflows/ci.yml

-3
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@ jobs:
2929
uses: actions/setup-go@v3
3030
with:
3131
go-version: '1.22'
32-
- name: Build Go library
33-
run: |
34-
./sdk/src/local/libsnark/compile.sh
3532
- name: Cargo build
3633
run: cargo build --verbose --release
3734
- name: Cargo test

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ members = [
44
"host-program/sha2-rust",
55
"host-program/revme",
66
"host-program/mem-alloc-vec",
7-
"host-program/sha2-precompile",
7+
"host-program/sha2-composition",
88
"sdk"
99
]
1010
resolver = "2"

README.md

-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ Please refer to [this](guest-program/README.md) guide.
6161

6262
```sh
6363
cd zkm-project-template
64-
sh sdk/src/local/libsnark/compile.sh # compile snark library
6564
cargo build --release # build host programs
6665
```
6766

contracts/src/verifier.sol

-271
This file was deleted.

host-program/mem-alloc-vec/build.rs

+3-10
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,7 @@
11
fn main() {
2-
let guest_path = format!(
3-
"{}/../../guest-program/mem-alloc-vec",
4-
env!("CARGO_MANIFEST_DIR")
5-
);
2+
let guest_path = format!("{}/../../guest-program/mem-alloc-vec", env!("CARGO_MANIFEST_DIR"));
63
zkm_build::build_program(&guest_path);
7-
let guest_target_path = format!(
8-
"{}/{}/{}",
9-
guest_path,
10-
zkm_build::DEFAULT_OUTPUT_DIR,
11-
zkm_build::BUILD_TARGET
12-
);
4+
let guest_target_path =
5+
format!("{}/{}/{}", guest_path, zkm_build::DEFAULT_OUTPUT_DIR, zkm_build::BUILD_TARGET);
136
println!("cargo:rustc-env=GUEST_TARGET_PATH={}", guest_target_path);
147
}

0 commit comments

Comments
 (0)