Skip to content
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
merged 1 commit into from
May 3, 2023

Conversation

vimpunk
Copy link
Contributor

@vimpunk vimpunk commented Mar 28, 2023

This PR updates the jsontests/res/ethtests submodule 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.

@vimpunk vimpunk force-pushed the sync-upstream-shanghai branch from 15d2bab to 05953c1 Compare April 27, 2023 14:30
@vimpunk vimpunk marked this pull request as ready for review April 27, 2023 14:38
@vimpunk vimpunk force-pushed the sync-upstream-shanghai branch from 05953c1 to bdb00fc Compare April 27, 2023 14:39
@sorpaas
Copy link
Collaborator

sorpaas commented May 3, 2023

Please resolve the conflict (it's a simple one!).

@vimpunk vimpunk force-pushed the sync-upstream-shanghai branch from 191e076 to 76552e0 Compare May 3, 2023 14:33
@vimpunk
Copy link
Contributor Author

vimpunk commented May 3, 2023

Resolved and rebased @sorpaas .

@sorpaas sorpaas merged commit 54947fc into rust-blockchain:master May 3, 2023
@vimpunk vimpunk deleted the sync-upstream-shanghai branch May 4, 2023 09:39
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants