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

merge with master #9068

Closed
wants to merge 20 commits into from
Closed

merge with master #9068

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
2b37b47
8957 (#9024)
rolfyone Jan 23, 2025
3b29505
change StateSelector logic (#8985)
rolfyone Jan 23, 2025
8117ebf
Update ref tests to v1.5.0-beta.0 (#9032)
StefanBratanov Jan 24, 2025
d9b07ea
cleanup stale todo's (#9028)
rolfyone Jan 24, 2025
28f69d3
undo yamux revert (#9036)
rolfyone Jan 26, 2025
5c8ccdb
Add custom iterator for LevelDB (#9033)
tbenr Jan 27, 2025
e44a47c
update empty storage initialization log (#9043)
mehdi-aouadi Jan 27, 2025
ed1bedb
Update ref tests to v1.5.0-beta.1 (#9044)
jtraglia Jan 27, 2025
07b70e2
debug command to see what values are in variables (#9030)
rolfyone Jan 28, 2025
05a0c70
rocksdb nits (#9046)
rolfyone Jan 28, 2025
4d0b4fe
stop all pruners in storage service (#9054)
tbenr Jan 29, 2025
8533316
Clean up blobsSidecar pruner workflow (#9029)
gfukushima Jan 29, 2025
633716e
removed MAX_CHUNK_SIZE from configuration (#9056)
rolfyone Jan 29, 2025
866725f
Reuse earliest blob slot (#9031)
gfukushima Jan 29, 2025
d58b37d
Remove TTD Bellatrix merge configuration option (#8951)
zilm13 Jan 29, 2025
67621fe
Update `wrapper-validation-action` (#9064)
StefanBratanov Jan 30, 2025
ae47629
remove duplication in getColumnCounts (#9061)
rolfyone Jan 30, 2025
3096044
update process_registry_updates (#9060)
rolfyone Jan 31, 2025
7bf58da
RocksdbStats should only create summary if database is open (#9066)
rolfyone Jan 31, 2025
0edcc30
Improve CommonAncestor logic for sync (#9057)
tbenr Jan 31, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/gradle-wrapper-validation.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: gradle/wrapper-validation-action@v2
- uses: gradle/actions/wrapper-validation@v3
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@
## Unreleased Changes

### Breaking Changes
- Removed `MAX_CHUNK_SIZE` from network global configurations, which will mean older clients will not get it from newer versions of Teku.

### Additions and Improvements
- Applied spec change to alter `GOSSIP_MAX_SIZE` to `MAX_PAYLOAD_SIZE`.
- `MAX_PAYLOAD_SIZE` is now used instead of `MAX_CHUNK_SIZE`.

### Bug Fixes
82 changes: 0 additions & 82 deletions ...e-test/java/tech/pegasys/teku/test/acceptance/BellatrixMergeTransitionAcceptanceTest.java
View file
Open in desktop

This file was deleted.

4 changes: 3 additions & 1 deletion ...c/acceptance-test/java/tech/pegasys/teku/test/acceptance/BlockProposalAcceptanceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ void shouldHaveCorrectFeeRecipientAndGraffiti(final boolean useSszBlocks) throws
.network(networkName)
.withAltairEpoch(UInt64.ZERO)
.withBellatrixEpoch(UInt64.ZERO)
.validatorKeys(validatorKeystores, validatorKeystores)
.withCapellaEpoch(UInt64.ZERO)
.validatorKeys(validatorKeystores)
.generate();

final String defaultFeeRecipient = "0xFE3B557E8Fb62b89F4916B721be55cEb828dBd73";
Expand All @@ -62,6 +63,7 @@ void shouldHaveCorrectFeeRecipientAndGraffiti(final boolean useSszBlocks) throws
.withInitialState(genesis)
.withAltairEpoch(UInt64.ZERO)
.withBellatrixEpoch(UInt64.ZERO)
.withCapellaEpoch(UInt64.ZERO)
.withValidatorProposerDefaultFeeRecipient(defaultFeeRecipient)
.build());
final TekuValidatorNode validatorClient =
Expand Down
5 changes: 2 additions & 3 deletions ...tance-test/java/tech/pegasys/teku/test/acceptance/BlsToExecutionChangeAcceptanceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,7 @@ private static TekuNodeConfigBuilder beaconNodeWithMilestones(final UInt64 capel
.withAltairEpoch(UInt64.ZERO)
.withBellatrixEpoch(UInt64.ZERO)
.withCapellaEpoch(capellaActivationEpoch)
.withTotalTerminalDifficulty(0)
.withStubExecutionEngine(
"0x14e88057b0b7538a8205cb07726a0de03dd69d9a70e88bcffae15ca3fc6b5215");
.withTerminalBlockHash(DEFAULT_EL_GENESIS_HASH, 0)
.withStubExecutionEngine(DEFAULT_EL_GENESIS_HASH);
}
}
2 changes: 1 addition & 1 deletion .../acceptance-test/java/tech/pegasys/teku/test/acceptance/CapellaUpgradeAcceptanceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ private static TekuNodeConfigBuilder beaconNodeConfigWithForks(
.withAltairEpoch(UInt64.ZERO)
.withBellatrixEpoch(UInt64.ZERO)
.withCapellaEpoch(UInt64.ONE)
.withTotalTerminalDifficulty(0)
.withTerminalBlockHash(DEFAULT_EL_GENESIS_HASH, 0)
.withGenesisTime(genesisTime)
.withExecutionEngine(besuNode)
.withJwtSecretFile(JWT_FILE)
Expand Down
2 changes: 1 addition & 1 deletion ...rc/acceptance-test/java/tech/pegasys/teku/test/acceptance/DenebUpgradeAcceptanceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,6 @@ private static TekuNodeConfigBuilder beaconNodeWithTrustedSetup(
.withRealNetwork()
.withJwtSecretFile(JWT_FILE)
.withDenebEpoch(UInt64.valueOf(2))
.withTotalTerminalDifficulty(0);
.withTerminalBlockHash(DEFAULT_EL_GENESIS_HASH, 0);
}
}
5 changes: 2 additions & 3 deletions ...tance-test/java/tech/pegasys/teku/test/acceptance/DoppelgangerDetectorAcceptanceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ void setUp() {
createBesuNode(
config ->
config
.withMiningEnabled(true)
.withMergeSupport()
.withGenesisFile("besu/preMergeGenesis.json")
.withJwtTokenAuthorization(JWT_FILE));
Expand All @@ -54,7 +53,7 @@ void shouldDetectDoppelgangersViaKeyManagerAPI() throws Exception {
eth1Node.start();

final ValidatorKeystores validatorKeystores =
createTekuDepositSender(networkName).sendValidatorDeposits(eth1Node, 2);
createTekuDepositSender(networkName).generateValidatorKeys(2);

final GenesisGenerator.InitialStateData genesis =
createGenesisGenerator().network(networkName).validatorKeys(validatorKeystores).generate();
Expand All @@ -66,7 +65,7 @@ void shouldDetectDoppelgangersViaKeyManagerAPI() throws Exception {
.withValidatorLivenessTracking()
.withJwtSecretFile(JWT_FILE)
.withBellatrixEpoch(UInt64.ONE)
.withTotalTerminalDifficulty(10001)
.withTerminalBlockHash(DEFAULT_EL_GENESIS_HASH, 0)
.withValidatorProposerDefaultFeeRecipient(defaultFeeRecipient)
.withInitialState(genesis)
.build());
Expand Down
1 change: 1 addition & 0 deletions ...eptance-test/java/tech/pegasys/teku/test/acceptance/LocalValidatorKeysAcceptanceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ void shouldMaintainValidatorsInMutableClient() throws Exception {
.withInitialState(genesis)
.withAltairEpoch(UInt64.ZERO)
.withBellatrixEpoch(UInt64.ZERO)
.withTerminalBlockHash(DEFAULT_EL_GENESIS_HASH, 0)
.withValidatorProposerDefaultFeeRecipient(defaultFeeRecipient)
.build());
final TekuValidatorNode validatorClient =
Expand Down
2 changes: 1 addition & 1 deletion ...c/acceptance-test/java/tech/pegasys/teku/test/acceptance/MergedGenesisAcceptanceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ void setup() throws Exception {
.withNetwork(NETWORK_NAME)
.withAltairEpoch(UInt64.ZERO)
.withBellatrixEpoch(UInt64.ZERO)
.withTotalTerminalDifficulty(0)
.withTerminalBlockHash(DEFAULT_EL_GENESIS_HASH, 0)
.withInitialState(initialStateData)
.withStartupTargetPeerCount(0)
.withReadOnlyKeystorePath(validatorKeys)
Expand Down
4 changes: 2 additions & 2 deletions ...e-test/java/tech/pegasys/teku/test/acceptance/MergedGenesisInteropModeAcceptanceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public void startFromMergedStatePerMilestoneUsingTerminalBlockHash(
final TekuNodeConfig config =
createTekuNodeBuilderForMilestone(specMilestone)
.withTerminalBlockHash(
"0x00000000000000000000000000000000000000000000000000000000000000aa")
"0x00000000000000000000000000000000000000000000000000000000000000aa", 0)
.withStubExecutionEngine()
.build();

Expand Down Expand Up @@ -70,7 +70,7 @@ private static TekuNodeConfigBuilder createTekuNodeBuilderForMilestone(
.withNetwork("minimal")
.withAltairEpoch(UInt64.ZERO)
.withBellatrixEpoch(UInt64.ZERO)
.withTotalTerminalDifficulty(0)
.withTerminalBlockHash(DEFAULT_EL_GENESIS_HASH, 0)
.withStartupTargetPeerCount(0)
.withInteropNumberOfValidators(64)
.withValidatorProposerDefaultFeeRecipient("0xFE3B557E8Fb62b89F4916B721be55cEb828dBd73");
Expand Down
2 changes: 1 addition & 1 deletion ...ce-test/java/tech/pegasys/teku/test/acceptance/OptimisticSyncPostMergeAcceptanceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ private TekuNodeConfigBuilder createBeaconNode(
final BesuNode executionEngine, final int genesisTime) throws Exception {
return TekuNodeConfigBuilder.createBeaconNode()
.withBellatrixEpoch(UInt64.ZERO)
.withTotalTerminalDifficulty(10001)
.withTerminalBlockHash(DEFAULT_EL_GENESIS_HASH, 1)
.withGenesisTime(genesisTime)
.withRealNetwork()
.withStartupTargetPeerCount(0)
Expand Down
100 changes: 0 additions & 100 deletions ...ce-test/java/tech/pegasys/teku/test/acceptance/OptimisticSyncSafeSlotsAcceptanceTest.java
View file
Open in desktop

This file was deleted.

5 changes: 2 additions & 3 deletions ...c/acceptance-test/java/tech/pegasys/teku/test/acceptance/SyncingStatusAcceptanceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,13 @@ void shouldRespondSyncingWhenExecutionLayerIsDown() throws Exception {
createBesuNode(
config ->
config
.withMiningEnabled(true)
.withMergeSupport()
.withGenesisFile("besu/preMergeGenesis.json")
.withJwtTokenAuthorization(JWT_FILE));
eth1Node.start();

final ValidatorKeystores validatorKeystores =
createTekuDepositSender(networkName).sendValidatorDeposits(eth1Node, 8);
createTekuDepositSender(networkName).generateValidatorKeys(8);

final GenesisGenerator.InitialStateData genesis =
createGenesisGenerator().network(networkName).validatorKeys(validatorKeystores).generate();
Expand All @@ -55,7 +54,7 @@ void shouldRespondSyncingWhenExecutionLayerIsDown() throws Exception {
.withNetwork(networkName)
.withDepositsFrom(eth1Node)
.withBellatrixEpoch(UInt64.ONE)
.withTotalTerminalDifficulty(10001)
.withTerminalBlockHash(DEFAULT_EL_GENESIS_HASH, 0)
.withValidatorProposerDefaultFeeRecipient(defaultFeeRecipient)
.withExecutionEngine(eth1Node)
.withInitialState(genesis)
Expand Down
16 changes: 12 additions & 4 deletions ...-test/java/tech/pegasys/teku/test/acceptance/WebsocketsMergeTransitionAcceptanceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import tech.pegasys.teku.infrastructure.unsigned.UInt64;
import tech.pegasys.teku.test.acceptance.dsl.AcceptanceTestBase;
import tech.pegasys.teku.test.acceptance.dsl.BesuNode;
import tech.pegasys.teku.test.acceptance.dsl.GenesisGenerator;
import tech.pegasys.teku.test.acceptance.dsl.TekuBeaconNode;
import tech.pegasys.teku.test.acceptance.dsl.TekuNodeConfigBuilder;
import tech.pegasys.teku.test.acceptance.dsl.tools.deposits.ValidatorKeystores;
Expand All @@ -41,24 +42,31 @@ void setup() throws Exception {
createBesuNode(
config ->
config
.withMiningEnabled(true)
.withMergeSupport()
.withGenesisFile("besu/preMergeGenesis.json")
.withJwtTokenAuthorization(jwtFile));
eth1Node.start();

final int totalValidators = 4;
final ValidatorKeystores validatorKeystores =
createTekuDepositSender(NETWORK_NAME).sendValidatorDeposits(eth1Node, totalValidators);
createTekuDepositSender(NETWORK_NAME).generateValidatorKeys(totalValidators);
final GenesisGenerator.InitialStateData genesis =
createGenesisGenerator()
.network(NETWORK_NAME)
.withAltairEpoch(UInt64.ZERO)
.withBellatrixEpoch(UInt64.ONE)
.validatorKeys(validatorKeystores)
.generate();
tekuNode =
createTekuBeaconNode(
configureTekuNode(genesisTime)
.withDepositsFrom(eth1Node)
.withStartupTargetPeerCount(0)
.withValidatorProposerDefaultFeeRecipient(
"0xFE3B557E8Fb62b89F4916B721be55cEb828dBd73")
.withExecutionEngine(eth1Node)
.withExecutionEngineEndpoint(eth1Node.getInternalEngineWebsocketsRpcUrl())
.withJwtSecretFile(jwtFile)
.withInitialState(genesis)
.withReadOnlyKeystorePath(validatorKeystores)
.build());
tekuNode.start();
Expand All @@ -74,7 +82,7 @@ void shouldPassMergeTransitionUsingWebsocketsEngine() {

private TekuNodeConfigBuilder configureTekuNode(final int genesisTime) throws IOException {
return TekuNodeConfigBuilder.createBeaconNode()
.withTotalTerminalDifficulty(10001)
.withTerminalBlockHash(DEFAULT_EL_GENESIS_HASH, 1)
.withBellatrixEpoch(UInt64.ONE)
.withGenesisTime(genesisTime);
}
Expand Down
Loading