Bläddra i källkod

chore: Unify all halo2 deps to be exact

We should still figure out what to do before publishing darkfi-sdk to
crates.io since it probably can't reference a git version.

This might imply publishing our halo2 fork as well, probably under
halo2-darkfi namespace.
x 7 månader sedan
förälder
incheckning
500f0c2891
3 ändrade filer med 9 tillägg och 42 borttagningar
  1. 4 37
      Cargo.lock
  2. 3 3
      Cargo.toml
  3. 2 2
      src/sdk/Cargo.toml

+ 4 - 37
Cargo.lock

@@ -1815,8 +1815,7 @@ dependencies = [
  "ed25519-compact",
  "futures",
  "futures-rustls",
- "halo2_gadgets 0.3.1",
- "halo2_gadgets 0.4.0",
+ "halo2_gadgets",
  "halo2_proofs",
  "hex",
  "httparse",
@@ -1913,7 +1912,7 @@ dependencies = [
  "bs58",
  "chacha20poly1305",
  "darkfi-serial",
- "halo2_gadgets 0.4.0",
+ "halo2_gadgets",
  "halo2_proofs",
  "hashbrown 0.16.1",
  "lazy_static",
@@ -1939,7 +1938,7 @@ dependencies = [
  "darkfi_dao_contract",
  "darkfi_deployooor_contract",
  "darkfi_money_contract",
- "halo2_gadgets 0.4.0",
+ "halo2_gadgets",
  "halo2_proofs",
  "plotters",
  "pyo3",
@@ -3468,26 +3467,6 @@ dependencies = [
  "zerocopy",
 ]
 
-[[package]]
-name = "halo2_gadgets"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73a5e510d58a07d8ed238a5a8a436fe6c2c79e1bb2611f62688bc65007b4e6e7"
-dependencies = [
- "arrayvec",
- "bitvec",
- "ff",
- "group",
- "halo2_poseidon 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "halo2_proofs",
- "lazy_static",
- "pasta_curves",
- "rand 0.8.5",
- "sinsemilla",
- "subtle",
- "uint 0.9.5",
-]
-
 [[package]]
 name = "halo2_gadgets"
 version = "0.4.0"
@@ -3497,7 +3476,7 @@ dependencies = [
  "bitvec",
  "ff",
  "group",
- "halo2_poseidon 0.1.0 (git+https://github.com/parazyd/halo2?branch=v032)",
+ "halo2_poseidon",
  "halo2_proofs",
  "lazy_static",
  "pasta_curves",
@@ -3508,18 +3487,6 @@ dependencies = [
  "uint 0.9.5",
 ]
 
-[[package]]
-name = "halo2_poseidon"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa3da60b81f02f9b33ebc6252d766f843291fb4d2247a07ae73d20b791fc56f"
-dependencies = [
- "bitvec",
- "ff",
- "group",
- "pasta_curves",
-]
-
 [[package]]
 name = "halo2_poseidon"
 version = "0.1.0"

+ 3 - 3
Cargo.toml

@@ -135,8 +135,8 @@ tiny-keccak = { version = "2.0.2", features = ["keccak"], optional = true }
 
 [dev-dependencies]
 clap = {version = "4.4.11", features = ["derive"]}
-halo2_proofs = {version = "0.3.1", features = ["dev-graph", "sanity-checks"]}
-halo2_gadgets = "0.3.1"
+halo2_proofs = {version = "0.3.2", features = ["circuit-params", "dev-graph", "sanity-checks"]}
+halo2_gadgets = {version = "0.4.0", features = ["circuit-params", "test-dependencies"]}
 plotters = "0.3.7"
 easy-parallel = "3.3.1"
 prettytable-rs = "0.10.0"
@@ -300,7 +300,7 @@ zk = [
     "halo2_gadgets",
     "rand",
 
-    "async-sdk",
+    "darkfi-sdk",
     "zkas",
 ]
 

+ 2 - 2
src/sdk/Cargo.toml

@@ -49,8 +49,8 @@ hashbrown = "0.16.1"
 sled-overlay = "0.1.14"
 
 [dev-dependencies]
-halo2_proofs = {version = "0.3.2", features = ["dev-graph", "sanity-checks"]}
-halo2_gadgets = {version = "0.4.0", features = ["test-dependencies"]}
+halo2_proofs = {version = "0.3.2", features = ["circuit-params", "dev-graph", "sanity-checks"]}
+halo2_gadgets = {version = "0.4.0", features = ["circuit-params", "test-dependencies"]}
 
 [lints]
 workspace = true