From ba072ce83c19a27b097252bb50304ecc0dc2193c Mon Sep 17 00:00:00 2001 From: Pierre-Louis Date: Fri, 1 Sep 2023 09:21:06 +0200 Subject: [PATCH 1/2] crypto: fix the version of blst to 0.3.10 --- CHANGELOG.md | 10 ++++++++++ Cargo.lock | 6 +++--- crypto/Cargo.toml | 4 ++-- tezos-encoding-derive/Cargo.toml | 4 ++-- tezos-encoding/Cargo.toml | 6 +++--- 5 files changed, 20 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 255b40bcc4..852f304918 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -33,6 +33,16 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Nothing. +## [0.5.1] - 2023-09-01 + +### Added + +- Nothing. + +### Changed + +- Fixed the version of `blst` to 0.3.10 + ## [0.5.0] - 2023-05-12 ### Added diff --git a/Cargo.lock b/Cargo.lock index 473aeb861f..c1b2dbc3d5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -991,7 +991,7 @@ dependencies = [ [[package]] name = "tezos_crypto_rs" -version = "0.5.0" +version = "0.5.1" dependencies = [ "anyhow", "base58", @@ -1016,7 +1016,7 @@ dependencies = [ [[package]] name = "tezos_data_encoding" -version = "0.5.0" +version = "0.5.1" dependencies = [ "bit-vec", "bitvec", @@ -1034,7 +1034,7 @@ dependencies = [ [[package]] name = "tezos_data_encoding_derive" -version = "0.5.0" +version = "0.5.1" dependencies = [ "lazy_static", "once_cell", diff --git a/crypto/Cargo.toml b/crypto/Cargo.toml index de6aef3a34..1b3f38fed3 100644 --- a/crypto/Cargo.toml +++ b/crypto/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tezos_crypto_rs" -version = "0.5.0" +version = "0.5.1" authors = ["TriliTech "] edition = "2021" rust-version = "1.60" @@ -27,7 +27,7 @@ strum_macros = "0.20" zeroize = { version = "1.5" } ed25519-dalek = { version = "2.0.0-rc.2", default-features = false } cryptoxide = { version = "0.4.4", default-features = false, features = ["sha2", "blake2"] } -blst = "0.3.10" +blst = "=0.3.10" proptest = { version = "1.1", optional = true } diff --git a/tezos-encoding-derive/Cargo.toml b/tezos-encoding-derive/Cargo.toml index 28323ae32b..6f92905ced 100644 --- a/tezos-encoding-derive/Cargo.toml +++ b/tezos-encoding-derive/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tezos_data_encoding_derive" -version = "0.5.0" +version = "0.5.1" authors = ["TriliTech "] edition = "2021" rust-version = "1.60" @@ -22,4 +22,4 @@ parse-display = "0.4.1" once_cell = "1.9.0" [features] -fuzzing = [] \ No newline at end of file +fuzzing = [] diff --git a/tezos-encoding/Cargo.toml b/tezos-encoding/Cargo.toml index ca0f99ea23..8cc37dd5ba 100644 --- a/tezos-encoding/Cargo.toml +++ b/tezos-encoding/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tezos_data_encoding" -version = "0.5.0" +version = "0.5.1" authors = ["TriliTech "] edition = "2021" rust-version = "1.60" @@ -23,12 +23,12 @@ lazy_static = "1.4" [dependencies.tezos_crypto_rs] path = "../crypto" -version = "0.5.0" +version = "0.5.1" default-features = false [dependencies.tezos_data_encoding_derive] path = "../tezos-encoding-derive" -version = "0.5.0" +version = "0.5.1" [features] From 0e9120154a7587c53aa1b11c4a2e54a6f7a53e73 Mon Sep 17 00:00:00 2001 From: Pierre-Louis Date: Wed, 6 Sep 2023 15:31:42 +0200 Subject: [PATCH 2/2] crypto: set version of dalek to 2.0.0 --- CHANGELOG.md | 1 + Cargo.lock | 60 ++++++++++++++++++++++++++++------------------- crypto/Cargo.toml | 2 +- 3 files changed, 38 insertions(+), 25 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 852f304918..ed9d6a7057 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -42,6 +42,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ### Changed - Fixed the version of `blst` to 0.3.10 +- Set the version of `ed25519-dalek` to 2.0.0 ## [0.5.0] - 2023-05-12 diff --git a/Cargo.lock b/Cargo.lock index c1b2dbc3d5..85536c6c2c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -178,18 +178,31 @@ checksum = "382ce8820a5bb815055d3553a610e8cb542b2d767bbacea99038afda96cd760d" [[package]] name = "curve25519-dalek" -version = "4.0.0-rc.2" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03d928d978dbec61a1167414f5ec534f24bea0d7a0d24dd9b6233d3d8223e585" +checksum = "622178105f911d937a42cdb140730ba4a3ed2becd8ae6ce39c7d28b5d75d4588" dependencies = [ "cfg-if", + "cpufeatures", + "curve25519-dalek-derive", "digest 0.10.6", "fiat-crypto", - "packed_simd_2", "platforms", + "rustc_version", "subtle", ] +[[package]] +name = "curve25519-dalek-derive" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.15", +] + [[package]] name = "der" version = "0.4.5" @@ -238,9 +251,9 @@ dependencies = [ [[package]] name = "ed25519-dalek" -version = "2.0.0-rc.2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "798f704d128510932661a3489b08e3f4c934a01d61c5def59ae7b8e48f19665a" +checksum = "7277392b266383ef8396db7fdeb1e77b6c52fed775f5df15bb24f35b72156980" dependencies = [ "curve25519-dalek", "ed25519", @@ -310,9 +323,9 @@ dependencies = [ [[package]] name = "fiat-crypto" -version = "0.1.20" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77" +checksum = "d0870c84016d4b481be5c9f323c24f65e31e901ae618f0e80f4308fb00de1d2d" [[package]] name = "fnv" @@ -453,12 +466,6 @@ version = "0.2.144" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" -[[package]] -name = "libm" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a" - [[package]] name = "libm" version = "0.2.6" @@ -569,7 +576,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" dependencies = [ "autocfg", - "libm 0.2.6", + "libm", ] [[package]] @@ -605,16 +612,6 @@ dependencies = [ "sha2 0.9.9", ] -[[package]] -name = "packed_simd_2" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1914cd452d8fccd6f9db48147b29fd4ae05bea9dc5d9ad578509f72415de282" -dependencies = [ - "cfg-if", - "libm 0.1.4", -] - [[package]] name = "parse-display" version = "0.4.1" @@ -821,6 +818,15 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c" +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + [[package]] name = "rustix" version = "0.37.19" @@ -853,6 +859,12 @@ version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" +[[package]] +name = "semver" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" + [[package]] name = "serde" version = "1.0.163" diff --git a/crypto/Cargo.toml b/crypto/Cargo.toml index 1b3f38fed3..67d48b3888 100644 --- a/crypto/Cargo.toml +++ b/crypto/Cargo.toml @@ -25,7 +25,7 @@ serde = { version = "1.0", features = ["derive"] } strum = "0.20" strum_macros = "0.20" zeroize = { version = "1.5" } -ed25519-dalek = { version = "2.0.0-rc.2", default-features = false } +ed25519-dalek = { version = "2.0.0", default-features = false } cryptoxide = { version = "0.4.4", default-features = false, features = ["sha2", "blake2"] } blst = "=0.3.10"