[release/5.x] Cherry picks: Pin typescript to 5.8.3 #7157, and Set constitution during recovery (#7155) (#7159)

Co-authored-by: cjen1-msft <chrisjensen@microsoft.com>

Author: eddyashton

CHANGELOG.md

@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [5.0.20]
+
+[5.0.20]: https://github.com/microsoft/CCF/releases/tag/5.0.20
+
+### Added
+
+- Allow changing the constitution during disaster recovery via the `command.recover.constitution_files` entry in cchost. (#7155)
+
 ## [5.0.19]
 
 [5.0.19]: https://github.com/microsoft/CCF/releases/tag/5.0.19

doc/host_config_schema/cchost_config.json

@@ -414,6 +414,13 @@
                   "previous_service_identity_file": {
                     "type": "string",
                     "description": "Path to the previous service certificate (PEM) file"
+                  },
+                  "constitution_files": {
+                    "type": "array",
+                    "items": {
+                      "type": "string"
+                    },
+                    "description": "List of constitution files. These typically include actions.js, validate.js, resolve.js and apply.js"
                   }
                 },
                 "required": ["previous_service_identity_file"],

include/ccf/node/startup_config.h

@@ -114,6 +114,7 @@ struct StartupConfig : CCFConfig
   {
     std::optional<std::vector<uint8_t>> previous_service_identity =
       std::nullopt;
+    std::optional<std::string> constitution = std::nullopt;
   };
   Recover recover = {};
 };

js/ccf-app/package.json

@@ -30,6 +30,6 @@
     "node-forge": "^1.2.0",
     "ts-node": "^10.4.0",
     "typedoc": "^0.27.0",
-    "typescript": "^5.7.2"
+    "typescript": "^5.8.3"
   }
 }

src/common/configuration.h

@@ -5,6 +5,7 @@
 
 #include "ccf/crypto/curve.h"
 #include "ccf/crypto/pem.h"
+#include "ccf/ds/json.h"
 #include "ccf/ds/logger.h"
 #include "ccf/ds/unit_strings.h"
 #include "ccf/node/startup_config.h"
@@ -107,8 +108,9 @@ DECLARE_JSON_REQUIRED_FIELDS(
   service_cert,
   follow_redirect);
 
-DECLARE_JSON_TYPE(StartupConfig::Recover);
+DECLARE_JSON_TYPE_WITH_OPTIONAL_FIELDS(StartupConfig::Recover);
 DECLARE_JSON_REQUIRED_FIELDS(StartupConfig::Recover, previous_service_identity);
+DECLARE_JSON_OPTIONAL_FIELDS(StartupConfig::Recover, constitution);
 
 DECLARE_JSON_TYPE_WITH_BASE(StartupConfig, CCFConfig);
 DECLARE_JSON_REQUIRED_FIELDS(

src/host/configuration.h

@@ -163,6 +163,7 @@ namespace host
       {
         size_t initial_service_certificate_validity_days = 1;
         std::string previous_service_identity_file;
+        std::vector<std::string> constitution_files = {};
         bool operator==(const Recover&) const = default;
       };
       Recover recover = {};
@@ -221,7 +222,8 @@ namespace host
   DECLARE_JSON_OPTIONAL_FIELDS(
     CCHostConfig::Command::Recover,
     initial_service_certificate_validity_days,
-    previous_service_identity_file);
+    previous_service_identity_file,
+    constitution_files);
 
   DECLARE_JSON_TYPE_WITH_OPTIONAL_FIELDS(CCHostConfig::Command);
   DECLARE_JSON_REQUIRED_FIELDS(CCHostConfig::Command, type);

src/host/main.cpp

@@ -675,6 +675,26 @@ int main(int argc, char** argv)
       }
       LOG_INFO_FMT("Reading previous service identity from {}", idf);
       startup_config.recover.previous_service_identity = files::slurp(idf);
+
+      if (!config.command.recover.constitution_files.empty())
+      {
+        LOG_INFO_FMT(
+          "Reading [{}] constitution file(s) for recovery",
+          fmt::join(config.command.recover.constitution_files, ", "));
+        startup_config.recover.constitution = "";
+        for (const auto& constitution_path :
+             config.command.recover.constitution_files)
+        {
+          // Separate with single newlines
+          if (!startup_config.recover.constitution->empty())
+          {
+            startup_config.recover.constitution.value() += '\n';
+          }
+
+          startup_config.recover.constitution.value() +=
+            files::slurp_string(constitution_path);
+        }
+      }
     }
     else
     {

src/node/node_state.h

@@ -359,6 +359,7 @@ namespace ccf
       {
         case StartType::Start:
         {
+          LOG_INFO_FMT("Creating boot request");
           create_and_send_boot_request(
             aft::starting_view_change, true /* Create new consortium */);
           return;
@@ -1904,6 +1905,16 @@ namespace ccf
       {
         create_params.genesis_info = config.start;
       }
+      create_params.recovery_constitution = config.recover.constitution;
+      LOG_INFO_FMT("serialise_create_request, set recovery_constitution to:");
+      if (create_params.recovery_constitution.has_value())
+      {
+        LOG_INFO_FMT("{}", create_params.recovery_constitution.value());
+      }
+      else
+      {
+        LOG_INFO_FMT("No recovery constitution provided");
+      }
 
       create_params.node_id = self;
       create_params.certificate_signing_request = node_sign_kp->create_csr(

src/node/rpc/node_call_types.h

@@ -74,6 +74,8 @@ namespace ccf
 
       // Only set on genesis transaction, but not on recovery
       std::optional<StartupConfig::Start> genesis_info = std::nullopt;
+      // Constitution to set on recovery
+      std::optional<std::string> recovery_constitution = std::nullopt;
     };
   };
 

src/node/rpc/node_frontend.h

@@ -1540,6 +1540,11 @@ namespace ccf
         }
         else
         {
+          if (in.recovery_constitution.has_value())
+          {
+            InternalTablesAccess::set_constitution(
+              ctx.tx, in.recovery_constitution.value());
+          }
           // On recovery, force a new ledger chunk
           auto tx_ = static_cast<ccf::kv::CommittableTx*>(&ctx.tx);
           if (tx_ == nullptr)