Fix restoring txpool from disk when blob transactions are present#8481
Merged
fab-10 merged 1 commit intobesu-eth:mainfrom Mar 28, 2025
Merged
Fix restoring txpool from disk when blob transactions are present#8481fab-10 merged 1 commit intobesu-eth:mainfrom
fab-10 merged 1 commit intobesu-eth:mainfrom
Conversation
fab-10
changed the title
fab-10
force-pushed
the
fix-txpool-restore-with-blobs
branch
from
abc86ca to
e8fbfc7
Compare
macfarla
approved these changes
Mar 27, 2025
pinges
reviewed
Mar 28, 2025
|
|
||
| clearInvocations(transactionValidatorFactory); | ||
|
|
||
| // trying to readd the same tx should return transaction already known and no |
Contributor
There was a problem hiding this comment.
Suggested change
| // trying to readd the same tx should return transaction already known and no | |
| // trying to read the same tx should return transaction already known and no |
|
|
||
| // re-enabling the txpool restores from file | ||
| transactionPool.setEnabled().get(10, TimeUnit.SECONDS); | ||
| transactionPool.setEnabled().get(10000, TimeUnit.SECONDS); |
Contributor
Author
There was a problem hiding this comment.
good catch, debug left over reverted
Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
fab-10
force-pushed
the
fix-txpool-restore-with-blobs
branch
from
e8fbfc7 to
db6ac73
Compare
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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
Fix to use the POOLED_TRANSACTION format also when reading from disk to fix the issue related to saving blob tx with that format but reading them with the BLOCK_BODY format.
Writing a test for this, I found that we where not correctly supporting the enable/disable feature in the unit tests, so that required a bit of refactoring on the test code.
Fixed Issue(s)
fixes #8449
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 spotlessApply./gradlew build./gradlew acceptanceTest./gradlew integrationTest./gradlew ethereum:referenceTests:referenceTests