Skip to content

Refactor configuration to update epoch values for features and fixes#5058

Merged
Frozen merged 4 commits into
devfrom
feature/activate-features-devnet-2026.2
Jun 29, 2026
Merged

Refactor configuration to update epoch values for features and fixes#5058
Frozen merged 4 commits into
devfrom
feature/activate-features-devnet-2026.2

Conversation

@Frozen

@Frozen Frozen commented Jun 16, 2026

Copy link
Copy Markdown
Collaborator

This pull request updates the activation epochs for several protocol features in the internal/params/config.go file. Previously, these features were either set to zero or marked as "to be determined" (TBD); now, they are all set to activate at epoch 52050. This change helps coordinate the rollout of multiple protocol improvements at the same time.

Protocol upgrade epoch alignment:

  • Set CXMerkleProofReplayFixEpoch, RejectShard0CrossLinkEpoch, DuplicateCrossLinkEpoch, ValidatorWrapperAddressBindEpoch, SlashExternalStakeDenomFixEpoch, RejectDuplicateSlashEvidenceEpoch, and SlashGroupOrderFixEpoch to activate at epoch 52050, replacing previous placeholder values. [1] [2]

@Frozen Frozen marked this pull request as ready for review June 16, 2026 01:37
@Frozen Frozen self-assigned this Jun 16, 2026
@Frozen Frozen force-pushed the feature/activate-features-devnet-2026.2 branch from b1eb1eb to db4e50a Compare June 23, 2026 21:56
@mur-me mur-me requested review from GheisMohammadi and mur-me June 24, 2026 12:25
@mergify

mergify Bot commented Jun 24, 2026

Copy link
Copy Markdown

Tick the box to add this pull request to the merge queue (same as @mergifyio queue).

  • Queue this pull request

@Frozen

Frozen commented Jun 27, 2026

Copy link
Copy Markdown
Collaborator Author

@copilot resolve the merge conflicts in this pull request

…res-devnet-2026.2

# Conflicts:
#	internal/params/config.go

Copilot AI commented Jun 27, 2026

Copy link
Copy Markdown

@copilot resolve the merge conflicts in this pull request

Resolved the merge conflict in internal/params/config.go. The conflict was in the mainnet MainnetChainConfig block where dev added VerifyBeaconHeaderSlashEpoch: EpochTBD and our branch had set CXReceiptStateRollbackEpoch, ShardStateValidationEpoch, and SlashBallotSignerFixEpoch to big.NewInt(52650). The resolution keeps all changes from both branches. Merge commit: aca006ea.

@Frozen Frozen merged commit cc889ee into dev Jun 29, 2026
9 checks passed
@mur-me mur-me deleted the feature/activate-features-devnet-2026.2 branch June 30, 2026 11:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants