fix build after merge

.github/workflows/ci.yml

@@ -23,12 +23,7 @@ jobs:
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           toolchain: stable
-      - shell: bash
-        env:
-          deploy_key: ${{ secrets.deploy_key }}
-        run: |
-          ./.github/checkout.sh
-          cargo build
+      - run: cargo build
 
   cargo-clippy:
     runs-on: ubuntu-latest
@@ -37,12 +32,7 @@ jobs:
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           toolchain: stable
-      - shell: bash
-        env:
-          deploy_key: ${{ secrets.deploy_key }}
-        run: |
-          ./.github/checkout.sh
-          cargo clippy --all-targets
+      - run: cargo clippy --all-targets
 
   test:
     runs-on: ubuntu-latest
@@ -51,9 +41,4 @@ jobs:
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           toolchain: stable
-      - shell: bash
-        env:
-          deploy_key: ${{ secrets.deploy_key }}
-        run: |
-          ./.github/checkout.sh
-          cargo test
+      - run: cargo test -r

Cargo.toml

@@ -8,9 +8,17 @@ members = [
     "tools",
     "prover",
     "network",
+    "supernova",
     "msnova",
 ]
-default-members = ["riscv", "riscv-circuit", "tools", "prover", "network"]
+default-members = [
+    "riscv",
+    "riscv-circuit",
+    "tools",
+    "prover",
+    "network",
+    "supernova",
+]
 
 [workspace.package]
 edition = "2021"
@@ -22,9 +30,6 @@ clap = { version = "4.3", features = ["derive"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 
-supernova = { git = "ssh://[email protected]:22/nexus-xyz/supernova.git", rev = "92e884c" }
-#supernova = { path = "../supernova" }
-
 ark-crypto-primitives = { version = "0.4.0", features = ["r1cs", "sponge", "crh", "merkle_tree"] }
 ark-std = "0.4.0"
 
@@ -34,24 +39,34 @@ ark-r1cs-std = { version = "0.4.0" }
 ark-ff = "0.4.0"
 ark-ec = { version = "0.4.0", default-features = false }
 ark-serialize = { version = "0.4.0", features = ["derive"] }
+ark-poly = "0.4.0"
+ark-poly-commit = "0.4.0"
 
 ark-bn254 = "0.4.0"
 ark-grumpkin = "0.4.0"
+ark-pallas = "0.4.0"
+ark-vesta = "0.4.0"
+ark-test-curves = { version = "0.4.2", features = ["bls12_381_curve"] }
 
-# Note, this should be in sync with the supernova repo
 [patch.crates-io]
 ark-crypto-primitives = { git = "https://github.com/arkworks-rs/crypto-primitives", rev = "d27a5c8" }
-#ark-r1cs-std = { git = "https://github.com/arkworks-rs/r1cs-std/", rev = "2ca3bd7" }
-ark-r1cs-std = { git = "https://github.com/slumber/r1cs-std/", branch = "slumber-hardcode-nonnative-params" }
 
-ark-ff = { git = "https://github.com/arkworks-rs/algebra/", rev = "c92be0e" }
-ark-ec = { git = "https://github.com/arkworks-rs/algebra/", rev = "c92be0e" }
-ark-serialize = { git = "https://github.com/arkworks-rs/algebra/", rev = "c92be0e" }
+ark-r1cs-std = { git = "https://github.com/arkworks-rs/r1cs-std/", rev = "2ca3bd7" }
+
+ark-ff          = { git = "https://github.com/arkworks-rs/algebra/", rev = "c92be0e" }
+ark-ec          = { git = "https://github.com/arkworks-rs/algebra/", rev = "c92be0e" }
+ark-serialize   = { git = "https://github.com/arkworks-rs/algebra/", rev = "c92be0e" }
+ark-poly        = { git = "https://github.com/arkworks-rs/algebra/", rev = "c92be0e" }
+ark-test-curves = { git = "https://github.com/arkworks-rs/algebra/", rev = "c92be0e" }
+
+ark-poly-commit = { git = "https://github.com/arkworks-rs/poly-commit/", rev = "c724fa6" }
 
-ark-bn254 = { git = "https://github.com/arkworks-rs/curves/", rev = "8c0256a" }
-ark-grumpkin = { git = "https://github.com/arkworks-rs/curves/", rev = "8c0256a" }
+ark-bn254     = { git = "https://github.com/arkworks-rs/curves/", rev = "8c0256a" }
+ark-grumpkin  = { git = "https://github.com/arkworks-rs/curves/", rev = "8c0256a" }
+ark-pallas    = { git = "https://github.com/arkworks-rs/curves/", rev = "8c0256a" }
+ark-vesta     = { git = "https://github.com/arkworks-rs/curves/", rev = "8c0256a" }
+ark-bls12-381 = { git = "https://github.com/arkworks-rs/curves/", rev = "3fded1f" }
 
-# additional settings in .cargo/config
 [profile.release]
 codegen-units = 1
 lto = true

bin/pre-commit.sh

@@ -8,4 +8,4 @@ set -e
 cargo fmt --all --check
 cargo build
 cargo clippy --all-targets
-cargo test
+cargo test -r

prover/Cargo.toml

@@ -14,8 +14,7 @@ zstd = { version = "0.12", default-features = false }
 
 nexus-riscv = { path = "../riscv" }
 nexus-riscv-circuit = { path = "../riscv-circuit" }
-
-supernova.workspace = true
+supernova = { path = "../supernova" }
 
 ark-ff.workspace = true
 ark-ec.workspace = true

supernova/Cargo.toml

@@ -1,18 +1,20 @@
 [package]
 name = "supernova"
-version = "0.1.0"
-edition = "2021"
+version.workspace = true
+edition.workspace = true
+publish = false
 
 [dependencies]
-ark-ff = "0.4.0"
-ark-ec = { version = "0.4.0", default-features = false }
-ark-std = "0.4.0"
-ark-crypto-primitives = { version = "0.4.0", features = ["r1cs", "sponge"] }
-ark-relations = { version = "0.4.0" }
-ark-r1cs-std = { version = "0.4.0" }
-ark-serialize = { version = "0.4.0", features = ["derive"] }
-ark-poly = "0.4.0"
-ark-poly-commit = { version = "0.4.0", optional = true }
+ark-ff.workspace = true
+ark-ec.workspace = true
+ark-std.workspace = true
+ark-crypto-primitives.workspace = true
+ark-relations.workspace = true
+ark-r1cs-std.workspace = true
+ark-serialize.workspace = true
+ark-poly.workspace = true
+ark-poly-commit = { workspace = true, optional = true }
+
 ark_spartan = { git = "ssh://[email protected]/nexus-xyz/committed-relaxed-spartan.git", package = "ark-spartan", optional = true }
 
 merlin = { version = "3.0.0", optional = true }
@@ -34,31 +36,16 @@ parallel = [
 spartan = ["ark-poly-commit", "ark_spartan", "merlin"]
 
 [dev-dependencies]
-ark-test-curves = { version = "0.4.2", features = ["bls12_381_curve"] }
+ark-test-curves.workspace = true
 
-ark-pallas = "0.4.0"
-ark-vesta = "0.4.0"
+ark-pallas.workspace = true
+ark-vesta.workspace = true
 
-ark-bn254 = "0.4.0"
-ark-grumpkin = "0.4.0"
+ark-bn254.workspace = true
+ark-grumpkin.workspace = true
 
 tracing-subscriber = { version = "0.2", default-features = false, features = [
    "fmt",
    "ansi",
 ] }
 
-[patch.crates-io]
-ark-bls12-381 = { git = "https://github.com/arkworks-rs/curves/", rev = "3fded1f" }
-ark-crypto-primitives = { git = "https://github.com/arkworks-rs/crypto-primitives", rev = "d27a5c8" }
-ark-r1cs-std = { git = "https://github.com/arkworks-rs/r1cs-std/", rev = "2ca3bd7" }
-ark-ff = { git = "https://github.com/arkworks-rs/algebra/", rev = "c92be0e" }
-ark-ec = { git = "https://github.com/arkworks-rs/algebra/", rev = "c92be0e" }
-ark-poly = { git = "https://github.com/arkworks-rs/algebra/", rev = "c92be0e" }
-ark-poly-commit = { git = "https://github.com/arkworks-rs/poly-commit/", rev = "c724fa6" }
-ark-serialize = { git = "https://github.com/arkworks-rs/algebra/", rev = "c92be0e" }
-
-ark-bn254 = { git = "https://github.com/arkworks-rs/curves", rev = "ccf8392" }
-ark-grumpkin = { git = "https://github.com/arkworks-rs/curves", rev = "ccf8392" }
-ark-pallas = { git = "https://github.com/arkworks-rs/curves/", rev = "3fded1f" }
-ark-vesta = { git = "https://github.com/arkworks-rs/curves/", rev = "3fded1f" }
-ark-test-curves = { git = "https://github.com/arkworks-rs/algebra/", rev = "c92be0e" }