Revert "Sandbox: add a development mode (#7127)" (#7168)

This reverts commit 87a0ee9.

CHANGELOG_BEGIN

WARNING remove the changelog entry from 87a0ee9 and starting by :
 "[Sandbox] By default Sandbox rejects the development versions of ..."

CHANGELOG_END

Author: remyhaemmerle-da

daml-lf/engine/src/main/scala/com/digitalasset/daml/lf/engine/EngineConfig.scala

@@ -33,15 +33,35 @@ final case class EngineConfig(
 
 object EngineConfig {
 
-  private[this] def toDev(config: EngineConfig): EngineConfig =
-    config.copy(
-      allowedLanguageVersions =
-        config.allowedLanguageVersions.copy(max = LV(LV.Major.V1, LV.Minor.Dev)),
-      allowedInputTransactionVersions = config.allowedInputTransactionVersions.copy(
-        max = TransactionVersions.acceptedVersions.last),
-      allowedOutputTransactionVersions = config.allowedOutputTransactionVersions.copy(
-        max = TransactionVersions.acceptedVersions.last),
+  // Development configuration, should not be used in PROD.
+  val Dev: EngineConfig = new EngineConfig(
+    allowedLanguageVersions = VersionRange(
+      LV(LV.Major.V1, LV.Minor.Stable("6")),
+      LV(LV.Major.V1, LV.Minor.Dev),
+    ),
+    allowedInputTransactionVersions = VersionRange(
+      TV("10"),
+      TransactionVersions.acceptedVersions.last
+    ),
+    allowedOutputTransactionVersions = TransactionVersions.DevOutputVersions
+  )
+
+  // Legacy configuration, to be used by sandbox classic only
+  @deprecated("Sandbox_Classic is to be used by sandbox classic only", since = "1.4.0")
+  val Sandbox_Classic: EngineConfig = new EngineConfig(
+    allowedLanguageVersions = VersionRange(
+      LV(LV.Major.V1, LV.Minor.Stable("0")),
+      LV(LV.Major.V1, LV.Minor.Dev),
+    ),
+    allowedInputTransactionVersions = VersionRange(
+      TransactionVersions.acceptedVersions.head,
+      TransactionVersions.acceptedVersions.last
+    ),
+    allowedOutputTransactionVersions = VersionRange(
+      TV("10"),
+      TransactionVersions.acceptedVersions.last
     )
+  )
 
   // recommended configuration
   val Stable: EngineConfig = new EngineConfig(
@@ -53,22 +73,4 @@ object EngineConfig {
     allowedOutputTransactionVersions = VersionRange(TV("10"), TV("10"))
   )
 
-  // development configuration, should not be used in PROD.
-  // accept all language and transaction versions supported by SDK_1_x plus development versions.
-  val Dev: EngineConfig = toDev(Stable)
-
-  // Legacy configuration, to be used by sandbox classic only
-  @deprecated("Sandbox_Classic_Stable is to be used by sandbox classic only", since = "1.5.0")
-  val Sandbox_Classic_Stable: EngineConfig =
-    Stable.copy(
-      allowedLanguageVersions =
-        Stable.allowedLanguageVersions.copy(min = LV(LV.Major.V1, LV.Minor.Stable("0"))),
-      allowedInputTransactionVersions = Stable.allowedInputTransactionVersions.copy(
-        min = TransactionVersions.acceptedVersions.head),
-    )
-
-  // Legacy configuration, to be used by sandbox classic only
-  @deprecated("Sandbox_Classic_Dev is to be used by sandbox classic only", since = "1.5.0")
-  val Sandbox_Classic_Dev = toDev(Sandbox_Classic_Stable)
-
 }

daml-lf/engine/src/test/scala/com/digitalasset/daml/lf/engine/EngineInfoTest.scala

@@ -2,17 +2,16 @@
 // SPDX-License-Identifier: Apache-2.0
 
 package com.daml.lf.engine
-
 import com.github.ghik.silencer.silent
 import org.scalatest.{Matchers, WordSpec}
 
 class EngineInfoTest extends WordSpec with Matchers {
 
   "EngineInfo" should {
 
-    @silent("Sandbox_Classic_Dev in object EngineConfig is deprecated")
+    @silent("Sandbox_Classic in object EngineConfig is deprecated")
     def infos =
-      Seq(EngineConfig.Stable, EngineConfig.Dev, EngineConfig.Sandbox_Classic_Dev)
+      Seq(EngineConfig.Stable, EngineConfig.Dev, EngineConfig.Sandbox_Classic)
         .map(new EngineInfo(_))
 
     val Seq(engineInfoStable, engineInfoDev, engineInfoLegacy) = infos

ledger/sandbox-classic/src/main/scala/platform/sandbox/SandboxServer.scala

@@ -143,14 +143,12 @@ final class SandboxServer(
 ) extends AutoCloseable {
 
   private[this] val engine = {
-    @silent("Sandbox_Classic_Dev in object EngineConfig is deprecated")
-    @silent("Sandbox_Classic_Stable in object EngineConfig is deprecated")
-    val engineConfig = (
-      if (config.devMode) EngineConfig.Sandbox_Classic_Stable else EngineConfig.Sandbox_Classic_Dev
-    ).copy(
-      profileDir = config.profileDir,
-      stackTraceMode = config.stackTraces,
-    )
+    @silent("Sandbox_Classic in object EngineConfig is deprecated")
+    val engineConfig =
+      EngineConfig.Sandbox_Classic.copy(
+        profileDir = config.profileDir,
+        stackTraceMode = config.stackTraces,
+      )
     getEngine(engineConfig)
   }
 

ledger/sandbox-common/src/main/scala/platform/sandbox/cli/CommonCli.scala

@@ -296,11 +296,6 @@ class CommonCli(name: LedgerName) {
         .text(
           s"Maximum skew (in seconds) between the ledger time and the record time. Default is ${v1.TimeModel.reasonableDefault.minSkew.getSeconds}.")
 
-      opt[Unit]("dev-mode")
-        .optional()
-        .action((_, config) => config.copy(devMode = true))
-        .text("Allows development versions of DAML-LF language and transaction format.")
-
       help("help").text("Print the usage text")
 
       checkConfig(c => {

ledger/sandbox-common/src/main/scala/platform/sandbox/config/SandboxConfig.scala

@@ -47,7 +47,6 @@ final case class SandboxConfig(
     lfValueTranslationContractCacheConfiguration: SizedCache.Configuration,
     profileDir: Option[Path],
     stackTraces: Boolean,
-    devMode: Boolean,
 )
 
 object SandboxConfig {
@@ -92,7 +91,6 @@ object SandboxConfig {
       lfValueTranslationContractCacheConfiguration = DefaultLfValueTranslationCacheConfiguration,
       profileDir = None,
       stackTraces = true,
-      devMode = false,
     )
 
 }

ledger/sandbox/src/main/scala/platform/sandboxnext/Runner.scala

@@ -63,13 +63,14 @@ class Runner(config: SandboxConfig) extends ResourceOwner[Port] {
       None
   }
 
+  // FIXME: https://github.com/digital-asset/daml/issues/5164
+  // should not use EngineConfig.Dev
   private[this] val engine = {
-    val engineConfig = (
-      if (config.devMode) EngineConfig.Dev else EngineConfig.Stable
-    ).copy(
-      profileDir = config.profileDir,
-      stackTraceMode = config.stackTraces,
-    )
+    val engineConfig =
+      EngineConfig.Dev.copy(
+        profileDir = config.profileDir,
+        stackTraceMode = config.stackTraces,
+      )
     new Engine(engineConfig)
   }