Sync with release v0.4.1-rc

.github/workflows/ci.yml

@@ -4,7 +4,7 @@ on:
   push:
     branches: ["main"]
   pull_request:
-    branches: ["main", "develop", "community-edition"]
+    branches: ["main", "develop", "community-edition", "release-*"]
 
 env:
   CARGO_TERM_COLOR: always
@@ -40,6 +40,7 @@ jobs:
         working-directory: "hashes/zkevm"
         run: |
           cargo test packed_multi_keccak_prover::k_14
+          cargo t test_vanilla_keccak_kat_vectors
 
   lint:
     name: Lint
@@ -62,4 +63,12 @@ jobs:
         run: cargo fmt --all -- --check
 
       - name: Run clippy
-        run: cargo clippy --all -- -D warnings
+        run: cargo clippy --all --all-targets -- -D warnings
+
+      - name: Generate Cargo.lock
+        run: cargo generate-lockfile
+
+      - name: Run cargo audit
+        uses: actions-rs/audit-check@v1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}

halo2-base/Cargo.toml

@@ -1,49 +1,48 @@
 [package]
-name="halo2-base"
-version="0.4.0"
-edition="2021"
+name = "halo2-base"
+version = "0.4.0"
+edition = "2021"
 
 [dependencies]
-itertools="0.11"
-num-bigint={ version="0.4", features=["rand"] }
-num-integer="0.1"
-num-traits="0.2"
-rand_chacha="0.3"
-rustc-hash="1.1"
-rayon="1.7"
-serde={ version="1.0", features=["derive"] }
-serde_json="1.0"
-log="0.4"
-getset="0.1.2"
-ark-std={ version="0.3.0", features=["print-trace"], optional=true }
+itertools = "0.11"
+num-bigint = { version = "0.4", features = ["rand"] }
+num-integer = "0.1"
+num-traits = "0.2"
+rand_chacha = "0.3"
+rustc-hash = "1.1"
+rayon = "1.8"
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
+log = "0.4"
+getset = "0.1.2"
+ark-std = { version = "0.3.0", features = ["print-trace"], optional = true }
 
 # Use Axiom's custom halo2 monorepo for faster proving when feature = "halo2-axiom" is on
-halo2_proofs_axiom={ git="https://github.com/axiom-crypto/halo2.git", package="halo2-axiom", optional=true }
+halo2_proofs_axiom = { version = "0.4", package = "halo2-axiom", optional = true }
 # Use PSE halo2 and halo2curves for compatibility when feature = "halo2-pse" is on
-halo2_proofs={ git="https://github.com/privacy-scaling-explorations/halo2.git", rev="7a21656", optional=true }
+halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", rev = "7a21656", optional = true }
 
 # This is Scroll's audited poseidon circuit. We only use it for the Native Poseidon spec. We do not use the halo2 circuit at all (and it wouldn't even work because the halo2_proofs tag is not compatbile).
 # We forked it to upgrade to ff v0.13 and removed the circuit module
-poseidon-rs={ git="https://github.com/axiom-crypto/poseidon-circuit.git", rev="1aee4a1" }
+poseidon-rs = { package = "poseidon-primitives", version = "=0.1.1" }
 # plotting circuit layout
-plotters={ version="0.3.0", optional=true }
-tabbycat={ version="0.1", features=["attributes"], optional=true }
+plotters = { version = "0.3.0", optional = true }
 
 # test-utils
 rand={ version="0.8", optional=true }
 
 [dev-dependencies]
-ark-std={ version="0.3.0", features=["print-trace"] }
-rand="0.8"
-pprof={ version="0.11", features=["criterion", "flamegraph"] }
-criterion="0.4"
-criterion-macro="0.4"
-test-case="3.1.0"
-test-log="0.2.12"
-env_logger="0.10.0"
-proptest="1.1.0"
+ark-std = { version = "0.3.0", features = ["print-trace"] }
+rand = "0.8"
+pprof = { version = "0.13", features = ["criterion", "flamegraph"] }
+criterion = "0.5.1"
+criterion-macro = "0.4"
+test-case = "3.1.0"
+test-log = "0.2.12"
+env_logger = "0.10.0"
+proptest = "1.1.0"
 # native poseidon for testing
-pse-poseidon={ git="https://github.com/axiom-crypto/pse-poseidon.git" }
+pse-poseidon = { git = "https://github.com/axiom-crypto/pse-poseidon.git" }
 
 # memory allocation
 [target.'cfg(not(target_env = "msvc"))'.dependencies]
@@ -52,23 +51,23 @@ jemallocator={ version="=0.5", optional=true }
 mimalloc={ version="=0.1", default-features=false, optional=true }
 
 [features]
-default=["halo2-axiom", "display", "test-utils"]
-asm=["halo2_proofs_axiom?/asm"]
-dev-graph=["halo2_proofs?/dev-graph", "halo2_proofs_axiom?/dev-graph", "plotters"]
-halo2-pse=["halo2_proofs/circuit-params"]
-halo2-axiom=["halo2_proofs_axiom"]
-display=[]
-profile=["halo2_proofs_axiom?/profile"]
-test-utils=["dep:rand", "ark-std"]
+default = ["halo2-axiom", "display", "test-utils"]
+asm = ["halo2_proofs_axiom?/asm"]
+dev-graph = ["halo2_proofs/dev-graph", "plotters"] # only works with halo2-pse for now
+halo2-pse = ["halo2_proofs/circuit-params"]
+halo2-axiom = ["halo2_proofs_axiom"]
+display = []
+profile = ["halo2_proofs_axiom?/profile"]
+test-utils = ["dep:rand", "ark-std"]
 
 [[bench]]
 name="mul"
 harness=false
 
 [[bench]]
-name="inner_product"
-harness=false
+name = "inner_product"
+harness = false
 
 [[example]]
-name="inner_product"
-required-features=["test-utils"]
+name = "inner_product"
+required-features = ["test-utils"]