fix: consensus timeouts

cmd/celestia-appd/cmd/root.go

@@ -136,7 +136,7 @@ func initRootCommand(rootCommand *cobra.Command, capp *app.App) {
 	modifyRootCommand(rootCommand)
 
 	// Add hooks run prior to the start command
-	if err := addPreStartHooks(rootCommand, overrideConsensusTimeouts, overrideP2PConfig, checkBBR); err != nil {
+	if err := addPreStartHooks(rootCommand, overrideP2PConfig, checkBBR); err != nil {
 		panic(fmt.Errorf("failed to add pre-start hooks: %w", err))
 	}
 }

go.mod

@@ -219,7 +219,7 @@ require (
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/prometheus/client_golang v1.23.2 // indirect
 	github.com/prometheus/client_model v0.6.2 // indirect
-	github.com/prometheus/common v0.67.1 // indirect
+	github.com/prometheus/common v0.67.2 // indirect
 	github.com/prometheus/procfs v0.16.1 // indirect
 	github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
 	github.com/rogpeppe/go-internal v1.14.1 // indirect
@@ -274,7 +274,7 @@ replace (
 	// f48fea92e627 commit coincides with the v0.51.8 cosmos-sdk release
 	cosmossdk.io/log => github.com/celestiaorg/cosmos-sdk/log v1.1.1-0.20251116153902-f48fea92e627
 	cosmossdk.io/x/upgrade => github.com/celestiaorg/cosmos-sdk/x/upgrade v0.2.0
-	github.com/cometbft/cometbft => github.com/celestiaorg/celestia-core v0.39.15
+	github.com/cometbft/cometbft => github.com/rootulp/celestia-core v0.0.0-20251116204809-c15991a360fd
 	github.com/cosmos/cosmos-sdk => github.com/celestiaorg/cosmos-sdk v0.51.8
 	github.com/cosmos/ibc-go/v8 => github.com/celestiaorg/ibc-go/v8 v8.7.2
 	// Use ledger-cosmos-go v0.16.0 because v0.15.0 causes "hidapi: unknown failure"

go.sum

@@ -775,8 +775,6 @@ github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1/go.mod h1:7SFka0XMvUgj3hfZtyd
 github.com/bufbuild/protocompile v0.14.1 h1:iA73zAf/fyljNjQKwYzUHD6AD4R8KMasmwa/FBatYVw=
 github.com/bufbuild/protocompile v0.14.1/go.mod h1:ppVdAIhbr2H8asPk6k4pY7t9zB1OU5DoEw9xY/FUi1c=
 github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ=
-github.com/celestiaorg/celestia-core v0.39.15 h1:Wpmu0nAPzhEiK2TbSGeTus4c0kikHQGs0Y3Q1q9eo1o=
-github.com/celestiaorg/celestia-core v0.39.15/go.mod h1:98r/9+ol56uhrtLQPmTpgGto2DJ4n8ga45T0xdSg4C0=
 github.com/celestiaorg/celestia-core v1.55.0-tm-v0.34.35 h1:FREwqZwPvYsodr1AqqEIyW+VsBnwTzJNtC6NFdZX8rs=
 github.com/celestiaorg/celestia-core v1.55.0-tm-v0.34.35/go.mod h1:SI38xqZZ4ccoAxszUJqsJ/a5rOkzQRijzHQQlLKkyUc=
 github.com/celestiaorg/cosmos-sdk v0.51.8 h1:kU86k7Vf/WynGIpoGbPn42X5ww/4A75K4ldKXn4TlJY=
@@ -1519,8 +1517,8 @@ github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8b
 github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
 github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s=
 github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc=
-github.com/prometheus/common v0.67.1 h1:OTSON1P4DNxzTg4hmKCc37o4ZAZDv0cfXLkOt0oEowI=
-github.com/prometheus/common v0.67.1/go.mod h1:RpmT9v35q2Y+lsieQsdOh5sXZ6ajUGC8NjZAmr8vb0Q=
+github.com/prometheus/common v0.67.2 h1:PcBAckGFTIHt2+L3I33uNRTlKTplNzFctXcWhPyAEN8=
+github.com/prometheus/common v0.67.2/go.mod h1:63W3KZb1JOKgcjlIr64WW/LvFGAqKPj0atm+knVGEko=
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
@@ -1541,6 +1539,8 @@ github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTE
 github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
 github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
 github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
+github.com/rootulp/celestia-core v0.0.0-20251116204809-c15991a360fd h1:bZUSbQcQc/iYOsXQjO04ekg2iXX1NPoUCnxTleDNX14=
+github.com/rootulp/celestia-core v0.0.0-20251116204809-c15991a360fd/go.mod h1:w4q8dpqADahvXj593IeobtgIzAa7C7Tf6yfX/loj3ZI=
 github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU=
 github.com/rs/cors v1.11.1 h1:eU3gRzXLRK57F5rKMGMZURNdIG4EoAmX8k94r9wXWHA=
 github.com/rs/cors v1.11.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU=

pkg/appconsts/v5/app_consts.go

@@ -1,5 +1,7 @@
 package v5
 
+import "time"
+
 const (
 	Version uint64 = 5
 	// SquareSizeUpperBound imposes an upper bound on the max effective square size.
@@ -13,4 +15,6 @@ const (
 	//
 	// The rationale for this value is described in more detail in ADR-013.
 	SubtreeRootThreshold int = 64
+	TimeoutPropose           = time.Millisecond * 3500
+	TimeoutCommit            = time.Millisecond * 4200
 )

scripts/single-node-upgrades.sh

@@ -95,7 +95,9 @@ startCelestiaApp() {
     --api.enable \
     --grpc.enable \
     --grpc-web.enable \
-    --delayed-precommit-timeout 1s
+    --force-no-bbr
+    # --timeout-commit 1s \
+    # --delayed-precommit-timeout 1s
 }
 
 upgrade() {

test/docker-e2e/e2e_upgrade_test.go

@@ -12,6 +12,8 @@ import (
 	"celestiaorg/celestia-app/test/docker-e2e/dockerchain"
 
 	"github.com/celestiaorg/celestia-app/v6/app"
+	"github.com/celestiaorg/celestia-app/v6/pkg/appconsts"
+	v5 "github.com/celestiaorg/celestia-app/v6/pkg/appconsts/v5"
 	"github.com/celestiaorg/celestia-app/v6/test/util/genesis"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 	icahosttypes "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/host/types"
@@ -94,10 +96,11 @@ func (s *CelestiaTestSuite) TestCelestiaAppV5ToV6() {
 	}
 
 	ctx := context.Background()
-	tag, err := dockerchain.GetCelestiaTagStrict()
-	s.Require().NoError(err)
+	// tag, err := dockerchain.GetCelestiaTagStrict()
+	// s.Require().NoError(err)
 
-	cfg := dockerchain.DefaultConfig(s.client, s.network).WithTag(tag)
+	// TODO(@rootulp): revert after we merge the celestia-core fix, cut a release, bump in app.
+	cfg := dockerchain.DefaultConfig(s.client, s.network).WithImage("celestiaorg/celestia-app").WithTag("dbf8e6e99")
 	cfg.Genesis = cfg.Genesis.WithAppVersion(AppVersionV5)
 
 	// For v5 genesis, set legacy (pre–CIP-037) values so the v6 upgrade can update them.
@@ -330,6 +333,7 @@ func (s *CelestiaTestSuite) validateParameters(ctx context.Context, node tastora
 		s.validateUnbondingTime(ctx, node, UnbondingTimeV5Hours, AppVersionV5)
 		s.validateMinCommissionRate(ctx, node, MinCommissionRateV5, AppVersionV5)
 		s.validateEvidenceParams(ctx, node, EvidenceMaxAgeV5Hours, EvidenceMaxAgeV5Blocks, AppVersionV5)
+		s.validateTimeoutInfo(ctx, node, AppVersionV5)
 		return
 	}
 
@@ -341,6 +345,7 @@ func (s *CelestiaTestSuite) validateParameters(ctx context.Context, node tastora
 		// Check ICA host params only on v6: v5 doesn't expose the icahost gRPC query service;
 		// the v6 upgrade applies these params per CIP-14.
 		s.validateICAHostParams(ctx, node, true, app.IcaAllowMessages(), AppVersionV6)
+		s.validateTimeoutInfo(ctx, node, AppVersionV6)
 		return
 	}
 
@@ -497,3 +502,36 @@ func (s *CelestiaTestSuite) validateICAHostParams(ctx context.Context, node tast
 	s.Require().Equal(expectedHostEnabled, resp.Params.HostEnabled, "v%d icahost host_enabled mismatch: expected %v, got %v", appVersion, expectedHostEnabled, resp.Params.HostEnabled)
 	s.Require().Equal(expectedAllowMessages, resp.Params.AllowMessages, "v%d icahost allow_messages mismatch", appVersion)
 }
+
+// validateTimeoutInfo queries and validates timeout_info values in ABCI ResponseInfo
+func (s *CelestiaTestSuite) validateTimeoutInfo(ctx context.Context, node tastoratypes.ChainNode, appVersion uint64) {
+	rpcClient, err := node.GetRPCClient()
+	s.Require().NoError(err, "failed to get RPC client")
+
+	abciInfo, err := rpcClient.ABCIInfo(ctx)
+	s.Require().NoError(err, "failed to fetch ABCI info")
+
+	timeoutInfo := abciInfo.Response.TimeoutInfo
+
+	if appVersion == AppVersionV5 {
+		// v5 app only hard-coded TimeoutPropose and TimeoutCommit values
+		s.Require().Equal(v5.TimeoutPropose, timeoutInfo.TimeoutPropose)
+		s.Require().Equal(v5.TimeoutCommit, timeoutInfo.TimeoutCommit)
+		return
+	}
+
+	if appVersion == AppVersionV6 {
+		// V6 timeout values: use constants from appconsts package
+		s.Require().Equal(appconsts.TimeoutPropose, timeoutInfo.TimeoutPropose, "v%d timeout_propose mismatch", appVersion)
+		s.Require().Equal(appconsts.TimeoutProposeDelta, timeoutInfo.TimeoutProposeDelta, "v%d timeout_propose_delta mismatch", appVersion)
+		s.Require().Equal(appconsts.TimeoutPrevote, timeoutInfo.TimeoutPrevote, "v%d timeout_prevote mismatch", appVersion)
+		s.Require().Equal(appconsts.TimeoutPrevoteDelta, timeoutInfo.TimeoutPrevoteDelta, "v%d timeout_prevote_delta mismatch", appVersion)
+		s.Require().Equal(appconsts.TimeoutPrecommit, timeoutInfo.TimeoutPrecommit, "v%d timeout_precommit mismatch", appVersion)
+		s.Require().Equal(appconsts.TimeoutPrecommitDelta, timeoutInfo.TimeoutPrecommitDelta, "v%d timeout_precommit_delta mismatch", appVersion)
+		s.Require().Equal(appconsts.TimeoutCommit, timeoutInfo.TimeoutCommit, "v%d timeout_commit mismatch", appVersion)
+		s.Require().Equal(appconsts.DelayedPrecommitTimeout, timeoutInfo.DelayedPrecommitTimeout, "v%d delayed_precommit_timeout mismatch", appVersion)
+		return
+	}
+
+	s.T().Fatalf("invalid app version for timeout validation: %d", appVersion)
+}

test/docker-e2e/go.mod

@@ -204,7 +204,7 @@ require (
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/prometheus/client_golang v1.23.2 // indirect
 	github.com/prometheus/client_model v0.6.2 // indirect
-	github.com/prometheus/common v0.67.1 // indirect
+	github.com/prometheus/common v0.67.2 // indirect
 	github.com/prometheus/procfs v0.16.1 // indirect
 	github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
 	github.com/rogpeppe/go-internal v1.14.1 // indirect

test/docker-e2e/go.sum

@@ -1522,8 +1522,8 @@ github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8b
 github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
 github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s=
 github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc=
-github.com/prometheus/common v0.67.1 h1:OTSON1P4DNxzTg4hmKCc37o4ZAZDv0cfXLkOt0oEowI=
-github.com/prometheus/common v0.67.1/go.mod h1:RpmT9v35q2Y+lsieQsdOh5sXZ6ajUGC8NjZAmr8vb0Q=
+github.com/prometheus/common v0.67.2 h1:PcBAckGFTIHt2+L3I33uNRTlKTplNzFctXcWhPyAEN8=
+github.com/prometheus/common v0.67.2/go.mod h1:63W3KZb1JOKgcjlIr64WW/LvFGAqKPj0atm+knVGEko=
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=