Merge branch 'master' into release-0.30.2

Author: lwshang

.github/workflows/audit.yml

@@ -34,3 +34,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: actions-rust-lang/audit@v1
+        with:
+          # TODO: remove this once the fix is backported to rkyv v0.7
+          # https://github.com/rkyv/rkyv/issues/644
+          ignore: RUSTSEC-2026-0001

CHANGELOG.md

@@ -2,20 +2,22 @@
 
 # UNRELEASED
 
-### Frontend canister
-
-Sets the `ic_env` cookie for all HTML files only if the canister environment changed in the `commit_batch` method.
-
-- Module hash: c156183e6a6f5c3c71ecde5f38a7280b770ff172b4827127ef03b89b764065ba
-- https://github.com/dfinity/sdk/pull/4446
-
 # 0.30.2
 
 ### Improve frontend canister sync logic
 
 Previously, committing frontend canister changes happened in multiple batches defined by simple heuristics that would likely not exceed the ingress message size limit.
 Now, the ingress message size limit is respected more explicitly, and also a limit of total content size per batch since all content in the batch newly gets hashed in the canister.
 
+### Frontend canister
+
+Sets the `ic_env` cookie for all HTML files only if the canister environment changed in the `commit_batch` method.
+
+Use canister self-calls to avoid hitting instruction limits during `commit_batch`, `compute_evidence`, and `compute_state_hash`.
+
+- Module hash: 63d122d0149a29f4e48603efdd7d2bce656a6a83bac1e3207897c68e8e225bb6
+- https://github.com/dfinity/sdk/pull/4450
+
 ## Dependencies
 
 ### Motoko

Cargo.lock

@@ -27,7 +27,7 @@ candid = "0.10.18"
 candid_parser = "0.2.4"
 dfx-core = { path = "src/dfx-core", version = "0.2.0" }
 ic-agent = "0.44.2"
-ic-asset = { path = "src/canisters/frontend/ic-asset", version = "0.25.0" }
+ic-asset = { path = "src/canisters/frontend/ic-asset", version = "0.26.0" }
 ic-cdk = "0.19.0-beta.2"
 ic-identity-hsm = "0.44.2"
 ic-utils = "0.44.2"
@@ -45,6 +45,7 @@ clap = "4.5"
 clap_complete = "4.5"
 dialoguer = "0.11.0"
 directories-next = "2.0.0"
+dunce = "1.0"
 flate2 = { version = "1.0.11" }
 futures = "0.3.21"
 handlebars = "4.3.3"
@@ -64,9 +65,7 @@ mime_guess = "2.0.4"
 num-traits = "0.2.14"
 pem = "1.0.2"
 proptest = "1.0.0"
-reqwest = { version = "0.12.4", default-features = false, features = [
-    "rustls-tls",
-] }
+reqwest = { version = "0.12.4", default-features = false, features = ["rustls-tls"] }
 ring = { version = "0.17.14", features = ["std"] }
 schemars = "0.8"
 sec1 = "0.3.0"

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ic-asset"
-version = "0.25.0" # sync with icx-asset
+version = "0.26.0" # sync with icx-asset
 authors.workspace = true
 edition.workspace = true
 repository.workspace = true
@@ -19,7 +19,7 @@ backoff.workspace = true
 brotli = "6.0.0"
 candid = { workspace = true }
 derivative = "2.2.0"
-dfx-core.workspace = true
+dunce.workspace = true
 flate2.workspace = true
 futures.workspace = true
 futures-intrusive = "0.4.0"

src/canisters/frontend/ic-asset/Cargo.toml

@@ -176,7 +176,7 @@ impl AssetSourceDirectoryConfiguration {
         &mut self,
         canonical_path: &Path,
     ) -> Result<AssetConfig, GetAssetConfigError> {
-        let parent_dir = dfx_core::fs::parent(canonical_path)?;
+        let parent_dir = crate::fs::parent(canonical_path)?;
         Ok(self
             .config_map
             .get(&parent_dir)
@@ -243,7 +243,7 @@ impl AssetConfigTreeNode {
         };
         let mut rules = vec![];
         if let Some(config_path) = config_path {
-            let content = dfx_core::fs::read_to_string(&config_path)?;
+            let content = crate::fs::read_to_string(&config_path)?;
 
             let interim_rules: Vec<rule_utils::InterimAssetConfigRule> = json5::from_str(&content)
                 .map_err(|e| MalformedAssetConfigFile(config_path.to_path_buf(), e))?;
@@ -264,7 +264,7 @@ impl AssetConfigTreeNode {
         };
 
         configs.insert(dir.to_path_buf(), parent_ref.clone());
-        for f in dfx_core::fs::read_dir(dir)?
+        for f in crate::fs::read_dir(dir)?
             .filter_map(|x| x.ok())
             .filter(|x| x.file_type().map_or_else(|_e| false, |ft| ft.is_dir()))
         {

src/canisters/frontend/ic-asset/src/asset/config.rs

@@ -1,6 +1,6 @@
 use crate::asset::content_encoder::ContentEncoder;
+use crate::error::fs::ReadFileError;
 use brotli::CompressorWriter;
-use dfx_core::error::fs::ReadFileError;
 use flate2::Compression;
 use flate2::write::GzEncoder;
 use mime::Mime;
@@ -16,7 +16,7 @@ pub(crate) struct Content {
 
 impl Content {
     pub fn load(path: &Path) -> Result<Content, ReadFileError> {
-        let data = dfx_core::fs::read(path)?;
+        let data = crate::fs::read(path)?;
 
         // todo: check contents if mime_guess fails https://github.com/dfinity/sdk/issues/1594
         let media_type = mime_guess::from_path(path)

src/canisters/frontend/ic-asset/src/asset/content.rs

@@ -159,15 +159,6 @@ impl<'agent> ChunkUploader<'agent> {
         self.chunks.load(Ordering::SeqCst)
     }
 
-    /// Get total size of chunks by their canister chunk IDs
-    pub(crate) async fn get_canister_chunk_total_size(&self, canister_chunk_ids: &[Nat]) -> usize {
-        let sizes = self.canister_chunk_sizes.lock().await;
-        canister_chunk_ids
-            .iter()
-            .filter_map(|id| sizes.get(id))
-            .sum()
-    }
-
     /// Call only after `finalize_upload` has completed.
     pub(crate) async fn uploader_ids_to_canister_chunk_ids(
         &self,
@@ -448,7 +439,7 @@ async fn make_project_asset(
     logger: &Logger,
     progress: Option<&dyn AssetSyncProgressRenderer>,
 ) -> Result<ProjectAsset, CreateProjectAssetError> {
-    let file_size = dfx_core::fs::metadata(&asset_descriptor.source)?.len();
+    let file_size = crate::fs::metadata(&asset_descriptor.source)?.len();
     let permits = (file_size.div_ceil(1000000) as usize).clamp(1, MAX_COST_SINGLE_FILE_MB);
     let _releaser = semaphores.file.acquire(permits).await;
     let content = Content::load(&asset_descriptor.source)

src/canisters/frontend/ic-asset/src/batch_upload/plumbing.rs

@@ -1,5 +1,5 @@
 use crate::error::create_encoding::CreateEncodingError;
-use dfx_core::error::fs::{ReadFileError, ReadMetadataError};
+use crate::error::fs::{ReadFileError, ReadMetadataError};
 use thiserror::Error;
 
 /// Errors related to creating an asset found in the project in the asset canister.

src/canisters/frontend/ic-asset/src/error/create_project_asset.rs

@@ -0,0 +1,133 @@
+use std::path::PathBuf;
+use thiserror::Error;
+
+#[derive(Error, Debug)]
+#[error("failed to canonicalize '{path}'")]
+pub struct CanonicalizePathError {
+    pub path: PathBuf,
+    pub source: std::io::Error,
+}
+
+#[derive(Error, Debug)]
+#[error("failed to copy {from} to {to}")]
+pub struct CopyFileError {
+    pub from: PathBuf,
+    pub to: PathBuf,
+    pub source: std::io::Error,
+}
+
+#[derive(Error, Debug)]
+#[error("failed to create directory {path} and parents")]
+pub struct CreateDirAllError {
+    pub path: PathBuf,
+    pub source: std::io::Error,
+}
+
+#[derive(Error, Debug)]
+pub enum EnsureDirExistsError {
+    #[error(transparent)]
+    CreateDirAll(#[from] CreateDirAllError),
+
+    #[error("path {0} is not a directory")]
+    NotADirectory(PathBuf),
+}
+
+#[derive(Error, Debug)]
+pub enum EnsureParentDirExistsError {
+    #[error(transparent)]
+    EnsureDirExists(#[from] EnsureDirExistsError),
+
+    #[error(transparent)]
+    NoParentPath(#[from] NoParentPathError),
+}
+
+#[derive(Error, Debug)]
+#[error("failed to determine parent path for '{0}'")]
+pub struct NoParentPathError(pub PathBuf);
+
+#[derive(Error, Debug)]
+#[error("failed to read directory {path}")]
+pub struct ReadDirError {
+    pub path: PathBuf,
+    pub source: std::io::Error,
+}
+
+#[derive(Error, Debug)]
+#[error("failed to read from {path}")]
+pub struct ReadFileError {
+    pub path: PathBuf,
+    pub source: std::io::Error,
+}
+
+#[derive(Error, Debug)]
+#[error("failed to remove directory {path}")]
+pub struct RemoveDirectoryError {
+    pub path: PathBuf,
+    pub source: std::io::Error,
+}
+
+#[derive(Error, Debug)]
+#[error("failed to write to {path}")]
+pub struct WriteFileError {
+    pub path: PathBuf,
+    pub source: std::io::Error,
+}
+
+#[derive(Error, Debug)]
+#[error("failed to read metadata of {path}")]
+pub struct ReadMetadataError {
+    pub path: PathBuf,
+    pub source: std::io::Error,
+}
+
+#[derive(Error, Debug)]
+#[error("failed to read permissions of {path}")]
+pub struct ReadPermissionsError {
+    pub path: PathBuf,
+    pub source: std::io::Error,
+}
+
+#[derive(Error, Debug)]
+#[error("failed to read {path} as string")]
+pub struct ReadToStringError {
+    pub path: PathBuf,
+    pub source: std::io::Error,
+}
+
+#[derive(Error, Debug)]
+#[error("failed to remove directory {path} and its contents")]
+pub struct RemoveDirectoryAndContentsError {
+    pub path: PathBuf,
+    pub source: std::io::Error,
+}
+
+#[derive(Error, Debug)]
+#[error("failed to remove file {path}")]
+pub struct RemoveFileError {
+    pub path: PathBuf,
+    pub source: std::io::Error,
+}
+
+#[derive(Error, Debug)]
+#[error("Failed to rename {from} to {to}")]
+pub struct RenameError {
+    pub from: PathBuf,
+    pub to: PathBuf,
+    pub source: std::io::Error,
+}
+
+#[derive(Error, Debug)]
+#[error("failed to set permissions of {path}")]
+pub struct SetPermissionsError {
+    pub path: PathBuf,
+    pub source: std::io::Error,
+}
+
+#[derive(Error, Debug)]
+pub enum SetPermissionsReadWriteError {
+    #[error(transparent)]
+    ReadPermissions(#[from] ReadPermissionsError),
+
+    #[error(transparent)]
+    SetPermissions(#[from] SetPermissionsError),
+}