jleony/nanoreth
1
0
Fork 0
mirror of https://github.com/hl-archive-node/nanoreth.git synced 2025-12-06 10:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Filter announcement txns pending import (#6932)

Browse Source
This commit is contained in:
Emilia Hane
2024-03-02 19:51:30 +01:00
committed by GitHub
parent b6dca63010
commit ef7ce3601f
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -887,7 +887,6 @@ impl TransactionFetcher {
true
});
fetched.shrink_to_fit();
self.remove_hashes_from_transaction_fetcher(fetched);
// buffer left over hashes
self.try_buffer_hashes_for_retry(requested_hashes, &peer_id);

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

@ -691,7 +691,10 @@ where
self.report_peer(peer_id, ReputationChangeKind::BadAnnouncement);
}
// 2. filter out known hashes
// 2. filter out transactions pending import to pool
partially_valid_msg.retain_by_hash(|hash| !self.transactions_by_peers.contains_key(hash));
// 3. filter out known hashes
//
// known txns have already been successfully fetched or received over gossip.
//
@ -713,7 +716,7 @@ where
return
}
// 3. filter out invalid entries (spam)
// 4. filter out invalid entries (spam)
//
// validates messages with respect to the given network, e.g. allowed tx types
//
@ -742,7 +745,7 @@ where
return
}
// 4. filter out already seen unknown hashes
// 5. filter out already seen unknown hashes
//
// seen hashes are already in the tx fetcher, pending fetch.
//
@ -863,11 +866,6 @@ where
.filter_map(Result::ok)
.collect::<PooledTransactions>();
// mark the transactions as received
self.transaction_fetcher.remove_hashes_from_transaction_fetcher(
non_blob_txs.iter().map(|tx| *tx.hash()),
);
self.import_transactions(peer_id, non_blob_txs, TransactionSource::Broadcast);
if has_blob_txs {
@ -989,6 +987,10 @@ where
let mut transactions = transactions.0;
// mark the transactions as received
self.transaction_fetcher
.remove_hashes_from_transaction_fetcher(transactions.iter().map(|tx| *tx.hash()));
let Some(peer) = self.peers.get_mut(&peer_id) else { return };
// track that the peer knows these transaction, but only if this is a new broadcast.
@ -1151,7 +1153,6 @@ where
self.report_peer_bad_transactions(peer_id);
}
}
self.transaction_fetcher.remove_hashes_from_transaction_fetcher([hash]);
self.bad_imports.insert(hash);
}