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

Withdrawals wiring #4968

Merged
merged 9 commits into from
Jan 22, 2023
Merged

Withdrawals wiring #4968

merged 9 commits into from
Jan 22, 2023

Conversation

jframe
Copy link
Contributor

@jframe jframe commented Jan 20, 2023 •
edited

PR description

Final piece to wire together withdrawals and adding missing pieces

  • withdrawalsRoot calculation
  • withdrawals block body RLP encoding
  • add withdrawalsRoot and withdrawals when creating a block
  • validate withdrawals when validating mainnet blocks
  • fix invalid withdrawals root during backwards sync
  • include withdrawalsRoot when creating new header in EngineNewPayload

Fixed Issue(s)

Documentation

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

Changelog

@jframe jframe changed the title Withdrawals root encoding Withdrawals wiring Jan 20, 2023
siladu
siladu approved these changes Jan 20, 2023
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

.../core/src/test/java/org/hyperledger/besu/ethereum/mainnet/MainnetBlockBodyValidatorTest.java
import org.mockito.junit.jupiter.MockitoExtension;

@ExtendWith(MockitoExtension.class)
class MainnetBlockBodyValidatorTest {
Copy link
Contributor

Choose a reason for hiding this comment

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

nice!

jframe and others added 9 commits January 22, 2023 23:24
@jframe @siladu
add withdrawalRoot computation
1e46721 
Signed-off-by: Jason Frame <jason.frame@consensys.net>
@jframe @siladu
include withdrawalsRoot and withdrawals when creating block
e71a904 
Signed-off-by: Jason Frame <jason.frame@consensys.net>
@jframe @siladu
validate withdrawals when validation mainnet blocks
10dc93f 
Signed-off-by: Jason Frame <jason.frame@consensys.net>
@jframe @siladu
Fix invalid withdrawals root during backwards sync
11bacf5 
Add withdrawalsRoot as part of BodyIdentifier
Add comment to avoid new issues when adding new fields to BlockBody

Signed-off-by: Jason Frame <jason.frame@consensys.net>
@jframe @siladu
Include withdrawalsRoot when creating new header in EngineNewPayload
58de94d 
Signed-off-by: Jason Frame <jason.frame@consensys.net>
@jframe @siladu
Use empty trie hash in genesis for withdrawalsRoot if shanghai is ena…
14e05a1 
…bled at genesis

Signed-off-by: Jason Frame <jason.frame@consensys.net>
@jframe @siladu
Revert testing changes to AbstractEngineNewPayload
a93795a 
Signed-off-by: Jason Frame <jason.frame@consensys.net>
@jframe @siladu
Fix BesuController tests failing after GenesisState change
cb77341 
Signed-off-by: Jason Frame <jason.frame@consensys.net>
@siladu
Missing withdrawals wiring in BlockProcessor
ada45e1 
Add empty withdrawals in GenesisState for shanghai at genesis
Signed-off-by: Simon Dudley <simon.dudley@consensys.net>
@siladu siladu marked this pull request as ready for review January 22, 2023 22:26
@siladu siladu enabled auto-merge (squash) January 22, 2023 22:26
@siladu siladu merged commit f4a6219 into hyperledger:main Jan 22, 2023
@jframe jframe added TeamGroot GH issues worked on by Groot Team EIP Ethereum Improvement Proposal mainnet labels Jan 25, 2023
@gakonst gakonst mentioned this pull request Feb 11, 2023
Closed
@garyschulte garyschulte mentioned this pull request Apr 15, 2023
Merged
elenduuche pushed a commit to elenduuche/besu that referenced this pull request Aug 16, 2023
@jframe @siladu @elenduuche
Withdrawals wiring (hyperledger#4968)
99773cb 
* add withdrawalRoot computation

Signed-off-by: Jason Frame <jason.frame@consensys.net>

* include withdrawalsRoot and withdrawals when creating block

Signed-off-by: Jason Frame <jason.frame@consensys.net>

* validate withdrawals when validation mainnet blocks

Signed-off-by: Jason Frame <jason.frame@consensys.net>

* Fix invalid withdrawals root during backwards sync

Add withdrawalsRoot as part of BodyIdentifier
Add comment to avoid new issues when adding new fields to BlockBody

Signed-off-by: Jason Frame <jason.frame@consensys.net>

* Include withdrawalsRoot when creating new header in EngineNewPayload

Signed-off-by: Jason Frame <jason.frame@consensys.net>

* Use empty trie hash in genesis for withdrawalsRoot if shanghai is enabled at genesis

Signed-off-by: Jason Frame <jason.frame@consensys.net>

* Revert testing changes to AbstractEngineNewPayload

Signed-off-by: Jason Frame <jason.frame@consensys.net>

* Fix BesuController tests failing after GenesisState change

Signed-off-by: Jason Frame <jason.frame@consensys.net>

* Missing withdrawals wiring in BlockProcessor

Add empty withdrawals in GenesisState for shanghai at genesis
Signed-off-by: Simon Dudley <simon.dudley@consensys.net>

Signed-off-by: Jason Frame <jason.frame@consensys.net>
Co-authored-by: Simon Dudley <simon.dudley@consensys.net>
eum602 pushed a commit to lacchain/besu that referenced this pull request Nov 3, 2023
@jframe @siladu @eum602
Withdrawals wiring (hyperledger#4968)
b6d2ad1 
* add withdrawalRoot computation

Signed-off-by: Jason Frame <jason.frame@consensys.net>

* include withdrawalsRoot and withdrawals when creating block

Signed-off-by: Jason Frame <jason.frame@consensys.net>

* validate withdrawals when validation mainnet blocks

Signed-off-by: Jason Frame <jason.frame@consensys.net>

* Fix invalid withdrawals root during backwards sync

Add withdrawalsRoot as part of BodyIdentifier
Add comment to avoid new issues when adding new fields to BlockBody

Signed-off-by: Jason Frame <jason.frame@consensys.net>

* Include withdrawalsRoot when creating new header in EngineNewPayload

Signed-off-by: Jason Frame <jason.frame@consensys.net>

* Use empty trie hash in genesis for withdrawalsRoot if shanghai is enabled at genesis

Signed-off-by: Jason Frame <jason.frame@consensys.net>

* Revert testing changes to AbstractEngineNewPayload

Signed-off-by: Jason Frame <jason.frame@consensys.net>

* Fix BesuController tests failing after GenesisState change

Signed-off-by: Jason Frame <jason.frame@consensys.net>

* Missing withdrawals wiring in BlockProcessor

Add empty withdrawals in GenesisState for shanghai at genesis
Signed-off-by: Simon Dudley <simon.dudley@consensys.net>

Signed-off-by: Jason Frame <jason.frame@consensys.net>
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
EIP Ethereum Improvement Proposal mainnet TeamGroot GH issues worked on by Groot Team
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@jframe @siladu