chore!: bump core v0.39.3 (celestiaorg#5639)

bumps core to use new dynamic timeouts, prevent panics, performance
improvements, and bug fixes

---------

Co-authored-by: Callum Waters <[email protected]>
Co-authored-by: Rootul P <[email protected]>

Author: 3 people

Makefile

@@ -296,7 +296,7 @@ test-race:
 # TODO: Remove the -skip flag once the following tests no longer contain data races.
 # https://github.com/celestiaorg/celestia-app/issues/1369
 	@echo "--> Running tests in race mode"
-	@go test -timeout 15m ./... -v -race -skip "TestPrepareProposalConsistency|TestIntegrationTestSuite|TestSquareSizeIntegrationTest|TestStandardSDKIntegrationTestSuite|TestTxsimCommandFlags|TestTxsimCommandEnvVar|TestTxsimDefaultKeypath|TestMintIntegrationTestSuite|TestUpgrade|TestMaliciousTestNode|TestBigBlobSuite|TestQGBIntegrationSuite|TestSignerTestSuite|TestPriorityTestSuite|TestTimeInPrepareProposalContext|TestCLITestSuite|TestLegacyUpgrade|TestSignerTwins|TestConcurrentTxSubmission|TestTxClientTestSuite|Test_testnode|TestEvictions|TestEstimateGasUsed|TestEstimateGasPrice|TestWithEstimatorService|TestTxsOverMaxTxSizeGetRejected|TestStart_Success|TestReadBlockchainHeaders|TestPrepareProposalCappingNumberOfMessages|TestGasEstimatorE2E|TestGasEstimatorE2EWithNetworkMinGasPrice"
+	@go test -timeout 15m ./... -v -race -skip "TestPrepareProposalConsistency|TestIntegrationTestSuite|TestSquareSizeIntegrationTest|TestStandardSDKIntegrationTestSuite|TestTxsimCommandFlags|TestTxsimCommandEnvVar|TestTxsimDefaultKeypath|TestMintIntegrationTestSuite|TestUpgrade|TestMaliciousTestNode|TestBigBlobSuite|TestQGBIntegrationSuite|TestSignerTestSuite|TestPriorityTestSuite|TestTimeInPrepareProposalContext|TestCLITestSuite|TestLegacyUpgrade|TestSignerTwins|TestConcurrentTxSubmission|TestTxClientTestSuite|Test_testnode|TestEvictions|TestEstimateGasUsed|TestEstimateGasPrice|TestWithEstimatorService|TestTxsOverMaxTxSizeGetRejected|TestStart_Success|TestReadBlockchainHeaders|TestPrepareProposalCappingNumberOfMessages|TestGasEstimatorE2E|TestGasEstimatorE2EWithNetworkMinGasPrice|TestRejections|TestClaimRewardsAfterFullUndelegation"
 .PHONY: test-race
 
 ## test-bench: Run benchmark unit tests.

app/app.go

@@ -190,19 +190,20 @@ type App struct {
 	BasicManager  module.BasicManager
 	ModuleManager *module.Manager
 	configurator  module.Configurator
-	// timeoutCommit is used to override the default timeoutCommit. This is
+	// blockTime is used to override the default TimeoutHeightDelay. This is
 	// useful for testing purposes and should not be used on public networks
 	// (Arabica, Mocha, or Mainnet Beta).
-	timeoutCommit time.Duration
+	delayedPrecommitTimeout time.Duration
 }
 
 // New returns a reference to an uninitialized app. Callers must subsequently
-// call app.Info or app.InitChain to initialize the baseapp.
+// call app.Info or app.InitChain to initialize the baseapp. Setting
+// delayedPrecommitTimeout to 0 will result in using the default value.
 func New(
 	logger log.Logger,
 	db dbm.DB,
 	traceStore io.Writer,
-	timeoutCommit time.Duration,
+	delayedPrecommitTimeout time.Duration,
 	appOpts servertypes.AppOptions,
 	baseAppOptions ...func(*baseapp.BaseApp),
 ) *App {
@@ -219,12 +220,16 @@ func New(
 
 	govModuleAddr := authtypes.NewModuleAddress(govtypes.ModuleName).String()
 
+	if delayedPrecommitTimeout == 0 {
+		delayedPrecommitTimeout = appconsts.DelayedPrecommitTimeout
+	}
+
 	app := &App{
-		BaseApp:       baseApp,
-		keys:          keys,
-		tkeys:         tkeys,
-		memKeys:       memKeys,
-		timeoutCommit: timeoutCommit,
+		BaseApp:                 baseApp,
+		keys:                    keys,
+		tkeys:                   tkeys,
+		memKeys:                 memKeys,
+		delayedPrecommitTimeout: delayedPrecommitTimeout,
 	}
 
 	// needed for migration from x/params -> module's ownership of own params
@@ -509,8 +514,7 @@ func (app *App) Info(req *abci.RequestInfo) (*abci.ResponseInfo, error) {
 		return nil, err
 	}
 
-	res.TimeoutInfo.TimeoutCommit = app.TimeoutCommit()
-	res.TimeoutInfo.TimeoutPropose = app.TimeoutPropose()
+	res.TimeoutInfo = app.TimeoutInfo()
 
 	return res, nil
 }
@@ -563,8 +567,7 @@ func (app *App) EndBlocker(ctx sdk.Context) (sdk.EndBlock, error) {
 		}
 	}
 
-	res.TimeoutInfo.TimeoutCommit = app.TimeoutCommit()
-	res.TimeoutInfo.TimeoutPropose = app.TimeoutPropose()
+	res.TimeoutInfo = app.TimeoutInfo()
 
 	return res, nil
 }
@@ -586,9 +589,7 @@ func (app *App) InitChainer(ctx sdk.Context, req *abci.RequestInitChain) (*abci.
 		return nil, err
 	}
 
-	res.TimeoutInfo.TimeoutCommit = app.TimeoutCommit()
-	res.TimeoutInfo.TimeoutPropose = app.TimeoutPropose()
-
+	res.TimeoutInfo = app.TimeoutInfo()
 	return res, nil
 }
 
@@ -811,19 +812,15 @@ func (app *App) NewProposalContext(header tmproto.Header) sdk.Context {
 	return ctx
 }
 
-// TimeoutCommit returns the timeout commit duration to be used on the next block.
-// It returns the user specified value as overridden by the --timeout-commit flag, otherwise
-// the default timeout commit value for the current app version.
-func (app *App) TimeoutCommit() time.Duration {
-	if app.timeoutCommit != 0 {
-		return app.timeoutCommit
+func (app *App) TimeoutInfo() abci.TimeoutInfo {
+	return abci.TimeoutInfo{
+		TimeoutPropose:          appconsts.TimeoutPropose,
+		TimeoutProposeDelta:     appconsts.TimeoutProposeDelta,
+		TimeoutCommit:           appconsts.TimeoutCommit,
+		TimeoutPrevote:          appconsts.TimeoutPrevote,
+		TimeoutPrevoteDelta:     appconsts.TimeoutPrevoteDelta,
+		TimeoutPrecommit:        appconsts.TimeoutPrecommit,
+		TimeoutPrecommitDelta:   appconsts.TimeoutPrecommitDelta,
+		DelayedPrecommitTimeout: app.delayedPrecommitTimeout,
 	}
-
-	return appconsts.TimeoutCommit
-}
-
-// TimeoutPropose returns the timeout propose duration to be used on the next block.
-// It returns the default timeout propose value for the current app version.
-func (app *App) TimeoutPropose() time.Duration {
-	return appconsts.TimeoutPropose
 }

app/grpc/gasestimation/gas_estimator_e2e_test.go

@@ -39,7 +39,7 @@ func TestGasEstimatorE2E(t *testing.T) {
 	// Create test node configuration
 	cfg := testnode.DefaultConfig().
 		WithFundedAccounts(accounts...).
-		WithTimeoutCommit(100 * time.Millisecond).
+		WithDelayedPrecommitTimeout(100 * time.Millisecond).
 		WithGenesis(
 			genesis.NewDefaultGenesis().
 				WithValidators(genesis.NewDefaultValidator(testnode.DefaultValidatorAccountName)).
@@ -51,6 +51,10 @@ func TestGasEstimatorE2E(t *testing.T) {
 	// Start the test network
 	cctx, _, _ := testnode.NewNetwork(t, cfg)
 
+	// Wait for the first block to ensure the node is ready
+	_, err := cctx.WaitForHeight(1)
+	require.NoError(t, err)
+
 	estimatorClient := gasestimation.NewGasEstimatorClient(cctx.GRPCClient)
 	gasPriceResp, err := estimatorClient.EstimateGasPrice(ctx, &gasestimation.EstimateGasPriceRequest{})
 	require.NoError(t, err)
@@ -110,7 +114,7 @@ func TestGasEstimatorE2EWithNetworkMinGasPrice(t *testing.T) {
 	// Create test node configuration
 	cfg := testnode.DefaultConfig().
 		WithFundedAccounts(accounts...).
-		WithTimeoutCommit(100 * time.Millisecond).
+		WithDelayedPrecommitTimeout(100 * time.Millisecond).
 		WithGenesis(
 			genesis.NewDefaultGenesis().
 				WithValidators(genesis.NewDefaultValidator(testnode.DefaultValidatorAccountName)).
@@ -124,6 +128,10 @@ func TestGasEstimatorE2EWithNetworkMinGasPrice(t *testing.T) {
 	// Start the test network
 	cctx, _, _ := testnode.NewNetwork(t, cfg)
 
+	// Wait for the first block to ensure the node is ready
+	_, err := cctx.WaitForHeight(1)
+	require.NoError(t, err)
+
 	estimatorClient := gasestimation.NewGasEstimatorClient(cctx.GRPCClient)
 	gasPriceResp, err := estimatorClient.EstimateGasPrice(ctx, &gasestimation.EstimateGasPriceRequest{})
 	require.NoError(t, err)

app/test/gas_estimation_test.go

@@ -97,7 +97,7 @@ func TestEstimateGasPrice(t *testing.T) {
 	// price, then test the gas estimator API.
 	accountNames := testfactory.GenerateAccounts(10)
 	cfg := testnode.DefaultConfig().WithFundedAccounts(accountNames...).
-		WithTimeoutCommit(10 * time.Second) // to have all transactions in the mempool without being included in a block
+		WithDelayedPrecommitTimeout(10 * time.Second) // to have all transactions in the mempool without being included in a block
 
 	cctx, _, _ := testnode.NewNetwork(t, cfg)
 

app/test/integration_test.go

@@ -45,7 +45,7 @@ func (s *IntegrationTestSuite) SetupSuite() {
 	t := s.T()
 	s.accounts = testnode.RandomAccounts(142)
 
-	cfg := testnode.DefaultConfig().WithFundedAccounts(s.accounts...).WithTimeoutCommit(time.Millisecond * 500)
+	cfg := testnode.DefaultConfig().WithFundedAccounts(s.accounts...).WithDelayedPrecommitTimeout(time.Millisecond * 500)
 	cctx, _, _ := testnode.NewNetwork(t, cfg)
 
 	s.cctx = cctx

app/test/priority_test.go

@@ -51,7 +51,7 @@ func (s *PriorityTestSuite) SetupSuite() {
 	cfg := testnode.DefaultConfig().
 		WithFundedAccounts(s.accountNames...).
 		// use a long block time to guarantee that some transactions are included in the same block
-		WithTimeoutCommit(time.Second)
+		WithDelayedPrecommitTimeout(time.Second)
 
 	cctx, _, _ := testnode.NewNetwork(t, cfg)
 	s.cctx = cctx

app/test/square_size_test.go

@@ -48,8 +48,8 @@ func (s *SquareSizeIntegrationTest) SetupSuite() {
 	s.enc = encoding.MakeConfig(app.ModuleEncodingRegisters...)
 	cfg := testnode.DefaultConfig().
 		WithModifiers(genesis.ImmediateProposals(s.enc.Codec)).
-		WithTimeoutCommit(time.Millisecond * 500). // long timeout commit to provide time for submitting txs
-		WithFundedAccounts("txsim")                // add a specific txsim account
+		WithDelayedPrecommitTimeout(time.Millisecond * 500). // long time to provide time for submitting txs
+		WithFundedAccounts("txsim")                          // add a specific txsim account
 
 	cctx, rpcAddr, grpcAddr := testnode.NewNetwork(t, cfg)
 	s.cctx = cctx

cmd/celestia-appd/cmd/app_server.go

@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"io"
+	"time"
 
 	"cosmossdk.io/log"
 	"github.com/celestiaorg/celestia-app/v6/app"
@@ -12,11 +13,19 @@ import (
 )
 
 func NewAppServer(logger log.Logger, db dbm.DB, traceStore io.Writer, appOptions servertypes.AppOptions) servertypes.Application {
+	// Check for the new --delayed-precommit-timeout flag first, then fall back to deprecated --timeout-commit
+	var delayedPrecommitTimeout time.Duration
+	if delayedPrecommitTimeoutFromFlag := appOptions.Get(DelayedPrecommitTimeoutFlag); delayedPrecommitTimeoutFromFlag != nil {
+		delayedPrecommitTimeout = cast.ToDuration(delayedPrecommitTimeoutFromFlag)
+	} else if timeoutCommitFromFlag := appOptions.Get(TimeoutCommitFlag); timeoutCommitFromFlag != nil {
+		delayedPrecommitTimeout = cast.ToDuration(timeoutCommitFromFlag)
+	}
+
 	return app.New(
 		logger,
 		db,
 		traceStore,
-		cast.ToDuration(appOptions.Get(TimeoutCommitFlag)),
+		delayedPrecommitTimeout,
 		appOptions,
 		server.DefaultBaseappOptions(appOptions)...,
 	)

cmd/celestia-appd/cmd/root.go

@@ -34,7 +34,11 @@ const (
 	UpgradeHeightFlag = "v2-upgrade-height"
 
 	// TimeoutCommit is a flag that can be used to override the timeout_commit.
+	// Deprecated: Use DelayedPrecommitTimeoutFlag instead.
 	TimeoutCommitFlag = "timeout-commit"
+
+	// DelayedPrecommitTimeoutFlag is a flag that can be used to override the DelayedPrecommitTimeout.
+	DelayedPrecommitTimeoutFlag = "delayed-precommit-timeout"
 )
 
 // NewRootCmd creates a new root command for celestia-appd.
@@ -144,6 +148,11 @@ func addStartFlags(startCmd *cobra.Command) {
 	}
 
 	startCmd.Flags().Duration(TimeoutCommitFlag, 0, "Override the application configured timeout_commit. Note: only for testing purposes.")
+	if err := startCmd.Flags().MarkDeprecated(TimeoutCommitFlag, "Use --delayed-precommit-timeout instead."); err != nil {
+		panic(err)
+	}
+
+	startCmd.Flags().Duration(DelayedPrecommitTimeoutFlag, 0, "Override the DelayedPrecommitTimeout to control block time. Note: only for testing purposes.")
 	startCmd.Flags().Bool(FlagForceNoBBR, false, "bypass the requirement to use bbr locally")
 }
 

go.mod

@@ -251,11 +251,11 @@ require (
 	go.opentelemetry.io/otel/trace v1.37.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	golang.org/x/arch v0.15.0 // indirect
-	golang.org/x/crypto v0.40.0 // indirect
-	golang.org/x/net v0.42.0 // indirect
-	golang.org/x/sys v0.34.0 // indirect
-	golang.org/x/term v0.33.0 // indirect
-	golang.org/x/text v0.27.0 // indirect
+	golang.org/x/crypto v0.41.0 // indirect
+	golang.org/x/net v0.43.0 // indirect
+	golang.org/x/sys v0.35.0 // indirect
+	golang.org/x/term v0.34.0 // indirect
+	golang.org/x/text v0.28.0 // indirect
 	golang.org/x/time v0.9.0 // indirect
 	google.golang.org/api v0.215.0 // indirect
 	google.golang.org/genproto v0.0.0-20241118233622-e639e219e697 // indirect
@@ -270,8 +270,7 @@ require (
 replace (
 	cosmossdk.io/api => github.com/celestiaorg/cosmos-sdk/api v0.7.6
 	cosmossdk.io/x/upgrade => github.com/celestiaorg/cosmos-sdk/x/upgrade v0.2.0
-	// TODO: update to a v0.39.x release after that is created from celestia-core main branch.
-	github.com/cometbft/cometbft => github.com/celestiaorg/celestia-core v0.39.2
+	github.com/cometbft/cometbft => github.com/celestiaorg/celestia-core v0.39.3
 	github.com/cosmos/cosmos-sdk => github.com/celestiaorg/cosmos-sdk v0.51.0
 	github.com/cosmos/ibc-go/v8 => github.com/celestiaorg/ibc-go/v8 v8.7.2
 	// goleveldb: canonical version