From a2f8913429e668f74ef6d6863384a6cab0f5d3b5 Mon Sep 17 00:00:00 2001 From: Davide Galassi Date: Thu, 31 Aug 2023 19:50:40 +0200 Subject: [PATCH 1/3] Use bandersnatch-vrfs with locked dependencies ref --- Cargo.lock | 41 +++++++++++++++++++--------- substrate/primitives/core/Cargo.toml | 2 +- 2 files changed, 29 insertions(+), 14 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9ea938e9caa57..2036bd6c47038 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -509,10 +509,23 @@ dependencies = [ "parity-scale-codec", ] +[[package]] +name = "ark-scale" +version = "0.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49b08346a3e38e2be792ef53ee168623c9244d968ff00cd70fb9932f6fe36393" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-serialize", + "ark-std", + "parity-scale-codec", +] + [[package]] name = "ark-secret-scalar" version = "0.0.2" -source = "git+https://github.com/w3f/ring-vrf?rev=c86ebd4#c86ebd4114d3165d05f9ce28c1d9e8d7a9a4e801" +source = "git+https://github.com/w3f/ring-vrf?rev=3119f51#3119f51b54b69308abfb0671f6176cb125ae1bf1" dependencies = [ "ark-ec", "ark-ff", @@ -560,7 +573,7 @@ dependencies = [ [[package]] name = "ark-transcript" version = "0.0.2" -source = "git+https://github.com/w3f/ring-vrf?rev=c86ebd4#c86ebd4114d3165d05f9ce28c1d9e8d7a9a4e801" +source = "git+https://github.com/w3f/ring-vrf?rev=3119f51#3119f51b54b69308abfb0671f6176cb125ae1bf1" dependencies = [ "ark-ff", "ark-serialize", @@ -1255,12 +1268,13 @@ dependencies = [ [[package]] name = "bandersnatch_vrfs" version = "0.0.1" -source = "git+https://github.com/w3f/ring-vrf?rev=c86ebd4#c86ebd4114d3165d05f9ce28c1d9e8d7a9a4e801" +source = "git+https://github.com/w3f/ring-vrf?rev=3119f51#3119f51b54b69308abfb0671f6176cb125ae1bf1" dependencies = [ "ark-bls12-381", "ark-ec", "ark-ed-on-bls12-381-bandersnatch", "ark-ff", + "ark-scale 0.0.10", "ark-serialize", "ark-std", "dleq_vrf", @@ -2732,7 +2746,7 @@ dependencies = [ [[package]] name = "common" version = "0.1.0" -source = "git+https://github.com/w3f/ring-proof#0e948f3c28cbacecdd3020403c4841c0eb339213" +source = "git+https://github.com/w3f/ring-proof?rev=0e948f3#0e948f3c28cbacecdd3020403c4841c0eb339213" dependencies = [ "ark-ec", "ark-ff", @@ -4461,10 +4475,11 @@ checksum = "86e3bdc80eee6e16b2b6b0f87fbc98c04bee3455e35174c0de1a125d0688c632" [[package]] name = "dleq_vrf" version = "0.0.2" -source = "git+https://github.com/w3f/ring-vrf?rev=c86ebd4#c86ebd4114d3165d05f9ce28c1d9e8d7a9a4e801" +source = "git+https://github.com/w3f/ring-vrf?rev=3119f51#3119f51b54b69308abfb0671f6176cb125ae1bf1" dependencies = [ "ark-ec", "ark-ff", + "ark-scale 0.0.10", "ark-secret-scalar", "ark-serialize", "ark-std", @@ -14057,7 +14072,7 @@ dependencies = [ [[package]] name = "ring" version = "0.1.0" -source = "git+https://github.com/w3f/ring-proof#0e948f3c28cbacecdd3020403c4841c0eb339213" +source = "git+https://github.com/w3f/ring-proof?rev=0e948f3#0e948f3c28cbacecdd3020403c4841c0eb339213" dependencies = [ "ark-ec", "ark-ff", @@ -16827,7 +16842,7 @@ dependencies = [ "ark-bls12-377", "ark-ff", "ark-r1cs-std", - "ark-scale", + "ark-scale 0.0.3", "ark-std", "parity-scale-codec", "sp-ark-models", @@ -16841,7 +16856,7 @@ checksum = "3352feef6c9c34022fa766a0c9a86a88a83d280a3e5b34781a1a9af98377a130" dependencies = [ "ark-bls12-381", "ark-ff", - "ark-scale", + "ark-scale 0.0.3", "ark-serialize", "ark-std", "parity-scale-codec", @@ -16856,7 +16871,7 @@ checksum = "2bf069165e230aef3c4680edea2d8ab3caa89c039e0b61fad2b8e061fb393668" dependencies = [ "ark-bw6-761", "ark-ff", - "ark-scale", + "ark-scale 0.0.3", "ark-std", "parity-scale-codec", "sp-ark-models", @@ -16871,7 +16886,7 @@ dependencies = [ "ark-ed-on-bls12-377", "ark-ff", "ark-r1cs-std", - "ark-scale", + "ark-scale 0.0.3", "ark-serialize", "ark-std", "parity-scale-codec", @@ -16888,7 +16903,7 @@ dependencies = [ "ark-ed-on-bls12-381-bandersnatch", "ark-ff", "ark-r1cs-std", - "ark-scale", + "ark-scale 0.0.3", "ark-std", "parity-scale-codec", "sp-ark-bls12-381", @@ -17157,7 +17172,7 @@ dependencies = [ "ark-ed-on-bls12-377", "ark-ed-on-bls12-381-bandersnatch", "ark-ff", - "ark-scale", + "ark-scale 0.0.3", "ark-serialize", "ark-std", "parity-scale-codec", @@ -19419,7 +19434,7 @@ checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ "cfg-if", "digest 0.10.7", - "rand 0.8.5", + "rand 0.7.3", "static_assertions", ] diff --git a/substrate/primitives/core/Cargo.toml b/substrate/primitives/core/Cargo.toml index 355cbab26fb9d..6cd6eec4beb02 100644 --- a/substrate/primitives/core/Cargo.toml +++ b/substrate/primitives/core/Cargo.toml @@ -58,7 +58,7 @@ sp-runtime-interface = { path = "../runtime-interface", default-features = false # bls crypto w3f-bls = { version = "0.1.3", default-features = false, optional = true} # bandersnatch crypto -bandersnatch_vrfs = { git = "https://github.com/w3f/ring-vrf", rev = "c86ebd4", default-features = false, optional = true } +bandersnatch_vrfs = { git = "https://github.com/w3f/ring-vrf", rev = "3119f51", default-features = false, optional = true } [dev-dependencies] criterion = "0.4.0" From f6c3883ed901cbc654bcfe3aa28991d61e82cf80 Mon Sep 17 00:00:00 2001 From: Davide Galassi Date: Thu, 31 Aug 2023 22:03:35 +0200 Subject: [PATCH 2/3] Update ark-scale to 0.0.10 --- Cargo.lock | 2 +- substrate/primitives/crypto/ec-utils/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2036bd6c47038..2fad77be4a189 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -17172,7 +17172,7 @@ dependencies = [ "ark-ed-on-bls12-377", "ark-ed-on-bls12-381-bandersnatch", "ark-ff", - "ark-scale 0.0.3", + "ark-scale 0.0.10", "ark-serialize", "ark-std", "parity-scale-codec", diff --git a/substrate/primitives/crypto/ec-utils/Cargo.toml b/substrate/primitives/crypto/ec-utils/Cargo.toml index 3ee9fea6a3600..96c7c9df00d44 100644 --- a/substrate/primitives/crypto/ec-utils/Cargo.toml +++ b/substrate/primitives/crypto/ec-utils/Cargo.toml @@ -23,7 +23,7 @@ ark-ed-on-bls12-381-bandersnatch = { version = "0.4.0", default-features = false ark-ed-on-bls12-377 = { version = "0.4.0", default-features = false } sp-std = { path = "../../std", default-features = false } codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false } -ark-scale = { version = "0.0.3", features = ["hazmat"], default-features = false } +ark-scale = { version = "0.0.10", features = ["hazmat"], default-features = false } sp-runtime-interface = { path = "../../runtime-interface", default-features = false} [dev-dependencies] From f4f86f5d7c004c44f4bf58e5fb1561516dd9c65a Mon Sep 17 00:00:00 2001 From: Davide Galassi Date: Fri, 1 Sep 2023 12:21:21 +0200 Subject: [PATCH 3/3] Bump ark-substrate crates version --- Cargo.lock | 52 +++++++------------ .../primitives/crypto/ec-utils/Cargo.toml | 12 ++--- 2 files changed, 26 insertions(+), 38 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2fad77be4a189..ba05bdc156625 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -497,18 +497,6 @@ dependencies = [ "tracing-subscriber 0.2.25", ] -[[package]] -name = "ark-scale" -version = "0.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d028cd1025d002fa88c10cd644d29028a7b40806579b608c6ba843b937bbb23" -dependencies = [ - "ark-ec", - "ark-serialize", - "ark-std", - "parity-scale-codec", -] - [[package]] name = "ark-scale" version = "0.0.10" @@ -1274,7 +1262,7 @@ dependencies = [ "ark-ec", "ark-ed-on-bls12-381-bandersnatch", "ark-ff", - "ark-scale 0.0.10", + "ark-scale", "ark-serialize", "ark-std", "dleq_vrf", @@ -4479,7 +4467,7 @@ source = "git+https://github.com/w3f/ring-vrf?rev=3119f51#3119f51b54b69308abfb06 dependencies = [ "ark-ec", "ark-ff", - "ark-scale 0.0.10", + "ark-scale", "ark-secret-scalar", "ark-serialize", "ark-std", @@ -16835,14 +16823,14 @@ dependencies = [ [[package]] name = "sp-ark-bls12-377" -version = "0.4.0-beta" +version = "0.4.1-beta" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b8e61a06f286f4e8565a67865ef52e83edabf447881898c94527ffc7b839177" +checksum = "f9b60ba7d8fbb82e21f5be499b02438c9a79365acb441a4dc3993179f09c4cc9" dependencies = [ "ark-bls12-377", "ark-ff", "ark-r1cs-std", - "ark-scale 0.0.3", + "ark-scale", "ark-std", "parity-scale-codec", "sp-ark-models", @@ -16850,13 +16838,13 @@ dependencies = [ [[package]] name = "sp-ark-bls12-381" -version = "0.4.0-beta" +version = "0.4.1-beta" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3352feef6c9c34022fa766a0c9a86a88a83d280a3e5b34781a1a9af98377a130" +checksum = "c2cd101171d2e988a4e1b2320ad3f26f8746a263110c7153213fe86293e0552b" dependencies = [ "ark-bls12-381", "ark-ff", - "ark-scale 0.0.3", + "ark-scale", "ark-serialize", "ark-std", "parity-scale-codec", @@ -16865,13 +16853,13 @@ dependencies = [ [[package]] name = "sp-ark-bw6-761" -version = "0.4.0-beta" +version = "0.4.1-beta" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bf069165e230aef3c4680edea2d8ab3caa89c039e0b61fad2b8e061fb393668" +checksum = "d94d66ba98893cc42dfe81d5b5dee9142577176bdbdba80ec25a37d8cdffdbd5" dependencies = [ "ark-bw6-761", "ark-ff", - "ark-scale 0.0.3", + "ark-scale", "ark-std", "parity-scale-codec", "sp-ark-models", @@ -16879,14 +16867,14 @@ dependencies = [ [[package]] name = "sp-ark-ed-on-bls12-377" -version = "0.4.0-beta" +version = "0.4.1-beta" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e63f1fe8e7e87cb0258d61212b019d4d0fd230293ec42a564eb671c83d437497" +checksum = "37f6ea96c9b1cd4cbd05d741225ff7f6328ab035bda16cf3fac105c87ad98959" dependencies = [ "ark-ed-on-bls12-377", "ark-ff", "ark-r1cs-std", - "ark-scale 0.0.3", + "ark-scale", "ark-serialize", "ark-std", "parity-scale-codec", @@ -16895,15 +16883,15 @@ dependencies = [ [[package]] name = "sp-ark-ed-on-bls12-381-bandersnatch" -version = "0.4.0-beta" +version = "0.4.1-beta" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "838ddc5508aff3e89f930e7e7f3565d0786ac27868cfd61587afe681011e1140" +checksum = "4db7a801260397cd58077befcee87acfdde8c189f48718bba1bc3783c799b67b" dependencies = [ "ark-ec", "ark-ed-on-bls12-381-bandersnatch", "ark-ff", "ark-r1cs-std", - "ark-scale 0.0.3", + "ark-scale", "ark-std", "parity-scale-codec", "sp-ark-bls12-381", @@ -16912,9 +16900,9 @@ dependencies = [ [[package]] name = "sp-ark-models" -version = "0.4.0" +version = "0.4.1-beta" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28fa906b809d7a346b2aa32a4bd0c884a75f9f588f9a4a07272f63eaf8a10765" +checksum = "cd77599e09f12893739e1ef822ae065f2f46c3be040ba1979bb786ae21059f44" dependencies = [ "ark-ec", "ark-ff", @@ -17172,7 +17160,7 @@ dependencies = [ "ark-ed-on-bls12-377", "ark-ed-on-bls12-381-bandersnatch", "ark-ff", - "ark-scale 0.0.10", + "ark-scale", "ark-serialize", "ark-std", "parity-scale-codec", diff --git a/substrate/primitives/crypto/ec-utils/Cargo.toml b/substrate/primitives/crypto/ec-utils/Cargo.toml index 96c7c9df00d44..15a6e85abb967 100644 --- a/substrate/primitives/crypto/ec-utils/Cargo.toml +++ b/substrate/primitives/crypto/ec-utils/Cargo.toml @@ -29,12 +29,12 @@ sp-runtime-interface = { path = "../../runtime-interface", default-features = fa [dev-dependencies] sp-io = { path = "../../io", default-features = false } ark-algebra-test-templates = { version = "0.4.2", default-features = false } -sp-ark-models = { version = "0.4.0-beta", default-features = false } -sp-ark-bls12-377 = { version = "0.4.0-beta", default-features = false } -sp-ark-bls12-381 = { version = "0.4.0-beta", default-features = false } -sp-ark-bw6-761 = { version = "0.4.0-beta", default-features = false } -sp-ark-ed-on-bls12-377 = { version = "0.4.0-beta", default-features = false } -sp-ark-ed-on-bls12-381-bandersnatch = { version = "0.4.0-beta", default-features = false } +sp-ark-models = { version = "0.4.1-beta", default-features = false } +sp-ark-bls12-377 = { version = "0.4.1-beta", default-features = false } +sp-ark-bls12-381 = { version = "0.4.1-beta", default-features = false } +sp-ark-bw6-761 = { version = "0.4.1-beta", default-features = false } +sp-ark-ed-on-bls12-377 = { version = "0.4.1-beta", default-features = false } +sp-ark-ed-on-bls12-381-bandersnatch = { version = "0.4.1-beta", default-features = false } [features] default = [ "std" ]