Skip to content

Commit

Permalink
[fix] sync changes with minimize diff branches (#12)
Browse files Browse the repository at this point in the history
* [fix] sync changes with minimize diff branches

* [feat] remove zkevm-circuit dependencies

* [clean up] remove unused ipa source code

* [feat] document trait definitions

* [feat] merge more comments

* [feat] merge more comments

* [chore] more doc; cargo fmt
  • Loading branch information
zhenfeizhang authored May 26, 2023
1 parent a3d0a5a commit ae6a9ef
Show file tree
Hide file tree
Showing 53 changed files with 1,737 additions and 5,916 deletions.
5,602 changes: 1,174 additions & 4,428 deletions Cargo.lock

Large diffs are not rendered by default.

10 changes: 2 additions & 8 deletions snark-verifier-sdk/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ serde_json = "1.0"
bincode = "1.3.3"
ark-std = { version = "0.3.0", features = ["print-trace"], optional = true }

halo2-base = { git = "https://github.com/scroll-tech/halo2-lib.git", branch = "halo2-ecc-snark-verifier-0323", default-features=false, features=["halo2-pse","display"] }
halo2-base = { git = "https://github.com/scroll-tech/halo2-lib.git", branch = "minimize-diff", default-features=false, features=["halo2-pse","display"] }
snark-verifier = { path = "../snark-verifier", default-features = false }

# loader_evm
Expand All @@ -40,14 +40,8 @@ criterion-macro = "0.4"
crossterm = { version = "0.25" }
tui = { version = "0.19", default-features = false, features = ["crossterm"] }

# zkevm benchmarks
zkevm-circuits = { git = "https://github.com/scroll-tech/zkevm-circuits.git", branch = "halo2-ecc-snark-verifier-0323", default-features=false, features = ["test"] }
bus-mapping = { git = "https://github.com/scroll-tech/zkevm-circuits.git", branch = "halo2-ecc-snark-verifier-0323" }
eth-types = { git = "https://github.com/scroll-tech/zkevm-circuits.git", branch = "halo2-ecc-snark-verifier-0323" }
mock = { git = "https://github.com/scroll-tech/zkevm-circuits.git", branch = "halo2-ecc-snark-verifier-0323" }

[features]
default = ["loader_halo2", "loader_evm", "halo2-pse", "halo2-base/jemallocator"]
default = ["loader_halo2", "loader_evm", "halo2-pse"]
display = ["snark-verifier/display", "dep:ark-std"]
loader_evm = ["snark-verifier/loader_evm", "dep:ethereum-types"]
loader_halo2 = ["snark-verifier/loader_halo2"]
Expand Down
5 changes: 1 addition & 4 deletions snark-verifier-sdk/src/evm.rs
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,7 @@ where
{
#[cfg(debug_assertions)]
{
use halo2_base::halo2_proofs::{
dev::MockProver,
poly::commitment::Params,
};
use halo2_base::halo2_proofs::{dev::MockProver, poly::commitment::Params};
MockProver::run(params.k(), &circuit, instances.clone()).unwrap().assert_satisfied();
}

Expand Down
16 changes: 0 additions & 16 deletions snark-verifier-sdk/src/evm_circuits/evm_circuit.rs

This file was deleted.

Loading

0 comments on commit ae6a9ef

Please sign in to comment.