diff --git a/Cargo.lock b/Cargo.lock
index 1767245c6abfc55b7faba7b8487fa0b7b19c05ab..82dfd34c25289ed668030452f8e3ce1a8412c0ec 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2366,9 +2366,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
[[package]]
name = "bytes"
-version = "1.4.0"
+version = "1.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
+checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
[[package]]
name = "bzip2-sys"
@@ -5339,9 +5339,9 @@ dependencies = [
[[package]]
name = "fastrand"
-version = "2.0.0"
+version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764"
+checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
[[package]]
name = "fastrlp"
@@ -6175,9 +6175,9 @@ checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
[[package]]
name = "futures-timer"
-version = "3.0.2"
+version = "3.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c"
+checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24"
[[package]]
name = "futures-util"
@@ -7956,9 +7956,9 @@ dependencies = [
[[package]]
name = "litep2p"
-version = "0.4.0"
+version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adf107268459b653df189050c9ae2301253b9c62ceafa993dc69dad29870155c"
+checksum = "7f02542ae3a94b4c4ffa37dc56388c923e286afa3bf65452e3984b50b2a2f316"
dependencies = [
"async-trait",
"bs58 0.4.0",
@@ -7970,7 +7970,7 @@ dependencies = [
"hex-literal",
"indexmap 2.2.3",
"libc",
- "mockall",
+ "mockall 0.12.1",
"multiaddr",
"multihash 0.17.0",
"network-interface",
@@ -8480,11 +8480,26 @@ dependencies = [
"downcast",
"fragile",
"lazy_static",
- "mockall_derive",
+ "mockall_derive 0.11.4",
"predicates 2.1.5",
"predicates-tree",
]
+[[package]]
+name = "mockall"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43766c2b5203b10de348ffe19f7e54564b64f3d6018ff7648d1e2d6d3a0f0a48"
+dependencies = [
+ "cfg-if",
+ "downcast",
+ "fragile",
+ "lazy_static",
+ "mockall_derive 0.12.1",
+ "predicates 3.0.3",
+ "predicates-tree",
+]
+
[[package]]
name = "mockall_derive"
version = "0.11.4"
@@ -8497,6 +8512,18 @@ dependencies = [
"syn 1.0.109",
]
+[[package]]
+name = "mockall_derive"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af7cbce79ec385a1d4f54baa90a76401eb15d9cab93685f62e7e9f942aa00ae2"
+dependencies = [
+ "cfg-if",
+ "proc-macro2 1.0.82",
+ "quote 1.0.35",
+ "syn 2.0.61",
+]
+
[[package]]
name = "multiaddr"
version = "0.17.1"
@@ -16817,7 +16844,7 @@ dependencies = [
"futures",
"futures-timer",
"log",
- "mockall",
+ "mockall 0.11.4",
"parking_lot 0.12.1",
"sc-client-api",
"sc-network-types",
@@ -17342,7 +17369,7 @@ dependencies = [
"linked_hash_set",
"litep2p",
"log",
- "mockall",
+ "mockall 0.11.4",
"multistream-select",
"once_cell",
"parity-scale-codec",
@@ -17480,7 +17507,7 @@ dependencies = [
"futures-timer",
"libp2p",
"log",
- "mockall",
+ "mockall 0.11.4",
"parity-scale-codec",
"prost 0.12.4",
"prost-build 0.12.4",
@@ -18231,9 +18258,9 @@ dependencies = [
[[package]]
name = "sctp-proto"
-version = "0.1.7"
+version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f64cef148d3295c730c3cb340b0b252a4d570b1c7d4bf0808f88540b0a888bc"
+checksum = "b6220f78bb44c15f326b0596113305f6101097a18755d53727a575c97e09fb24"
dependencies = [
"bytes",
"crc",
@@ -18802,9 +18829,9 @@ dependencies = [
[[package]]
name = "smallvec"
-version = "1.11.2"
+version = "1.13.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
[[package]]
name = "smol"
@@ -20679,17 +20706,17 @@ dependencies = [
[[package]]
name = "str0m"
-version = "0.4.1"
+version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3f10d3f68e60168d81110410428a435dbde28cc5525f5f7c6fdec92dbdc2800"
+checksum = "6706347e49b13373f7ddfafad47df7583ed52083d6fc8a594eb2c80497ef959d"
dependencies = [
"combine",
"crc",
+ "fastrand 2.1.0",
"hmac 0.12.1",
"once_cell",
"openssl",
"openssl-sys",
- "rand 0.8.5",
"sctp-proto",
"serde",
"sha-1 0.10.1",
@@ -21361,7 +21388,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5"
dependencies = [
"cfg-if",
- "fastrand 2.0.0",
+ "fastrand 2.1.0",
"redox_syscall 0.4.1",
"rustix 0.38.21",
"windows-sys 0.48.0",
@@ -21553,9 +21580,9 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
[[package]]
name = "thiserror"
-version = "1.0.50"
+version = "1.0.61"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2"
+checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709"
dependencies = [
"thiserror-impl",
]
@@ -21582,9 +21609,9 @@ dependencies = [
[[package]]
name = "thiserror-impl"
-version = "1.0.50"
+version = "1.0.61"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8"
+checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
dependencies = [
"proc-macro2 1.0.82",
"quote 1.0.35",
@@ -21828,9 +21855,9 @@ dependencies = [
[[package]]
name = "tokio-util"
-version = "0.7.8"
+version = "0.7.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d"
+checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1"
dependencies = [
"bytes",
"futures-core",
@@ -21838,7 +21865,6 @@ dependencies = [
"futures-sink",
"pin-project-lite 0.2.12",
"tokio",
- "tracing",
]
[[package]]
diff --git a/substrate/client/network/Cargo.toml b/substrate/client/network/Cargo.toml
index b06d9c73540cf610fb6924068f29acfe80ac7a89..29b14a4511cac655096b3e3dded5013462ae7e9e 100644
--- a/substrate/client/network/Cargo.toml
+++ b/substrate/client/network/Cargo.toml
@@ -59,7 +59,7 @@ sp-blockchain = { path = "../../primitives/blockchain" }
sp-core = { path = "../../primitives/core" }
sp-runtime = { path = "../../primitives/runtime" }
wasm-timer = "0.2"
-litep2p = "0.4.0"
+litep2p = "0.5.0"
once_cell = "1.18.0"
void = "1.0.2"
schnellru = "0.2.1"
diff --git a/substrate/client/network/src/litep2p/discovery.rs b/substrate/client/network/src/litep2p/discovery.rs
index 351380755dbd644abc01ed8c09a094d28b8b8073..ff5f492df246a6e4165700132d080c183b91b79a 100644
--- a/substrate/client/network/src/litep2p/discovery.rs
+++ b/substrate/client/network/src/litep2p/discovery.rs
@@ -34,7 +34,7 @@ use litep2p::{
identify::{Config as IdentifyConfig, IdentifyEvent},
kademlia::{
Config as KademliaConfig, ConfigBuilder as KademliaConfigBuilder, KademliaEvent,
- KademliaHandle, QueryId, Quorum, Record, RecordKey,
+ KademliaHandle, QueryId, Quorum, Record, RecordKey, RecordsType,
},
ping::{Config as PingConfig, PingEvent},
},
@@ -123,8 +123,8 @@ pub enum DiscoveryEvent {
/// Query ID.
query_id: QueryId,
- /// Record.
- record: Record,
+ /// Records.
+ records: RecordsType,
},
/// Record was successfully stored on the DHT.
@@ -460,16 +460,13 @@ impl Stream for Discovery {
peers: peers.into_iter().collect(),
}))
},
- Poll::Ready(Some(KademliaEvent::GetRecordSuccess { query_id, record })) => {
+ Poll::Ready(Some(KademliaEvent::GetRecordSuccess { query_id, records })) => {
log::trace!(
target: LOG_TARGET,
- "`GET_RECORD` succeeded for {query_id:?}: {record:?}",
+ "`GET_RECORD` succeeded for {query_id:?}: {records:?}",
);
- return Poll::Ready(Some(DiscoveryEvent::GetRecordSuccess {
- query_id,
- record: record.record,
- }));
+ return Poll::Ready(Some(DiscoveryEvent::GetRecordSuccess { query_id, records }));
},
Poll::Ready(Some(KademliaEvent::PutRecordSucess { query_id, key: _ })) =>
return Poll::Ready(Some(DiscoveryEvent::PutRecordSuccess { query_id })),
diff --git a/substrate/client/network/src/litep2p/mod.rs b/substrate/client/network/src/litep2p/mod.rs
index 67085a81a5c8113cb238c82333993fb101557898..ae287052b2d44934a8b4827e53c77cae0d707be9 100644
--- a/substrate/client/network/src/litep2p/mod.rs
+++ b/substrate/client/network/src/litep2p/mod.rs
@@ -56,7 +56,10 @@ use litep2p::{
crypto::ed25519::Keypair,
executor::Executor,
protocol::{
- libp2p::{bitswap::Config as BitswapConfig, kademlia::QueryId},
+ libp2p::{
+ bitswap::Config as BitswapConfig,
+ kademlia::{QueryId, RecordsType},
+ },
request_response::ConfigBuilder as RequestResponseConfigBuilder,
},
transport::{
@@ -796,23 +799,30 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkBackend<B, H> for Litep2pNetworkBac
self.peerstore_handle.add_known_peer(peer.into());
}
}
- Some(DiscoveryEvent::GetRecordSuccess { query_id, record }) => {
+ Some(DiscoveryEvent::GetRecordSuccess { query_id, records }) => {
match self.pending_get_values.remove(&query_id) {
None => log::warn!(
target: LOG_TARGET,
"`GET_VALUE` succeeded for a non-existent query",
),
- Some((_key, started)) => {
+ Some((key, started)) => {
log::trace!(
target: LOG_TARGET,
"`GET_VALUE` for {:?} ({query_id:?}) succeeded",
- record.key,
+ key,
);
- self.event_streams.send(Event::Dht(
- DhtEvent::ValueFound(vec![
+ let value_found = match records {
+ RecordsType::LocalStore(record) => vec![
(libp2p::kad::RecordKey::new(&record.key), record.value)
- ])
+ ],
+ RecordsType::Network(records) => records.into_iter().map(|peer_record| {
+ (libp2p::kad::RecordKey::new(&peer_record.record.key), peer_record.record.value)
+ }).collect(),
+ };
+
+ self.event_streams.send(Event::Dht(
+ DhtEvent::ValueFound(value_found)
));
if let Some(ref metrics) = self.metrics {
diff --git a/substrate/client/network/types/Cargo.toml b/substrate/client/network/types/Cargo.toml
index ed89eca2dd1f0164b1474bee283ac534f4e2d123..a9334aaa1705987a35322921616188113f011ed8 100644
--- a/substrate/client/network/types/Cargo.toml
+++ b/substrate/client/network/types/Cargo.toml
@@ -13,7 +13,7 @@ documentation = "https://docs.rs/sc-network-types"
bs58 = "0.5.0"
ed25519-dalek = "2.1"
libp2p-identity = { version = "0.1.3", features = ["ed25519", "peerid"] }
-litep2p = "0.4.0"
+litep2p = "0.5.0"
multiaddr = "0.17.0"
multihash = { version = "0.17.0", default-features = false, features = ["identity", "multihash-impl", "sha2", "std"] }
rand = "0.8.5"