Merge branch 'master' into ens/refactor-load-extension-manifests

src/dfx-core/Cargo.toml

@@ -42,7 +42,10 @@ tar.workspace = true
 tempfile.workspace = true
 thiserror.workspace = true
 tiny-bip39 = "1.0.0"
-time.workspace = true
+time = { workspace = true, features = [
+    "serde",
+    "serde-human-readable",
+] }
 url.workspace = true
 
 [dev-dependencies]

src/dfx-core/src/config/model/local_server_descriptor.rs

@@ -12,9 +12,17 @@ use crate::error::network_config::{
 use crate::error::structured_file::StructuredFileError;
 use crate::json::load_json_file;
 use crate::json::structure::SerdeVec;
+use serde::{Deserialize, Serialize};
 use slog::{debug, info, Logger};
 use std::net::SocketAddr;
 use std::path::{Path, PathBuf};
+use time::OffsetDateTime;
+
+#[derive(Deserialize, Serialize, Debug)]
+pub struct NetworkMetadata {
+    pub created: OffsetDateTime,
+    pub settings_digest: String,
+}
 
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub enum LocalNetworkScopeDescriptor {
@@ -173,6 +181,15 @@ impl LocalServerDescriptor {
         path.exists().then(|| load_json_file(&path)).transpose()
     }
 
+    pub fn load_settings_digest(&mut self) -> Result<(), StructuredFileError> {
+        if self.settings_digest.is_none() {
+            let network_id_path = self.data_directory.join("network-id");
+            let network_metadata: NetworkMetadata = load_json_file(&network_id_path)?;
+            self.settings_digest = Some(network_metadata.settings_digest);
+        }
+        Ok(())
+    }
+
     pub fn settings_digest(&self) -> &str {
         self.settings_digest
             .as_ref()

src/dfx/src/lib/network/id.rs

@@ -1,16 +1,9 @@
 use crate::lib::error::DfxResult;
 use anyhow::Context;
-use dfx_core::config::model::local_server_descriptor::LocalServerDescriptor;
+use dfx_core::config::model::local_server_descriptor::{LocalServerDescriptor, NetworkMetadata};
 use fn_error_context::context;
-use serde::{Deserialize, Serialize};
 use time::OffsetDateTime;
 
-#[derive(Deserialize, Serialize, Debug)]
-struct NetworkMetadata {
-    created: OffsetDateTime,
-    settings_digest: String,
-}
-
 #[context("Failed write network id to {}.", local_server_descriptor.network_id_path().display())]
 pub fn write_network_id(local_server_descriptor: &LocalServerDescriptor) -> DfxResult {
     let settings_digest = local_server_descriptor.settings_digest().to_string();