Fix to avoid broadcasting full blob txs #6835
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com>
Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com>
Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
fab-10
force-pushed
the
fix-blob-tx-full-broadcast
branch
from
c08ecc0
to
c3d96e8
Compare
|
Testing this PR, I see now consistant Geth peers |
Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
fab-10
force-pushed
the
fix-blob-tx-full-broadcast
branch
from
b584079
to
a51ce2e
Compare
fab-10
changed the title
Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
jflo
approved these changes
Mar 28, 2024
.../java/org/hyperledger/besu/tests/acceptance/jsonrpc/EthSendRawTransactionAcceptanceTest.java
Outdated
Show resolved
Hide resolved
| public synchronized Set<Transaction> claimTransactionHashesToSendToPeer(final EthPeer peer) { | ||
| final Set<Transaction> transactionHashesToSend = this.transactionHashesToSend.remove(peer); | ||
| if (transactionHashesToSend != null) { | ||
| markTransactionHashesAsSeen(peer, toHashList(transactionHashesToSend)); |
There was a problem hiding this comment.
should work, but i wonder if it would be more correct to mark them as seen after we know they've been sent to the peer. we could restore them to the cache in the exception handling of NewPooledTransactionHashesMessageSender:63
There was a problem hiding this comment.
good point, will review next
| @@ -77,7 +102,7 @@ public void onTransactionsAdded(final Collection<Transaction> transactions) { | |||
| return; | |||
| } | |||
|
|
|||
| final int numPeersToSendFullTransactions = (int) Math.ceil(Math.sqrt(currPeerCount)); | |||
| final int numPeersToSendFullTransactions = (int) Math.round(Math.sqrt(currPeerCount)); | |||
There was a problem hiding this comment.
This allows for rounding down as well as up, instead of ceil which is up only. It still works, but I'm unclear why it is necessary or preferred?
There was a problem hiding this comment.
it is not necessary, just seems more appropriate to round instead of ceil, to avoid strange results when few peers are connected, for example with 2 peers, with round we have 1, otherwise is 2.
| txBroadcaster = | ||
| new TransactionBroadcaster( | ||
| ethContext, | ||
| transactionTracker, | ||
| transactionsMessageSender, | ||
| newPooledTransactionHashesMessageSender); | ||
| newPooledTransactionHashesMessageSender, | ||
| FIXED_RANDOM_SEED); |
There was a problem hiding this comment.
Excellent move. My list of "flaky tests to fix" thanks you!
macfarla
pushed a commit
that referenced
this pull request
Apr 8, 2024
* separate queue for tx hashes Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> --------- Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com> Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> Co-authored-by: Gabriel Fukushima <gabrielfukushima@gmail.com>
amsmota
pushed a commit
to Citi/besu
that referenced
this pull request
Apr 16, 2024
* separate queue for tx hashes Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com> * Refinements Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * Update tests Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * Update CHANGELOG Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * Refinements Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> --------- Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com> Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> Co-authored-by: Gabriel Fukushima <gabrielfukushima@gmail.com> Signed-off-by: amsmota <antonio.mota@citi.com>
amsmota
pushed a commit
to Citi/besu
that referenced
this pull request
Apr 16, 2024
* separate queue for tx hashes Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com> * Refinements Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * Update tests Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * Update CHANGELOG Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * Refinements Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> --------- Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com> Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> Co-authored-by: Gabriel Fukushima <gabrielfukushima@gmail.com> Signed-off-by: amsmota <antonio.mota@citi.com>
matthew1001
pushed a commit
to kaleido-io/besu
that referenced
this pull request
Jun 7, 2024
* separate queue for tx hashes Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com> * Refinements Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * Update tests Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * Update CHANGELOG Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * Refinements Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> --------- Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com> Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> Co-authored-by: Gabriel Fukushima <gabrielfukushima@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
PR description
As @macfarla discovered, Besu is wrongly sending the full blob tx payload to a subset of peers, specifically the subset of peers that are selected for full tx broadcast ( sqrt(num of peers) ), and the problem was that there is a single queue for full tx and hash only broadcast, so for this subset of peers, actually it could happen that both kind of broadcasts are performed, and sending full blob tx is a breach of the protocol.
This PR finalize the work started by @gfukushima , that introduces 2 queues, one for full txs, and one for hashes only, so the specific broadcast methods do not incur in fetching a tx that is not meant for them.
Fixed Issue(s)
fixes #6777
Thanks for sending a pull request! Have you done the following?
doc-change-requiredlabel to this PR if updates are required.Locally, you can run these tests to catch failures early:
./gradlew build./gradlew acceptanceTest./gradlew integrationTest./gradlew ethereum:referenceTests:referenceTests