Config cleanup (#7151)

maxtropets · web-flow · commit 763519a604af · 2025-07-30T14:18:53.000Z
diff --git a/doc/host_config_schema/cchost_config.json b/doc/host_config_schema/cchost_config.json
@@ -4,30 +4,6 @@
   "title": "CCF node configuration",
   "description": "JSON schema for configuration of a single CCF node",
   "properties": {
-    "enclave": {
-      "type": "object",
-      "properties": {
-        "file": {
-          "type": "string",
-          "description": "DEPRECATED: No longer required."
-        },
-        "platform": {
-          "type": "string",
-          "enum": ["SNP", "Virtual"],
-          "default": "SNP",
-          "description": "Trusted Execution Environment platform"
-        },
-        "type": {
-          "type": "string",
-          "enum": ["Release", "Debug", "Virtual"],
-          "default": "Release",
-          "description": "Type of enclave application (only if platform is SGX, now deprecated). \"Virtual\" is deprecated (use ``platform`` instead)"
-        }
-      },
-      "description": "This section includes configuration for the enclave application launched by this node",
-      "required": ["platform", "type"],
-      "additionalProperties": false
-    },
     "network": {
       "type": "object",
       "properties": {
@@ -751,7 +727,7 @@
       "description": "Historical queries cache soft limit (as size string)"
     }
   },
-  "required": ["enclave", "network", "command"],
+  "required": ["network", "command"],
   "additionalProperties": false,
   "$defs": {
     "RedirectionResolver": {
diff --git a/samples/config/join_config.json b/samples/config/join_config.json
@@ -1,9 +1,4 @@
 {
-  "enclave": {
-    "file": "libjs_generic.enclave.so.signed",
-    "platform": "SNP",
-    "type": "Release"
-  },
   "network": {
     "node_to_node_interface": { "bind_address": "127.0.0.1:8081" },
     "rpc_interfaces": {
diff --git a/samples/config/minimal_config.json b/samples/config/minimal_config.json
@@ -1,9 +1,4 @@
 {
-  "enclave": {
-    "file": "libjs_generic.enclave.so.signed",
-    "platform": "SNP",
-    "type": "Release"
-  },
   "network": {
     "node_to_node_interface": { "bind_address": "127.0.0.1:8081" },
     "rpc_interfaces": {
diff --git a/samples/config/minimal_config_redirects_role.json b/samples/config/minimal_config_redirects_role.json
@@ -1,9 +1,4 @@
 {
-  "enclave": {
-    "file": "libjs_generic.enclave.so.signed",
-    "platform": "SNP",
-    "type": "Release"
-  },
   "network": {
     "node_to_node_interface": { "bind_address": "127.0.0.1:8081" },
     "rpc_interfaces": {
diff --git a/samples/config/minimal_config_redirects_static.json b/samples/config/minimal_config_redirects_static.json
@@ -1,9 +1,4 @@
 {
-  "enclave": {
-    "file": "libjs_generic.enclave.so.signed",
-    "platform": "SNP",
-    "type": "Release"
-  },
   "network": {
     "node_to_node_interface": { "bind_address": "127.0.0.1:8081" },
     "rpc_interfaces": {
diff --git a/samples/config/recover_config.json b/samples/config/recover_config.json
@@ -1,9 +1,4 @@
 {
-  "enclave": {
-    "file": "libjs_generic.enclave.so.signed",
-    "platform": "SNP",
-    "type": "Release"
-  },
   "network": {
     "node_to_node_interface": { "bind_address": "127.0.0.1:8081" },
     "rpc_interfaces": {
diff --git a/samples/config/start_config.json b/samples/config/start_config.json
@@ -1,9 +1,4 @@
 {
-  "enclave": {
-    "file": "libjs_generic.enclave.so.signed",
-    "platform": "SNP",
-    "type": "Release"
-  },
   "network": {
     "node_to_node_interface": { "bind_address": "127.0.0.1:8081" },
     "rpc_interfaces": {
diff --git a/samples/config/start_config_aci_sev_snp.json b/samples/config/start_config_aci_sev_snp.json
@@ -1,9 +1,4 @@
 {
-  "enclave": {
-    "file": "libjs_generic.so",
-    "platform": "SNP",
-    "type": "Release"
-  },
   "network": {
     "node_to_node_interface": {
       "bind_address": "127.0.0.1:8081"
diff --git a/samples/config/start_config_aks_sev_snp.json b/samples/config/start_config_aks_sev_snp.json
@@ -1,9 +1,4 @@
 {
-  "enclave": {
-    "file": "libjs_generic.so",
-    "platform": "SNP",
-    "type": "Release"
-  },
   "network": {
     "node_to_node_interface": {
       "bind_address": "127.0.0.1:8081"
diff --git a/samples/config/start_config_amd_sev_snp.json b/samples/config/start_config_amd_sev_snp.json
@@ -1,9 +1,4 @@
 {
-  "enclave": {
-    "file": "libjs_generic.so",
-    "platform": "SNP",
-    "type": "Release"
-  },
   "network": {
     "node_to_node_interface": {
       "bind_address": "127.0.0.1:8081"
diff --git a/src/host/configuration.h b/src/host/configuration.h
@@ -12,18 +12,6 @@
 
 namespace host
 {
-  enum class EnclaveType
-  {
-    RELEASE,
-    DEBUG,
-    VIRTUAL // Deprecated (use ccf::pal::Platform instead)
-  };
-  DECLARE_JSON_ENUM(
-    EnclaveType,
-    {{EnclaveType::RELEASE, "Release"},
-     {EnclaveType::DEBUG, "Debug"},
-     {EnclaveType::VIRTUAL, "Virtual"}});
-
   enum class LogFormat
   {
     TEXT,
@@ -52,17 +40,6 @@ namespace host
 
   struct CCHostConfig : public ccf::CCFConfig
   {
-    struct Enclave
-    {
-      std::string file;
-      EnclaveType type;
-      ccf::pal::Platform platform;
-
-      bool operator==(const Enclave&) const = default;
-    };
-    Enclave enclave = {};
-
-    // Other
     ccf::ds::TimeString tick_interval = {"10ms"};
     ccf::ds::TimeString slow_io_logging_threshold = {"10ms"};
     std::optional<std::string> node_client_interface = std::nullopt;
@@ -148,10 +125,6 @@ namespace host
     Command command = {};
   };
 
-  DECLARE_JSON_TYPE_WITH_OPTIONAL_FIELDS(CCHostConfig::Enclave);
-  DECLARE_JSON_REQUIRED_FIELDS(CCHostConfig::Enclave, type, platform);
-  DECLARE_JSON_OPTIONAL_FIELDS(CCHostConfig::Enclave, file);
-
   DECLARE_JSON_TYPE_WITH_OPTIONAL_FIELDS(CCHostConfig::OutputFiles);
   DECLARE_JSON_REQUIRED_FIELDS(CCHostConfig::OutputFiles);
   DECLARE_JSON_OPTIONAL_FIELDS(
@@ -203,7 +176,7 @@ namespace host
     CCHostConfig::Command, service_certificate_file, start, join, recover);
 
   DECLARE_JSON_TYPE_WITH_BASE_AND_OPTIONAL_FIELDS(CCHostConfig, ccf::CCFConfig);
-  DECLARE_JSON_REQUIRED_FIELDS(CCHostConfig, enclave, command);
+  DECLARE_JSON_REQUIRED_FIELDS(CCHostConfig, command);
   DECLARE_JSON_OPTIONAL_FIELDS(
     CCHostConfig,
     tick_interval,
diff --git a/tests/config.jinja b/tests/config.jinja
@@ -1,8 +1,4 @@
 {
-  "enclave": {
-    "type": "{{ enclave_type }}",
-    "platform": "{{ enclave_platform }}"
-  },
   "network": {
     "node_to_node_interface": { "bind_address": "{{ node_address }}", "published_address": "{{ published_node_address }}" },
     "rpc_interfaces": {{ rpc_interfaces|tojson }}
diff --git a/tests/infra/network.py b/tests/infra/network.py
@@ -165,8 +165,6 @@ class Network:
     KEY_GEN = "keygenerator.sh"
     SHARE_SCRIPT = "submit_recovery_share.sh"
     node_args_to_forward = [
-        "enclave_type",
-        "enclave_platform",
         "log_level",
         "sig_tx_interval",
         "sig_ms_interval",
diff --git a/tests/infra/node.py b/tests/infra/node.py
@@ -183,7 +183,6 @@ def __eq__(self, other):
     def start(
         self,
         lib_name,
-        enclave_type,
         workspace,
         label,
         common_dir,
@@ -193,7 +192,6 @@ def start(
         self._setup(
             infra.remote.StartType.start,
             lib_name,
-            enclave_type,
             workspace,
             label,
             common_dir,
@@ -231,7 +229,6 @@ def save_sealed_ledger_secret(self, destination=None):
     def join(
         self,
         lib_name,
-        enclave_type,
         workspace,
         label,
         common_dir,
@@ -240,7 +237,6 @@ def join(
         self._setup(
             infra.remote.StartType.join,
             lib_name,
-            enclave_type,
             workspace,
             label,
             common_dir,
@@ -251,7 +247,6 @@ def join(
     def prepare_join(
         self,
         lib_name,
-        enclave_type,
         workspace,
         label,
         common_dir,
@@ -260,7 +255,6 @@ def prepare_join(
         self._setup(
             infra.remote.StartType.join,
             lib_name,
-            enclave_type,
             workspace,
             label,
             common_dir,
@@ -270,11 +264,10 @@ def prepare_join(
     def complete_join(self):
         self._start()
 
-    def recover(self, lib_name, enclave_type, workspace, label, common_dir, **kwargs):
+    def recover(self, lib_name, workspace, label, common_dir, **kwargs):
         self._setup(
             infra.remote.StartType.recover,
             lib_name,
-            enclave_type,
             workspace,
             label,
             common_dir,
@@ -287,12 +280,10 @@ def _setup(
         self,
         start_type,
         lib_name,
-        enclave_type,
         workspace,
         label,
         common_dir,
         members_info=None,
-        enclave_platform="sgx",
         enable_local_sealing=False,
         previous_sealed_ledger_secret_location=None,
         **kwargs,
@@ -314,7 +305,6 @@ def _setup(
         self.common_dir = common_dir
         members_info = members_info or []
         self.label = label
-        self.enclave_platform = enclave_platform
         self.enable_local_sealing = enable_local_sealing
         if enable_local_sealing:
             self.sealed_ledger_secret_location = "sealed_ledger_secret"
@@ -328,7 +318,6 @@ def _setup(
         self.remote = infra.remote.CCFRemote(
             start_type,
             lib_path,
-            enclave_type,
             workspace,
             common_dir,
             binary_dir=self.binary_dir,
@@ -344,7 +333,6 @@ def _setup(
             version=self.version,
             major_version=self.major_version,
             node_data_json_file=self.initial_node_data_json_file,
-            enclave_platform=enclave_platform,
             enable_local_sealing=enable_local_sealing,
             sealed_ledger_secret_location=self.sealed_ledger_secret_location,
             previous_sealed_ledger_secret_location=previous_sealed_ledger_secret_location,
diff --git a/tests/infra/remote.py b/tests/infra/remote.py
@@ -273,7 +273,6 @@ def __init__(
         self,
         start_type,
         enclave_file,
-        enclave_type,
         workspace,
         common_dir,
         label="",
@@ -302,7 +301,6 @@ def __init__(
         service_data_json_file=None,
         snp_endorsements_servers=None,
         node_pid_file="node.pid",
-        enclave_platform="sgx",
         snp_uvm_security_context_dir=None,
         set_snp_uvm_security_context_dir_envvar=True,
         ignore_first_sigterm=False,
@@ -359,13 +357,7 @@ def __init__(
         self.node_address_file = f"{local_node_id}.node_address"
         self.rpc_addresses_file = f"{local_node_id}.rpc_addresses"
 
-        # 1.x releases have a separate cchost.virtual binary for virtual enclaves
-        if enclave_type == "virtual" and (
-            major_version is not None and major_version <= 1
-        ):
-            self.BIN = "cchost.virtual"
         self.BIN = infra.path.build_bin_path(self.BIN, binary_dir=binary_dir)
-
         # 7.x releases combined binaries and removed the separate cchost entry-point
         if major_version is None or major_version >= 7:
             self.BIN = enclave_file
@@ -494,18 +486,8 @@ def __init__(
                     previous_sealed_ledger_secret_location
                 )
 
-            enclave_platform = infra.platform_detection.get_platform()
-            enclave_platform = (
-                "Virtual"
-                if enclave_platform.lower() == "virtual"
-                else enclave_platform.upper()
-            )
-
             output = t.render(
                 start_type=start_type.name.title(),
-                enclave_file=self.enclave_file,  # Ignored by current jinja, but passed for LTS compat
-                enclave_type="Release",
-                enclave_platform=enclave_platform,  # Ignored, but paased for LTS compat
                 rpc_interfaces=infra.interfaces.HostSpec.to_json(
                     LocalRemote.make_host(host)
                 ),
@@ -554,6 +536,20 @@ def __init__(
                 # Parse and re-emit output to produce consistently formatted (indented) JSON.
                 # This will also ensure the render produced valid JSON
                 j = json.loads(output)
+
+                # Enclave config removed from 7.x onwards.
+                if major_version is not None and major_version < 7:
+                    enclave_platform = infra.platform_detection.get_platform()
+                    enclave_platform = (
+                        "Virtual"
+                        if enclave_platform.lower() == "virtual"
+                        else enclave_platform.upper()
+                    )
+                    j["enclave"] = {
+                        "type": "Release",
+                        "platform": enclave_platform,
+                    }
+
                 json.dump(j, f, indent=2)
 
         exe_files += [self.BIN, enclave_file] + self.DEPS
@@ -589,14 +585,11 @@ def __init__(
                 "--log-level",
                 log_level,
             ]
-        else:
-            if v >= Version("4.0.5"):
-                # Avoid passing too-low level to debug SGX nodes
-                if not (enclave_type == "debug" and enclave_platform == "sgx"):
-                    cmd += [
-                        "--enclave-log-level",
-                        log_level,
-                    ]
+        elif v >= Version("4.0.5"):
+            cmd += [
+                "--enclave-log-level",
+                log_level,
+            ]
 
         if v is not None and v >= Version("4.0.11") and v <= Version("7.0.0-dev1"):
             cmd += [
