Remove TTD Bellatrix merge configuration option #8951
Conversation
|
It's built on top of #8943 which should be merged before Some notes:
|
| } | ||
| STATUS_LOG.fatalError(errorDescription, rootCause); | ||
| System.exit(FATAL_EXIT_CODE); |
There was a problem hiding this comment.
Are we sure we always want to do System.exit()?
There was a problem hiding this comment.
Just for information: here is the original PR where exit() appeared: #2626
| createGenesisGenerator() | ||
| .network(NETWORK_NAME) | ||
| .withAltairEpoch(UInt64.ZERO) | ||
| .withBellatrixEpoch(UInt64.ONE) |
There was a problem hiding this comment.
Why Bellatrix at epoch 1? So essentially the EL remains waiting at genesis block (which is known and is DEFAULT_EL_GENESIS_HASH until CL reaches epoch 1 and then it merges using that genesis block?
| @@ -13,6 +13,7 @@ | |||
| "londonBlock": 0, | |||
| "parisBlock": 0, | |||
| "terminalTotalDifficulty": 0, | |||
| "terminalTotalDifficultyPassed": true, | |||
There was a problem hiding this comment.
This is needed to deprecate TTD I guess
| terminalBlock = | ||
| new PowBlock( | ||
| terminalBlockHash, TERMINAL_BLOCK_PARENT_HASH, terminalTotalDifficulty, transitionTime); | ||
| terminalBlockParent = new PowBlock(TERMINAL_BLOCK_PARENT_HASH, Bytes32.ZERO, UInt64.ZERO); |
There was a problem hiding this comment.
we can do some additional cleanup here in the stub, see terminalBlockHashInTTDMode
| final boolean isMergeTransitionComplete = | ||
| isMergeTransitionComplete(recentChainData.getChainHead()); | ||
| if (!isMergeTransitionComplete | ||
| && spec.isMilestoneSupported(SpecMilestone.BELLATRIX) |
There was a problem hiding this comment.
i think spec.isMilestoneSupported(SpecMilestone.BELLATRIX) is redundant since we already check bellatrix spec config at line 75
| final IntCollection actual = provider.getValidatorIndices().getImmediately(); | ||
| assertThat(actual).containsExactlyInAnyOrderElementsOf(IntArrayList.of(1, 20, 300)); |
There was a problem hiding this comment.
why this change? (the same below)
PR Description
WIP
Fixed Issue(s)
Documentation
doc-change-requiredlabel to this PR if updates are required.Changelog