[OTE-573] Remove experimental warning log for OE (#1971)

(cherry picked from commit ac1e4f7) # Conflicts: # protocol/app/app.go
dydxprotocol · Jul 29, 2024 · 9f0a53a · 9f0a53a
1 parent b12a872
commit 9f0a53a
Showing 1 changed file with 9 additions and 0 deletions.
diff --git 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)