Skip to content

Commit

Permalink
use halo2-lib v0.1.1; auto format
Browse files Browse the repository at this point in the history
  • Loading branch information
lispc committed Aug 26, 2023
1 parent 4466059 commit 663d40c
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 10 deletions.
4 changes: 2 additions & 2 deletions 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 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.4.0", features = ["print-trace"], optional = true }

halo2-base = { git = "https://github.com/scroll-tech/halo2-lib.git", tag = "v0.1.0", default-features=false, features=["halo2-pse","display"] }
halo2-base = { git = "https://github.com/scroll-tech/halo2-lib.git", tag = "v0.1.1", default-features=false, features=["halo2-pse","display"] }
snark-verifier = { path = "../snark-verifier", default-features = false }

# loader_evm
Expand Down
4 changes: 2 additions & 2 deletions snark-verifier/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ rustc-hash = "1.1.0"
serde = { version = "1.0", features = ["derive"] }

# Use halo2-base as non-optional dependency because it re-exports halo2_proofs, halo2curves, and poseidon, using different repos based on feature flag "halo2-axiom" or "halo2-pse"
halo2-base = { git = "https://github.com/scroll-tech/halo2-lib", tag = "v0.1.0", default-features=false, features=["halo2-pse","display"] }
halo2-base = { git = "https://github.com/scroll-tech/halo2-lib", tag = "v0.1.1", default-features=false, features=["halo2-pse","display"] }
# This poseidon is identical to PSE (for now) but uses axiom's halo2curves; otherwise would require patching
poseidon-axiom = { git = "https://github.com/axiom-crypto/halo2.git", branch = "axiom/dev", package = "poseidon", optional = true }
poseidon= { git = "https://github.com/privacy-scaling-explorations/poseidon", optional = true }
Expand All @@ -31,7 +31,7 @@ bytes = { version = "1.2", optional = true }
rlp = { version = "0.5", default-features = false, features = ["std"], optional = true }

# loader_halo2
halo2-ecc = { git = "https://github.com/scroll-tech/halo2-lib", tag = "v0.1.0", optional = true, default-features=false, features=["halo2-pse","display"] }
halo2-ecc = { git = "https://github.com/scroll-tech/halo2-lib", tag = "v0.1.1", optional = true, default-features=false, features=["halo2-pse","display"] }

[dev-dependencies]
ark-std = { version = "0.3.0", features = ["print-trace"] }
Expand Down
6 changes: 1 addition & 5 deletions snark-verifier/src/pcs/kzg/decider.rs
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,7 @@ mod native {
accumulators: Vec<KzgAccumulator<M::G1Affine, NativeLoader>>,
) -> bool {
assert!(!accumulators.is_empty());
!accumulators
.into_iter()
.any(|accumulator| {
!Self::decide(dk, accumulator)
})
!accumulators.into_iter().any(|accumulator| !Self::decide(dk, accumulator))
}
}
}
Expand Down

0 comments on commit 663d40c

Please sign in to comment.