Merge branches 'cl/icicle' and 'main' of github.com:EspressoSystems/jellyfish into cl/icicle

Author: mrain

.cargo/audit.toml

@@ -0,0 +1,9 @@
+[advisories]
+ignore = [
+    # WARNING: crate `derivative` unmaintained, still resides in `ark-crypto-primitives`.
+    "RUSTSEC-2024-0388",
+    # WARNING: crate `paste` unmaintained.
+    "RUSTSEC-2024-0436",
+    # `tracing-subscriber` doesn't rule out poisoning logs. But we are not using it.
+    "RUSTSEC-2025-0055",
+]

.github/workflows/build.yml

@@ -2,9 +2,9 @@ name: Build
 
 on:
   push:
-    branches:
-      - main
+    branches: ["main"]
   pull_request:
+    branches: ["main", "jf-*-v*.*.*"]
   schedule:
     - cron: "0 0 * * 1"
   workflow_dispatch:
@@ -20,7 +20,7 @@ jobs:
           access_token: ${{ github.token }}
 
       - name: Checkout Repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Install stable toolchain
         uses: actions-rs/toolchain@v1
@@ -37,7 +37,7 @@ jobs:
         uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: nightly
+          toolchain: nightly-2025-09-04
           override: false
           default: false
           components: rustfmt
@@ -46,10 +46,10 @@ jobs:
         name: Enable Rust Caching
 
       - name: Spell Check
-        uses: crate-ci/typos@v1.23.1
+        uses: crate-ci/typos@v1.37.2
 
       - name: Format Check
-        run: cargo +nightly fmt -- --check
+        run: cargo +nightly-2025-09-04 fmt -- --check
 
       - name: Clippy
         uses: actions-rs/clippy-check@v1

.github/workflows/combine-prs.yml

@@ -18,7 +18,7 @@ jobs:
     steps:
       - name: combine-prs
         id: combine-prs
-        uses: github/combine-prs@v5.0.0
+        uses: github/combine-prs@v5.2.0
         with:
           github_token: ${{ secrets.ORG_GITHUB_PAT }}
           labels: "dependabot,combined-pr"

.github/workflows/periodic_checks.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Install nightly toolchain
         uses: actions-rs/toolchain@v1

.github/workflows/update_nix.yml

@@ -10,17 +10,17 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Install Nix
-        uses: cachix/install-nix-action@V27
+        uses: cachix/install-nix-action@v30
 
       - uses: cachix/cachix-action@v15
         with:
           name: espresso-systems-private
           authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
 
       - name: Update flake.lock
-        uses: DeterminateSystems/update-flake-lock@v23
+        uses: DeterminateSystems/update-flake-lock@v27
         with:
           pr-title: "Weekly PR to bump flake.nix" # Title of PR to be created

.gitignore

@@ -1,12 +1,13 @@
 .*.sw*
 .DS_Store
 .idea
-/target
+**/target
 cargo-system-config.toml
 Cargo.lock
 *.org
 .pre-commit-config.yaml
 .vscode
+.direnv
 
 # Test coverage (grcov)
 default.profraw

CODEOWNERS

@@ -25,9 +25,6 @@
 # Owner of `jf-rescue` crate
 /rescue/ @philippecamacho
 
-# Owner of `jf-vdf` crate
-/vdf/ @mrain
-
 # Owner of `jf-vid` crate
 /vid/ @ggutoski @akonring
 

Cargo.toml

@@ -1,36 +1,61 @@
 [workspace]
-members = ["aead", "commitment", "crhf", "elgamal", "merkle_tree", "pcs", "plonk", "prf", "relation", "rescue", "signature", "utilities", "vdf", "vid", "vrf"]
+members = [
+    "aead",
+    "commitment",
+    "crhf",
+    "elgamal",
+    "merkle_tree",
+    "pcs",
+    "plonk",
+    "poseidon2",
+    "prf",
+    "relation",
+    "rescue",
+    "signature",
+    "utilities",
+    "vrf",
+]
 resolver = "2"
 
 [workspace.package]
-version = "0.4.4"
 authors = ["Espresso Systems <[email protected]>"]
 edition = "2021"
 license = "MIT"
-rust-version = "1.64.0"
+rust-version = "1.73.0"
 homepage = "https://github.com/EspressoSystems/jellyfish"
 documentation = "https://jellyfish.docs.espressosys.com"
 repository = "https://github.com/EspressoSystems/jellyfish"
 
 [workspace.dependencies]
-ark-bls12-377 = { version = "0.4.0", default-features = false, features = [ "curve" ] }
-ark-bls12-381 = { version = "0.4.0", default-features = false, features = [ "curve" ] }
-ark-bn254 = { version = "0.4.0", default-features = false, features = [ "curve" ] }
-ark-bw6-761 = { version = "0.4.0", default-features = false }
-ark-ec = { version = "0.4.0", default-features = false }
-ark-ff = { version = "0.4.0", default-features = false, features = [ "asm" ] }
-ark-poly = { version = "0.4.0", default-features = false }
-ark-serialize = { version = "0.4.0", default-features = false }
-ark-std = { version = "0.4.0", default-features = false }
-derivative = { version = "2", features = ["use_core"] }
-digest = { version = "0.10.1", default-features = false, features = [ "alloc" ] }
+ark-bls12-377 = { version = "0.5", default-features = false, features = [ "curve" ] }
+ark-bls12-381 = { version = "0.5", default-features = false, features = [ "curve" ] }
+ark-bn254 = { version = "0.5", default-features = false, features = [ "curve" ] }
+ark-bw6-761 = { version = "0.5", default-features = false }
+ark-ec = { version = "0.5", default-features = false }
+ark-ed-on-bls12-377 = { version = "0.5", default-features = false }
+ark-ed-on-bls12-381 = { version = "0.5", default-features = false }
+ark-ed-on-bls12-381-bandersnatch = { version = "0.5", default-features = false }
+ark-ed-on-bn254 = { version = "0.5", default-features = false }
+ark-ff = { version = "0.5", default-features = false, features = [ "asm" ] }
+ark-poly = { version = "0.5", default-features = false }
+ark-serialize = { version = "0.5", default-features = false, features = [ "derive" ] }
+ark-std = { version = "0.5", default-features = false }
+derive-where = { version = "1.6" }
+digest = { version = "0.10.7", default-features = false, features = [ "alloc" ] }
 displaydoc = { version = "0.2", default-features = false }
 hashbrown = "0.14.3"
+itertools = { version = "0.12", default-features = false }
 merlin = { version = "3.0.0", default-features = false }
 num-bigint = { version = "0.4", default-features = false }
 rand_chacha = { version = "0.3.1", default-features = false }
-serde = { version = "1.0", default-features = false, features = [ "derive", "rc" ] }
+rayon = "1.11"
+serde = { version = "1.0", default-features = false, features = [ "derive", "rc", "alloc" ] }
 sha2 = { version = "0.10", default-features = false }
 sha3 = { version = "0.10", default-features = false }
-itertools = { version = "0.12", default-features = false } 
-tagged-base64 = "0.4"
+spongefish = { git = "https://github.com/arkworks-rs/spongefish.git", rev = "3ded547f7f56d7f8a1fc4c9a5c0ce965310bba5f", features = ["arkworks-algebra"] }
+tagged-base64 = "0.4.1"
+zeroize = { version = "^1.8" }
+
+[profile.profiling]
+inherits = "release"
+debug = true

README.md

@@ -18,22 +18,23 @@ For general discussions on Jellyfish PLONK, please join our [Discord channel](ht
 - ['jf-utils'](utilities): utilities and helper functions.
 
 ### Primitives
-- ['jf-prf'](prf): trait definitions for pesudorandom function (PRF).
-- ['jf-crhf'](crhf): trait definitions for collision-resistant hash function (CRHF).
-- ['jf-commitment'](commitment): trait definitions for cryptographic commitment scheme.
-- ['jf-rescue'](rescue): Rescue hash function, and its subsequent PRF, CRHF, commitment scheme implementations.
-- ['jf-elgamal'](elgamal): a Rescue-based ElGamal encryption scheme implementation.
-- ['jf-signature'](signature): signature scheme trait definition, and BLS/Schnorr signature scheme implementations.
-- ['jf-vrf'](vrf): verifiable random function trait definition and BLS-based implementation.
-- ['jf-aead'](aead): authenticated encryption with associated data (AEAD) implementation.
-- ['jf-merkle-tree'](merkle_tree): various (vanilla, sparse, namespaced) Merkle tree trait definitions and implementations.
-- ['jf-pcs'](pcs): polynomial commitment scheme (PCS) trait definitions and univariate/multilinear KZG-PCS implementations.
-- ['jf-vdf'](vdf): verifiable delay function (VDF) trait definitions and (non-verifiable) MinRoot implementation.
-- ['jf-vid'](vid): verifiable information dispersal (VID) trait definition and implementation.
+- [`jf-prf`](prf): trait definitions for pseudorandom function (PRF).
+- [`jf-crhf`](crhf): trait definitions for collision-resistant hash function (CRHF).
+- [`jf-commitment`](commitment): trait definitions for cryptographic commitment scheme.
+- [`jf-rescue`](rescue): Rescue hash function, and its subsequent PRF, CRHF, commitment scheme implementations.
+- [`jf-elgamal`](elgamal): a Rescue-based ElGamal encryption scheme implementation.
+- [`jf-signature`](signature): signature scheme trait definition, and BLS/Schnorr signature scheme implementations.
+- [`jf-vrf`](vrf): verifiable random function trait definition and BLS-based implementation.
+- [`jf-aead`](aead): authenticated encryption with associated data (AEAD) implementation.
+- [`jf-merkle-tree`](merkle_tree): various (vanilla, sparse, namespaced) Merkle tree trait definitions and implementations.
+- [`jf-pcs`](pcs): polynomial commitment scheme (PCS) trait definitions and univariate/multilinear KZG-PCS implementations.
+- [`jf-poseidon2`](poseidon2): Poseidon2 permutation, and Sponge, CRHF, derived from this permutation.
+
+The `jf-vid` crate is now moved to another repo [`jf-advz`](https://github.com/EspressoSystems/jellyfish-compat/tree/main/advz).
 
 ### Plonk
-- ['jf-relation'](relation): Jellyfish constraint system for PLONK.
-- ['jf-plonk'](plonk): KZG-PCS based TurboPlonk and UltraPlonk implementations.
+- [`jf-relation`](relation): Jellyfish constraint system for PLONK.
+- [`jf-plonk`](plonk): KZG-PCS based TurboPlonk and UltraPlonk implementations.
 
 ## Development environment setup
 

aead/CHANGELOG.md

@@ -3,6 +3,10 @@
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 0.2.0
+
+- Upgrade arkworks dependencies to v0.5.0.
+
 ## 0.1.0
 
 - Initial release.