Merge branch 'main' of github.com:privacy-scaling-explorations/halo2 …

…into experimental/nocopy1
privacy-scaling-explorations · Jun 18, 2024 · 1e8ddc3 · 1e8ddc3
2 parents 9205a3b + d7c6279
commit 1e8ddc3
Show file tree

Hide file tree

Showing 7 changed files with 459 additions and 43 deletions.
diff --git a/.github/scripts/wasm-target-test-build.sh b/.github/scripts/wasm-target-test-build.sh
@@ -15,7 +15,7 @@ cp "${GIT_ROOT}/rust-toolchain" .
 rustup target add wasm32-unknown-unknown wasm32-wasi
 
 # add dependencies
-cargo add --path "${GIT_ROOT}/halo2_proofs" --features batch,dev-graph,gadget-traces
+cargo add --path "${GIT_ROOT}/halo2_proofs" --features batch,dev-graph,gadget-traces,lookup-any-sanity-checks
 cargo add getrandom --features js --target wasm32-unknown-unknown
 
 # test build for wasm32-* targets

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -19,7 +19,7 @@ jobs:
           - feature_set: basic
             features: batch,dev-graph,gadget-traces
           - feature_set: all
-            features: batch,dev-graph,gadget-traces,test-dev-graph,thread-safe-region,sanity-checks,circuit-params
+            features: batch,dev-graph,gadget-traces,test-dev-graph,thread-safe-region,sanity-checks,circuit-params,lookup-any-sanity-checks
 
     steps:
       - uses: actions/checkout@v3

diff --git a/halo2_frontend/Cargo.toml b/halo2_frontend/Cargo.toml
@@ -48,7 +48,7 @@ serde_json = "1"
 getrandom = { version = "0.2", features = ["js"] }
 
 [features]
-default = ["bits"]
+default = ["bits", "lookup-any-sanity-checks"]
 dev-graph = ["plotters", "tabbycat"]
 test-dev-graph = [
     "dev-graph",
@@ -63,6 +63,7 @@ circuit-params = []
 heap-profiling = []
 cost-estimator = ["serde", "serde_derive"]
 derive_serde = ["halo2curves/derive_serde"]
+lookup-any-sanity-checks = []
 
 [lib]
 bench = false