chore: cherry-pick all to main
#187
Merged
Conversation
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
ARR4N
force-pushed
the
arr4n/cherry-pick-all
branch
from
816b485 to
ae5a958
Compare
alarso16
approved these changes
Jun 10, 2025
…hereum#29223) Co-authored-by: Felix Lange <[email protected]>
…ion (ethereum#29563) This change removes an unnecessary preallocation and fixes a flaw with no-op copies of some parts of the statedb
…thereum#29644) * eth/gasprice: add query limit for FeeHistory to defend DDOS attack * fix return values after cherry-pick --------- Co-authored-by: Eric <[email protected]>
* upgrade lock usage * revert unnecessary change
Fixes an error when the block is not found in debug methods.
ARR4N
force-pushed
the
arr4n/cherry-pick-all
branch
from
ae5a958 to
7b6ff3e
Compare
|
Thanks for the review @alarso16. I stupidly didn't pull #183 before doing the cherry-picks so then couldn't fast-forward merge the branch 🤦 I've rebased and force-pushed from ae5a958 (which you approved) to 7b6ff3e. The comparison shows that the only diff is the code from #183. I'm going to go ahead and merge despite force-pushing post review but wanted to record my rationale before doing so. |
This was referenced Jun 10, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
8 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.
Why this should be merged
Prerequisite for #186, cherry-picking to
main.Note
These are already on the production release branch so merging them will have no effect on functionality. The only difference is which branch we use for cherry-picking.
How this works
Runs cherry-pick script previously reserved for release branches. This PR MUST be fast-forward merged to
mainto allow reverting individual commits in the event that we upgrade geth to some point in the middle of the cherry-picks.There were no non-trivial merge conflicts that required resolution. One was due to our change of
ethereum/go-ethereumtoava-labs/libevmin an import path, and the other was due to a cherry-pick deleting amaps.Clonewhere we still had a manual, per-key copying of the map. The change toeth/gaspriceassumed a different return signature, which was rectified, but didn't result in a conflict.This PR is being tracked in #128.
How this was tested
Existing unit tests.
I have locally verified that every commit builds, independently, and that the tests for the relevant packages pass.