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

Update worldstate state change behavior in case of FCU #5699

Merged
merged 15 commits into from
Aug 18, 2023
Merged

Update worldstate state change behavior in case of FCU #5699

Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
7d66d39
update fcu
matkt Jul 13, 2023
fc718d2
fix rewind to block
matkt Jul 13, 2023
8fd0025
trigger backward sync when distance is too high
matkt Jul 13, 2023
cde4bfd
update code
matkt Jul 13, 2023
940a6e1
fix tests
matkt Jul 13, 2023
d9b6593
Merge branch 'main' into feature/update-fcu
ahamlat Aug 1, 2023
dd2bee4
Fix a build issue following a merge with main.
ahamlat Aug 1, 2023
dfbb338
Remove triggering backward sync on NewPayload as it is already managed.
ahamlat Aug 4, 2023
ebe2766
Spotless
ahamlat Aug 4, 2023
2b89261
Fix unit tests.
ahamlat Aug 4, 2023
615a3d4
Merge branch 'main' into feature/update-fcu
ahamlat Aug 4, 2023
1c2a574
revert getOrSyncHeadByHash modification
matkt Aug 16, 2023
8691897
Merge branch 'main' into feature/update-fcu
matkt Aug 16, 2023
7ca17a3
Merge branch 'main' into feature/update-fcu
matkt Aug 17, 2023
4ed3f4b
Merge branch 'main' into feature/update-fcu
matkt Aug 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 12 additions & 15 deletions ...ge/src/main/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeCoordinator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -607,33 +607,30 @@ private boolean setNewHead(final MutableBlockchain blockchain, final BlockHeader
return true;
}

if (newHead.getParentHash().equals(blockchain.getChainHeadHash())) {
LOG.atDebug()
.setMessage(
"Forwarding chain head to the block {} saved from a previous newPayload invocation")
.addArgument(newHead::toLogString)
.log();

if (forwardWorldStateTo(newHead)) {
// move chain head forward:
if (moveWorldStateTo(newHead)) {
if (newHead.getParentHash().equals(blockchain.getChainHeadHash())) {
LOG.atDebug()
.setMessage(
"Forwarding chain head to the block {} saved from a previous newPayload invocation")
.addArgument(newHead::toLogString)
.log();
return blockchain.forwardToBlock(newHead);
} else {
LOG.atDebug()
.setMessage("Failed to move the worldstate forward to hash {}, not moving chain head")
.setMessage("New head {} is a chain reorg, rewind chain head to it")
.addArgument(newHead::toLogString)
.log();
return false;
return blockchain.rewindToBlock(newHead.getHash());
}
}

LOG.atDebug()
.setMessage("New head {} is a chain reorg, rewind chain head to it")
.setMessage("Failed to move the worldstate forward to hash {}, not moving chain head")
.addArgument(newHead::toLogString)
.log();
return blockchain.rewindToBlock(newHead.getHash());
return false;
}

private boolean forwardWorldStateTo(final BlockHeader newHead) {
private boolean moveWorldStateTo(final BlockHeader newHead) {
Copy link
Contributor

@gfukushima gfukushima Aug 18, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

This rename implies that we could use this method to move the ws "backwards", is that correct?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yes we can do rollback and rollfoward with this code

Optional<MutableWorldState> newWorldState =
protocolContext
.getWorldStateArchive()
Expand Down
Loading