deps(identity): update ed25519-dalek to 2.0

Pull-Request: #4337.
(cherry picked from commit fb61697)

# Conflicts:
#	Cargo.lock
#	Cargo.toml
#	identity/CHANGELOG.md
#	identity/Cargo.toml

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)

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<ed25519::PublicKey> for PublicKey` so that `PublicKey::from(ed25519::PublicKey)` works.

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 }