Fix sandbox

run-full-compat: true

Author: samuel-williams-da

sdk/daml-assistant/daml-helper/src/DA/Daml/Helper/Main.hs

@@ -158,7 +158,7 @@ commandParser = subparser $ fold
 
     startCmd = do
         sandboxPortM <- sandboxPortOpt "sandbox-port" "Port number for the sandbox"
-        jsonApiPortM <- jsonApiPortOpt "json-api-port" "Port that the HTTP JSON API should listen on or 'none' to disable it"
+        jsonApiPort <- jsonApiPortOpt "json-api-port" "Port that the HTTP JSON API should listen on"
         onStartM <- optional (option str (long "on-start" <> metavar "COMMAND" <> help "Command to run once sandbox is running."))
         shouldWaitForSignal <- flagYesNoAuto "wait-for-signal" True "Wait for Ctrl+C or interrupt after starting servers." idm
         sandboxOptions <- many (strOption (long "sandbox-option" <> metavar "SANDBOX_OPTION" <> help "Pass option to sandbox"))
@@ -201,16 +201,13 @@ commandParser = subparser $ fold
     jsonApiPortOpt name desc = option
         readJsonApiPort
         ( long name
-       <> value (Just $ JsonApiPort 7575)
+       <> value (JsonApiPort 7575)
        <> help desc
         )
 
-    readJsonApiPort = eitherReader $ \case
-        "none" -> Right Nothing
-        s -> maybe
-            (Left $ "Failed to parse port " <> show s)
-            (Right . Just . JsonApiPort)
-            (readMaybe s)
+    readJsonApiPort =
+      eitherReader $ \s ->
+        maybe (Left $ "Failed to parse port " <> show s) (Right . JsonApiPort) $ readMaybe s
 
     codegenCmd = asum
         [ subparser $ fold
@@ -416,8 +413,8 @@ commandParser = subparser $ fold
             cantonSequencerPublicApi <- option auto (long "sequencer-public-port" <> value (sequencerPublic defaultSandboxPorts))
             cantonSequencerAdminApi <- option auto (long "sequencer-admin-port" <> value (sequencerAdmin defaultSandboxPorts))
             cantonMediatorAdminApi <- option auto (long "mediator-admin-port" <> value (mediatorAdmin defaultSandboxPorts))
-            cantonJsonApi <- optional $ option auto (long "json-api-port"
-                <> help "Port that the HTTP JSON API should listen on, omit to disable it")
+            cantonJsonApi <- option auto (long "json-api-port"
+                <> help "Port that the HTTP JSON API should listen on" <> value (jsonApi defaultSandboxPorts))
             cantonJsonApiPortFileM <- optional $ option str (long "json-api-port-file" <> metavar "PATH"
                 <> help "File to write canton json-api port when ready")
             cantonPortFileM <- optional $ option str (long "canton-port-file" <> metavar "PATH"

sdk/daml-assistant/daml-helper/src/DA/Daml/Helper/Start.hs

@@ -50,7 +50,7 @@ getPortForSandbox defaultPortSpec portSpecM =
         SpecifiedPort port -> pure (unSandboxPort port)
         FreePort -> fromIntegral <$> getFreePort
 
-determineCantonOptions :: Maybe SandboxPortSpec -> SandboxCantonPortSpec -> FilePath -> Maybe JsonApiPort -> IO CantonOptions
+determineCantonOptions :: Maybe SandboxPortSpec -> SandboxCantonPortSpec -> FilePath -> JsonApiPort -> IO CantonOptions
 determineCantonOptions ledgerApiSpec SandboxCantonPortSpec{..} portFile jsonApi = do
     cantonLedgerApi <- getPortForSandbox (SpecifiedPort (SandboxPort (ledger defaultSandboxPorts))) ledgerApiSpec
     cantonAdminApi <- getPortForSandbox (SpecifiedPort (SandboxPort (admin defaultSandboxPorts))) adminApiSpec
@@ -61,7 +61,7 @@ determineCantonOptions ledgerApiSpec SandboxCantonPortSpec{..} portFile jsonApi
     let cantonStaticTime = StaticTime False
     let cantonHelp = False
     let cantonConfigFiles = []
-    let cantonJsonApi = fmap unJsonApiPort jsonApi
+    let cantonJsonApi = unJsonApiPort jsonApi
     let cantonJsonApiPortFileM = Nothing
     pure CantonOptions {..}
 
@@ -71,7 +71,7 @@ withSandbox StartOptions{..} darPath sandboxArgs kont =
   where
     cantonSandbox = withTempDir $ \tempDir -> do
       let portFile = tempDir </> "sandbox-portfile"
-      cantonOptions <- determineCantonOptions sandboxPortM sandboxPortSpec portFile jsonApiPortM
+      cantonOptions <- determineCantonOptions sandboxPortM sandboxPortSpec portFile jsonApiPort
       putStrLn "Waiting for canton sandbox to start."
       withCantonSandbox cantonOptions sandboxArgs $ \(ph, sandboxPort) -> do
         runLedgerUploadDar (sandboxLedgerFlags sandboxPort) (DryRun False) (Just darPath)
@@ -93,7 +93,7 @@ withOptsFromPackageConfig fieldName cliOpts packageConfig = do
 
 data StartOptions = StartOptions
     { sandboxPortM :: Maybe SandboxPortSpec
-    , jsonApiPortM :: Maybe JsonApiPort
+    , jsonApiPort :: JsonApiPort
     , onStartM :: Maybe String
     , shouldWaitForSignal :: Bool
     , sandboxOptions :: [String]
@@ -141,7 +141,7 @@ runStart startOptions@StartOptions{..} =
                   runProcess_ procScript
         doRunInitScript
         whenJust onStartM $ \onStart -> runProcess_ (shell onStart)
-        whenJust jsonApiPortM $ \jsonApiPort -> waitForJsonApi sandboxPh jsonApiPort
+        waitForJsonApi sandboxPh jsonApiPort
         printReadyInstructions
         when shouldWaitForSignal $
           void $ waitAnyCancel =<< mapM (async . waitExitCode) [sandboxPh]

sdk/daml-assistant/daml-helper/src/DA/Daml/Helper/Util.hs

@@ -260,10 +260,11 @@ data SandboxPorts = SandboxPorts
   , sequencerPublic :: Int
   , sequencerAdmin :: Int
   , mediatorAdmin :: Int
+  , jsonApi :: Int
   }
 
 defaultSandboxPorts :: SandboxPorts
-defaultSandboxPorts = SandboxPorts 6865 6866 6867 6868 6869
+defaultSandboxPorts = SandboxPorts 6865 6866 6867 6868 6869 6870
 
 runCantonSandbox :: CantonOptions -> [String] -> IO ()
 runCantonSandbox options args = withCantonSandbox options args (const $ pure ())
@@ -337,7 +338,7 @@ data CantonOptions = CantonOptions
   , cantonStaticTime :: StaticTime
   , cantonHelp :: Bool
   , cantonConfigFiles :: [FilePath]
-  , cantonJsonApi :: Maybe Int
+  , cantonJsonApi :: Int
   , cantonJsonApiPortFileM :: Maybe FilePath
   }
 
@@ -368,7 +369,7 @@ cantonConfig CantonOptions{..} =
                      ] <>
                      [ "http-ledger-api" Aeson..= Aeson.object
                         [ "server" Aeson..= Aeson.object ( concat
-                            [ [ "port" Aeson..= port | Just port <- [cantonJsonApi] ]
+                            [ [ "port" Aeson..= cantonJsonApi ]
                             , [ "port-file" Aeson..= portFile | Just portFile <- [cantonJsonApiPortFileM] ]
                             ])
                         ]