Skip to content
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.

Sign up for GitHub

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

Jump to bottom

EIP-6122 Timestamp based fork IDs #4841

Merged
merged 18 commits into from
Dec 21, 2022
Merged

EIP-6122 Timestamp based fork IDs #4841

merged 18 commits into from
Dec 21, 2022

Conversation

jframe
Copy link
Contributor

@jframe jframe commented Dec 20, 2022 •
edited by siladu

PR description

Timestamp based fork IDs implementing EIP-6122

Fixed Issue(s)

#4793

Documentation

  • I thought about documentation and added the doc-change-required label to this PR if
    updates are required.

Changelog

gezero and others added 10 commits December 20, 2022 10:22
@gezero @jframe
initial implemenation of fork id logic
67cd080 
Signed-off-by: Jiri Peinlich <jiri.peinlich@gmail.com>
@jframe
fix ForkIdsTest
0156760 
Signed-off-by: Jason Frame <jason.frame@consensys.net>
@jframe
fix unit tests
518a7bb 
Signed-off-by: Jason Frame <jason.frame@consensys.net>
@siladu @jframe
Fix more units related to ForkId fixes
e4d19fc 
Signed-off-by: Simon Dudley <simon.dudley@consensys.net>
@jframe
Add some withdrawals fork ID test cases
a496ff0 
Signed-off-by: Jason Frame <jason.frame@consensys.net>
@jframe
Rename tests
b198554 
Signed-off-by: Jason Frame <jason.frame@consensys.net>
@jframe
Move forkId tests to forkId package
b5786e0 
Signed-off-by: Jason Frame <jason.frame@consensys.net>
@jframe
comment
1c86b13 
Signed-off-by: Jason Frame <jason.frame@consensys.net>
@jframe
Refactor ForkIdManager to use a single list of forkIDs where possible
5bdb413 
Signed-off-by: Jason Frame <jason.frame@consensys.net>
@jframe
Use shanghaiTime and cancunTime for time based forks
63da347 
Signed-off-by: Jason Frame <jason.frame@consensys.net>
siladu
siladu reviewed Dec 20, 2022
View reviewed changes
config/src/main/java/org/hyperledger/besu/config/GenesisConfigOptions.java Outdated Show resolved Hide resolved
config/src/main/java/org/hyperledger/besu/config/JsonGenesisConfigOptions.java Show resolved Hide resolved
ethereum/core/src/main/java/org/hyperledger/besu/ethereum/forkid/ForkIdManager.java Show resolved Hide resolved
ethereum/core/src/main/java/org/hyperledger/besu/ethereum/forkid/ForkIdManager.java Outdated Show resolved Hide resolved
ethereum/core/src/main/java/org/hyperledger/besu/ethereum/forkid/ForkIdManager.java Show resolved Hide resolved
ethereum/core/src/test/java/org/hyperledger/besu/ethereum/forkid/ForkIdTest.java Outdated Show resolved Hide resolved
ethereum/core/src/test/java/org/hyperledger/besu/ethereum/forkid/ForkIdTestUtil.java Outdated Show resolved Hide resolved
@jframe
Do peer check using timestamp if nextFork isn't in the block number f…
63a8f41 
…orks

Signed-off-by: Jason Frame <jason.frame@consensys.net>
@jframe
Timestamp based peer check cases
0e6132d 
Signed-off-by: Jason Frame <jason.frame@consensys.net>
@siladu siladu mentioned this pull request Dec 20, 2022
Closed
2 tasks
@jframe
Rename numberForkHashes to forkHashes
75a909f 
Signed-off-by: Jason Frame <jason.frame@consensys.net>
@jframe
Rename getForkTimestamps to getForkBlockTimestamps
e223f4e 
Signed-off-by: Jason Frame <jason.frame@consensys.net>
@jframe
Removed duplicate withdrawals/mainnet test cases
8643d60 
Signed-off-by: Jason Frame <jason.frame@consensys.net>
@jframe jframe marked this pull request as ready for review December 21, 2022 01:25
siladu
siladu approved these changes Dec 21, 2022
View reviewed changes
Copy link
Contributor

@siladu siladu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@jframe jframe enabled auto-merge (squash) December 21, 2022 06:53
@jframe jframe merged commit 38316ef into hyperledger:main Dec 21, 2022
@jframe jframe deleted the timestamp_based_forkId branch December 21, 2022 07:14
jflo pushed a commit to jflo/besu that referenced this pull request Dec 22, 2022
@jframe @gezero
@siladu @jflo
EIP-6122 Timestamp based fork IDs (hyperledger#4841)
f879790 
Signed-off-by: Jason Frame <jason.frame@consensys.net>
Co-authored-by: Jiri Peinlich <jiri.peinlich@gmail.com>
Co-authored-by: Simon Dudley <simon.dudley@consensys.net>
Signed-off-by: Justin Florentine <justin+github@florentine.us>
macfarla pushed a commit to macfarla/besu that referenced this pull request Jan 10, 2023
@jframe @gezero
@siladu @macfarla
EIP-6122 Timestamp based fork IDs (hyperledger#4841)
a6fdcfe 
Signed-off-by: Jason Frame <jason.frame@consensys.net>
Co-authored-by: Jiri Peinlich <jiri.peinlich@gmail.com>
Co-authored-by: Simon Dudley <simon.dudley@consensys.net>
Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com>
@garyschulte garyschulte mentioned this pull request Apr 15, 2023
Merged
eum602 pushed a commit to lacchain/besu that referenced this pull request Nov 3, 2023
@jframe @gezero
@siladu @eum602
EIP-6122 Timestamp based fork IDs (hyperledger#4841)
78ba71c 
Signed-off-by: Jason Frame <jason.frame@consensys.net>
Co-authored-by: Jiri Peinlich <jiri.peinlich@gmail.com>
Co-authored-by: Simon Dudley <simon.dudley@consensys.net>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@siladu siladu siladu approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@jframe @siladu @gezero