Merge pull request #1500 from eqlabs/chris/libp2p053

update libp2p to 0.53.0
eqlabs · Nov 6, 2023 · 1c8ebef · 1c8ebef
2 parents 6bc2cff + bdbf041
commit 1c8ebef
Show file tree

Hide file tree

Showing 13 changed files with 370 additions and 426 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -36,7 +36,7 @@ lto = true
 [workspace.package]
 edition = "2021"
 license = "MIT OR Apache-2.0"
-rust-version = "1.72"
+rust-version = "1.73"
 
 [workspace.dependencies]
 anyhow = "1.0.75"

diff --git a/crates/load-test/Cargo.toml b/crates/load-test/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 description = "Load test for pathfinder JSON-RPC endpoints"
 edition = "2021"
 license = "MIT OR Apache-2.0"
-rust-version = "1.72"
+rust-version = "1.73"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]

diff --git a/crates/p2p/Cargo.toml b/crates/p2p/Cargo.toml
@@ -12,7 +12,7 @@ anyhow = { workspace = true }
 async-trait = { workspace = true }
 base64 = { workspace = true }
 futures = { workspace = true }
-libp2p = { version = "0.52.4", default-features = false, features = [
+libp2p = { version = "0.53.0", default-features = false, features = [
     "autonat",
     "dcutr",
     "dns",
@@ -24,6 +24,7 @@ libp2p = { version = "0.52.4", default-features = false, features = [
     "ping",
     "relay",
     "request-response",
+    "serde",
     "tcp",
     "tokio",
     "yamux",
@@ -38,6 +39,7 @@ sha2 = "0.10.7"
 stark_hash = { path = "../stark_hash" }
 tokio = { version = "1.32.0", features = ["macros", "rt-multi-thread", "sync"] }
 tracing = "0.1.37"
+unsigned-varint = { version = "0.8.0", features = ["futures"] }
 void = "1.0.2"
 zeroize = "1.6.0"
 

diff --git a/crates/p2p/src/behaviour.rs b/crates/p2p/src/behaviour.rs
@@ -8,7 +8,7 @@ use libp2p::dcutr;
 use libp2p::gossipsub::{self, IdentTopic, MessageAuthenticity, MessageId};
 use libp2p::identify;
 use libp2p::identity;
-use libp2p::kad::{self, record::store::MemoryStore};
+use libp2p::kad::{self, store::MemoryStore};
 use libp2p::ping;
 use libp2p::relay;
 use libp2p::request_response::{self, ProtocolSupport};
@@ -223,10 +223,10 @@ impl From<request_response::Event<EventsRequest, EventsResponseList>> for Event
     }
 }
 
-fn string_to_key(input: &str) -> kad::record::Key {
+fn string_to_key(input: &str) -> kad::RecordKey {
     use sha2::{Digest, Sha256};
     let mut hasher = Sha256::new();
     hasher.update(input.as_bytes());
     let result = hasher.finalize();
-    kad::record::Key::new(&result.as_slice())
+    kad::RecordKey::new(&result.as_slice())
 }
diff --git a/crates/p2p/src/lib.rs b/crates/p2p/src/lib.rs
@@ -6,7 +6,7 @@ use std::time::Duration;
 
 use libp2p::gossipsub::IdentTopic;
 use libp2p::identity::Keypair;
-use libp2p::kad::record::Key;
+use libp2p::kad::RecordKey;
 use libp2p::request_response::ResponseChannel;
 use libp2p::swarm::Config;
 use libp2p::{Multiaddr, PeerId, Swarm};
@@ -224,7 +224,7 @@ pub enum Event {
 pub enum TestEvent {
     NewListenAddress(Multiaddr),
     PeriodicBootstrapCompleted(Result<PeerId, PeerId>),
-    StartProvidingCompleted(Result<Key, Key>),
+    StartProvidingCompleted(Result<RecordKey, RecordKey>),
     ConnectionEstablished { outbound: bool, remote: PeerId },
     Subscribed { remote: PeerId, topic: String },
     PeerAddedToDHT { remote: PeerId },