This repository was archived by the owner on Nov 20, 2023. It is now read-only.
chore: sync with upstream for Shanghai changes#19
Merged
sorpaas merged 1 commit intorust-blockchain:masterfrom May 3, 2023
Merged
chore: sync with upstream for Shanghai changes#19sorpaas merged 1 commit intorust-blockchain:masterfrom
sorpaas merged 1 commit intorust-blockchain:masterfrom
Conversation
This was referenced Mar 28, 2023
vimpunk
commented
Mar 28, 2023
vimpunk
force-pushed
the
sync-upstream-shanghai
branch
from
15d2bab to
05953c1
Compare
vimpunk
force-pushed
the
sync-upstream-shanghai
branch
from
05953c1 to
bdb00fc
Compare
Collaborator
|
Please resolve the conflict (it's a simple one!). |
vimpunk
force-pushed
the
sync-upstream-shanghai
branch
from
191e076 to
76552e0
Compare
Contributor
Author
|
Resolved and rebased @sorpaas . |
sorpaas
approved these changes
May 3, 2023
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 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.
This PR updates the
jsontests/res/ethtestssubmodule to include tests for the recent Shanghai hard fork.The repo hasn't been updated since before the Merge, so specifics around that have been added here as well.