Revamped HyperNova -> staging

.cargo/config.toml

@@ -0,0 +1,5 @@
+[target.wasm32-unknown-unknown]
+runner = 'wasm-bindgen-test-runner'
+
+[target.wasm32-wasip2]
+runner = 'wasmtime'

.github/workflows/ci.yml

@@ -1,5 +1,6 @@
 name: CI Check
 on:
+  workflow_dispatch:
   merge_group:
   pull_request:
   push:
@@ -36,44 +37,45 @@ concurrency:
 jobs:
   test:
     if: github.event.pull_request.draft == false
-    name: Test
+    name: Test ${{ matrix.target }} (${{ matrix.features }})
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        feature_set: [basic]
         include:
-          - feature_set: basic
-            features: --features default,light-test
+          # x64: both parallel and no-parallel
+          - target: x86_64-unknown-linux-gnu
+            features: parallel
+            args: "--features parallel"
+          - target: x86_64-unknown-linux-gnu
+            features: no-parallel
+            args: ""
+          # wasm: no-parallel only
+          - target: wasm32-unknown-unknown
+            features: no-parallel
+            args: ""
+          - target: wasm32-wasip2
+            features: no-parallel
+            args: ""
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
-      - uses: noir-lang/noirup@v0.1.3
-        with:
-          toolchain: 0.36.0
-      - name: Download Circom
-        run: |
-          mkdir -p $HOME/bin
-          curl -sSfL https://github.com/iden3/circom/releases/download/v2.1.6/circom-linux-amd64 -o $HOME/bin/circom
-          chmod +x $HOME/bin/circom
-          echo "$HOME/bin" >> $GITHUB_PATH
-      - name: Download solc
-        run: |
-          curl -sSfL https://github.com/ethereum/solidity/releases/download/v0.8.4/solc-static-linux -o /usr/local/bin/solc
-          chmod +x /usr/local/bin/solc
-      - name: Execute compile.sh to generate .r1cs and .wasm from .circom
-        run: ./experimental-frontends/src/circom/test_folder/compile.sh
-      - name: Execute compile.sh to generate .json from noir
-        run: ./experimental-frontends/src/noir/test_folder/compile.sh
-      - name: Run tests
-        uses: actions-rs/cargo@v1
-        with:
-          command: test
-          args: --release --workspace --no-default-features ${{ matrix.features }}
-      - name: Run Doc-tests
-        uses: actions-rs/cargo@v1
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@stable
         with:
-          command: test
-          args: --doc
+          targets: ${{ matrix.target }}
+      - uses: Swatinem/rust-cache@v2
+      - name: Install wasm-bindgen-cli
+        if: matrix.target == 'wasm32-unknown-unknown'
+        run: cargo install wasm-bindgen-cli
+      - name: Install wasmtime-cli
+        if: matrix.target == 'wasm32-wasip2'
+        run: cargo install wasmtime-cli
+      - name: Test sonobe-primitives
+        run: cargo test --release -p sonobe-primitives --target ${{ matrix.target }} ${{ matrix.args }}
+      - name: Test sonobe-fs
+        run: cargo test --release -p sonobe-fs --target ${{ matrix.target }} ${{ matrix.args }}
+      - name: Test sonobe-ivc
+        run: cargo test --release -p sonobe-ivc --target ${{ matrix.target }} ${{ matrix.args }}
+      - name: Test documentation examples
+        run: cargo test --doc --target ${{ matrix.target }} ${{ matrix.args }}
 
   build:
     if: github.event.pull_request.draft == false
@@ -82,121 +84,55 @@ jobs:
     strategy:
       matrix:
         target:
+          - x86_64-unknown-linux-gnu
           - wasm32-unknown-unknown
-          - wasm32-wasip1
-          # Ignoring until clear usage is required
-          # - wasm32-unknown-emscripten
-
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions-rs/toolchain@v1
-        with:
-          override: false
-          default: true
-      - name: Add target
-        run: rustup target add ${{ matrix.target }}
-      - name: Wasm-compat experimental-frontends build
-        uses: actions-rs/cargo@v1
-        with:
-          command: build
-          args: -p experimental-frontends --no-default-features --target ${{ matrix.target }} --features "wasm, parallel"
-      - name: Wasm-compat folding-schemes build
-        uses: actions-rs/cargo@v1
-        with:
-          command: build
-          args: -p folding-schemes --no-default-features --target ${{ matrix.target }} --features "default,light-test"
-      - name: Run wasm-compat script
-        run: |
-          chmod +x .github/scripts/wasm-target-test-build.sh
-          .github/scripts/wasm-target-test-build.sh
-        shell: bash
-
-  examples:
-    if: github.event.pull_request.draft == false
-    name: Run examples & examples tests
-    runs-on: ubuntu-latest
+          - wasm32-wasip2
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
-      - uses: noir-lang/noirup@v0.1.3
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@stable
         with:
-          toolchain: 0.36.0
-      - name: Download Circom
-        run: |
-          mkdir -p $HOME/bin
-          curl -sSfL https://github.com/iden3/circom/releases/download/v2.1.6/circom-linux-amd64 -o $HOME/bin/circom
-          chmod +x $HOME/bin/circom
-          echo "$HOME/bin" >> $GITHUB_PATH
-      - name: Download solc
-        run: |
-          curl -sSfL https://github.com/ethereum/solidity/releases/download/v0.8.4/solc-static-linux -o /usr/local/bin/solc
-          chmod +x /usr/local/bin/solc
-      - name: Execute compile.sh to generate .r1cs and .wasm from .circom
-        run: ./experimental-frontends/src/circom/test_folder/compile.sh
-      - name: Execute compile.sh to generate .json from noir
-        run: ./experimental-frontends/src/noir/test_folder/compile.sh
-      - name: Run examples tests
-        run: cargo test --examples
-      - name: Run examples
-        run: cargo run --release --example 2>&1 | grep -E '^ ' | xargs -n1 cargo run --release --example
-
-  # run the benchmarks with the flag `--no-run` to ensure that they compile,
-  # but without executing them.
-  bench:
-    if: github.event.pull_request.draft == false
-    name: Bench compile
-    timeout-minutes: 30
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
+          targets: ${{ matrix.target }}
       - uses: Swatinem/rust-cache@v2
-      - uses: actions-rs/cargo@v1
-        with:
-          command: bench
-          args: -p folding-schemes --no-run
+      - name: Build sonobe-primitives
+        run: cargo build -p sonobe-primitives --target ${{ matrix.target }}
+      - name: Build sonobe-fs
+        run: cargo build -p sonobe-fs --target ${{ matrix.target }}
+      - name: Build sonobe-ivc
+        run: cargo build -p sonobe-ivc --target ${{ matrix.target }}
 
   fmt:
     if: github.event.pull_request.draft == false
     name: Rustfmt
     timeout-minutes: 30
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
-      - uses: Swatinem/rust-cache@v2
-      - run: rustup component add rustfmt
-      - uses: actions-rs/cargo@v1
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@stable
         with:
-          command: fmt
-          args: --all --check
+          components: rustfmt
+      - uses: Swatinem/rust-cache@v2
+      - name: Run rustfmt
+        run: cargo fmt --all --check
 
   clippy:
     if: github.event.pull_request.draft == false
-    name: Clippy lint checks
+    name: Clippy (${{ matrix.target }})
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        feature_set: [basic, wasm]
-        include:
-          - feature_set: basic
-            features: --features default
-            # We only want to test `experimental-frontends` package with `wasm` feature.
-          - feature_set: wasm
-            features: -p experimental-frontends --features wasm,parallel --target wasm32-unknown-unknown
+        target:
+          - x86_64-unknown-linux-gnu
+          - wasm32-unknown-unknown
+          - wasm32-wasip2
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@stable
         with:
           components: clippy
+          targets: ${{ matrix.target }}
       - uses: Swatinem/rust-cache@v2
-      - name: Add target
-        run: rustup target add wasm32-unknown-unknown
       - name: Run clippy
-        uses: actions-rs/cargo@v1
-        with:
-          command: clippy
-          args: --no-default-features ${{ matrix.features }} -- -D warnings
+        run: cargo clippy --workspace --all-targets --target ${{ matrix.target }} -- -D warnings
 
   typos:
     if: github.event.pull_request.draft == false

Cargo.toml

@@ -1,10 +1,50 @@
 [workspace]
 members = [
     "crates/primitives",
-    "crates/traits",
+    "crates/fs",
+    "crates/ivc",
 ]
 resolver = "2"
 
+[workspace.package]
+edition = "2024"
+license = "MIT"
+repository = "https://github.com/privacy-scaling-explorations/sonobe/"
+rust-version = "1.85.1"
+
+[workspace.dependencies]
+num-bigint = { version = "0.4.3" }
+num-integer = { version = "0.1" }
+num-traits = { version = "0.2" }
+sha3 = { version = "0.10" }
+rayon = { version = "1" }
+thiserror = { version = "2.0.16" }
+wasm-bindgen-test = { version = "0.3" }
+
+# Arkworks family
+ark-crypto-primitives = { git = "https://github.com/arkworks-rs/crypto-primitives", default-features = false }
+ark-ec = { git = "https://github.com/arkworks-rs/algebra", default-features = false }
+ark-ff = { git = "https://github.com/arkworks-rs/algebra", default-features = false }
+ark-groth16 = { git = "https://github.com/arkworks-rs/groth16", default-features = false }
+ark-poly = { git = "https://github.com/arkworks-rs/algebra", default-features = false }
+ark-poly-commit = { git = "https://github.com/arkworks-rs/poly-commit", default-features = false }
+ark-r1cs-std = { git = "https://github.com/arkworks-rs/r1cs-std", default-features = false }
+ark-relations = { git = "https://github.com/arkworks-rs/snark", default-features = false }
+ark-serialize = { git = "https://github.com/arkworks-rs/algebra", default-features = false }
+ark-snark = { git = "https://github.com/arkworks-rs/snark", default-features = false }
+ark-std = { git = "https://github.com/arkworks-rs/std", default-features = false }
+
+# Ark curves
+ark-bn254 = { git = "https://github.com/arkworks-rs/algebra", default-features = false }
+ark-grumpkin = { git = "https://github.com/arkworks-rs/algebra", default-features = false }
+ark-pallas = { git = "https://github.com/arkworks-rs/algebra", default-features = false }
+ark-vesta = { git = "https://github.com/arkworks-rs/algebra", default-features = false }
+
+# Local crates
+sonobe-primitives = { path = "crates/primitives", default-features = false }
+sonobe-fs = { path = "crates/fs", default-features = false }
+sonobe-ivc = { path = "crates/ivc", default-features = false }
+
 [patch.crates-io]
 # We depend on git versions of arkworks crates, but some of our dependencies
 # depend on crates.io versions, so we need to override them here to avoid
@@ -19,64 +59,9 @@ ark-r1cs-std = { git = "https://github.com/winderica/r1cs-std", rev = "ae8283a"
 
 # Curve crates also need git versions
 ark-bn254 = { git = "https://github.com/arkworks-rs/algebra" }
-ark-grumpkin = { git = "https://github.com/arkworks-rs/algebra" }
 
 [patch."https://github.com/arkworks-rs/crypto-primitives"]
 ark-crypto-primitives = { git = "https://github.com/winderica/crypto-primitives", rev = "af003fc" }
 
 [patch."https://github.com/arkworks-rs/r1cs-std"]
-ark-r1cs-std = { git = "https://github.com/winderica/r1cs-std", rev = "ae8283a" } # "sw-fix-updated" branch
-
-[workspace.package]
-edition = "2021"
-license = "MIT"
-repository = "https://github.com/privacy-scaling-explorations/sonobe/"
-
-[workspace.dependencies]
-acvm = { git = "https://github.com/winderica/noir", rev = "fc9e99", default-features = false } # "arkworks-next" branch
-askama = { version = "0.12.0", default-features = false }
-clap = { version = "4.4" }
-clap-verbosity-flag = { version = "2.1" }
-criterion = { version = "0.5" }
-env_logger = { version = "0.10" }
-getrandom = { version = "0.2" }
-log = { version = "0.4" }
-noname = { git = "https://github.com/dmpierre/noname", rev = "c34f17" }
-num-bigint = { version = "0.4.3" }
-num-integer = { version = "0.1" }
-num-traits = { version = "0.2" }
-pprof = { version = "0.13" }
-serde = { version = "^1.0.0" }
-serde_json = { version = "^1.0.0" }
-sha3 = { version = "0.10" }
-rand = { version = "0.8.5" }
-rayon = { version = "1" }
-revm = { version = "19.5.0", default-features = false }
-rust-crypto = { version = "0.2" }
-thiserror = { version = "1.0" }
-tokio = "1.44.1"
-wasmer = { version = "6.1.0", default-features = false }
-
-# Arkworks family
-ark-bn254 = { version = "^0.5.0", default-features = false }
-ark-circom = { git = "https://github.com/arkworks-rs/circom-compat", default-features = false }
-ark-crypto-primitives = { version = "^0.5.0", default-features = false }
-ark-ec = { version = "^0.5.0", default-features = false }
-ark-ff = { version = "^0.5.0", default-features = false }
-ark-groth16 = { git = "https://github.com/arkworks-rs/groth16" }
-ark-grumpkin = { version = "^0.5.0", default-features = false }
-ark-mnt4-298 = { version = "^0.5.0" }
-ark-mnt6-298 = { version = "^0.5.0" }
-ark-pallas = { version = "^0.5.0" }
-ark-poly = { version = "^0.5.0", default-features = false }
-ark-poly-commit = { version = "^0.5.0" }
-ark-r1cs-std = { version = "^0.5.0", default-features = false }
-ark-relations = { git = "https://github.com/arkworks-rs/snark", default-features = false }
-ark-serialize = { version = "^0.5.0" }
-ark-snark = { git = "https://github.com/arkworks-rs/snark", default-features = false }
-ark-std = { version = "^0.5.0", default-features = false }
-ark-vesta = { version = "^0.5.0" }
-
-# Local crates
-sonobe-primitives = { path = "crates/primitives", default-features = false }
-sonobe-traits = { path = "crates/traits" }
+ark-r1cs-std = { git = "https://github.com/winderica/r1cs-std", rev = "ae8283a" } # "sw-fix-updated" branch