github/reth
1
1
Fork 0
mirror of https://github.com/paradigmxyz/reth.git synced 2026-01-30 01:28:21 -05:00
Code Issues Packages Projects Releases Wiki Activity

opt-out of filling space in request upon announcement (#6310)

Browse Source 
Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
This commit is contained in:
Emilia Hane
2024-01-31 22:25:00 +01:00
committed by GitHub
parent e5cd8ccac7
commit 82b20403cc
2 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
crates/net/network/src/transactions/fetcher.rs
View File

@@ -236,12 +236,6 @@ impl TransactionFetcher {
}
});
// all hashes included in request and there is still space
// todo: compare free space with min tx size
if acc_size_response < POOLED_TRANSACTIONS_RESPONSE_SOFT_LIMIT_BYTE_SIZE {
self.fill_eth68_request_for_peer(hashes, peer_id, &mut acc_size_response);
}
surplus_hashes
}
@@ -503,10 +497,12 @@ impl TransactionFetcher {
peer_id: PeerId,
acc_size_response: &mut usize,
) {
if *acc_size_response >= POOLED_TRANSACTIONS_RESPONSE_SOFT_LIMIT_BYTE_SIZE {
if *acc_size_response >= POOLED_TRANSACTIONS_RESPONSE_SOFT_LIMIT_BYTE_SIZE / 2 {
return
}
// all hashes included in request and there is still a lot of space
debug_assert!(
{
let mut acc_size = 0;
@@ -523,11 +519,18 @@ impl TransactionFetcher {
);
for hash in self.buffered_hashes.iter() {
// fill request to 2/3 of the soft limit for the response size, or until the number of
// hashes reaches the soft limit number for a request (like in eth66), whatever
// happens first
if hashes.len() > GET_POOLED_TRANSACTION_SOFT_LIMIT_NUM_HASHES {
break
}
// copy acc size
let mut next_acc_size = *acc_size_response;
// 1. Check acc size against limit, if so stop looping.
if next_acc_size >= POOLED_TRANSACTIONS_RESPONSE_SOFT_LIMIT_BYTE_SIZE {
if next_acc_size >= 2 * POOLED_TRANSACTIONS_RESPONSE_SOFT_LIMIT_BYTE_SIZE / 3 {
trace!(target: "net::tx",
peer_id=format!("{peer_id:#}"),
acc_size_eth68_response=acc_size_response, // no change acc size

10
crates/net/network/src/transactions/mod.rs
View File

@@ -1853,7 +1853,7 @@ mod tests {
assert!(tx_fetcher.buffered_hashes.is_empty());
}
#[tokio::test]
/*#[tokio::test]
async fn fill_eth68_request_for_peer() {
reth_tracing::init_test_tracing();
@@ -1864,8 +1864,8 @@ mod tests {
let eth_version = EthVersion::Eth68;
let unseen_eth68_hashes = [B256::from_slice(&[1; 32]), B256::from_slice(&[2; 32])];
let unseen_eth68_hashes_sizes = [
POOLED_TRANSACTIONS_RESPONSE_SOFT_LIMIT_BYTE_SIZE / 2,
POOLED_TRANSACTIONS_RESPONSE_SOFT_LIMIT_BYTE_SIZE / 2 - 4,
POOLED_TRANSACTIONS_RESPONSE_SOFT_LIMIT_BYTE_SIZE / 4 - 1,
POOLED_TRANSACTIONS_RESPONSE_SOFT_LIMIT_BYTE_SIZE / 4 - 5,
];
// hashes and sizes to buffer in reverse order so that seen_eth68_hashes[0] and
// seen_eth68_hashes_sizes[0] are lru
@@ -1916,7 +1916,7 @@ mod tests {
sizes: unseen_eth68_hashes_sizes.to_vec(),
types: [0; 2].to_vec(),
});
tx_manager.on_new_pooled_transaction_hashes(peer_id, msg);
tx_manager.request_buffered_hashes();
let tx_fetcher = &mut tx_manager.transaction_fetcher;
@@ -1940,5 +1940,5 @@ mod tests {
hashes.sort();
assert_eq!(hashes, expected_request);
}
}*/
}