-
Notifications
You must be signed in to change notification settings - Fork 1.3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Upstream merge fixes #1273
Upstream merge fixes #1273
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think cherry-picking upstream changes makes sense. We should endeavour to stay up to date with geth changes. Pulling in an additional changes that aren't part of geth v1.9.25 makes it difficult to track and maintain what is going on with quorum.
@antonydenyer would you rather getting rid of the upstream cherry-pick and making the bug fix as part of commit a8338d8? |
👍 Yeah let's do that for now. |
1856cae
a8338d8
to
1856cae
Compare
This is currently only used for the experimental YoloV2 EIP 2929 (where all active precompiles for the current block height must be known) so not critical but worth fixing ahead of the concrete release that will be pulled in from a future upstream geth merge Also includes core/vm: fix Byzantium address list (#22603) (cherry picked from commit 44fe466)
1856cae
to
6be279d
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Fixes relating to recent upstream geth merges.
ActivePrecompiles()
however there is a typo causing tests added in this PR to fail. This bug was fixed in upstream 1.10.2 - the content of that fix has been included in this change. To simplify future merges the content of the commit has been copied instead of cherry-picking the commit.ActivePrecompiles()
list. This is currently only used for the experimental YoloV2 EIP 2929 (where all active precompiles for the current block height must be known) so not critical but worth fixing ahead of the concrete release that will be pulled in from a future upstream geth merge.