From 2d2507b90747c2760481616b552e936c33ba4406 Mon Sep 17 00:00:00 2001
From: terence <terence@prysmaticlabs.com>
Date: Fri, 4 Jul 2025 11:28:48 -0700
Subject: [PATCH] Attest timely by default (#15410)

* Attest timely by default

* Fix deprecated flag naming
---
 changelog/tt_formula_mlk.md         | 7 +++++++
 config/features/config.go           | 7 ++++---
 config/features/deprecated_flags.go | 6 ++++++
 config/features/flags.go            | 8 ++++----
 4 files changed, 21 insertions(+), 7 deletions(-)
 create mode 100644 changelog/tt_formula_mlk.md

diff --git a/changelog/tt_formula_mlk.md b/changelog/tt_formula_mlk.md
new file mode 100644
index 0000000000..b0b0890671
--- /dev/null
+++ b/changelog/tt_formula_mlk.md
@@ -0,0 +1,7 @@
+### Changed
+
+- Attest timely is now default. `attest-timely` flag is now deprecated.
+
+### Added
+
+- `disable-attest-timely` flag to disable attest timely.
\ No newline at end of file
diff --git a/config/features/config.go b/config/features/config.go
index 1df69e0fce..edd84f72f9 100644
--- a/config/features/config.go
+++ b/config/features/config.go
@@ -318,9 +318,10 @@ func ConfigureValidator(ctx *cli.Context) error {
 		logEnabled(writeWalletPasswordOnWebOnboarding)
 		cfg.WriteWalletPasswordOnWebOnboarding = true
 	}
-	if ctx.Bool(attestTimely.Name) {
-		logEnabled(attestTimely)
-		cfg.AttestTimely = true
+	cfg.AttestTimely = true
+	if ctx.Bool(disableAttestTimely.Name) {
+		logEnabled(disableAttestTimely)
+		cfg.AttestTimely = false
 	}
 	if ctx.Bool(enableSlashingProtectionPruning.Name) {
 		logEnabled(enableSlashingProtectionPruning)
diff --git a/config/features/deprecated_flags.go b/config/features/deprecated_flags.go
index cecbadebef..501c981776 100644
--- a/config/features/deprecated_flags.go
+++ b/config/features/deprecated_flags.go
@@ -98,6 +98,11 @@ var (
 		Usage:  deprecatedUsage,
 		Hidden: true,
 	}
+	deprecatedAttestTimely = &cli.BoolFlag{
+		Name:   "attest-timely",
+		Usage:  deprecatedUsage,
+		Hidden: true,
+	}
 )
 
 // Deprecated flags for both the beacon node and validator client.
@@ -118,6 +123,7 @@ var deprecatedFlags = []cli.Flag{
 	deprecatedEnableCommitteeAwarePacking,
 	deprecatedInteropGenesisTimeFlag,
 	deprecatedEnableQuic,
+	deprecatedAttestTimely,
 }
 
 var upcomingDeprecation = []cli.Flag{
diff --git a/config/features/flags.go b/config/features/flags.go
index a5d640549b..f5f947348e 100644
--- a/config/features/flags.go
+++ b/config/features/flags.go
@@ -91,9 +91,9 @@ var (
 		Name:  "disable-broadcast-slashings",
 		Usage: "Disables broadcasting slashings submitted to the beacon node.",
 	}
-	attestTimely = &cli.BoolFlag{
-		Name:  "attest-timely",
-		Usage: "Fixes validator can attest timely after current block processes. See #8185 for more details.",
+	disableAttestTimely = &cli.BoolFlag{
+		Name:  "disable-attest-timely",
+		Usage: "Disable validator attesting timely after current block processes. See #8185 for more details.",
 	}
 	enableSlashingProtectionPruning = &cli.BoolFlag{
 		Name:  "enable-slashing-protection-history-pruning",
@@ -222,7 +222,7 @@ var ValidatorFlags = append(deprecatedFlags, []cli.Flag{
 	HoodiTestnet,
 	Mainnet,
 	dynamicKeyReloadDebounceInterval,
-	attestTimely,
+	disableAttestTimely,
 	enableSlashingProtectionPruning,
 	EnableMinimalSlashingProtection,
 	enableDoppelGangerProtection,