PoS checkpoint sync #4844
There are no files selected for viewing
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,6 +14,8 @@ | |
| */ | ||
| package org.hyperledger.besu.controller; | ||
|
|
||
| import static org.hyperledger.besu.ethereum.eth.sync.SyncMode.isCheckpointSync; | ||
|
|
||
| import org.hyperledger.besu.cli.config.EthNetworkConfig; | ||
| import org.hyperledger.besu.config.GenesisConfigFile; | ||
| import org.hyperledger.besu.config.GenesisConfigOptions; | ||
|
|
@@ -28,6 +30,7 @@ | |
| import org.hyperledger.besu.ethereum.core.PrivacyParameters; | ||
| import org.hyperledger.besu.ethereum.core.Synchronizer; | ||
| import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManager; | ||
| import org.hyperledger.besu.ethereum.eth.sync.SyncMode; | ||
| import org.hyperledger.besu.ethereum.eth.sync.state.SyncState; | ||
| import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool; | ||
| import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule; | ||
|
|
@@ -41,6 +44,7 @@ | |
| import java.util.List; | ||
| import java.util.Map; | ||
|
|
||
| import org.apache.tuweni.units.bigints.UInt256; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
|
|
@@ -171,24 +175,26 @@ public PluginServiceFactory getAdditionalPluginServices() { | |
|
|
||
| public static class Builder { | ||
|
|
||
| public BesuControllerBuilder fromEthNetworkConfig( | ||
| final EthNetworkConfig ethNetworkConfig, | ||
| final Map<String, String> genesisConfigOverrides, | ||
| final SyncMode syncMode) { | ||
| return fromGenesisConfig( | ||
| GenesisConfigFile.fromConfig(ethNetworkConfig.getGenesisConfig()), | ||
| genesisConfigOverrides, | ||
| syncMode) | ||
| .networkId(ethNetworkConfig.getNetworkId()); | ||
| } | ||
|
|
||
| public BesuControllerBuilder fromGenesisConfig( | ||
| final GenesisConfigFile genesisConfig, final SyncMode syncMode) { | ||
| return fromGenesisConfig(genesisConfig, Collections.emptyMap(), syncMode); | ||
| } | ||
|
|
||
| BesuControllerBuilder fromGenesisConfig( | ||
| final GenesisConfigFile genesisConfig, | ||
| final Map<String, String> genesisConfigOverrides, | ||
| final SyncMode syncMode) { | ||
| final GenesisConfigOptions configOptions = | ||
| genesisConfig.getConfigOptions(genesisConfigOverrides); | ||
| final BesuControllerBuilder builder; | ||
|
|
@@ -213,11 +219,17 @@ BesuControllerBuilder fromGenesisConfig( | |
|
|
||
| // wrap with TransitionBesuControllerBuilder if we have a terminal total difficulty: | ||
| if (configOptions.getTerminalTotalDifficulty().isPresent()) { | ||
| // Enable start with vanilla MergeBesuControllerBuilder for PoS checkpoint block | ||
| if (isCheckpointSync(syncMode) && isCheckpointPoSBlock(configOptions)) { | ||
jframe marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| return new MergeBesuControllerBuilder().genesisConfigFile(genesisConfig); | ||
| } else { | ||
| // TODO this should be changed to vanilla MergeBesuControllerBuilder and the Transition* | ||
| // series of classes removed after we successfully transition to PoS | ||
| // https://github.com/hyperledger/besu/issues/2897 | ||
| return new TransitionBesuControllerBuilder(builder, new MergeBesuControllerBuilder()) | ||
| .genesisConfigFile(genesisConfig); | ||
| } | ||
|
|
||
| } else return builder.genesisConfigFile(genesisConfig); | ||
| } | ||
|
|
||
|
|
@@ -258,5 +270,13 @@ private Long readQbftStartBlockConfig(final QbftConfigOptions qbftConfigOptions) | |
|
|
||
| return startBlock; | ||
| } | ||
|
|
||
| private boolean isCheckpointPoSBlock(final GenesisConfigOptions configOptions) { | ||
siladu marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| final UInt256 terminalTotalDifficulty = configOptions.getTerminalTotalDifficulty().get(); | ||
|
Contributor
There was a problem hiding this comment. I think we cannot have empty here ? |
||
|
|
||
| return configOptions.getCheckpointOptions().isValid() | ||
|
Contributor
There was a problem hiding this comment. we are not already checking if it is valid here ? https://github.com/hyperledger/besu/pull/4844/files#diff-2080ac0bf38c1e492921f4191b738b729195e0b1ad82657abc9103f19ac87cd8R3368 |
||
| && (UInt256.fromHexString(configOptions.getCheckpointOptions().getTotalDifficulty().get()) | ||
| .greaterThan(terminalTotalDifficulty)); | ||
| } | ||
| } | ||
| } | ||
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
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
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
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
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why all of this check are not in the valid method of CheckpointConfigOptions ?