From 52e2e7ee2850fa86a816c1f1e00703a9e3d2c54a Mon Sep 17 00:00:00 2001 From: mmagician Date: Thu, 20 Jun 2024 14:27:34 +0200 Subject: [PATCH 1/8] bump dep versions --- crypto-primitives/Cargo.toml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/crypto-primitives/Cargo.toml b/crypto-primitives/Cargo.toml index a3c9bc5..11599c2 100644 --- a/crypto-primitives/Cargo.toml +++ b/crypto-primitives/Cargo.toml @@ -17,18 +17,18 @@ edition.workspace = true [dependencies] ark-crypto-primitives-macros = { version = "^0.4.0", path = "../macros" } -ark-ff = { version = "^0.4.0", default-features = false } -ark-ec = { version = "^0.4.0", default-features = false } -ark-std = { version = "^0.4.0", default-features = false } -ark-relations = { version = "^0.4.0", default-features = false } -ark-serialize = { version = "^0.4.0", default-features = false, features = [ "derive" ] } +ark-ff = { version = "0.5.0-alpha", default-features = false } +ark-ec = { version = "0.5.0-alpha", default-features = false } +ark-std = { version = "0.5.0-alpha", default-features = false } +ark-relations = { version = "0.5.0-alpha", default-features = false } +ark-serialize = { version = "0.5.0-alpha", default-features = false, features = [ "derive" ] } blake2 = { version = "0.10", default-features = false } sha2 = { version = "0.10", default-features = false } digest = { version = "0.10", default-features = false } -ark-r1cs-std = { version = "^0.4.0", optional = true, default-features = false } -ark-snark = { version = "^0.4.0", default-features = false } +ark-r1cs-std = { version = "0.5.0-alpha", optional = true, default-features = false } +ark-snark = { version = "0.5.0-alpha", default-features = false } rayon = { version = "1.0", optional = true } derivative = { version = "2.0", features = ["use_core"] } @@ -57,11 +57,11 @@ ahash = { version = "0.8", default-features = false} fnv = { version = "1.0", default-features = false } [dev-dependencies] -ark-ed-on-bls12-377 = { version = "^0.4.0", default-features = false } -ark-ed-on-bls12-381 = { version = "^0.4.0", default-features = false, features = [ "r1cs" ] } -ark-bls12-377 = { version = "^0.4.0", default-features = false, features = [ "curve", "r1cs" ] } -ark-mnt4-298 = { version = "^0.4.0", default-features = false, features = [ "curve", "r1cs" ] } -ark-mnt6-298 = { version = "^0.4.0", default-features = false, features = [ "r1cs" ] } +ark-ed-on-bls12-377 = { version = "0.5.0-alpha", default-features = false } +ark-ed-on-bls12-381 = { version = "0.5.0-alpha", default-features = false, features = [ "r1cs" ] } +ark-bls12-377 = { version = "0.5.0-alpha", default-features = false, features = [ "curve", "r1cs" ] } +ark-mnt4-298 = { version = "0.5.0-alpha", default-features = false, features = [ "curve", "r1cs" ] } +ark-mnt6-298 = { version = "0.5.0-alpha", default-features = false, features = [ "r1cs" ] } criterion = { version = "0.4" } ################################# Benchmarks ################################## From 3c16820938e80effd3c168fec6b02c3ac6e7b4ca Mon Sep 17 00:00:00 2001 From: mmagician Date: Thu, 20 Jun 2024 14:34:28 +0200 Subject: [PATCH 2/8] bump crate version --- Cargo.toml | 2 +- crypto-primitives/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index afe68c4..5e73241 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,7 +6,7 @@ members = [ resolver = "2" [workspace.package] -version = "0.4.0" +version = "0.5.0-alpha.0" authors = [ "arkworks contributors" ] description = "A library of useful cryptographic primitives" homepage = "https://arkworks.rs" diff --git a/crypto-primitives/Cargo.toml b/crypto-primitives/Cargo.toml index 11599c2..bf0ca9b 100644 --- a/crypto-primitives/Cargo.toml +++ b/crypto-primitives/Cargo.toml @@ -15,7 +15,7 @@ edition.workspace = true ################################# Dependencies ################################ [dependencies] -ark-crypto-primitives-macros = { version = "^0.4.0", path = "../macros" } +ark-crypto-primitives-macros = { version = "^0.5.0-alpha.0", path = "../macros" } ark-ff = { version = "0.5.0-alpha", default-features = false } ark-ec = { version = "0.5.0-alpha", default-features = false } From d559c6a4f771bdb62218113c3f540a4494bb8659 Mon Sep 17 00:00:00 2001 From: mmagician Date: Thu, 20 Jun 2024 14:50:52 +0200 Subject: [PATCH 3/8] fix recursion in symlinks license --- crypto-primitives/LICENSE-APACHE | 2 +- crypto-primitives/LICENSE-MIT | 2 +- macros/LICENSE-APACHE | 2 +- macros/LICENSE-MIT | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/crypto-primitives/LICENSE-APACHE b/crypto-primitives/LICENSE-APACHE index 6b579aa..965b606 120000 --- a/crypto-primitives/LICENSE-APACHE +++ b/crypto-primitives/LICENSE-APACHE @@ -1 +1 @@ -LICENSE-APACHE \ No newline at end of file +../LICENSE-APACHE \ No newline at end of file diff --git a/crypto-primitives/LICENSE-MIT b/crypto-primitives/LICENSE-MIT index 7f9a88e..76219eb 120000 --- a/crypto-primitives/LICENSE-MIT +++ b/crypto-primitives/LICENSE-MIT @@ -1 +1 @@ -LICENSE-MIT \ No newline at end of file +../LICENSE-MIT \ No newline at end of file diff --git a/macros/LICENSE-APACHE b/macros/LICENSE-APACHE index 6b579aa..965b606 120000 --- a/macros/LICENSE-APACHE +++ b/macros/LICENSE-APACHE @@ -1 +1 @@ -LICENSE-APACHE \ No newline at end of file +../LICENSE-APACHE \ No newline at end of file diff --git a/macros/LICENSE-MIT b/macros/LICENSE-MIT index 7f9a88e..76219eb 120000 --- a/macros/LICENSE-MIT +++ b/macros/LICENSE-MIT @@ -1 +1 @@ -LICENSE-MIT \ No newline at end of file +../LICENSE-MIT \ No newline at end of file From f7733f3d54e59944a5d48a9f49d21441eb78b3a9 Mon Sep 17 00:00:00 2001 From: mmagician Date: Thu, 20 Jun 2024 14:41:46 +0200 Subject: [PATCH 4/8] fix dep requirement --- crypto-primitives/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crypto-primitives/Cargo.toml b/crypto-primitives/Cargo.toml index bf0ca9b..ad74dcd 100644 --- a/crypto-primitives/Cargo.toml +++ b/crypto-primitives/Cargo.toml @@ -15,7 +15,7 @@ edition.workspace = true ################################# Dependencies ################################ [dependencies] -ark-crypto-primitives-macros = { version = "^0.5.0-alpha.0", path = "../macros" } +ark-crypto-primitives-macros = { version = "0.5.0-alpha", path = "../macros" } ark-ff = { version = "0.5.0-alpha", default-features = false } ark-ec = { version = "0.5.0-alpha", default-features = false } From af9944be94d94e84818e9d7bdae5e7fff82ce486 Mon Sep 17 00:00:00 2001 From: mmagician Date: Thu, 20 Jun 2024 14:50:13 +0200 Subject: [PATCH 5/8] need to publish macros paths dependencies are ignored in public packages --- macros/Cargo.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/macros/Cargo.toml b/macros/Cargo.toml index 7b20973..57f0902 100644 --- a/macros/Cargo.toml +++ b/macros/Cargo.toml @@ -10,7 +10,6 @@ categories.workspace = true include.workspace = true license.workspace = true edition.workspace = true -publish = false [dependencies] quote = { version = "1.0" } From 1d9b6722eb23494876b55ca221687526d82bb53c Mon Sep 17 00:00:00 2001 From: mmagician Date: Mon, 28 Oct 2024 13:53:51 +0100 Subject: [PATCH 6/8] bump versions to 0.5 --- Cargo.toml | 2 +- crypto-primitives/Cargo.toml | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 5e73241..360ee1b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,7 +6,7 @@ members = [ resolver = "2" [workspace.package] -version = "0.5.0-alpha.0" +version = "0.5.0" authors = [ "arkworks contributors" ] description = "A library of useful cryptographic primitives" homepage = "https://arkworks.rs" diff --git a/crypto-primitives/Cargo.toml b/crypto-primitives/Cargo.toml index affa780..ca402d6 100644 --- a/crypto-primitives/Cargo.toml +++ b/crypto-primitives/Cargo.toml @@ -17,19 +17,19 @@ edition.workspace = true [dependencies] ark-crypto-primitives-macros = { version = "0.5.0-alpha", path = "../macros" } -ark-ff = { version = "0.5.0-alpha", default-features = false } -ark-ec = { version = "0.5.0-alpha", default-features = false } -ark-std = { version = "0.5.0-alpha", default-features = false } -ark-relations = { version = "0.5.0-alpha", default-features = false } -ark-serialize = { version = "0.5.0-alpha", default-features = false, features = [ "derive" ] } +ark-ff = { version = "0.5.0", default-features = false } +ark-ec = { version = "0.5.0", default-features = false } +ark-std = { version = "0.5.0", default-features = false } +ark-relations = { version = "0.5.0", default-features = false } +ark-serialize = { version = "0.5.0", default-features = false, features = [ "derive" ] } blake2 = { version = "0.10", default-features = false } sha2 = { version = "0.10", default-features = false } digest = { version = "0.10", default-features = false } merlin = { version = "3.0.0", default-features = false, optional = true } -ark-r1cs-std = { version = "0.5.0-alpha", optional = true, default-features = false } -ark-snark = { version = "0.5.0-alpha", default-features = false } +ark-r1cs-std = { version = "0.5.0", optional = true, default-features = false } +ark-snark = { version = "0.5.0", default-features = false } rayon = { version = "1.0", optional = true } derivative = { version = "2.0", features = ["use_core"] } @@ -58,11 +58,11 @@ ahash = { version = "0.8", default-features = false} fnv = { version = "1.0", default-features = false } [dev-dependencies] -ark-ed-on-bls12-377 = { version = "0.5.0-alpha", default-features = false } -ark-ed-on-bls12-381 = { version = "0.5.0-alpha", default-features = false, features = [ "r1cs" ] } -ark-bls12-377 = { version = "0.5.0-alpha", default-features = false, features = [ "curve", "r1cs" ] } -ark-mnt4-298 = { version = "0.5.0-alpha", default-features = false, features = [ "curve", "r1cs" ] } -ark-mnt6-298 = { version = "0.5.0-alpha", default-features = false, features = [ "r1cs" ] } +ark-ed-on-bls12-377 = { version = "0.5.0", default-features = false } +ark-ed-on-bls12-381 = { version = "0.5.0", default-features = false, features = [ "r1cs" ] } +ark-bls12-377 = { version = "0.5.0", default-features = false, features = [ "curve", "r1cs" ] } +ark-mnt4-298 = { version = "0.5.0", default-features = false, features = [ "curve", "r1cs" ] } +ark-mnt6-298 = { version = "0.5.0", default-features = false, features = [ "r1cs" ] } criterion = { version = "0.4" } ################################# Benchmarks ################################## From b9414b6e89f541f40ee2489abcc2ee998821fc03 Mon Sep 17 00:00:00 2001 From: mmagician Date: Mon, 28 Oct 2024 14:01:57 +0100 Subject: [PATCH 7/8] temp remove patching --- Cargo.toml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 360ee1b..2776179 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -43,16 +43,16 @@ incremental = true debug-assertions = true debug = true -[patch.crates-io] -ark-r1cs-std = { git = "https://github.com/arkworks-rs/r1cs-std/" } -ark-ff = { git = "https://github.com/arkworks-rs/algebra/" } -ark-ec = { git = "https://github.com/arkworks-rs/algebra/" } -ark-poly = { git = "https://github.com/arkworks-rs/algebra/" } -ark-serialize = { git = "https://github.com/arkworks-rs/algebra/" } -ark-std = { git = "https://github.com/arkworks-rs/std/" } +# [patch.crates-io] +# ark-r1cs-std = { git = "https://github.com/arkworks-rs/r1cs-std/" } +# ark-ff = { git = "https://github.com/arkworks-rs/algebra/" } +# ark-ec = { git = "https://github.com/arkworks-rs/algebra/" } +# ark-poly = { git = "https://github.com/arkworks-rs/algebra/" } +# ark-serialize = { git = "https://github.com/arkworks-rs/algebra/" } +# ark-std = { git = "https://github.com/arkworks-rs/std/" } -ark-ed-on-bls12-377 = { git = "https://github.com/arkworks-rs/algebra/" } -ark-ed-on-bls12-381 = { git = "https://github.com/arkworks-rs/algebra/" } -ark-bls12-377 = { git = "https://github.com/arkworks-rs/algebra/" } -ark-mnt4-298 = { git = "https://github.com/arkworks-rs/algebra/" } -ark-mnt6-298 = { git = "https://github.com/arkworks-rs/algebra/" } +# ark-ed-on-bls12-377 = { git = "https://github.com/arkworks-rs/algebra/" } +# ark-ed-on-bls12-381 = { git = "https://github.com/arkworks-rs/algebra/" } +# ark-bls12-377 = { git = "https://github.com/arkworks-rs/algebra/" } +# ark-mnt4-298 = { git = "https://github.com/arkworks-rs/algebra/" } +# ark-mnt6-298 = { git = "https://github.com/arkworks-rs/algebra/" } From 455d599aae0aa81acf1c2faadf37def63a25a291 Mon Sep 17 00:00:00 2001 From: mmagician Date: Mon, 28 Oct 2024 14:03:04 +0100 Subject: [PATCH 8/8] update changelog --- CHANGELOG.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8b8d846..3be1dda 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,16 @@ ## Pending +### Breaking changes + +### Features + +### Improvements + +### Bugfixes + +## v0.5.0 + - [\#120](https://github.com/arkworks-rs/crypto-primitives/pull/120) Add input size check to `bowe_hopwood::CRHGadget::evaluate`. ### Breaking changes