diff --git a/Cargo.lock b/Cargo.lock index ad7523ba1b..a9a856dcca 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -836,7 +836,7 @@ dependencies = [ "ff", "group", "halo2_proofs", - "halo2curves", + "halo2curves 0.3.3", "lazy_static", "plotters", "pprof", @@ -869,7 +869,7 @@ dependencies = [ "group", "gumdrop", "halo2_legacy_pdqsort", - "halo2curves", + "halo2curves 0.3.3", "lazy_static", "log", "maybe-rayon", @@ -894,6 +894,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6b1142bd1059aacde1b477e0c80c142910f1ceae67fc619311d6a17428007ab" dependencies = [ "blake2b_simd", + "ff", + "group", + "lazy_static", + "num-bigint", + "num-traits", + "pasta_curves", + "paste", + "rand", + "rand_core", + "static_assertions", + "subtle", +] + +[[package]] +name = "halo2curves" +version = "0.3.3" +source = "git+https://github.com/kunxian-xia/halo2curves?branch=feat/sp1#f3ca06c2c9b84d1661d76112d38d21418e208c28" +dependencies = [ "ff", "group", "lazy_static", @@ -904,7 +922,6 @@ dependencies = [ "rand", "rand_core", "serde", - "serde_arrays", "static_assertions", "subtle", ] @@ -1381,7 +1398,7 @@ name = "poseidon" version = "0.2.0" source = "git+https://github.com/scroll-tech/poseidon.git?branch=main#5787dd3d2ce7a9e9601a035c396ac0c03449b54d" dependencies = [ - "halo2curves", + "halo2curves 0.1.0", "subtle", ] @@ -1665,15 +1682,6 @@ dependencies = [ "serde_derive", ] -[[package]] -name = "serde_arrays" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38636132857f68ec3d5f3eb121166d2af33cb55174c4d5ff645db6165cbef0fd" -dependencies = [ - "serde", -] - [[package]] name = "serde_cbor" version = "0.11.2" diff --git a/halo2_gadgets/Cargo.toml b/halo2_gadgets/Cargo.toml index 4c62d46cf7..daab399b66 100644 --- a/halo2_gadgets/Cargo.toml +++ b/halo2_gadgets/Cargo.toml @@ -28,7 +28,7 @@ ff = { version = "0.13", features = ["bits"] } group = "0.13" halo2_proofs = { path = "../halo2_proofs", default-features = false } lazy_static = "1" -halo2curves = { version = "0.1.0" } +halo2curves = { git = "https://github.com/kunxian-xia/halo2curves", branch = "feat/sp1" } proptest = { version = "1.0.0", optional = true } rand = "0.8" subtle = "2.3" diff --git a/halo2_proofs/Cargo.toml b/halo2_proofs/Cargo.toml index ba76b86892..186347e766 100644 --- a/halo2_proofs/Cargo.toml +++ b/halo2_proofs/Cargo.toml @@ -52,7 +52,7 @@ rayon = "1.5.1" backtrace = { version = "0.3", optional = true } ff = "0.13" group = "0.13" -halo2curves = { version = "0.1.0", features = [ "derive_serde" ] } +halo2curves = { git = "https://github.com/kunxian-xia/halo2curves", branch = "feat/sp1", features = [ "derive_serde" ] } rand_core = { version = "0.6", default-features = false } tracing = "0.1" blake2b_simd = "1" # MSRV 1.66.0