From 5a6f9ae476af23e85ea746d619726792aeb2dab1 Mon Sep 17 00:00:00 2001 From: Teddy Ding Date: Mon, 29 Jul 2024 12:25:34 -0400 Subject: [PATCH] [OTE-573] Remove experimental warning log for OE (#1971) (cherry picked from commit ac1e4f79ef8d46b5ab775258052e416dc4c9d818) # Conflicts: # protocol/app/app.go --- protocol/app/app.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/protocol/app/app.go b/protocol/app/app.go index 193f6f20df..afba5e89ec 100644 --- a/protocol/app/app.go +++ b/protocol/app/app.go @@ -382,6 +382,15 @@ func New( interfaceRegistry := encodingConfig.InterfaceRegistry txConfig := encodingConfig.TxConfig +<<<<<<< HEAD +======= + // Enable optimistic block execution. + if appFlags.OptimisticExecutionEnabled { + logger.Info("optimistic execution is enabled.") + baseAppOptions = append(baseAppOptions, baseapp.SetOptimisticExecution()) + } + +>>>>>>> ac1e4f79 ([OTE-573] Remove experimental warning log for OE (#1971)) bApp := baseapp.NewBaseApp(appconstants.AppName, logger, db, txConfig.TxDecoder(), baseAppOptions...) bApp.SetCommitMultiStoreTracer(traceStore) bApp.SetVersion(version.Version)