Move Poseidon primitive into halo2_poseidon

zcash · Dec 16, 2024 · de7219d · de7219d
1 parent 6a1962b
commit de7219d
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 1 deletion.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/halo2_gadgets/Cargo.toml b/halo2_gadgets/Cargo.toml
@@ -26,6 +26,7 @@ arrayvec = "0.7.0"
 bitvec = "1"
 ff = "0.13"
 group = "0.13"
+halo2_poseidon = { version = "0.0", path = "../halo2_poseidon", default-features = false }
 halo2_proofs = { version = "0.3", path = "../halo2_proofs", default-features = false }
 lazy_static = "1"
 pasta_curves = "0.5"
@@ -40,6 +41,7 @@ plotters = { version = "0.3.0", default-features = false, optional = true }
 
 [dev-dependencies]
 criterion = "0.3"
+halo2_poseidon = { version = "0.0", path = "../halo2_poseidon", default-features = false, features = ["test-dependencies"] }
 proptest = "1.0.0"
 sinsemilla = { version = "0.1", features = ["test-dependencies"] }
 

diff --git a/halo2_gadgets/src/poseidon.rs b/halo2_gadgets/src/poseidon.rs
@@ -13,7 +13,7 @@ use halo2_proofs::{
 mod pow5;
 pub use pow5::{Pow5Chip, Pow5Config, StateWord};
 
-pub mod primitives;
+pub use ::halo2_poseidon as primitives;
 use primitives::{Absorbing, ConstantLength, Domain, Spec, SpongeMode, Squeezing, State};
 
 /// A word from the padded input to a Poseidon sponge.

diff --git a/halo2_poseidon/Cargo.toml b/halo2_poseidon/Cargo.toml
@@ -15,3 +15,10 @@ readme = "README.md"
 categories = ["cryptography"]
 
 [dependencies]
+bitvec = "1"
+ff = "0.13"
+group = "0.13"
+pasta_curves = "0.5"
+
+[features]
+test-dependencies = []
diff --git a/halo2_gadgets/src/poseidon/primitives/fp.rs → halo2_poseidon/src/fp.rs b/halo2_gadgets/src/poseidon/primitives/fp.rs → halo2_poseidon/src/fp.rs
diff --git a/halo2_gadgets/src/poseidon/primitives/fq.rs → halo2_poseidon/src/fq.rs b/halo2_gadgets/src/poseidon/primitives/fq.rs → halo2_poseidon/src/fq.rs
diff --git a/..._gadgets/src/poseidon/primitives/grain.rs → halo2_poseidon/src/grain.rs b/..._gadgets/src/poseidon/primitives/grain.rs → halo2_poseidon/src/grain.rs
diff --git a/halo2_gadgets/src/poseidon/primitives.rs → halo2_poseidon/src/lib.rs b/halo2_gadgets/src/poseidon/primitives.rs → halo2_poseidon/src/lib.rs
diff --git a/halo2_gadgets/src/poseidon/primitives/mds.rs → halo2_poseidon/src/mds.rs b/halo2_gadgets/src/poseidon/primitives/mds.rs → halo2_poseidon/src/mds.rs
diff --git a/...ets/src/poseidon/primitives/p128pow5t3.rs → halo2_poseidon/src/p128pow5t3.rs b/...ets/src/poseidon/primitives/p128pow5t3.rs → halo2_poseidon/src/p128pow5t3.rs
diff --git a/...s/src/poseidon/primitives/test_vectors.rs → halo2_poseidon/src/test_vectors.rs b/...s/src/poseidon/primitives/test_vectors.rs → halo2_poseidon/src/test_vectors.rs