From 2e70cdb355beba99dc0e4e2fabdf0cef57caa2be Mon Sep 17 00:00:00 2001 From: Steven Gu Date: Sat, 8 Jul 2023 08:48:32 +0800 Subject: [PATCH 1/2] Replace `tag` with `rev` for halo2curves in `Cargo.toml`. --- Cargo.lock | 4 ++-- halo2_gadgets/Cargo.toml | 2 +- halo2_proofs/Cargo.toml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 40d1e8ba76..527bf9b041 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -860,7 +860,7 @@ dependencies = [ "ff", "group", "halo2_proofs", - "halo2curves 0.2.1", + "halo2curves 0.3.1", "lazy_static", "plotters", "pprof", @@ -921,7 +921,7 @@ dependencies = [ [[package]] name = "halo2curves" version = "0.3.1" -source = "git+https://github.com/privacy-scaling-explorations/halo2curves.git?tag=0.3.1#9b67e19bca30a35208b0c1b41c1723771e2c9f49" +source = "git+https://github.com/privacy-scaling-explorations/halo2curves.git?rev=9b67e19#9b67e19bca30a35208b0c1b41c1723771e2c9f49" dependencies = [ "ff", "group", diff --git a/halo2_gadgets/Cargo.toml b/halo2_gadgets/Cargo.toml index 6025ef7297..2172d60989 100644 --- a/halo2_gadgets/Cargo.toml +++ b/halo2_gadgets/Cargo.toml @@ -28,7 +28,7 @@ ff = "0.12" group = "0.12" halo2_proofs = { version = "0.2", path = "../halo2_proofs" } lazy_static = "1" -halo2curves = { git = 'https://github.com/privacy-scaling-explorations/halo2curves', tag = '0.3.0' } +halo2curves = { git = 'https://github.com/privacy-scaling-explorations/halo2curves', rev = "9b67e19" } 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 c4f5489de2..70a5bec37d 100644 --- a/halo2_proofs/Cargo.toml +++ b/halo2_proofs/Cargo.toml @@ -48,7 +48,7 @@ backtrace = { version = "0.3", optional = true } rayon = "1.5.1" ff = "0.12" group = "0.12" -halo2curves = { git = 'https://github.com/privacy-scaling-explorations/halo2curves.git', tag = "0.3.1" } +halo2curves = { git = 'https://github.com/privacy-scaling-explorations/halo2curves.git', rev = "9b67e19" } rand_core = { version = "0.6", default-features = false } tracing = "0.1" blake2b_simd = "1" From c5aafd5ca664bf7cc42275d9dba159cdfd578f07 Mon Sep 17 00:00:00 2001 From: Steven Gu Date: Sat, 8 Jul 2023 09:15:16 +0800 Subject: [PATCH 2/2] Update --- Cargo.lock | 21 +++++++++++++++++++-- halo2_gadgets/Cargo.toml | 2 +- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 527bf9b041..3c8206491a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -860,7 +860,7 @@ dependencies = [ "ff", "group", "halo2_proofs", - "halo2curves 0.3.1", + "halo2curves 0.2.1 (git+https://github.com/privacy-scaling-explorations/halo2curves?rev=83c72d4)", "lazy_static", "plotters", "pprof", @@ -918,6 +918,23 @@ dependencies = [ "subtle", ] +[[package]] +name = "halo2curves" +version = "0.2.1" +source = "git+https://github.com/privacy-scaling-explorations/halo2curves?rev=83c72d4#83c72d49762343ffc9576ca11a2aa615efe1029b" +dependencies = [ + "ff", + "group", + "lazy_static", + "num-bigint", + "num-traits", + "pasta_curves", + "rand", + "rand_core", + "static_assertions", + "subtle", +] + [[package]] name = "halo2curves" version = "0.3.1" @@ -1401,7 +1418,7 @@ version = "0.2.0" source = "git+https://github.com/privacy-scaling-explorations/poseidon.git?tag=v2022_10_22#5d29df01a95e3df6334080d28e983407f56b5da3" dependencies = [ "group", - "halo2curves 0.2.1", + "halo2curves 0.2.1 (git+https://github.com/privacy-scaling-explorations/halo2curves?tag=0.3.0)", "subtle", ] diff --git a/halo2_gadgets/Cargo.toml b/halo2_gadgets/Cargo.toml index 2172d60989..9397d929d2 100644 --- a/halo2_gadgets/Cargo.toml +++ b/halo2_gadgets/Cargo.toml @@ -28,7 +28,7 @@ ff = "0.12" group = "0.12" halo2_proofs = { version = "0.2", path = "../halo2_proofs" } lazy_static = "1" -halo2curves = { git = 'https://github.com/privacy-scaling-explorations/halo2curves', rev = "9b67e19" } +halo2curves = { git = 'https://github.com/privacy-scaling-explorations/halo2curves', rev = "83c72d4" } proptest = { version = "1.0.0", optional = true } rand = "0.8" subtle = "2.3"