From 7266eb737bbdaad82aa2c9c4d00ea729db0acde0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Oliveira?= Date: Fri, 18 Aug 2023 09:03:22 +0100 Subject: [PATCH 1/4] deps(identity): update ed25519-dalek to 2.0 Pull-Request: #4337. (cherry picked from commit fb61697390081b908e2b79fdcb8b3cc4cf00f5ef) # Conflicts: # Cargo.lock # Cargo.toml # identity/CHANGELOG.md # identity/Cargo.toml --- Cargo.lock | 62 +++++++++++++++++++++++----------- Cargo.toml | 61 +++++++++++++++++++++++++++++++++ identity/CHANGELOG.md | 55 ++++++++++++++++++++++++++++++ identity/Cargo.toml | 9 +++++ identity/src/ed25519.rs | 74 +++++++++++++---------------------------- 5 files changed, 191 insertions(+), 70 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 890eb5583ac..dbed3aac9f8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1120,18 +1120,36 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "4.0.0-rc.1" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d4ba9852b42210c7538b75484f9daa0655e9a3ac04f693747bb0f02cf3cfe16" +checksum = "f711ade317dd348950a9910f81c5947e3d8907ebd2b83f76203ff1807e6a2bc2" dependencies = [ +<<<<<<< HEAD "cfg-if", +======= + "cfg-if 1.0.0", + "cpufeatures", + "curve25519-dalek-derive", + "digest 0.10.7", +>>>>>>> fb616973 (deps(identity): update ed25519-dalek to 2.0) "fiat-crypto", - "packed_simd_2", "platforms", + "rustc_version", "subtle", "zeroize", ] +[[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.28", +] + [[package]] name = "darling" version = "0.10.2" @@ -1385,24 +1403,25 @@ dependencies = [ [[package]] name = "ed25519" -version = "1.5.3" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7" +checksum = "60f6d271ca33075c88028be6f04d502853d63a5ece419d269c15315d4fc1cf1d" dependencies = [ - "signature 1.6.4", + "pkcs8 0.10.2", + "signature 2.1.0", ] [[package]] name = "ed25519-dalek" -version = "1.0.1" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d" +checksum = "7277392b266383ef8396db7fdeb1e77b6c52fed775f5df15bb24f35b72156980" dependencies = [ - "curve25519-dalek 3.2.0", + "curve25519-dalek 4.0.0", "ed25519", - "rand 0.7.3", + "rand_core 0.6.4", "serde", - "sha2 0.9.9", + "sha2 0.10.7", "zeroize", ] @@ -2264,12 +2283,6 @@ version = "0.2.142" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317" -[[package]] -name = "libm" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a" - [[package]] name = "libp2p" version = "0.51.3" @@ -2548,7 +2561,11 @@ dependencies = [ [[package]] name = "libp2p-identity" +<<<<<<< HEAD version = "0.1.2" +======= +version = "0.2.3" +>>>>>>> fb616973 (deps(identity): update ed25519-dalek to 2.0) dependencies = [ "asn1_der", "base64 0.21.0", @@ -3589,6 +3606,7 @@ dependencies = [ ] [[package]] +<<<<<<< HEAD name = "packed_simd_2" version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3601,6 +3619,10 @@ dependencies = [ [[package]] name = "parity-send-wrapper" version = "0.1.0" +======= +name = "parking" +version = "2.1.0" +>>>>>>> fb616973 (deps(identity): update ed25519-dalek to 2.0) source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa9777aa91b8ad9dd5aaa04a9b6bcb02c7f1deb952fca5a66034d5e63afc5c6f" @@ -4644,14 +4666,14 @@ dependencies = [ [[package]] name = "snow" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ccba027ba85743e09d15c03296797cad56395089b832b48b5a5217880f57733" +checksum = "0c9d1425eb528a21de2755c75af4c9b5d57f50a0d4c3b7f1828a4cd03f8ba155" dependencies = [ "aes-gcm 0.9.4", "blake2", "chacha20poly1305", - "curve25519-dalek 4.0.0-rc.1", + "curve25519-dalek 4.0.0", "rand_core 0.6.4", "ring", "rustc_version", diff --git a/Cargo.toml b/Cargo.toml index 280eb094675..6555dde1b1d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -55,3 +55,64 @@ members = [ "transports/websocket", ] resolver = "2" +<<<<<<< HEAD +======= + +[workspace.package] +rust-version = "1.65.0" + +[workspace.dependencies] +libp2p-allow-block-list = { version = "0.2.0", path = "misc/allow-block-list" } +libp2p-autonat = { version = "0.11.0", path = "protocols/autonat" } +libp2p-connection-limits = { version = "0.2.1", path = "misc/connection-limits" } +libp2p-core = { version = "0.40.0", path = "core" } +libp2p-dcutr = { version = "0.10.0", path = "protocols/dcutr" } +libp2p-deflate = { version = "0.40.0", path = "transports/deflate" } +libp2p-dns = { version = "0.40.0", path = "transports/dns" } +libp2p-floodsub = { version = "0.43.0", path = "protocols/floodsub" } +libp2p-gossipsub = { version = "0.45.1", path = "protocols/gossipsub" } +libp2p-identify = { version = "0.43.0", path = "protocols/identify" } +libp2p-identity = { version = "0.2.3" } +libp2p-kad = { version = "0.44.4", path = "protocols/kad" } +libp2p-mdns = { version = "0.44.0", path = "protocols/mdns" } +libp2p-memory-connection-limits = { version = "0.1.0", path = "misc/memory-connection-limits" } +libp2p-metrics = { version = "0.13.1", path = "misc/metrics" } +libp2p-mplex = { version = "0.40.0", path = "muxers/mplex" } +libp2p-muxer-test-harness = { path = "muxers/test-harness" } +libp2p-noise = { version = "0.43.0", path = "transports/noise" } +libp2p-perf = { version = "0.2.0", path = "protocols/perf" } +libp2p-ping = { version = "0.43.0", path = "protocols/ping" } +libp2p-plaintext = { version = "0.40.0", path = "transports/plaintext" } +libp2p-pnet = { version = "0.23.0", path = "transports/pnet" } +libp2p-quic = { version = "0.9.2", path = "transports/quic" } +libp2p-relay = { version = "0.16.1", path = "protocols/relay" } +libp2p-rendezvous = { version = "0.13.0", path = "protocols/rendezvous" } +libp2p-request-response = { version = "0.25.1", path = "protocols/request-response" } +libp2p-swarm = { version = "0.43.3", path = "swarm" } +libp2p-swarm-derive = { version = "0.33.0", path = "swarm-derive" } +libp2p-swarm-test = { version = "0.2.0", path = "swarm-test" } +libp2p-tcp = { version = "0.40.0", path = "transports/tcp" } +libp2p-tls = { version = "0.2.0", path = "transports/tls" } +libp2p-uds = { version = "0.39.0", path = "transports/uds" } +libp2p-wasm-ext = { version = "0.40.0", path = "transports/wasm-ext" } +libp2p-webrtc = { version = "0.6.0-alpha", path = "transports/webrtc" } +libp2p-websocket = { version = "0.42.0", path = "transports/websocket" } +libp2p-webtransport-websys = { version = "0.1.0", path = "transports/webtransport-websys" } +libp2p-yamux = { version = "0.44.1", path = "muxers/yamux" } +multistream-select = { version = "0.13.0", path = "misc/multistream-select" } +quick-protobuf-codec = { version = "0.2.0", path = "misc/quick-protobuf-codec" } +quickcheck = { package = "quickcheck-ext", path = "misc/quickcheck-ext" } +rw-stream-sink = { version = "0.4.0", path = "misc/rw-stream-sink" } +multiaddr = "0.18.0" +multihash = "0.19.0" + + +[patch.crates-io] + +# Patch away `libp2p-idnentity` in our dependency tree with the workspace version. +# `libp2p-identity` is a leaf dependency and used within `rust-multiaddr` which is **not** part of the workspace. +# As a result, we cannot just reference the workspace version in our crates because the types would mismatch with what +# we import via `rust-multiaddr`. +# This is expected to stay here until we move `libp2p-identity` to a separate repository which makes the dependency relationship more obvious. +libp2p-identity = { path = "identity" } +>>>>>>> fb616973 (deps(identity): update ed25519-dalek to 2.0) diff --git a/identity/CHANGELOG.md b/identity/CHANGELOG.md index 0d2851ac6e2..3e9802400df 100644 --- a/identity/CHANGELOG.md +++ b/identity/CHANGELOG.md @@ -1,3 +1,58 @@ +<<<<<<< HEAD +======= +## 0.2.3 + +- Fix [RUSTSEC-2022-0093] by updating `ed25519-dalek` to `2.0`. + See [PR 4337] + +[RUSTSEC-2022-0093]: https://rustsec.org/advisories/RUSTSEC-2022-0093 +[PR 4337]: https://github.com/libp2p/rust-libp2p/pull/4337 + +## 0.2.2 + +- Implement `from_protobuf_encoding` for RSA `Keypair`. + See [PR 4193]. + +[PR 4193]: https://github.com/libp2p/rust-libp2p/pull/4193 + +## 0.2.1 + +- Expose `KeyType` for `PublicKey` and `Keypair`. + See [PR 4107]. + +[PR 4107]: https://github.com/libp2p/rust-libp2p/pull/4107 + +## 0.2.0 + +- Raise MSRV to 1.65. + See [PR 3715]. +- Add support for exporting and importing ECDSA keys via the libp2p [protobuf format]. + See [PR 3863]. + +- Make `Keypair` and `PublicKey` opaque. + See [PR 3866]. + +- Remove `identity::secp256k1::SecretKey::sign_hash` and make `identity::secp256k1::SecretKey::sign` infallible. + See [PR 3850]. + +- Remove deprecated items. See [PR 3928]. + +- Remove `PeerId::try_from_multiaddr`. + `multiaddr::Protocol::P2p` is now type-safe and contains a `PeerId` directly, rendering this function obsolete. + See [PR 3656]. + +- Remove `PeerId::is_public_key` because it is unused and can be implemented externally. + See [PR 3656]. + +[PR 3656]: https://github.com/libp2p/rust-libp2p/pull/3656 +[PR 3850]: https://github.com/libp2p/rust-libp2p/pull/3850 +[PR 3715]: https://github.com/libp2p/rust-libp2p/pull/3715 +[PR 3863]: https://github.com/libp2p/rust-libp2p/pull/3863 +[PR 3866]: https://github.com/libp2p/rust-libp2p/pull/3866 +[PR 3928]: https://github.com/libp2p/rust-libp2p/pull/3928 +[protobuf format]: https://github.com/libp2p/specs/blob/master/peer-ids/peer-ids.md#keys + +>>>>>>> fb616973 (deps(identity): update ed25519-dalek to 2.0) ## 0.1.2 - Add `impl From for PublicKey` so that `PublicKey::from(ed25519::PublicKey)` works. diff --git a/identity/Cargo.toml b/identity/Cargo.toml index 99012eeab6f..283c866f717 100644 --- a/identity/Cargo.toml +++ b/identity/Cargo.toml @@ -1,6 +1,10 @@ [package] name = "libp2p-identity" +<<<<<<< HEAD version = "0.1.2" +======= +version = "0.2.3" +>>>>>>> fb616973 (deps(identity): update ed25519-dalek to 2.0) edition = "2021" description = "Data structures and algorithms for identifying peers in libp2p." rust-version = "1.60.0" @@ -13,8 +17,13 @@ categories = ["cryptography"] [dependencies] asn1_der = { version = "0.7.6", optional = true } +<<<<<<< HEAD bs58 = { version = "0.4.0", optional = true } ed25519-dalek = { version = "1.0.1", optional = true } +======= +bs58 = { version = "0.5.0", optional = true } +ed25519-dalek = { version = "2.0", optional = true, features = ["rand_core"] } +>>>>>>> fb616973 (deps(identity): update ed25519-dalek to 2.0) libsecp256k1 = { version = "0.7.0", optional = true } log = "0.4" multiaddr = { version = "0.17.1", optional = true } diff --git a/identity/src/ed25519.rs b/identity/src/ed25519.rs index 90782de378a..2210eacb798 100644 --- a/identity/src/ed25519.rs +++ b/identity/src/ed25519.rs @@ -25,12 +25,12 @@ use core::cmp; use core::fmt; use core::hash; use ed25519_dalek::{self as ed25519, Signer as _, Verifier as _}; -use rand::RngCore; use std::convert::TryFrom; use zeroize::Zeroize; /// An Ed25519 keypair. -pub struct Keypair(ed25519::Keypair); +#[derive(Clone)] +pub struct Keypair(ed25519::SigningKey); impl Keypair { /// Generate a new random Ed25519 keypair. @@ -50,7 +50,7 @@ impl Keypair { /// of the secret scalar and the compressed public point, /// an informal standard for encoding Ed25519 keypairs. pub fn to_bytes(&self) -> [u8; 64] { - self.0.to_bytes() + self.0.to_keypair_bytes() } /// Decode a keypair from the [binary format](https://datatracker.ietf.org/doc/html/rfc8032#section-5.1.5) @@ -70,7 +70,10 @@ impl Keypair { /// /// Note that this binary format is the same as `ed25519_dalek`'s and `ed25519_zebra`'s. pub fn try_from_bytes(kp: &mut [u8]) -> Result { - ed25519::Keypair::from_bytes(kp) + let bytes = <[u8; 64]>::try_from(&*kp) + .map_err(|e| DecodingError::failed_to_parse("Ed25519 keypair", e))?; + + ed25519::SigningKey::from_keypair_bytes(&bytes) .map(|k| { kp.zeroize(); Keypair(k) @@ -85,60 +88,41 @@ impl Keypair { /// Get the public key of this keypair. pub fn public(&self) -> PublicKey { - PublicKey(self.0.public) + PublicKey(self.0.verifying_key()) } /// Get the secret key of this keypair. pub fn secret(&self) -> SecretKey { - SecretKey::try_from_bytes(&mut self.0.secret.to_bytes()) - .expect("ed25519::SecretKey::from_bytes(to_bytes(k)) != k") + SecretKey(self.0.to_bytes()) } } impl fmt::Debug for Keypair { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { f.debug_struct("Keypair") - .field("public", &self.0.public) + .field("public", &self.0.verifying_key()) .finish() } } -impl Clone for Keypair { - fn clone(&self) -> Keypair { - let mut sk_bytes = self.0.secret.to_bytes(); - let secret = SecretKey::try_from_bytes(&mut sk_bytes) - .expect("ed25519::SecretKey::from_bytes(to_bytes(k)) != k") - .0; - - Keypair(ed25519::Keypair { - secret, - public: self.0.public, - }) - } -} - /// Demote an Ed25519 keypair to a secret key. impl From for SecretKey { fn from(kp: Keypair) -> SecretKey { - SecretKey(kp.0.secret) + SecretKey(kp.0.to_bytes()) } } /// Promote an Ed25519 secret key into a keypair. impl From for Keypair { fn from(sk: SecretKey) -> Keypair { - let secret: ed25519::ExpandedSecretKey = (&sk.0).into(); - let public = ed25519::PublicKey::from(&secret); - Keypair(ed25519::Keypair { - secret: sk.0, - public, - }) + let signing = ed25519::SigningKey::from_bytes(&sk.0); + Keypair(signing) } } /// An Ed25519 public key. #[derive(Eq, Clone)] -pub struct PublicKey(ed25519::PublicKey); +pub struct PublicKey(ed25519::VerifyingKey); impl fmt::Debug for PublicKey { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { @@ -209,27 +193,22 @@ impl PublicKey { /// Try to parse a public key from a byte array containing the actual key as produced by `to_bytes`. pub fn try_from_bytes(k: &[u8]) -> Result { - ed25519::PublicKey::from_bytes(k) + let k = <[u8; 32]>::try_from(k) + .map_err(|e| DecodingError::failed_to_parse("Ed25519 public key", e))?; + ed25519::VerifyingKey::from_bytes(&k) .map_err(|e| DecodingError::failed_to_parse("Ed25519 public key", e)) .map(PublicKey) } } /// An Ed25519 secret key. +#[derive(Clone)] pub struct SecretKey(ed25519::SecretKey); /// View the bytes of the secret key. impl AsRef<[u8]> for SecretKey { fn as_ref(&self) -> &[u8] { - self.0.as_bytes() - } -} - -impl Clone for SecretKey { - fn clone(&self) -> SecretKey { - let mut sk_bytes = self.0.to_bytes(); - Self::try_from_bytes(&mut sk_bytes) - .expect("ed25519::SecretKey::from_bytes(to_bytes(k)) != k") + &self.0[..] } } @@ -242,13 +221,8 @@ impl fmt::Debug for SecretKey { impl SecretKey { /// Generate a new Ed25519 secret key. pub fn generate() -> SecretKey { - let mut bytes = [0u8; 32]; - rand::thread_rng().fill_bytes(&mut bytes); - SecretKey( - ed25519::SecretKey::from_bytes(&bytes).expect( - "this returns `Err` only if the length is wrong; the length is correct; qed", - ), - ) + let signing = ed25519::SigningKey::generate(&mut rand::rngs::OsRng); + SecretKey(signing.to_bytes()) } /// Create an Ed25519 secret key from a byte slice, zeroing the input on success. @@ -269,7 +243,7 @@ impl SecretKey { /// returned. pub fn try_from_bytes(mut sk_bytes: impl AsMut<[u8]>) -> Result { let sk_bytes = sk_bytes.as_mut(); - let secret = ed25519::SecretKey::from_bytes(&*sk_bytes) + let secret = <[u8; 32]>::try_from(&*sk_bytes) .map_err(|e| DecodingError::failed_to_parse("Ed25519 secret key", e))?; sk_bytes.zeroize(); Ok(SecretKey(secret)) @@ -282,7 +256,7 @@ mod tests { use quickcheck::*; fn eq_keypairs(kp1: &Keypair, kp2: &Keypair) -> bool { - kp1.public() == kp2.public() && kp1.0.secret.as_bytes() == kp2.0.secret.as_bytes() + kp1.public() == kp2.public() && kp1.0.to_bytes() == kp2.0.to_bytes() } #[test] @@ -300,7 +274,7 @@ mod tests { fn ed25519_keypair_from_secret() { fn prop() -> bool { let kp1 = Keypair::generate(); - let mut sk = kp1.0.secret.to_bytes(); + let mut sk = kp1.0.to_bytes(); let kp2 = Keypair::from(SecretKey::try_from_bytes(&mut sk).unwrap()); eq_keypairs(&kp1, &kp2) && sk == [0u8; 32] } From c349c55f32c5e4f6d8efd92c0642890e5b31e659 Mon Sep 17 00:00:00 2001 From: Aaro Altonen Date: Mon, 21 Aug 2023 11:36:06 +0300 Subject: [PATCH 2/4] Backport rust-libp2p#4337 to 0.51 --- Cargo.lock | 102 ++++++++++++++------------ Cargo.toml | 3 - core/Cargo.toml | 2 +- identity/CHANGELOG.md | 3 - identity/Cargo.toml | 9 --- libp2p/Cargo.toml | 2 +- misc/allow-block-list/Cargo.toml | 2 +- misc/connection-limits/Cargo.toml | 2 +- misc/keygen/Cargo.toml | 2 +- misc/metrics/Cargo.toml | 2 +- muxers/mplex/Cargo.toml | 2 +- protocols/autonat/Cargo.toml | 2 +- protocols/dcutr/Cargo.toml | 2 +- protocols/floodsub/Cargo.toml | 2 +- protocols/gossipsub/Cargo.toml | 2 +- protocols/identify/Cargo.toml | 2 +- protocols/kad/Cargo.toml | 2 +- protocols/mdns/Cargo.toml | 2 +- protocols/perf/Cargo.toml | 2 +- protocols/ping/Cargo.toml | 2 +- protocols/relay/Cargo.toml | 2 +- protocols/rendezvous/Cargo.toml | 2 +- protocols/request-response/Cargo.toml | 2 +- swarm-test/Cargo.toml | 2 +- swarm/Cargo.toml | 4 +- transports/dns/Cargo.toml | 2 +- transports/noise/Cargo.toml | 2 +- transports/plaintext/Cargo.toml | 2 +- transports/quic/Cargo.toml | 2 +- transports/tcp/Cargo.toml | 2 +- transports/tls/Cargo.toml | 2 +- transports/webrtc/Cargo.toml | 2 +- transports/websocket/Cargo.toml | 2 +- 33 files changed, 86 insertions(+), 91 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index dbed3aac9f8..6f006ca803e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -615,9 +615,12 @@ dependencies = [ [[package]] name = "bs58" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" +checksum = "f5353f36341f7451062466f0b755b96ac3a9547e4d7f6b70d603fc721a7d7896" +dependencies = [ + "tinyvec", +] [[package]] name = "bumpalo" @@ -861,9 +864,9 @@ dependencies = [ [[package]] name = "const-oid" -version = "0.9.1" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cec318a675afcb6a1ea1d4340e2d377e56e47c266f28043ceccbf4412ddfdd3b" +checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f" [[package]] name = "core-foundation" @@ -892,9 +895,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.5" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" +checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" dependencies = [ "libc", ] @@ -1124,14 +1127,10 @@ version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f711ade317dd348950a9910f81c5947e3d8907ebd2b83f76203ff1807e6a2bc2" dependencies = [ -<<<<<<< HEAD "cfg-if", -======= - "cfg-if 1.0.0", "cpufeatures", "curve25519-dalek-derive", - "digest 0.10.7", ->>>>>>> fb616973 (deps(identity): update ed25519-dalek to 2.0) + "digest 0.10.6", "fiat-crypto", "platforms", "rustc_version", @@ -1147,7 +1146,7 @@ checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.15", ] [[package]] @@ -1269,6 +1268,16 @@ dependencies = [ "zeroize", ] +[[package]] +name = "der" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" +dependencies = [ + "const-oid", + "zeroize", +] + [[package]] name = "der-parser" version = "7.0.0" @@ -1383,7 +1392,7 @@ version = "0.14.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c" dependencies = [ - "der", + "der 0.6.1", "elliptic-curve", "rfc6979", "signature 1.6.4", @@ -1395,7 +1404,7 @@ version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12844141594ad74185a926d030f3b605f6a903b4e3fec351f3ea338ac5b7637e" dependencies = [ - "der", + "der 0.6.1", "elliptic-curve", "rfc6979", "signature 2.0.0", @@ -1408,7 +1417,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60f6d271ca33075c88028be6f04d502853d63a5ece419d269c15315d4fc1cf1d" dependencies = [ "pkcs8 0.10.2", - "signature 2.1.0", + "signature 2.0.0", ] [[package]] @@ -1421,7 +1430,7 @@ dependencies = [ "ed25519", "rand_core 0.6.4", "serde", - "sha2 0.10.7", + "sha2 0.10.6", "zeroize", ] @@ -1439,14 +1448,14 @@ checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3" dependencies = [ "base16ct", "crypto-bigint", - "der", + "der 0.6.1", "digest 0.10.6", "ff", "generic-array", "group", "hkdf", "pem-rfc7468", - "pkcs8", + "pkcs8 0.9.0", "rand_core 0.6.4", "sec1", "subtle", @@ -1536,9 +1545,9 @@ dependencies = [ [[package]] name = "fiat-crypto" -version = "0.1.17" +version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a214f5bb88731d436478f3ae1f8a277b62124089ba9fb67f4f93fb100ef73c90" +checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77" [[package]] name = "file-sharing" @@ -2561,11 +2570,7 @@ dependencies = [ [[package]] name = "libp2p-identity" -<<<<<<< HEAD -version = "0.1.2" -======= version = "0.2.3" ->>>>>>> fb616973 (deps(identity): update ed25519-dalek to 2.0) dependencies = [ "asn1_der", "base64 0.21.0", @@ -3605,32 +3610,17 @@ dependencies = [ "sha2 0.10.6", ] -[[package]] -<<<<<<< HEAD -name = "packed_simd_2" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1914cd452d8fccd6f9db48147b29fd4ae05bea9dc5d9ad578509f72415de282" -dependencies = [ - "cfg-if", - "libm", -] - [[package]] name = "parity-send-wrapper" version = "0.1.0" -======= -name = "parking" -version = "2.1.0" ->>>>>>> fb616973 (deps(identity): update ed25519-dalek to 2.0) source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa9777aa91b8ad9dd5aaa04a9b6bcb02c7f1deb952fca5a66034d5e63afc5c6f" [[package]] name = "parking" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" +checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" [[package]] name = "parking_lot" @@ -3765,8 +3755,18 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba" dependencies = [ - "der", - "spki", + "der 0.6.1", + "spki 0.6.0", +] + +[[package]] +name = "pkcs8" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" +dependencies = [ + "der 0.7.8", + "spki 0.7.2", ] [[package]] @@ -4487,9 +4487,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928" dependencies = [ "base16ct", - "der", + "der 0.6.1", "generic-array", - "pkcs8", + "pkcs8 0.9.0", "subtle", "zeroize", ] @@ -4720,7 +4720,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b" dependencies = [ "base64ct", - "der", + "der 0.6.1", +] + +[[package]] +name = "spki" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a" +dependencies = [ + "base64ct", + "der 0.7.8", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 6555dde1b1d..99f109155d6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -55,8 +55,6 @@ members = [ "transports/websocket", ] resolver = "2" -<<<<<<< HEAD -======= [workspace.package] rust-version = "1.65.0" @@ -115,4 +113,3 @@ multihash = "0.19.0" # we import via `rust-multiaddr`. # This is expected to stay here until we move `libp2p-identity` to a separate repository which makes the dependency relationship more obvious. libp2p-identity = { path = "identity" } ->>>>>>> fb616973 (deps(identity): update ed25519-dalek to 2.0) diff --git a/core/Cargo.toml b/core/Cargo.toml index 60fa51c904b..74f1b5dc6eb 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -16,7 +16,7 @@ fnv = "1.0" futures = { version = "0.3.28", features = ["executor", "thread-pool"] } futures-timer = "3" instant = "0.1.11" -libp2p-identity = { version = "0.1", path = "../identity", features = ["peerid", "ed25519"] } +libp2p-identity = { version = "0.2.3", path = "../identity", features = ["peerid", "ed25519"] } log = "0.4" multiaddr = { version = "0.17.1" } multihash = { version = "0.17.0", default-features = false, features = ["std"] } diff --git a/identity/CHANGELOG.md b/identity/CHANGELOG.md index 3e9802400df..b52f001827f 100644 --- a/identity/CHANGELOG.md +++ b/identity/CHANGELOG.md @@ -1,5 +1,3 @@ -<<<<<<< HEAD -======= ## 0.2.3 - Fix [RUSTSEC-2022-0093] by updating `ed25519-dalek` to `2.0`. @@ -52,7 +50,6 @@ [PR 3928]: https://github.com/libp2p/rust-libp2p/pull/3928 [protobuf format]: https://github.com/libp2p/specs/blob/master/peer-ids/peer-ids.md#keys ->>>>>>> fb616973 (deps(identity): update ed25519-dalek to 2.0) ## 0.1.2 - Add `impl From for PublicKey` so that `PublicKey::from(ed25519::PublicKey)` works. diff --git a/identity/Cargo.toml b/identity/Cargo.toml index 283c866f717..40ae2a39c4d 100644 --- a/identity/Cargo.toml +++ b/identity/Cargo.toml @@ -1,10 +1,6 @@ [package] name = "libp2p-identity" -<<<<<<< HEAD -version = "0.1.2" -======= version = "0.2.3" ->>>>>>> fb616973 (deps(identity): update ed25519-dalek to 2.0) edition = "2021" description = "Data structures and algorithms for identifying peers in libp2p." rust-version = "1.60.0" @@ -17,13 +13,8 @@ categories = ["cryptography"] [dependencies] asn1_der = { version = "0.7.6", optional = true } -<<<<<<< HEAD -bs58 = { version = "0.4.0", optional = true } -ed25519-dalek = { version = "1.0.1", optional = true } -======= bs58 = { version = "0.5.0", optional = true } ed25519-dalek = { version = "2.0", optional = true, features = ["rand_core"] } ->>>>>>> fb616973 (deps(identity): update ed25519-dalek to 2.0) libsecp256k1 = { version = "0.7.0", optional = true } log = "0.4" multiaddr = { version = "0.17.1", optional = true } diff --git a/libp2p/Cargo.toml b/libp2p/Cargo.toml index f979366b71a..4ff585bf132 100644 --- a/libp2p/Cargo.toml +++ b/libp2p/Cargo.toml @@ -103,7 +103,7 @@ libp2p-core = { version = "0.39.0", path = "../core" } libp2p-dcutr = { version = "0.9.0", path = "../protocols/dcutr", optional = true } libp2p-floodsub = { version = "0.42.0", path = "../protocols/floodsub", optional = true } libp2p-identify = { version = "0.42.0", path = "../protocols/identify", optional = true } -libp2p-identity = { version = "0.1.0", path = "../identity" } +libp2p-identity = { version = "0.2.3", path = "../identity" } libp2p-kad = { version = "0.43.0", path = "../protocols/kad", optional = true } libp2p-metrics = { version = "0.12.0", path = "../misc/metrics", optional = true } libp2p-mplex = { version = "0.39.0", path = "../muxers/mplex", optional = true } diff --git a/misc/allow-block-list/Cargo.toml b/misc/allow-block-list/Cargo.toml index e65f93c53de..a74ec3144d4 100644 --- a/misc/allow-block-list/Cargo.toml +++ b/misc/allow-block-list/Cargo.toml @@ -12,7 +12,7 @@ categories = ["network-programming", "asynchronous"] [dependencies] libp2p-core = { version = "0.39.0", path = "../../core" } libp2p-swarm = { version = "0.42.1", path = "../../swarm" } -libp2p-identity = { version = "0.1.0", path = "../../identity", features = ["peerid"] } +libp2p-identity = { version = "0.2.3", path = "../../identity", features = ["peerid"] } void = "1" [dev-dependencies] diff --git a/misc/connection-limits/Cargo.toml b/misc/connection-limits/Cargo.toml index b1ea179f371..2cd7136ef6c 100644 --- a/misc/connection-limits/Cargo.toml +++ b/misc/connection-limits/Cargo.toml @@ -12,7 +12,7 @@ categories = ["network-programming", "asynchronous"] [dependencies] libp2p-core = { version = "0.39.0", path = "../../core" } libp2p-swarm = { version = "0.42.1", path = "../../swarm" } -libp2p-identity = { version = "0.1.0", path = "../../identity", features = ["peerid"] } +libp2p-identity = { version = "0.2.3", path = "../../identity", features = ["peerid"] } void = "1" [dev-dependencies] diff --git a/misc/keygen/Cargo.toml b/misc/keygen/Cargo.toml index 18b4d8b0154..583b56519b1 100644 --- a/misc/keygen/Cargo.toml +++ b/misc/keygen/Cargo.toml @@ -16,4 +16,4 @@ serde = { version = "1.0.160", features = ["derive"] } serde_json = "1.0.96" libp2p-core = { version = "0.39.0", path = "../../core" } base64 = "0.21.0" -libp2p-identity = { version = "0.1.0", path = "../../identity" } +libp2p-identity = { version = "0.2.3", path = "../../identity" } diff --git a/misc/metrics/Cargo.toml b/misc/metrics/Cargo.toml index d1e44165125..f8f8c3251a4 100644 --- a/misc/metrics/Cargo.toml +++ b/misc/metrics/Cargo.toml @@ -26,7 +26,7 @@ libp2p-kad = { version = "0.43.0", path = "../../protocols/kad", optional = true libp2p-ping = { version = "0.42.0", path = "../../protocols/ping", optional = true } libp2p-relay = { version = "0.15.0", path = "../../protocols/relay", optional = true } libp2p-swarm = { version = "0.42.0", path = "../../swarm" } -libp2p-identity = { version = "0.1.0", path = "../../identity" } +libp2p-identity = { version = "0.2.3", path = "../../identity" } prometheus-client = "0.19.0" [target.'cfg(not(target_os = "unknown"))'.dependencies] diff --git a/muxers/mplex/Cargo.toml b/muxers/mplex/Cargo.toml index 1c0562803c7..dc2c5368d74 100644 --- a/muxers/mplex/Cargo.toml +++ b/muxers/mplex/Cargo.toml @@ -15,7 +15,7 @@ bytes = "1" futures = "0.3.28" asynchronous-codec = "0.6" libp2p-core = { version = "0.39.0", path = "../../core" } -libp2p-identity = { version = "0.1.0", path = "../../identity" } +libp2p-identity = { version = "0.2.3", path = "../../identity" } log = "0.4" nohash-hasher = "0.2" parking_lot = "0.12" diff --git a/protocols/autonat/Cargo.toml b/protocols/autonat/Cargo.toml index bf235d9dbe2..eef2511df35 100644 --- a/protocols/autonat/Cargo.toml +++ b/protocols/autonat/Cargo.toml @@ -18,7 +18,7 @@ instant = "0.1" libp2p-core = { version = "0.39.0", path = "../../core" } libp2p-swarm = { version = "0.42.1", path = "../../swarm" } libp2p-request-response = { version = "0.24.0", path = "../request-response" } -libp2p-identity = { version = "0.1.0", path = "../../identity" } +libp2p-identity = { version = "0.2.3", path = "../../identity" } log = "0.4" rand = "0.8" quick-protobuf = "0.8" diff --git a/protocols/dcutr/Cargo.toml b/protocols/dcutr/Cargo.toml index 93e17d5082a..a350646dae8 100644 --- a/protocols/dcutr/Cargo.toml +++ b/protocols/dcutr/Cargo.toml @@ -18,7 +18,7 @@ futures-timer = "3.0" instant = "0.1.11" libp2p-core = { version = "0.39.0", path = "../../core" } libp2p-swarm = { version = "0.42.1", path = "../../swarm" } -libp2p-identity = { version = "0.1.0", path = "../../identity" } +libp2p-identity = { version = "0.2.3", path = "../../identity" } log = "0.4" quick-protobuf = "0.8" quick-protobuf-codec = { version = "0.1", path = "../../misc/quick-protobuf-codec" } diff --git a/protocols/floodsub/Cargo.toml b/protocols/floodsub/Cargo.toml index 22f040e159e..6326c7dd514 100644 --- a/protocols/floodsub/Cargo.toml +++ b/protocols/floodsub/Cargo.toml @@ -17,7 +17,7 @@ fnv = "1.0" futures = "0.3.28" libp2p-core = { version = "0.39.0", path = "../../core" } libp2p-swarm = { version = "0.42.1", path = "../../swarm" } -libp2p-identity = { version = "0.1.0", path = "../../identity" } +libp2p-identity = { version = "0.2.3", path = "../../identity" } log = "0.4" quick-protobuf = "0.8" quick-protobuf-codec = { version = "0.1", path = "../../misc/quick-protobuf-codec" } diff --git a/protocols/gossipsub/Cargo.toml b/protocols/gossipsub/Cargo.toml index 39a5b3a2d7f..7881de705a2 100644 --- a/protocols/gossipsub/Cargo.toml +++ b/protocols/gossipsub/Cargo.toml @@ -14,7 +14,7 @@ categories = ["network-programming", "asynchronous"] either = "1.5" libp2p-swarm = { version = "0.42.2", path = "../../swarm" } libp2p-core = { version = "0.39.0", path = "../../core" } -libp2p-identity = { version = "0.1.2", path = "../../identity" } +libp2p-identity = { version = "0.2.3", path = "../../identity" } bytes = "1.4" byteorder = "1.3.4" fnv = "1.0.7" diff --git a/protocols/identify/Cargo.toml b/protocols/identify/Cargo.toml index fb186360ba9..f1974a53f04 100644 --- a/protocols/identify/Cargo.toml +++ b/protocols/identify/Cargo.toml @@ -16,7 +16,7 @@ futures = "0.3.28" futures-timer = "3.0.2" libp2p-core = { version = "0.39.0", path = "../../core" } libp2p-swarm = { version = "0.42.1", path = "../../swarm" } -libp2p-identity = { version = "0.1.2", path = "../../identity" } +libp2p-identity = { version = "0.2.3", path = "../../identity" } log = "0.4.1" lru = "0.10.0" quick-protobuf-codec = { version = "0.1", path = "../../misc/quick-protobuf-codec" } diff --git a/protocols/kad/Cargo.toml b/protocols/kad/Cargo.toml index c555bf8b768..221b3b3cad4 100644 --- a/protocols/kad/Cargo.toml +++ b/protocols/kad/Cargo.toml @@ -21,7 +21,7 @@ log = "0.4" libp2p-core = { version = "0.39.0", path = "../../core" } libp2p-swarm = { version = "0.42.1", path = "../../swarm" } quick-protobuf = "0.8" -libp2p-identity = { version = "0.1.0", path = "../../identity" } +libp2p-identity = { version = "0.2.3", path = "../../identity" } rand = "0.8" sha2 = "0.10.0" smallvec = "1.6.1" diff --git a/protocols/mdns/Cargo.toml b/protocols/mdns/Cargo.toml index 5f311f56bd5..41ce5ea452f 100644 --- a/protocols/mdns/Cargo.toml +++ b/protocols/mdns/Cargo.toml @@ -17,7 +17,7 @@ futures = "0.3.28" if-watch = "3.0.1" libp2p-core = { version = "0.39.0", path = "../../core" } libp2p-swarm = { version = "0.42.1", path = "../../swarm" } -libp2p-identity = { version = "0.1.0", path = "../../identity" } +libp2p-identity = { version = "0.2.3", path = "../../identity" } log = "0.4.14" rand = "0.8.3" smallvec = "1.6.1" diff --git a/protocols/perf/Cargo.toml b/protocols/perf/Cargo.toml index 4609b076220..cb883bdb8e5 100644 --- a/protocols/perf/Cargo.toml +++ b/protocols/perf/Cargo.toml @@ -19,7 +19,7 @@ futures = "0.3.28" instant = "0.1.11" libp2p-core = { version = "0.39.0", path = "../../core" } libp2p-dns = { version = "0.39.0", path = "../../transports/dns", features = ["async-std"] } -libp2p-identity = { version = "0.1.0", path = "../../identity" } +libp2p-identity = { version = "0.2.3", path = "../../identity" } libp2p-noise = { version = "0.42.2", path = "../../transports/noise" } libp2p-quic = { version = "0.7.0-alpha.2", path = "../../transports/quic", features = ["async-std"] } libp2p-swarm = { version = "0.42.1", path = "../../swarm", features = ["macros", "async-std"] } diff --git a/protocols/ping/Cargo.toml b/protocols/ping/Cargo.toml index b917d467184..b43d8f3b13e 100644 --- a/protocols/ping/Cargo.toml +++ b/protocols/ping/Cargo.toml @@ -17,7 +17,7 @@ futures-timer = "3.0.2" instant = "0.1.11" libp2p-core = { version = "0.39.0", path = "../../core" } libp2p-swarm = { version = "0.42.1", path = "../../swarm" } -libp2p-identity = { version = "0.1.0", path = "../../identity" } +libp2p-identity = { version = "0.2.3", path = "../../identity" } log = "0.4.1" rand = "0.8" void = "1.0" diff --git a/protocols/relay/Cargo.toml b/protocols/relay/Cargo.toml index 9bb92bb8961..1e999e838af 100644 --- a/protocols/relay/Cargo.toml +++ b/protocols/relay/Cargo.toml @@ -19,7 +19,7 @@ futures-timer = "3" instant = "0.1.11" libp2p-core = { version = "0.39.0", path = "../../core" } libp2p-swarm = { version = "0.42.1", path = "../../swarm", features = ["async-std"] } -libp2p-identity = { version = "0.1.0", path = "../../identity" } +libp2p-identity = { version = "0.2.3", path = "../../identity" } log = "0.4" quick-protobuf = "0.8" quick-protobuf-codec = { version = "0.1", path = "../../misc/quick-protobuf-codec" } diff --git a/protocols/rendezvous/Cargo.toml b/protocols/rendezvous/Cargo.toml index 45945837b91..8d6e5805846 100644 --- a/protocols/rendezvous/Cargo.toml +++ b/protocols/rendezvous/Cargo.toml @@ -18,7 +18,7 @@ futures-timer = "3.0.2" instant = "0.1.11" libp2p-core = { version = "0.39.0", path = "../../core" } libp2p-swarm = { version = "0.42.1", path = "../../swarm" } -libp2p-identity = { version = "0.1.0", path = "../../identity" } +libp2p-identity = { version = "0.2.3", path = "../../identity" } log = "0.4" quick-protobuf = "0.8" quick-protobuf-codec = { version = "0.1", path = "../../misc/quick-protobuf-codec" } diff --git a/protocols/request-response/Cargo.toml b/protocols/request-response/Cargo.toml index 75cbdc369fa..b0cedf0a789 100644 --- a/protocols/request-response/Cargo.toml +++ b/protocols/request-response/Cargo.toml @@ -16,7 +16,7 @@ futures = "0.3.28" instant = "0.1.11" libp2p-core = { version = "0.39.0", path = "../../core" } libp2p-swarm = { version = "0.42.1", path = "../../swarm" } -libp2p-identity = { version = "0.1.0", path = "../../identity" } +libp2p-identity = { version = "0.2.3", path = "../../identity" } rand = "0.8" smallvec = "1.6.1" diff --git a/swarm-test/Cargo.toml b/swarm-test/Cargo.toml index 9c922a1c2ed..074522220dd 100644 --- a/swarm-test/Cargo.toml +++ b/swarm-test/Cargo.toml @@ -14,7 +14,7 @@ categories = ["network-programming", "asynchronous"] [dependencies] async-trait = "0.1.68" libp2p-core = { version = "0.39.1", path = "../core" } -libp2p-identity = { version = "0.1.1", path = "../identity" } +libp2p-identity = { version = "0.2.3", path = "../identity" } libp2p-plaintext = { version = "0.39.1", path = "../transports/plaintext" } libp2p-swarm = { version = "0.42.0", path = "../swarm" } libp2p-tcp = { version = "0.39.0", path = "../transports/tcp", features = ["async-io"] } diff --git a/swarm/Cargo.toml b/swarm/Cargo.toml index 140d0a6d854..a2d595a3794 100644 --- a/swarm/Cargo.toml +++ b/swarm/Cargo.toml @@ -17,7 +17,7 @@ futures = "0.3.28" futures-timer = "3.0.2" instant = "0.1.11" libp2p-core = { version = "0.39.0", path = "../core" } -libp2p-identity = { version = "0.1.0", path = "../identity" } +libp2p-identity = { version = "0.2.3", path = "../identity" } libp2p-swarm-derive = { version = "0.32.0", path = "../swarm-derive", optional = true } log = "0.4" rand = "0.8" @@ -42,7 +42,7 @@ either = "1.6.0" env_logger = "0.10" futures = "0.3.28" libp2p-identify = { path = "../protocols/identify" } -libp2p-identity = { version = "0.1.0", path = "../identity", features = ["ed25519"] } +libp2p-identity = { version = "0.2.3", path = "../identity", features = ["ed25519"] } libp2p-kad = { path = "../protocols/kad" } libp2p-ping = { path = "../protocols/ping" } libp2p-plaintext = { path = "../transports/plaintext" } diff --git a/transports/dns/Cargo.toml b/transports/dns/Cargo.toml index 5cd734d4525..546ac68d207 100644 --- a/transports/dns/Cargo.toml +++ b/transports/dns/Cargo.toml @@ -12,7 +12,7 @@ categories = ["network-programming", "asynchronous"] [dependencies] libp2p-core = { version = "0.39.0", path = "../../core" } -libp2p-identity = { version = "0.1.0", path = "../../identity" } +libp2p-identity = { version = "0.2.3", path = "../../identity" } log = "0.4.1" futures = "0.3.28" async-std-resolver = { version = "0.22", optional = true } diff --git a/transports/noise/Cargo.toml b/transports/noise/Cargo.toml index b7da5a31090..d63c115f134 100644 --- a/transports/noise/Cargo.toml +++ b/transports/noise/Cargo.toml @@ -13,7 +13,7 @@ bytes = "1" curve25519-dalek = "3.0.0" futures = "0.3.28" libp2p-core = { version = "0.39.0", path = "../../core" } -libp2p-identity = { version = "0.1.2", path = "../../identity", features = ["ed25519"] } +libp2p-identity = { version = "0.2.3", path = "../../identity", features = ["ed25519"] } log = "0.4" quick-protobuf = "0.8" once_cell = "1.17.1" diff --git a/transports/plaintext/Cargo.toml b/transports/plaintext/Cargo.toml index b8ccbcc2162..271d2dd1134 100644 --- a/transports/plaintext/Cargo.toml +++ b/transports/plaintext/Cargo.toml @@ -15,7 +15,7 @@ asynchronous-codec = "0.6" bytes = "1" futures = "0.3.28" libp2p-core = { version = "0.39.0", path = "../../core" } -libp2p-identity = { version = "0.1.2", path = "../../identity" } +libp2p-identity = { version = "0.2.3", path = "../../identity" } log = "0.4.8" quick-protobuf = "0.8" unsigned-varint = { version = "0.7", features = ["asynchronous_codec"] } diff --git a/transports/quic/Cargo.toml b/transports/quic/Cargo.toml index 9bb54dddcb3..ba5c83a30b9 100644 --- a/transports/quic/Cargo.toml +++ b/transports/quic/Cargo.toml @@ -16,7 +16,7 @@ futures-timer = "3.0.2" if-watch = "3.0.1" libp2p-core = { version = "0.39.0", path = "../../core" } libp2p-tls = { version = "0.1.0", path = "../tls" } -libp2p-identity = { version = "0.1.0", path = "../../identity" } +libp2p-identity = { version = "0.2.3", path = "../../identity" } log = "0.4" parking_lot = "0.12.0" quinn-proto = { version = "0.9.3", default-features = false, features = ["tls-rustls"] } diff --git a/transports/tcp/Cargo.toml b/transports/tcp/Cargo.toml index 55507dd1dc4..23b7aa8ec2a 100644 --- a/transports/tcp/Cargo.toml +++ b/transports/tcp/Cargo.toml @@ -17,7 +17,7 @@ futures-timer = "3.0" if-watch = "3.0.1" libc = "0.2.142" libp2p-core = { version = "0.39.0", path = "../../core" } -libp2p-identity = { version = "0.1.0", path = "../../identity" } +libp2p-identity = { version = "0.2.3", path = "../../identity" } log = "0.4.11" socket2 = { version = "0.4.0", features = ["all"] } tokio = { version = "1.28.0", default-features = false, features = ["net"], optional = true } diff --git a/transports/tls/Cargo.toml b/transports/tls/Cargo.toml index 2a95d07aaba..eeb7e41db36 100644 --- a/transports/tls/Cargo.toml +++ b/transports/tls/Cargo.toml @@ -12,7 +12,7 @@ exclude = ["src/test_assets"] futures = { version = "0.3.28", default-features = false } futures-rustls = "0.22.2" libp2p-core = { version = "0.39.0", path = "../../core" } -libp2p-identity = { version = "0.1.2", path = "../../identity" } +libp2p-identity = { version = "0.2.3", path = "../../identity" } rcgen = "0.10.0" ring = "0.16.20" thiserror = "1.0.40" diff --git a/transports/webrtc/Cargo.toml b/transports/webrtc/Cargo.toml index ae0379b2e03..fd19ecdd335 100644 --- a/transports/webrtc/Cargo.toml +++ b/transports/webrtc/Cargo.toml @@ -20,7 +20,7 @@ hex = "0.4" if-watch = "3.0" libp2p-core = { version = "0.39.0", path = "../../core" } libp2p-noise = { version = "0.42.2", path = "../../transports/noise" } -libp2p-identity = { version = "0.1.0", path = "../../identity" } +libp2p-identity = { version = "0.2.3", path = "../../identity" } log = "0.4" sha2 = "0.10.6" multihash = { version = "0.17.0", default-features = false } diff --git a/transports/websocket/Cargo.toml b/transports/websocket/Cargo.toml index 11efd27d9cb..093dc7c6eba 100644 --- a/transports/websocket/Cargo.toml +++ b/transports/websocket/Cargo.toml @@ -15,7 +15,7 @@ futures-rustls = "0.22" either = "1.5.3" futures = "0.3.28" libp2p-core = { version = "0.39.0", path = "../../core" } -libp2p-identity = { version = "0.1.0", path = "../../identity" } +libp2p-identity = { version = "0.2.3", path = "../../identity" } log = "0.4.8" parking_lot = "0.12.0" quicksink = "0.1" From bd321117768f1bdbe65558a66b832aa6f5052607 Mon Sep 17 00:00:00 2001 From: Aaro Altonen Date: Mon, 21 Aug 2023 13:46:14 +0300 Subject: [PATCH 3/4] Use correct version for `libp2p-identify` --- Cargo.lock | 9 ++--- Cargo.toml | 58 --------------------------- core/Cargo.toml | 2 +- identity/CHANGELOG.md | 49 +--------------------- identity/Cargo.toml | 4 +- libp2p/Cargo.toml | 2 +- misc/allow-block-list/Cargo.toml | 2 +- misc/connection-limits/Cargo.toml | 2 +- misc/keygen/Cargo.toml | 2 +- misc/metrics/Cargo.toml | 2 +- muxers/mplex/Cargo.toml | 2 +- protocols/autonat/Cargo.toml | 2 +- protocols/dcutr/Cargo.toml | 2 +- protocols/floodsub/Cargo.toml | 2 +- protocols/gossipsub/Cargo.toml | 2 +- protocols/identify/Cargo.toml | 2 +- protocols/kad/Cargo.toml | 2 +- protocols/mdns/Cargo.toml | 2 +- protocols/perf/Cargo.toml | 2 +- protocols/ping/Cargo.toml | 2 +- protocols/relay/Cargo.toml | 2 +- protocols/rendezvous/Cargo.toml | 2 +- protocols/request-response/Cargo.toml | 2 +- swarm-test/Cargo.toml | 2 +- swarm/Cargo.toml | 4 +- transports/dns/Cargo.toml | 2 +- transports/noise/Cargo.toml | 2 +- transports/plaintext/Cargo.toml | 2 +- transports/quic/Cargo.toml | 2 +- transports/tcp/Cargo.toml | 2 +- transports/tls/Cargo.toml | 2 +- transports/webrtc/Cargo.toml | 2 +- transports/websocket/Cargo.toml | 2 +- 33 files changed, 36 insertions(+), 144 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6f006ca803e..a80bf337dbb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -615,12 +615,9 @@ dependencies = [ [[package]] name = "bs58" -version = "0.5.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5353f36341f7451062466f0b755b96ac3a9547e4d7f6b70d603fc721a7d7896" -dependencies = [ - "tinyvec", -] +checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" [[package]] name = "bumpalo" @@ -2570,7 +2567,7 @@ dependencies = [ [[package]] name = "libp2p-identity" -version = "0.2.3" +version = "0.1.3" dependencies = [ "asn1_der", "base64 0.21.0", diff --git a/Cargo.toml b/Cargo.toml index 99f109155d6..280eb094675 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -55,61 +55,3 @@ members = [ "transports/websocket", ] resolver = "2" - -[workspace.package] -rust-version = "1.65.0" - -[workspace.dependencies] -libp2p-allow-block-list = { version = "0.2.0", path = "misc/allow-block-list" } -libp2p-autonat = { version = "0.11.0", path = "protocols/autonat" } -libp2p-connection-limits = { version = "0.2.1", path = "misc/connection-limits" } -libp2p-core = { version = "0.40.0", path = "core" } -libp2p-dcutr = { version = "0.10.0", path = "protocols/dcutr" } -libp2p-deflate = { version = "0.40.0", path = "transports/deflate" } -libp2p-dns = { version = "0.40.0", path = "transports/dns" } -libp2p-floodsub = { version = "0.43.0", path = "protocols/floodsub" } -libp2p-gossipsub = { version = "0.45.1", path = "protocols/gossipsub" } -libp2p-identify = { version = "0.43.0", path = "protocols/identify" } -libp2p-identity = { version = "0.2.3" } -libp2p-kad = { version = "0.44.4", path = "protocols/kad" } -libp2p-mdns = { version = "0.44.0", path = "protocols/mdns" } -libp2p-memory-connection-limits = { version = "0.1.0", path = "misc/memory-connection-limits" } -libp2p-metrics = { version = "0.13.1", path = "misc/metrics" } -libp2p-mplex = { version = "0.40.0", path = "muxers/mplex" } -libp2p-muxer-test-harness = { path = "muxers/test-harness" } -libp2p-noise = { version = "0.43.0", path = "transports/noise" } -libp2p-perf = { version = "0.2.0", path = "protocols/perf" } -libp2p-ping = { version = "0.43.0", path = "protocols/ping" } -libp2p-plaintext = { version = "0.40.0", path = "transports/plaintext" } -libp2p-pnet = { version = "0.23.0", path = "transports/pnet" } -libp2p-quic = { version = "0.9.2", path = "transports/quic" } -libp2p-relay = { version = "0.16.1", path = "protocols/relay" } -libp2p-rendezvous = { version = "0.13.0", path = "protocols/rendezvous" } -libp2p-request-response = { version = "0.25.1", path = "protocols/request-response" } -libp2p-swarm = { version = "0.43.3", path = "swarm" } -libp2p-swarm-derive = { version = "0.33.0", path = "swarm-derive" } -libp2p-swarm-test = { version = "0.2.0", path = "swarm-test" } -libp2p-tcp = { version = "0.40.0", path = "transports/tcp" } -libp2p-tls = { version = "0.2.0", path = "transports/tls" } -libp2p-uds = { version = "0.39.0", path = "transports/uds" } -libp2p-wasm-ext = { version = "0.40.0", path = "transports/wasm-ext" } -libp2p-webrtc = { version = "0.6.0-alpha", path = "transports/webrtc" } -libp2p-websocket = { version = "0.42.0", path = "transports/websocket" } -libp2p-webtransport-websys = { version = "0.1.0", path = "transports/webtransport-websys" } -libp2p-yamux = { version = "0.44.1", path = "muxers/yamux" } -multistream-select = { version = "0.13.0", path = "misc/multistream-select" } -quick-protobuf-codec = { version = "0.2.0", path = "misc/quick-protobuf-codec" } -quickcheck = { package = "quickcheck-ext", path = "misc/quickcheck-ext" } -rw-stream-sink = { version = "0.4.0", path = "misc/rw-stream-sink" } -multiaddr = "0.18.0" -multihash = "0.19.0" - - -[patch.crates-io] - -# Patch away `libp2p-idnentity` in our dependency tree with the workspace version. -# `libp2p-identity` is a leaf dependency and used within `rust-multiaddr` which is **not** part of the workspace. -# As a result, we cannot just reference the workspace version in our crates because the types would mismatch with what -# we import via `rust-multiaddr`. -# This is expected to stay here until we move `libp2p-identity` to a separate repository which makes the dependency relationship more obvious. -libp2p-identity = { path = "identity" } diff --git a/core/Cargo.toml b/core/Cargo.toml index 74f1b5dc6eb..2ac6dd937b2 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -16,7 +16,7 @@ fnv = "1.0" futures = { version = "0.3.28", features = ["executor", "thread-pool"] } futures-timer = "3" instant = "0.1.11" -libp2p-identity = { version = "0.2.3", path = "../identity", features = ["peerid", "ed25519"] } +libp2p-identity = { version = "0.1.3", path = "../identity", features = ["peerid", "ed25519"] } log = "0.4" multiaddr = { version = "0.17.1" } multihash = { version = "0.17.0", default-features = false, features = ["std"] } diff --git a/identity/CHANGELOG.md b/identity/CHANGELOG.md index b52f001827f..d7881dca203 100644 --- a/identity/CHANGELOG.md +++ b/identity/CHANGELOG.md @@ -1,55 +1,8 @@ -## 0.2.3 +## 0.1.3 - Fix [RUSTSEC-2022-0093] by updating `ed25519-dalek` to `2.0`. See [PR 4337] -[RUSTSEC-2022-0093]: https://rustsec.org/advisories/RUSTSEC-2022-0093 -[PR 4337]: https://github.com/libp2p/rust-libp2p/pull/4337 - -## 0.2.2 - -- Implement `from_protobuf_encoding` for RSA `Keypair`. - See [PR 4193]. - -[PR 4193]: https://github.com/libp2p/rust-libp2p/pull/4193 - -## 0.2.1 - -- Expose `KeyType` for `PublicKey` and `Keypair`. - See [PR 4107]. - -[PR 4107]: https://github.com/libp2p/rust-libp2p/pull/4107 - -## 0.2.0 - -- Raise MSRV to 1.65. - See [PR 3715]. -- Add support for exporting and importing ECDSA keys via the libp2p [protobuf format]. - See [PR 3863]. - -- Make `Keypair` and `PublicKey` opaque. - See [PR 3866]. - -- Remove `identity::secp256k1::SecretKey::sign_hash` and make `identity::secp256k1::SecretKey::sign` infallible. - See [PR 3850]. - -- Remove deprecated items. See [PR 3928]. - -- Remove `PeerId::try_from_multiaddr`. - `multiaddr::Protocol::P2p` is now type-safe and contains a `PeerId` directly, rendering this function obsolete. - See [PR 3656]. - -- Remove `PeerId::is_public_key` because it is unused and can be implemented externally. - See [PR 3656]. - -[PR 3656]: https://github.com/libp2p/rust-libp2p/pull/3656 -[PR 3850]: https://github.com/libp2p/rust-libp2p/pull/3850 -[PR 3715]: https://github.com/libp2p/rust-libp2p/pull/3715 -[PR 3863]: https://github.com/libp2p/rust-libp2p/pull/3863 -[PR 3866]: https://github.com/libp2p/rust-libp2p/pull/3866 -[PR 3928]: https://github.com/libp2p/rust-libp2p/pull/3928 -[protobuf format]: https://github.com/libp2p/specs/blob/master/peer-ids/peer-ids.md#keys - ## 0.1.2 - Add `impl From for PublicKey` so that `PublicKey::from(ed25519::PublicKey)` works. diff --git a/identity/Cargo.toml b/identity/Cargo.toml index 40ae2a39c4d..a85a02eb21b 100644 --- a/identity/Cargo.toml +++ b/identity/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "libp2p-identity" -version = "0.2.3" +version = "0.1.3" edition = "2021" description = "Data structures and algorithms for identifying peers in libp2p." rust-version = "1.60.0" @@ -13,7 +13,7 @@ categories = ["cryptography"] [dependencies] asn1_der = { version = "0.7.6", optional = true } -bs58 = { version = "0.5.0", optional = true } +bs58 = { version = "0.4.0", optional = true } ed25519-dalek = { version = "2.0", optional = true, features = ["rand_core"] } libsecp256k1 = { version = "0.7.0", optional = true } log = "0.4" diff --git a/libp2p/Cargo.toml b/libp2p/Cargo.toml index 4ff585bf132..bd0d4234010 100644 --- a/libp2p/Cargo.toml +++ b/libp2p/Cargo.toml @@ -103,7 +103,7 @@ libp2p-core = { version = "0.39.0", path = "../core" } libp2p-dcutr = { version = "0.9.0", path = "../protocols/dcutr", optional = true } libp2p-floodsub = { version = "0.42.0", path = "../protocols/floodsub", optional = true } libp2p-identify = { version = "0.42.0", path = "../protocols/identify", optional = true } -libp2p-identity = { version = "0.2.3", path = "../identity" } +libp2p-identity = { version = "0.1.3", path = "../identity" } libp2p-kad = { version = "0.43.0", path = "../protocols/kad", optional = true } libp2p-metrics = { version = "0.12.0", path = "../misc/metrics", optional = true } libp2p-mplex = { version = "0.39.0", path = "../muxers/mplex", optional = true } diff --git a/misc/allow-block-list/Cargo.toml b/misc/allow-block-list/Cargo.toml index a74ec3144d4..f80201fd1e2 100644 --- a/misc/allow-block-list/Cargo.toml +++ b/misc/allow-block-list/Cargo.toml @@ -12,7 +12,7 @@ categories = ["network-programming", "asynchronous"] [dependencies] libp2p-core = { version = "0.39.0", path = "../../core" } libp2p-swarm = { version = "0.42.1", path = "../../swarm" } -libp2p-identity = { version = "0.2.3", path = "../../identity", features = ["peerid"] } +libp2p-identity = { version = "0.1.3", path = "../../identity", features = ["peerid"] } void = "1" [dev-dependencies] diff --git a/misc/connection-limits/Cargo.toml b/misc/connection-limits/Cargo.toml index 2cd7136ef6c..92c07bc296a 100644 --- a/misc/connection-limits/Cargo.toml +++ b/misc/connection-limits/Cargo.toml @@ -12,7 +12,7 @@ categories = ["network-programming", "asynchronous"] [dependencies] libp2p-core = { version = "0.39.0", path = "../../core" } libp2p-swarm = { version = "0.42.1", path = "../../swarm" } -libp2p-identity = { version = "0.2.3", path = "../../identity", features = ["peerid"] } +libp2p-identity = { version = "0.1.3", path = "../../identity", features = ["peerid"] } void = "1" [dev-dependencies] diff --git a/misc/keygen/Cargo.toml b/misc/keygen/Cargo.toml index 583b56519b1..d14a358bf56 100644 --- a/misc/keygen/Cargo.toml +++ b/misc/keygen/Cargo.toml @@ -16,4 +16,4 @@ serde = { version = "1.0.160", features = ["derive"] } serde_json = "1.0.96" libp2p-core = { version = "0.39.0", path = "../../core" } base64 = "0.21.0" -libp2p-identity = { version = "0.2.3", path = "../../identity" } +libp2p-identity = { version = "0.1.3", path = "../../identity" } diff --git a/misc/metrics/Cargo.toml b/misc/metrics/Cargo.toml index f8f8c3251a4..f1cd3f34558 100644 --- a/misc/metrics/Cargo.toml +++ b/misc/metrics/Cargo.toml @@ -26,7 +26,7 @@ libp2p-kad = { version = "0.43.0", path = "../../protocols/kad", optional = true libp2p-ping = { version = "0.42.0", path = "../../protocols/ping", optional = true } libp2p-relay = { version = "0.15.0", path = "../../protocols/relay", optional = true } libp2p-swarm = { version = "0.42.0", path = "../../swarm" } -libp2p-identity = { version = "0.2.3", path = "../../identity" } +libp2p-identity = { version = "0.1.3", path = "../../identity" } prometheus-client = "0.19.0" [target.'cfg(not(target_os = "unknown"))'.dependencies] diff --git a/muxers/mplex/Cargo.toml b/muxers/mplex/Cargo.toml index dc2c5368d74..05860f2455b 100644 --- a/muxers/mplex/Cargo.toml +++ b/muxers/mplex/Cargo.toml @@ -15,7 +15,7 @@ bytes = "1" futures = "0.3.28" asynchronous-codec = "0.6" libp2p-core = { version = "0.39.0", path = "../../core" } -libp2p-identity = { version = "0.2.3", path = "../../identity" } +libp2p-identity = { version = "0.1.3", path = "../../identity" } log = "0.4" nohash-hasher = "0.2" parking_lot = "0.12" diff --git a/protocols/autonat/Cargo.toml b/protocols/autonat/Cargo.toml index eef2511df35..bc9dabc55de 100644 --- a/protocols/autonat/Cargo.toml +++ b/protocols/autonat/Cargo.toml @@ -18,7 +18,7 @@ instant = "0.1" libp2p-core = { version = "0.39.0", path = "../../core" } libp2p-swarm = { version = "0.42.1", path = "../../swarm" } libp2p-request-response = { version = "0.24.0", path = "../request-response" } -libp2p-identity = { version = "0.2.3", path = "../../identity" } +libp2p-identity = { version = "0.1.3", path = "../../identity" } log = "0.4" rand = "0.8" quick-protobuf = "0.8" diff --git a/protocols/dcutr/Cargo.toml b/protocols/dcutr/Cargo.toml index a350646dae8..b46cdaec1c8 100644 --- a/protocols/dcutr/Cargo.toml +++ b/protocols/dcutr/Cargo.toml @@ -18,7 +18,7 @@ futures-timer = "3.0" instant = "0.1.11" libp2p-core = { version = "0.39.0", path = "../../core" } libp2p-swarm = { version = "0.42.1", path = "../../swarm" } -libp2p-identity = { version = "0.2.3", path = "../../identity" } +libp2p-identity = { version = "0.1.3", path = "../../identity" } log = "0.4" quick-protobuf = "0.8" quick-protobuf-codec = { version = "0.1", path = "../../misc/quick-protobuf-codec" } diff --git a/protocols/floodsub/Cargo.toml b/protocols/floodsub/Cargo.toml index 6326c7dd514..c70afb0bbc4 100644 --- a/protocols/floodsub/Cargo.toml +++ b/protocols/floodsub/Cargo.toml @@ -17,7 +17,7 @@ fnv = "1.0" futures = "0.3.28" libp2p-core = { version = "0.39.0", path = "../../core" } libp2p-swarm = { version = "0.42.1", path = "../../swarm" } -libp2p-identity = { version = "0.2.3", path = "../../identity" } +libp2p-identity = { version = "0.1.3", path = "../../identity" } log = "0.4" quick-protobuf = "0.8" quick-protobuf-codec = { version = "0.1", path = "../../misc/quick-protobuf-codec" } diff --git a/protocols/gossipsub/Cargo.toml b/protocols/gossipsub/Cargo.toml index 7881de705a2..3f52bc3f43e 100644 --- a/protocols/gossipsub/Cargo.toml +++ b/protocols/gossipsub/Cargo.toml @@ -14,7 +14,7 @@ categories = ["network-programming", "asynchronous"] either = "1.5" libp2p-swarm = { version = "0.42.2", path = "../../swarm" } libp2p-core = { version = "0.39.0", path = "../../core" } -libp2p-identity = { version = "0.2.3", path = "../../identity" } +libp2p-identity = { version = "0.1.3", path = "../../identity" } bytes = "1.4" byteorder = "1.3.4" fnv = "1.0.7" diff --git a/protocols/identify/Cargo.toml b/protocols/identify/Cargo.toml index f1974a53f04..98b67a5b979 100644 --- a/protocols/identify/Cargo.toml +++ b/protocols/identify/Cargo.toml @@ -16,7 +16,7 @@ futures = "0.3.28" futures-timer = "3.0.2" libp2p-core = { version = "0.39.0", path = "../../core" } libp2p-swarm = { version = "0.42.1", path = "../../swarm" } -libp2p-identity = { version = "0.2.3", path = "../../identity" } +libp2p-identity = { version = "0.1.3", path = "../../identity" } log = "0.4.1" lru = "0.10.0" quick-protobuf-codec = { version = "0.1", path = "../../misc/quick-protobuf-codec" } diff --git a/protocols/kad/Cargo.toml b/protocols/kad/Cargo.toml index 221b3b3cad4..19c1becb590 100644 --- a/protocols/kad/Cargo.toml +++ b/protocols/kad/Cargo.toml @@ -21,7 +21,7 @@ log = "0.4" libp2p-core = { version = "0.39.0", path = "../../core" } libp2p-swarm = { version = "0.42.1", path = "../../swarm" } quick-protobuf = "0.8" -libp2p-identity = { version = "0.2.3", path = "../../identity" } +libp2p-identity = { version = "0.1.3", path = "../../identity" } rand = "0.8" sha2 = "0.10.0" smallvec = "1.6.1" diff --git a/protocols/mdns/Cargo.toml b/protocols/mdns/Cargo.toml index 41ce5ea452f..de195a046e1 100644 --- a/protocols/mdns/Cargo.toml +++ b/protocols/mdns/Cargo.toml @@ -17,7 +17,7 @@ futures = "0.3.28" if-watch = "3.0.1" libp2p-core = { version = "0.39.0", path = "../../core" } libp2p-swarm = { version = "0.42.1", path = "../../swarm" } -libp2p-identity = { version = "0.2.3", path = "../../identity" } +libp2p-identity = { version = "0.1.3", path = "../../identity" } log = "0.4.14" rand = "0.8.3" smallvec = "1.6.1" diff --git a/protocols/perf/Cargo.toml b/protocols/perf/Cargo.toml index cb883bdb8e5..7ad69c02eb4 100644 --- a/protocols/perf/Cargo.toml +++ b/protocols/perf/Cargo.toml @@ -19,7 +19,7 @@ futures = "0.3.28" instant = "0.1.11" libp2p-core = { version = "0.39.0", path = "../../core" } libp2p-dns = { version = "0.39.0", path = "../../transports/dns", features = ["async-std"] } -libp2p-identity = { version = "0.2.3", path = "../../identity" } +libp2p-identity = { version = "0.1.3", path = "../../identity" } libp2p-noise = { version = "0.42.2", path = "../../transports/noise" } libp2p-quic = { version = "0.7.0-alpha.2", path = "../../transports/quic", features = ["async-std"] } libp2p-swarm = { version = "0.42.1", path = "../../swarm", features = ["macros", "async-std"] } diff --git a/protocols/ping/Cargo.toml b/protocols/ping/Cargo.toml index b43d8f3b13e..630d1179d1d 100644 --- a/protocols/ping/Cargo.toml +++ b/protocols/ping/Cargo.toml @@ -17,7 +17,7 @@ futures-timer = "3.0.2" instant = "0.1.11" libp2p-core = { version = "0.39.0", path = "../../core" } libp2p-swarm = { version = "0.42.1", path = "../../swarm" } -libp2p-identity = { version = "0.2.3", path = "../../identity" } +libp2p-identity = { version = "0.1.3", path = "../../identity" } log = "0.4.1" rand = "0.8" void = "1.0" diff --git a/protocols/relay/Cargo.toml b/protocols/relay/Cargo.toml index 1e999e838af..4dc3a6286d3 100644 --- a/protocols/relay/Cargo.toml +++ b/protocols/relay/Cargo.toml @@ -19,7 +19,7 @@ futures-timer = "3" instant = "0.1.11" libp2p-core = { version = "0.39.0", path = "../../core" } libp2p-swarm = { version = "0.42.1", path = "../../swarm", features = ["async-std"] } -libp2p-identity = { version = "0.2.3", path = "../../identity" } +libp2p-identity = { version = "0.1.3", path = "../../identity" } log = "0.4" quick-protobuf = "0.8" quick-protobuf-codec = { version = "0.1", path = "../../misc/quick-protobuf-codec" } diff --git a/protocols/rendezvous/Cargo.toml b/protocols/rendezvous/Cargo.toml index 8d6e5805846..6e02930f1e9 100644 --- a/protocols/rendezvous/Cargo.toml +++ b/protocols/rendezvous/Cargo.toml @@ -18,7 +18,7 @@ futures-timer = "3.0.2" instant = "0.1.11" libp2p-core = { version = "0.39.0", path = "../../core" } libp2p-swarm = { version = "0.42.1", path = "../../swarm" } -libp2p-identity = { version = "0.2.3", path = "../../identity" } +libp2p-identity = { version = "0.1.3", path = "../../identity" } log = "0.4" quick-protobuf = "0.8" quick-protobuf-codec = { version = "0.1", path = "../../misc/quick-protobuf-codec" } diff --git a/protocols/request-response/Cargo.toml b/protocols/request-response/Cargo.toml index b0cedf0a789..218f06c459f 100644 --- a/protocols/request-response/Cargo.toml +++ b/protocols/request-response/Cargo.toml @@ -16,7 +16,7 @@ futures = "0.3.28" instant = "0.1.11" libp2p-core = { version = "0.39.0", path = "../../core" } libp2p-swarm = { version = "0.42.1", path = "../../swarm" } -libp2p-identity = { version = "0.2.3", path = "../../identity" } +libp2p-identity = { version = "0.1.3", path = "../../identity" } rand = "0.8" smallvec = "1.6.1" diff --git a/swarm-test/Cargo.toml b/swarm-test/Cargo.toml index 074522220dd..82c7bfb78e3 100644 --- a/swarm-test/Cargo.toml +++ b/swarm-test/Cargo.toml @@ -14,7 +14,7 @@ categories = ["network-programming", "asynchronous"] [dependencies] async-trait = "0.1.68" libp2p-core = { version = "0.39.1", path = "../core" } -libp2p-identity = { version = "0.2.3", path = "../identity" } +libp2p-identity = { version = "0.1.3", path = "../identity" } libp2p-plaintext = { version = "0.39.1", path = "../transports/plaintext" } libp2p-swarm = { version = "0.42.0", path = "../swarm" } libp2p-tcp = { version = "0.39.0", path = "../transports/tcp", features = ["async-io"] } diff --git a/swarm/Cargo.toml b/swarm/Cargo.toml index a2d595a3794..69758402e49 100644 --- a/swarm/Cargo.toml +++ b/swarm/Cargo.toml @@ -17,7 +17,7 @@ futures = "0.3.28" futures-timer = "3.0.2" instant = "0.1.11" libp2p-core = { version = "0.39.0", path = "../core" } -libp2p-identity = { version = "0.2.3", path = "../identity" } +libp2p-identity = { version = "0.1.3", path = "../identity" } libp2p-swarm-derive = { version = "0.32.0", path = "../swarm-derive", optional = true } log = "0.4" rand = "0.8" @@ -42,7 +42,7 @@ either = "1.6.0" env_logger = "0.10" futures = "0.3.28" libp2p-identify = { path = "../protocols/identify" } -libp2p-identity = { version = "0.2.3", path = "../identity", features = ["ed25519"] } +libp2p-identity = { version = "0.1.3", path = "../identity", features = ["ed25519"] } libp2p-kad = { path = "../protocols/kad" } libp2p-ping = { path = "../protocols/ping" } libp2p-plaintext = { path = "../transports/plaintext" } diff --git a/transports/dns/Cargo.toml b/transports/dns/Cargo.toml index 546ac68d207..4e9350c7c9c 100644 --- a/transports/dns/Cargo.toml +++ b/transports/dns/Cargo.toml @@ -12,7 +12,7 @@ categories = ["network-programming", "asynchronous"] [dependencies] libp2p-core = { version = "0.39.0", path = "../../core" } -libp2p-identity = { version = "0.2.3", path = "../../identity" } +libp2p-identity = { version = "0.1.3", path = "../../identity" } log = "0.4.1" futures = "0.3.28" async-std-resolver = { version = "0.22", optional = true } diff --git a/transports/noise/Cargo.toml b/transports/noise/Cargo.toml index d63c115f134..d595d6009e2 100644 --- a/transports/noise/Cargo.toml +++ b/transports/noise/Cargo.toml @@ -13,7 +13,7 @@ bytes = "1" curve25519-dalek = "3.0.0" futures = "0.3.28" libp2p-core = { version = "0.39.0", path = "../../core" } -libp2p-identity = { version = "0.2.3", path = "../../identity", features = ["ed25519"] } +libp2p-identity = { version = "0.1.3", path = "../../identity", features = ["ed25519"] } log = "0.4" quick-protobuf = "0.8" once_cell = "1.17.1" diff --git a/transports/plaintext/Cargo.toml b/transports/plaintext/Cargo.toml index 271d2dd1134..fd45c5cc2dd 100644 --- a/transports/plaintext/Cargo.toml +++ b/transports/plaintext/Cargo.toml @@ -15,7 +15,7 @@ asynchronous-codec = "0.6" bytes = "1" futures = "0.3.28" libp2p-core = { version = "0.39.0", path = "../../core" } -libp2p-identity = { version = "0.2.3", path = "../../identity" } +libp2p-identity = { version = "0.1.3", path = "../../identity" } log = "0.4.8" quick-protobuf = "0.8" unsigned-varint = { version = "0.7", features = ["asynchronous_codec"] } diff --git a/transports/quic/Cargo.toml b/transports/quic/Cargo.toml index ba5c83a30b9..4c942fc4e5f 100644 --- a/transports/quic/Cargo.toml +++ b/transports/quic/Cargo.toml @@ -16,7 +16,7 @@ futures-timer = "3.0.2" if-watch = "3.0.1" libp2p-core = { version = "0.39.0", path = "../../core" } libp2p-tls = { version = "0.1.0", path = "../tls" } -libp2p-identity = { version = "0.2.3", path = "../../identity" } +libp2p-identity = { version = "0.1.3", path = "../../identity" } log = "0.4" parking_lot = "0.12.0" quinn-proto = { version = "0.9.3", default-features = false, features = ["tls-rustls"] } diff --git a/transports/tcp/Cargo.toml b/transports/tcp/Cargo.toml index 23b7aa8ec2a..05595c41680 100644 --- a/transports/tcp/Cargo.toml +++ b/transports/tcp/Cargo.toml @@ -17,7 +17,7 @@ futures-timer = "3.0" if-watch = "3.0.1" libc = "0.2.142" libp2p-core = { version = "0.39.0", path = "../../core" } -libp2p-identity = { version = "0.2.3", path = "../../identity" } +libp2p-identity = { version = "0.1.3", path = "../../identity" } log = "0.4.11" socket2 = { version = "0.4.0", features = ["all"] } tokio = { version = "1.28.0", default-features = false, features = ["net"], optional = true } diff --git a/transports/tls/Cargo.toml b/transports/tls/Cargo.toml index eeb7e41db36..11643d6b475 100644 --- a/transports/tls/Cargo.toml +++ b/transports/tls/Cargo.toml @@ -12,7 +12,7 @@ exclude = ["src/test_assets"] futures = { version = "0.3.28", default-features = false } futures-rustls = "0.22.2" libp2p-core = { version = "0.39.0", path = "../../core" } -libp2p-identity = { version = "0.2.3", path = "../../identity" } +libp2p-identity = { version = "0.1.3", path = "../../identity" } rcgen = "0.10.0" ring = "0.16.20" thiserror = "1.0.40" diff --git a/transports/webrtc/Cargo.toml b/transports/webrtc/Cargo.toml index fd19ecdd335..99968894f53 100644 --- a/transports/webrtc/Cargo.toml +++ b/transports/webrtc/Cargo.toml @@ -20,7 +20,7 @@ hex = "0.4" if-watch = "3.0" libp2p-core = { version = "0.39.0", path = "../../core" } libp2p-noise = { version = "0.42.2", path = "../../transports/noise" } -libp2p-identity = { version = "0.2.3", path = "../../identity" } +libp2p-identity = { version = "0.1.3", path = "../../identity" } log = "0.4" sha2 = "0.10.6" multihash = { version = "0.17.0", default-features = false } diff --git a/transports/websocket/Cargo.toml b/transports/websocket/Cargo.toml index 093dc7c6eba..e9a88c65e19 100644 --- a/transports/websocket/Cargo.toml +++ b/transports/websocket/Cargo.toml @@ -15,7 +15,7 @@ futures-rustls = "0.22" either = "1.5.3" futures = "0.3.28" libp2p-core = { version = "0.39.0", path = "../../core" } -libp2p-identity = { version = "0.2.3", path = "../../identity" } +libp2p-identity = { version = "0.1.3", path = "../../identity" } log = "0.4.8" parking_lot = "0.12.0" quicksink = "0.1" From 04f27c36f44471d6249d2e4d17d8cba3191e3fd9 Mon Sep 17 00:00:00 2001 From: Aaro Altonen Date: Mon, 21 Aug 2023 17:46:54 +0300 Subject: [PATCH 4/4] Revert `libp2p-identity` upgrade for other crates --- core/Cargo.toml | 2 +- libp2p/Cargo.toml | 2 +- misc/allow-block-list/Cargo.toml | 2 +- misc/connection-limits/Cargo.toml | 2 +- misc/keygen/Cargo.toml | 2 +- misc/metrics/Cargo.toml | 2 +- muxers/mplex/Cargo.toml | 2 +- protocols/autonat/Cargo.toml | 2 +- protocols/dcutr/Cargo.toml | 2 +- protocols/floodsub/Cargo.toml | 2 +- protocols/gossipsub/Cargo.toml | 2 +- protocols/identify/Cargo.toml | 2 +- protocols/kad/Cargo.toml | 2 +- protocols/mdns/Cargo.toml | 2 +- protocols/perf/Cargo.toml | 2 +- protocols/ping/Cargo.toml | 2 +- protocols/relay/Cargo.toml | 2 +- protocols/rendezvous/Cargo.toml | 2 +- protocols/request-response/Cargo.toml | 2 +- swarm-test/Cargo.toml | 2 +- swarm/Cargo.toml | 4 ++-- transports/dns/Cargo.toml | 2 +- transports/noise/Cargo.toml | 2 +- transports/plaintext/Cargo.toml | 2 +- transports/quic/Cargo.toml | 2 +- transports/tcp/Cargo.toml | 2 +- transports/tls/Cargo.toml | 2 +- transports/webrtc/Cargo.toml | 2 +- transports/websocket/Cargo.toml | 2 +- 29 files changed, 30 insertions(+), 30 deletions(-) diff --git a/core/Cargo.toml b/core/Cargo.toml index 2ac6dd937b2..60fa51c904b 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -16,7 +16,7 @@ fnv = "1.0" futures = { version = "0.3.28", features = ["executor", "thread-pool"] } futures-timer = "3" instant = "0.1.11" -libp2p-identity = { version = "0.1.3", path = "../identity", features = ["peerid", "ed25519"] } +libp2p-identity = { version = "0.1", path = "../identity", features = ["peerid", "ed25519"] } log = "0.4" multiaddr = { version = "0.17.1" } multihash = { version = "0.17.0", default-features = false, features = ["std"] } diff --git a/libp2p/Cargo.toml b/libp2p/Cargo.toml index bd0d4234010..f979366b71a 100644 --- a/libp2p/Cargo.toml +++ b/libp2p/Cargo.toml @@ -103,7 +103,7 @@ libp2p-core = { version = "0.39.0", path = "../core" } libp2p-dcutr = { version = "0.9.0", path = "../protocols/dcutr", optional = true } libp2p-floodsub = { version = "0.42.0", path = "../protocols/floodsub", optional = true } libp2p-identify = { version = "0.42.0", path = "../protocols/identify", optional = true } -libp2p-identity = { version = "0.1.3", path = "../identity" } +libp2p-identity = { version = "0.1.0", path = "../identity" } libp2p-kad = { version = "0.43.0", path = "../protocols/kad", optional = true } libp2p-metrics = { version = "0.12.0", path = "../misc/metrics", optional = true } libp2p-mplex = { version = "0.39.0", path = "../muxers/mplex", optional = true } diff --git a/misc/allow-block-list/Cargo.toml b/misc/allow-block-list/Cargo.toml index f80201fd1e2..e65f93c53de 100644 --- a/misc/allow-block-list/Cargo.toml +++ b/misc/allow-block-list/Cargo.toml @@ -12,7 +12,7 @@ categories = ["network-programming", "asynchronous"] [dependencies] libp2p-core = { version = "0.39.0", path = "../../core" } libp2p-swarm = { version = "0.42.1", path = "../../swarm" } -libp2p-identity = { version = "0.1.3", path = "../../identity", features = ["peerid"] } +libp2p-identity = { version = "0.1.0", path = "../../identity", features = ["peerid"] } void = "1" [dev-dependencies] diff --git a/misc/connection-limits/Cargo.toml b/misc/connection-limits/Cargo.toml index 92c07bc296a..b1ea179f371 100644 --- a/misc/connection-limits/Cargo.toml +++ b/misc/connection-limits/Cargo.toml @@ -12,7 +12,7 @@ categories = ["network-programming", "asynchronous"] [dependencies] libp2p-core = { version = "0.39.0", path = "../../core" } libp2p-swarm = { version = "0.42.1", path = "../../swarm" } -libp2p-identity = { version = "0.1.3", path = "../../identity", features = ["peerid"] } +libp2p-identity = { version = "0.1.0", path = "../../identity", features = ["peerid"] } void = "1" [dev-dependencies] diff --git a/misc/keygen/Cargo.toml b/misc/keygen/Cargo.toml index d14a358bf56..18b4d8b0154 100644 --- a/misc/keygen/Cargo.toml +++ b/misc/keygen/Cargo.toml @@ -16,4 +16,4 @@ serde = { version = "1.0.160", features = ["derive"] } serde_json = "1.0.96" libp2p-core = { version = "0.39.0", path = "../../core" } base64 = "0.21.0" -libp2p-identity = { version = "0.1.3", path = "../../identity" } +libp2p-identity = { version = "0.1.0", path = "../../identity" } diff --git a/misc/metrics/Cargo.toml b/misc/metrics/Cargo.toml index f1cd3f34558..d1e44165125 100644 --- a/misc/metrics/Cargo.toml +++ b/misc/metrics/Cargo.toml @@ -26,7 +26,7 @@ libp2p-kad = { version = "0.43.0", path = "../../protocols/kad", optional = true libp2p-ping = { version = "0.42.0", path = "../../protocols/ping", optional = true } libp2p-relay = { version = "0.15.0", path = "../../protocols/relay", optional = true } libp2p-swarm = { version = "0.42.0", path = "../../swarm" } -libp2p-identity = { version = "0.1.3", path = "../../identity" } +libp2p-identity = { version = "0.1.0", path = "../../identity" } prometheus-client = "0.19.0" [target.'cfg(not(target_os = "unknown"))'.dependencies] diff --git a/muxers/mplex/Cargo.toml b/muxers/mplex/Cargo.toml index 05860f2455b..1c0562803c7 100644 --- a/muxers/mplex/Cargo.toml +++ b/muxers/mplex/Cargo.toml @@ -15,7 +15,7 @@ bytes = "1" futures = "0.3.28" asynchronous-codec = "0.6" libp2p-core = { version = "0.39.0", path = "../../core" } -libp2p-identity = { version = "0.1.3", path = "../../identity" } +libp2p-identity = { version = "0.1.0", path = "../../identity" } log = "0.4" nohash-hasher = "0.2" parking_lot = "0.12" diff --git a/protocols/autonat/Cargo.toml b/protocols/autonat/Cargo.toml index bc9dabc55de..bf235d9dbe2 100644 --- a/protocols/autonat/Cargo.toml +++ b/protocols/autonat/Cargo.toml @@ -18,7 +18,7 @@ instant = "0.1" libp2p-core = { version = "0.39.0", path = "../../core" } libp2p-swarm = { version = "0.42.1", path = "../../swarm" } libp2p-request-response = { version = "0.24.0", path = "../request-response" } -libp2p-identity = { version = "0.1.3", path = "../../identity" } +libp2p-identity = { version = "0.1.0", path = "../../identity" } log = "0.4" rand = "0.8" quick-protobuf = "0.8" diff --git a/protocols/dcutr/Cargo.toml b/protocols/dcutr/Cargo.toml index b46cdaec1c8..93e17d5082a 100644 --- a/protocols/dcutr/Cargo.toml +++ b/protocols/dcutr/Cargo.toml @@ -18,7 +18,7 @@ futures-timer = "3.0" instant = "0.1.11" libp2p-core = { version = "0.39.0", path = "../../core" } libp2p-swarm = { version = "0.42.1", path = "../../swarm" } -libp2p-identity = { version = "0.1.3", path = "../../identity" } +libp2p-identity = { version = "0.1.0", path = "../../identity" } log = "0.4" quick-protobuf = "0.8" quick-protobuf-codec = { version = "0.1", path = "../../misc/quick-protobuf-codec" } diff --git a/protocols/floodsub/Cargo.toml b/protocols/floodsub/Cargo.toml index c70afb0bbc4..22f040e159e 100644 --- a/protocols/floodsub/Cargo.toml +++ b/protocols/floodsub/Cargo.toml @@ -17,7 +17,7 @@ fnv = "1.0" futures = "0.3.28" libp2p-core = { version = "0.39.0", path = "../../core" } libp2p-swarm = { version = "0.42.1", path = "../../swarm" } -libp2p-identity = { version = "0.1.3", path = "../../identity" } +libp2p-identity = { version = "0.1.0", path = "../../identity" } log = "0.4" quick-protobuf = "0.8" quick-protobuf-codec = { version = "0.1", path = "../../misc/quick-protobuf-codec" } diff --git a/protocols/gossipsub/Cargo.toml b/protocols/gossipsub/Cargo.toml index 3f52bc3f43e..39a5b3a2d7f 100644 --- a/protocols/gossipsub/Cargo.toml +++ b/protocols/gossipsub/Cargo.toml @@ -14,7 +14,7 @@ categories = ["network-programming", "asynchronous"] either = "1.5" libp2p-swarm = { version = "0.42.2", path = "../../swarm" } libp2p-core = { version = "0.39.0", path = "../../core" } -libp2p-identity = { version = "0.1.3", path = "../../identity" } +libp2p-identity = { version = "0.1.2", path = "../../identity" } bytes = "1.4" byteorder = "1.3.4" fnv = "1.0.7" diff --git a/protocols/identify/Cargo.toml b/protocols/identify/Cargo.toml index 98b67a5b979..fb186360ba9 100644 --- a/protocols/identify/Cargo.toml +++ b/protocols/identify/Cargo.toml @@ -16,7 +16,7 @@ futures = "0.3.28" futures-timer = "3.0.2" libp2p-core = { version = "0.39.0", path = "../../core" } libp2p-swarm = { version = "0.42.1", path = "../../swarm" } -libp2p-identity = { version = "0.1.3", path = "../../identity" } +libp2p-identity = { version = "0.1.2", path = "../../identity" } log = "0.4.1" lru = "0.10.0" quick-protobuf-codec = { version = "0.1", path = "../../misc/quick-protobuf-codec" } diff --git a/protocols/kad/Cargo.toml b/protocols/kad/Cargo.toml index 19c1becb590..c555bf8b768 100644 --- a/protocols/kad/Cargo.toml +++ b/protocols/kad/Cargo.toml @@ -21,7 +21,7 @@ log = "0.4" libp2p-core = { version = "0.39.0", path = "../../core" } libp2p-swarm = { version = "0.42.1", path = "../../swarm" } quick-protobuf = "0.8" -libp2p-identity = { version = "0.1.3", path = "../../identity" } +libp2p-identity = { version = "0.1.0", path = "../../identity" } rand = "0.8" sha2 = "0.10.0" smallvec = "1.6.1" diff --git a/protocols/mdns/Cargo.toml b/protocols/mdns/Cargo.toml index de195a046e1..5f311f56bd5 100644 --- a/protocols/mdns/Cargo.toml +++ b/protocols/mdns/Cargo.toml @@ -17,7 +17,7 @@ futures = "0.3.28" if-watch = "3.0.1" libp2p-core = { version = "0.39.0", path = "../../core" } libp2p-swarm = { version = "0.42.1", path = "../../swarm" } -libp2p-identity = { version = "0.1.3", path = "../../identity" } +libp2p-identity = { version = "0.1.0", path = "../../identity" } log = "0.4.14" rand = "0.8.3" smallvec = "1.6.1" diff --git a/protocols/perf/Cargo.toml b/protocols/perf/Cargo.toml index 7ad69c02eb4..4609b076220 100644 --- a/protocols/perf/Cargo.toml +++ b/protocols/perf/Cargo.toml @@ -19,7 +19,7 @@ futures = "0.3.28" instant = "0.1.11" libp2p-core = { version = "0.39.0", path = "../../core" } libp2p-dns = { version = "0.39.0", path = "../../transports/dns", features = ["async-std"] } -libp2p-identity = { version = "0.1.3", path = "../../identity" } +libp2p-identity = { version = "0.1.0", path = "../../identity" } libp2p-noise = { version = "0.42.2", path = "../../transports/noise" } libp2p-quic = { version = "0.7.0-alpha.2", path = "../../transports/quic", features = ["async-std"] } libp2p-swarm = { version = "0.42.1", path = "../../swarm", features = ["macros", "async-std"] } diff --git a/protocols/ping/Cargo.toml b/protocols/ping/Cargo.toml index 630d1179d1d..b917d467184 100644 --- a/protocols/ping/Cargo.toml +++ b/protocols/ping/Cargo.toml @@ -17,7 +17,7 @@ futures-timer = "3.0.2" instant = "0.1.11" libp2p-core = { version = "0.39.0", path = "../../core" } libp2p-swarm = { version = "0.42.1", path = "../../swarm" } -libp2p-identity = { version = "0.1.3", path = "../../identity" } +libp2p-identity = { version = "0.1.0", path = "../../identity" } log = "0.4.1" rand = "0.8" void = "1.0" diff --git a/protocols/relay/Cargo.toml b/protocols/relay/Cargo.toml index 4dc3a6286d3..9bb92bb8961 100644 --- a/protocols/relay/Cargo.toml +++ b/protocols/relay/Cargo.toml @@ -19,7 +19,7 @@ futures-timer = "3" instant = "0.1.11" libp2p-core = { version = "0.39.0", path = "../../core" } libp2p-swarm = { version = "0.42.1", path = "../../swarm", features = ["async-std"] } -libp2p-identity = { version = "0.1.3", path = "../../identity" } +libp2p-identity = { version = "0.1.0", path = "../../identity" } log = "0.4" quick-protobuf = "0.8" quick-protobuf-codec = { version = "0.1", path = "../../misc/quick-protobuf-codec" } diff --git a/protocols/rendezvous/Cargo.toml b/protocols/rendezvous/Cargo.toml index 6e02930f1e9..45945837b91 100644 --- a/protocols/rendezvous/Cargo.toml +++ b/protocols/rendezvous/Cargo.toml @@ -18,7 +18,7 @@ futures-timer = "3.0.2" instant = "0.1.11" libp2p-core = { version = "0.39.0", path = "../../core" } libp2p-swarm = { version = "0.42.1", path = "../../swarm" } -libp2p-identity = { version = "0.1.3", path = "../../identity" } +libp2p-identity = { version = "0.1.0", path = "../../identity" } log = "0.4" quick-protobuf = "0.8" quick-protobuf-codec = { version = "0.1", path = "../../misc/quick-protobuf-codec" } diff --git a/protocols/request-response/Cargo.toml b/protocols/request-response/Cargo.toml index 218f06c459f..75cbdc369fa 100644 --- a/protocols/request-response/Cargo.toml +++ b/protocols/request-response/Cargo.toml @@ -16,7 +16,7 @@ futures = "0.3.28" instant = "0.1.11" libp2p-core = { version = "0.39.0", path = "../../core" } libp2p-swarm = { version = "0.42.1", path = "../../swarm" } -libp2p-identity = { version = "0.1.3", path = "../../identity" } +libp2p-identity = { version = "0.1.0", path = "../../identity" } rand = "0.8" smallvec = "1.6.1" diff --git a/swarm-test/Cargo.toml b/swarm-test/Cargo.toml index 82c7bfb78e3..9c922a1c2ed 100644 --- a/swarm-test/Cargo.toml +++ b/swarm-test/Cargo.toml @@ -14,7 +14,7 @@ categories = ["network-programming", "asynchronous"] [dependencies] async-trait = "0.1.68" libp2p-core = { version = "0.39.1", path = "../core" } -libp2p-identity = { version = "0.1.3", path = "../identity" } +libp2p-identity = { version = "0.1.1", path = "../identity" } libp2p-plaintext = { version = "0.39.1", path = "../transports/plaintext" } libp2p-swarm = { version = "0.42.0", path = "../swarm" } libp2p-tcp = { version = "0.39.0", path = "../transports/tcp", features = ["async-io"] } diff --git a/swarm/Cargo.toml b/swarm/Cargo.toml index 69758402e49..140d0a6d854 100644 --- a/swarm/Cargo.toml +++ b/swarm/Cargo.toml @@ -17,7 +17,7 @@ futures = "0.3.28" futures-timer = "3.0.2" instant = "0.1.11" libp2p-core = { version = "0.39.0", path = "../core" } -libp2p-identity = { version = "0.1.3", path = "../identity" } +libp2p-identity = { version = "0.1.0", path = "../identity" } libp2p-swarm-derive = { version = "0.32.0", path = "../swarm-derive", optional = true } log = "0.4" rand = "0.8" @@ -42,7 +42,7 @@ either = "1.6.0" env_logger = "0.10" futures = "0.3.28" libp2p-identify = { path = "../protocols/identify" } -libp2p-identity = { version = "0.1.3", path = "../identity", features = ["ed25519"] } +libp2p-identity = { version = "0.1.0", path = "../identity", features = ["ed25519"] } libp2p-kad = { path = "../protocols/kad" } libp2p-ping = { path = "../protocols/ping" } libp2p-plaintext = { path = "../transports/plaintext" } diff --git a/transports/dns/Cargo.toml b/transports/dns/Cargo.toml index 4e9350c7c9c..5cd734d4525 100644 --- a/transports/dns/Cargo.toml +++ b/transports/dns/Cargo.toml @@ -12,7 +12,7 @@ categories = ["network-programming", "asynchronous"] [dependencies] libp2p-core = { version = "0.39.0", path = "../../core" } -libp2p-identity = { version = "0.1.3", path = "../../identity" } +libp2p-identity = { version = "0.1.0", path = "../../identity" } log = "0.4.1" futures = "0.3.28" async-std-resolver = { version = "0.22", optional = true } diff --git a/transports/noise/Cargo.toml b/transports/noise/Cargo.toml index d595d6009e2..b7da5a31090 100644 --- a/transports/noise/Cargo.toml +++ b/transports/noise/Cargo.toml @@ -13,7 +13,7 @@ bytes = "1" curve25519-dalek = "3.0.0" futures = "0.3.28" libp2p-core = { version = "0.39.0", path = "../../core" } -libp2p-identity = { version = "0.1.3", path = "../../identity", features = ["ed25519"] } +libp2p-identity = { version = "0.1.2", path = "../../identity", features = ["ed25519"] } log = "0.4" quick-protobuf = "0.8" once_cell = "1.17.1" diff --git a/transports/plaintext/Cargo.toml b/transports/plaintext/Cargo.toml index fd45c5cc2dd..b8ccbcc2162 100644 --- a/transports/plaintext/Cargo.toml +++ b/transports/plaintext/Cargo.toml @@ -15,7 +15,7 @@ asynchronous-codec = "0.6" bytes = "1" futures = "0.3.28" libp2p-core = { version = "0.39.0", path = "../../core" } -libp2p-identity = { version = "0.1.3", path = "../../identity" } +libp2p-identity = { version = "0.1.2", path = "../../identity" } log = "0.4.8" quick-protobuf = "0.8" unsigned-varint = { version = "0.7", features = ["asynchronous_codec"] } diff --git a/transports/quic/Cargo.toml b/transports/quic/Cargo.toml index 4c942fc4e5f..9bb54dddcb3 100644 --- a/transports/quic/Cargo.toml +++ b/transports/quic/Cargo.toml @@ -16,7 +16,7 @@ futures-timer = "3.0.2" if-watch = "3.0.1" libp2p-core = { version = "0.39.0", path = "../../core" } libp2p-tls = { version = "0.1.0", path = "../tls" } -libp2p-identity = { version = "0.1.3", path = "../../identity" } +libp2p-identity = { version = "0.1.0", path = "../../identity" } log = "0.4" parking_lot = "0.12.0" quinn-proto = { version = "0.9.3", default-features = false, features = ["tls-rustls"] } diff --git a/transports/tcp/Cargo.toml b/transports/tcp/Cargo.toml index 05595c41680..55507dd1dc4 100644 --- a/transports/tcp/Cargo.toml +++ b/transports/tcp/Cargo.toml @@ -17,7 +17,7 @@ futures-timer = "3.0" if-watch = "3.0.1" libc = "0.2.142" libp2p-core = { version = "0.39.0", path = "../../core" } -libp2p-identity = { version = "0.1.3", path = "../../identity" } +libp2p-identity = { version = "0.1.0", path = "../../identity" } log = "0.4.11" socket2 = { version = "0.4.0", features = ["all"] } tokio = { version = "1.28.0", default-features = false, features = ["net"], optional = true } diff --git a/transports/tls/Cargo.toml b/transports/tls/Cargo.toml index 11643d6b475..2a95d07aaba 100644 --- a/transports/tls/Cargo.toml +++ b/transports/tls/Cargo.toml @@ -12,7 +12,7 @@ exclude = ["src/test_assets"] futures = { version = "0.3.28", default-features = false } futures-rustls = "0.22.2" libp2p-core = { version = "0.39.0", path = "../../core" } -libp2p-identity = { version = "0.1.3", path = "../../identity" } +libp2p-identity = { version = "0.1.2", path = "../../identity" } rcgen = "0.10.0" ring = "0.16.20" thiserror = "1.0.40" diff --git a/transports/webrtc/Cargo.toml b/transports/webrtc/Cargo.toml index 99968894f53..ae0379b2e03 100644 --- a/transports/webrtc/Cargo.toml +++ b/transports/webrtc/Cargo.toml @@ -20,7 +20,7 @@ hex = "0.4" if-watch = "3.0" libp2p-core = { version = "0.39.0", path = "../../core" } libp2p-noise = { version = "0.42.2", path = "../../transports/noise" } -libp2p-identity = { version = "0.1.3", path = "../../identity" } +libp2p-identity = { version = "0.1.0", path = "../../identity" } log = "0.4" sha2 = "0.10.6" multihash = { version = "0.17.0", default-features = false } diff --git a/transports/websocket/Cargo.toml b/transports/websocket/Cargo.toml index e9a88c65e19..11efd27d9cb 100644 --- a/transports/websocket/Cargo.toml +++ b/transports/websocket/Cargo.toml @@ -15,7 +15,7 @@ futures-rustls = "0.22" either = "1.5.3" futures = "0.3.28" libp2p-core = { version = "0.39.0", path = "../../core" } -libp2p-identity = { version = "0.1.3", path = "../../identity" } +libp2p-identity = { version = "0.1.0", path = "../../identity" } log = "0.4.8" parking_lot = "0.12.0" quicksink = "0.1"