Skip to content

Commit f4eb19a

Browse files
authored
Merge branch 'master' into david/eip-7702
2 parents f527b5f + 81a3af9 commit f4eb19a

File tree

6 files changed

+38
-4
lines changed

6 files changed

+38
-4
lines changed

Cargo.lock

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -899,7 +899,7 @@ linked-hash-map = { version = "0.5.4" }
899899
linked_hash_set = { version = "0.1.4" }
900900
linregress = { version = "0.5.1" }
901901
lite-json = { version = "0.2.0", default-features = false }
902-
litep2p = { version = "0.12.3", features = ["rsa", "websocket"] }
902+
litep2p = { version = "0.13.0", features = ["rsa", "websocket"] }
903903
log = { version = "0.4.22", default-features = false }
904904
macro_magic = { version = "0.5.1" }
905905
maplit = { version = "1.0.2" }

cumulus/pallets/parachain-system/src/lib.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1118,7 +1118,11 @@ impl<T: Config> Pallet<T> {
11181118
fn messages_collection_size_limit() -> usize {
11191119
let max_block_weight = <T as frame_system::Config>::BlockWeights::get().max_block;
11201120
let max_block_pov = max_block_weight.proof_size();
1121-
(max_block_pov / 6).saturated_into()
1121+
1122+
let remaining_proof_size =
1123+
frame_system::Pallet::<T>::remaining_block_weight().remaining().proof_size();
1124+
1125+
(max_block_pov / 6).min(remaining_proof_size).saturated_into()
11221126
}
11231127

11241128
/// Updates inherent data to only include the messages that weren't already processed

prdoc/pr_10859.prdoc

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
title: Upgrade litep2p to v0.13.0
2+
doc:
3+
- audience: Node Dev
4+
description: |-
5+
This PR upgrades litep2p to the latest version, bringing multiple fixes with this release.
6+
7+
Specifically, this release enhances WebSocket stability by resolving `AsyncWrite` errors and ensuring that partial writes during the negotiation phase no longer trigger connection failures.
8+
9+
It also fixes large file download using Bitswap protocol by grouping blocks into batches of <= 2 MiB.
10+
crates:
11+
- name: sc-network
12+
bump: major
13+
- name: sc-network-types
14+
bump: major

prdoc/pr_10863.prdoc

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
title: 'parachain-system: Ensure left-over message budget fits into the PoV'
2+
doc:
3+
- audience: Runtime Dev
4+
description: Ensure we check the buget against the remaining proof size in the block.
5+
crates:
6+
- name: cumulus-pallet-parachain-system
7+
bump: patch

substrate/client/network/src/litep2p/shim/bitswap.rs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,14 @@ impl<Block: BlockT> BitswapServer<Block> {
100100

101101
self.handle.send_response(peer, response).await;
102102
},
103+
BitswapEvent::Response { peer, responses } => {
104+
// We're a server, not a client - ignore incoming responses
105+
log::trace!(
106+
target: LOG_TARGET,
107+
"ignoring bitswap response from {peer:?} with {} entries",
108+
responses.len()
109+
);
110+
},
103111
}
104112
}
105113
}

0 commit comments

Comments
 (0)