Skip to content

Add support for fulu fork epoch and bpo schedule#15975

Merged
james-prysm merged 51 commits intodevelopfrom
fulu-fork-epoch
Nov 5, 2025
Merged

Add support for fulu fork epoch and bpo schedule#15975
james-prysm merged 51 commits intodevelopfrom
fulu-fork-epoch

Conversation

@james-prysm
Copy link
Copy Markdown
Contributor

@james-prysm james-prysm commented Nov 4, 2025

What type of PR is this?

Other

What does this PR do? Why is it needed?

as per ethereum/consensus-specs#4689

Which issues(s) does this PR fix?

Fixes #

Other notes for review

Acknowledgements

@james-prysm james-prysm changed the title Add support for fulu fork epoch Add support for fulu fork epoch and bpo schedule Nov 4, 2025
Comment thread beacon-chain/das/availability_blobs_test.go
Comment thread hack/update_eth_clients.sh Outdated

if [ "$#" -lt 2 ]; then
echo "Usage: $0 <network> <commit_sha> [workspace_file]" >&2
echo " network: mainnet | holesky | sepolia | hoodi" >&2
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

This is just a script to update the WORKSPACE in the future for ethclient package verifying configs

Comment thread beacon-chain/p2p/broadcaster_test.go Outdated
genesisTime := time.Now()
genesisValidatorsRoot := make([]byte, 32)
custodyInfoSet := make(chan struct{})
close(custodyInfoSet) // Close immediately since custodyInfo is already set
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

This is required because the custody check is enabled now that we have fulu set

@james-prysm james-prysm marked this pull request as ready for review November 4, 2025 21:37
Comment thread hack/update_eth_clients.sh Outdated
export ARCHIVE_NAME URL STRIP_PREFIX INTEGRITY

# Update integrity
perl -0pi -e '
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Why are you using perl for this?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I didn't put much thought into this script and just got it generated, did some tests, saw it worked and just went with it. will change it to use something standard.

maybe for the sake of this PR i'll just remove this for now

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I updated the values manually at first but it was tedious so i just tried to get ai to automate

Comment thread beacon-chain/p2p/discovery_test.go Outdated
@james-prysm
Copy link
Copy Markdown
Contributor Author

will merge fulu-p2p-rpc-test-fixes back in after discussing offline

Comment thread beacon-chain/rpc/eth/config/handlers_test.go Outdated
Comment thread config/params/fork_test.go Outdated
@@ -132,8 +132,8 @@ func TestNextForkData(t *testing.T) {
{
name: "after last bpo - should be far future epoch and 0x00000000",
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This test doesn't match the data here. The data is neither far future epoch or 0x000000

Comment thread beacon-chain/p2p/service_test.go Outdated
Comment thread beacon-chain/p2p/broadcaster_test.go Outdated
Comment on lines +703 to +706
params.SetupTestConfigCleanup(t)
config := params.BeaconConfig()
config.FuluForkEpoch = 0
params.OverrideBeaconConfig(config)
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This is also a hack. Why not fix the test to support fulu or use a block number that is in electra or something other than unsetting the fulu fork epoch?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

reverted, was due to merging from separate pr

Comment thread beacon-chain/p2p/discovery_test.go Outdated
Comment thread beacon-chain/p2p/discovery_test.go Outdated
Comment thread beacon-chain/p2p/discovery_test.go Outdated
Comment thread beacon-chain/p2p/discovery_test.go Outdated
Comment thread beacon-chain/p2p/discovery_test.go Outdated
Comment thread beacon-chain/p2p/service_test.go Outdated
},
{
name: "after last bpo - should be far future epoch and 0x00000000",
name: "post last full fork, fulu bpo 1",
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

@kasey I updated this test name based on feedback it gives the bpo 1 after setting

@james-prysm james-prysm added this pull request to the merge queue Nov 5, 2025
Merged via the queue into develop with commit 8b6f187 Nov 5, 2025
19 checks passed
@james-prysm james-prysm deleted the fulu-fork-epoch branch November 5, 2025 22:49
nalepae added a commit that referenced this pull request Nov 5, 2025
* wip

* fixing tests

* adding script to update workspace for eth clients

* updating test sepc to 1.6.0 and fixing broadcaster test

* fix specrefs

* more ethspecify fixes

* still trying to fix ethspecify

* fixing attestation tests

* fixing sha for consensus specs

* removing script for now until i have something more standard

* fixing more p2p tests

* fixing discovery tests

* attempting to fix discovery test flakeyness

* attempting to fix port binding issue

* more attempts to fix flakey tests

* Revert "more attempts to fix flakey tests"

This reverts commit 25e8183.

* Revert "attempting to fix port binding issue"

This reverts commit 583df80.

* Revert "attempting to fix discovery test flakeyness"

This reverts commit 3c76525.

* Revert "fixing discovery tests"

This reverts commit 8c701bf.

* Revert "fixing more p2p tests"

This reverts commit 140d5db.

* Revert "fixing attestation tests"

This reverts commit 26ded24.

* fixing attestation tests

* fixing more p2p tests

* fixing discovery tests

* attempting to fix discovery test flakeyness

* attempting to fix port binding issue

* more attempts to fix flakey tests

* changelog

* fixing import

* adding some missing dependencies, but  TestService_BroadcastAttestationWithDiscoveryAttempts is still failing

* attempting to fix test

* reverting test as it migrated to other pr

* reverting test

* fixing test from merge

* Fix `TestService_BroadcastAttestationWithDiscoveryAttempts`.

* Fix again `TestService_Start_OnlyStartsOnce`.

* fixing TestListenForNewNodes

* removing manual set of fulu epoch

* missed a few

* fixing subnet test

* Update beacon-chain/rpc/eth/config/handlers_test.go

Co-authored-by: Preston Van Loon <[email protected]>

* removing a few more missed spots of reverting fulu epoch setting

* updating test name based on feedback

* fixing rest apis, they actually need the setting of the epoch due to the guard

---------

Co-authored-by: Manu NALEPA <[email protected]>
Co-authored-by: Preston Van Loon <[email protected]>
Muzry pushed a commit to Muzry/prysm that referenced this pull request Nov 14, 2025
* wip

* fixing tests

* adding script to update workspace for eth clients

* updating test sepc to 1.6.0 and fixing broadcaster test

* fix specrefs

* more ethspecify fixes

* still trying to fix ethspecify

* fixing attestation tests

* fixing sha for consensus specs

* removing script for now until i have something more standard

* fixing more p2p tests

* fixing discovery tests

* attempting to fix discovery test flakeyness

* attempting to fix port binding issue

* more attempts to fix flakey tests

* Revert "more attempts to fix flakey tests"

This reverts commit 25e8183.

* Revert "attempting to fix port binding issue"

This reverts commit 583df80.

* Revert "attempting to fix discovery test flakeyness"

This reverts commit 3c76525.

* Revert "fixing discovery tests"

This reverts commit 8c701bf.

* Revert "fixing more p2p tests"

This reverts commit 140d5db.

* Revert "fixing attestation tests"

This reverts commit 26ded24.

* fixing attestation tests

* fixing more p2p tests

* fixing discovery tests

* attempting to fix discovery test flakeyness

* attempting to fix port binding issue

* more attempts to fix flakey tests

* changelog

* fixing import

* adding some missing dependencies, but  TestService_BroadcastAttestationWithDiscoveryAttempts is still failing

* attempting to fix test

* reverting test as it migrated to other pr

* reverting test

* fixing test from merge

* Fix `TestService_BroadcastAttestationWithDiscoveryAttempts`.

* Fix again `TestService_Start_OnlyStartsOnce`.

* fixing TestListenForNewNodes

* removing manual set of fulu epoch

* missed a few

* fixing subnet test

* Update beacon-chain/rpc/eth/config/handlers_test.go

Co-authored-by: Preston Van Loon <[email protected]>

* removing a few more missed spots of reverting fulu epoch setting

* updating test name based on feedback

* fixing rest apis, they actually need the setting of the epoch due to the guard

---------

Co-authored-by: Manu NALEPA <[email protected]>
Co-authored-by: Preston Van Loon <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants