diff --git a/CHANGELOG.md b/CHANGELOG.md index 9841c900d0..3fc971af41 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,16 +4,20 @@ ## Dependencies -### Motoko - -Updated Motoko to [1.2.0](https://github.com/dfinity/motoko/releases/tag/1.2.0) - ## Fixes ### fix: correct `dfx sns` example commands in documentation Fixed incorrect commands `dfx sns config create` and `dfx sns config validate` in the `dfx sns` CLI reference examples. The correct commands are `dfx sns create` and `dfx sns validate`. +### Motoko + +Updated Motoko to [1.2.0](https://github.com/dfinity/motoko/releases/tag/1.2.0) + +### Replica + +Updated replica to commit 142182f2ec4d916fa32e32da59239c4eb0c87bd3. + # 0.31.0 ### chore!: `dfx generate` now imports `@icp-sdk/core` instead of `@dfinity/` packages diff --git a/Cargo.lock b/Cargo.lock index b6756495b6..18b76c0a8b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -119,7 +119,7 @@ checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" dependencies = [ "cfg-if", "cipher", - "cpufeatures", + "cpufeatures 0.2.17", ] [[package]] @@ -403,6 +403,28 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" +[[package]] +name = "aws-lc-rs" +version = "1.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94bffc006df10ac2a68c83692d734a465f8ee6c5b384d8545a636f81d858f4bf" +dependencies = [ + "aws-lc-sys", + "zeroize", +] + +[[package]] +name = "aws-lc-sys" +version = "0.38.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4321e568ed89bb5a7d291a7f37997c2c0df89809d7b6d12062c81ddb54aa782e" +dependencies = [ + "cc", + "cmake", + "dunce", + "fs_extra", +] + [[package]] name = "backoff" version = "0.4.0" @@ -737,7 +759,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9718806c4a2fe9e8a56fd736f97b340dd10ed1be8ed733ed50449f351dc33cae" dependencies = [ "ahash 0.8.12", - "cached_proc_macro", + "cached_proc_macro 0.23.0", "cached_proc_macro_types", "hashbrown 0.14.5", "once_cell", @@ -752,6 +774,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "801927ee168e17809ab8901d9f01f700cd7d8d6a6527997fee44e4b0327a253c" dependencies = [ "ahash 0.8.12", + "cached_proc_macro 0.25.0", + "cached_proc_macro_types", "hashbrown 0.15.5", "once_cell", "thiserror 2.0.18", @@ -770,6 +794,18 @@ dependencies = [ "syn 2.0.114", ] +[[package]] +name = "cached_proc_macro" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9225bdcf4e4a9a4c08bf16607908eb2fbf746828d5e0b5e019726dbf6571f201" +dependencies = [ + "darling 0.20.11", + "proc-macro2", + "quote", + "syn 2.0.114", +] + [[package]] name = "cached_proc_macro_types" version = "0.1.1" @@ -787,9 +823,9 @@ dependencies = [ [[package]] name = "candid" -version = "0.10.21" +version = "0.10.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e49a6e53730e2d41f6fc3ad9ef4d9bc7ad738ddc6aed4ceb30a35a2cd63e9bcb" +checksum = "601b519700ec333a2a2c7eb3e8e1eca89177055e3e1fb24ca42cbbb025986696" dependencies = [ "anyhow", "binread", @@ -810,9 +846,9 @@ dependencies = [ [[package]] name = "candid_derive" -version = "0.10.21" +version = "0.10.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab75e3283c7912bb2986dd7033a87e4e5f3f472158816308a04d40f5d697099c" +checksum = "f195a40cd3d199191fc8b534165fadd78c08a1f9666222addaf9f58593002a73" dependencies = [ "lazy_static", "proc-macro2", @@ -903,6 +939,12 @@ dependencies = [ "shlex", ] +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + [[package]] name = "cfg-if" version = "1.0.4" @@ -915,6 +957,17 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" +[[package]] +name = "chacha20" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f8d983286843e49675a4b7a2d174efe136dc93a18d69130dd18198a6c167601" +dependencies = [ + "cfg-if", + "cpufeatures 0.3.0", + "rand_core 0.10.0", +] + [[package]] name = "chrono" version = "0.4.43" @@ -1025,7 +1078,7 @@ checksum = "af491d569909a7e4dee0ad7db7f5341fef5c614d5b8ec8cf765732aba3cff681" dependencies = [ "serde", "termcolor", - "unicode-width 0.2.2", + "unicode-width 0.1.14", ] [[package]] @@ -1044,6 +1097,16 @@ dependencies = [ "windows-sys 0.59.0", ] +[[package]] +name = "combine" +version = "4.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" +dependencies = [ + "bytes", + "memchr", +] + [[package]] name = "comparable" version = "0.5.6" @@ -1177,6 +1240,15 @@ dependencies = [ "libc", ] +[[package]] +name = "cpufeatures" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b2a41393f66f16b0823bb79094d54ac5fbd34ab292ddafb9a0456ac9f87d201" +dependencies = [ + "libc", +] + [[package]] name = "crc32fast" version = "1.5.0" @@ -1310,7 +1382,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" dependencies = [ "cfg-if", - "cpufeatures", + "cpufeatures 0.2.17", "curve25519-dalek-derive", "digest 0.10.7", "fiat-crypto", @@ -1659,8 +1731,8 @@ dependencies = [ "ic-asset", "ic-cdk", "ic-identity-hsm", - "ic-management-canister-types", - "ic-utils 0.45.0", + "ic-management-canister-types 0.7.1", + "ic-utils 0.46.0", "ic-wasm", "icrc-ledger-types", "idl2json", @@ -1683,7 +1755,7 @@ dependencies = [ "proptest", "rand 0.8.5", "regex", - "reqwest", + "reqwest 0.13.2", "ring", "rust_decimal", "rustls-webpki 0.101.7", @@ -1737,13 +1809,13 @@ dependencies = [ "humantime-serde", "ic-agent", "ic-identity-hsm", - "ic-utils 0.45.0", + "ic-utils 0.46.0", "itertools 0.10.5", "k256 0.11.6", "keyring", "lazy_static", "proptest", - "reqwest", + "reqwest 0.13.2", "ring", "schemars", "sec1 0.3.0", @@ -2050,6 +2122,15 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0" +[[package]] +name = "encoding_rs" +version = "0.8.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" +dependencies = [ + "cfg-if", +] + [[package]] name = "env_logger" version = "0.10.2" @@ -2271,6 +2352,12 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "fs_extra" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" + [[package]] name = "fsio" version = "0.4.1" @@ -2428,11 +2515,25 @@ dependencies = [ "cfg-if", "js-sys", "libc", - "r-efi", + "r-efi 5.3.0", "wasip2", "wasm-bindgen", ] +[[package]] +name = "getrandom" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0de51e6874e94e7bf76d726fc5d13ba782deca734ff60d5bb2fb2607c7406555" +dependencies = [ + "cfg-if", + "libc", + "r-efi 6.0.0", + "rand_core 0.10.0", + "wasip2", + "wasip3", +] + [[package]] name = "ghash" version = "0.5.1" @@ -2864,9 +2965,11 @@ dependencies = [ "percent-encoding", "pin-project-lite", "socket2", + "system-configuration", "tokio", "tower-service", "tracing", + "windows-registry", ] [[package]] @@ -2895,9 +2998,9 @@ dependencies = [ [[package]] name = "ic-agent" -version = "0.45.0" +version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20a6173286a80fc478462fc45de42faf37a79b0109a489743aeffb3e4a2fc772" +checksum = "da4fb6055538a9f0ee634f0be865cafbe79e74b8addd1eeb05ba0b51d4e8271f" dependencies = [ "arc-swap", "async-channel 2.5.0", @@ -2908,7 +3011,6 @@ dependencies = [ "bytes", "cached 0.56.0", "candid", - "der 0.7.10", "ecdsa 0.16.9", "ed25519-consensus", "elliptic-curve 0.13.8", @@ -2919,16 +3021,16 @@ dependencies = [ "http-body-util", "ic-certification 3.1.0", "ic-ed25519", - "ic-transport-types 0.45.0", + "ic-transport-types 0.46.0", "ic-verify-bls-signature", "k256 0.13.4", "leb128", "p256", "pem 3.0.6", "pkcs8 0.10.2", - "rand 0.8.5", + "rand 0.10.0", "rangemap", - "reqwest", + "reqwest 0.13.2", "sec1 0.7.3", "serde", "serde_bytes", @@ -2945,7 +3047,7 @@ dependencies = [ [[package]] name = "ic-asset" -version = "0.27.0" +version = "0.28.0" dependencies = [ "backoff", "brotli", @@ -2958,7 +3060,7 @@ dependencies = [ "globset", "hex", "ic-agent", - "ic-utils 0.45.0", + "ic-utils 0.46.0", "itertools 0.10.5", "json5", "mime", @@ -3045,7 +3147,7 @@ dependencies = [ "ic-cdk-executor", "ic-cdk-macros", "ic-error-types 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "ic-management-canister-types", + "ic-management-canister-types 0.5.0", "ic0", "pin-project-lite", "serde", @@ -3296,9 +3398,9 @@ dependencies = [ [[package]] name = "ic-ed25519" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b73f85d01b7a3d538353050f1eda546f827ffe7f3ffa35f8e80faa8cff1da10" +checksum = "6ad3d86f2e35cb99ae7497b3e4fa92ad751a8e8978f0680d37b86dd51ef91714" dependencies = [ "curve25519-dalek", "ed25519-dalek", @@ -3402,9 +3504,9 @@ dependencies = [ [[package]] name = "ic-identity-hsm" -version = "0.45.0" +version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cadfa7095085405ceaadc8aa7714e313cb778d1b98292dbfe23cd087b345b35" +checksum = "b6753cf0b4b1c8abf9c900bd2dc233635a10f800fb12f27ffe39212d8d2458c7" dependencies = [ "hex", "ic-agent", @@ -3439,6 +3541,17 @@ dependencies = [ "serde_bytes", ] +[[package]] +name = "ic-management-canister-types" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51705516ed4d23f24e8d714a70fe9d7ec17106cfd830d5434a1b29f583ef70ee" +dependencies = [ + "candid", + "serde", + "serde_bytes", +] + [[package]] name = "ic-management-canister-types-private" version = "0.9.0" @@ -3547,9 +3660,9 @@ dependencies = [ [[package]] name = "ic-transport-types" -version = "0.40.1" +version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2e7706e55836e8104c98149ec0796d20d5213fef972ac01b544657d410f1883" +checksum = "4a775244756a5d97ff19b08071a946a4b4896904e35deb036bf215e80f2e703d" dependencies = [ "candid", "hex", @@ -3565,9 +3678,9 @@ dependencies = [ [[package]] name = "ic-transport-types" -version = "0.45.0" +version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a775244756a5d97ff19b08071a946a4b4896904e35deb036bf215e80f2e703d" +checksum = "2957ed6ce101b3b6c4aa65bbcf8e92afdec42758b58cb03c7df76c96db13d0c0" dependencies = [ "candid", "hex", @@ -3633,22 +3746,22 @@ dependencies = [ [[package]] name = "ic-utils" -version = "0.45.0" +version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30c22aaa2924df0321705dc01d408c8b75d1e1deb40b65defd2ff04008a720be" +checksum = "99534a857fd9999b9adfde82b2623bb9925997dc1813ec315bd3b4085911104a" dependencies = [ "async-trait", "candid", "futures-util", "ic-agent", - "ic-management-canister-types", + "ic-management-canister-types 0.7.1", "once_cell", "semver", "serde", "serde_bytes", "sha2 0.10.9", - "strum 0.27.2", - "strum_macros 0.27.2", + "strum 0.28.0", + "strum_macros 0.28.0", "thiserror 2.0.18", "time", ] @@ -3858,7 +3971,7 @@ dependencies = [ [[package]] name = "icx-asset" -version = "0.27.0" +version = "0.28.0" dependencies = [ "anstyle", "anyhow", @@ -3868,7 +3981,7 @@ dependencies = [ "humantime", "ic-agent", "ic-asset", - "ic-utils 0.45.0", + "ic-utils 0.46.0", "libflate 1.4.0", "num-traits", "pem 1.1.1", @@ -4063,6 +4176,28 @@ version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2" +[[package]] +name = "jni" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" +dependencies = [ + "cesu8", + "cfg-if", + "combine", + "jni-sys", + "log", + "thiserror 1.0.69", + "walkdir", + "windows-sys 0.45.0", +] + +[[package]] +name = "jni-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + [[package]] name = "jobserver" version = "0.1.34" @@ -4148,7 +4283,7 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb26cec98cce3a3d96cbb7bced3c4b16e3d13f27ec56dbd62cbc8f39cfb9d653" dependencies = [ - "cpufeatures", + "cpufeatures 0.2.17", ] [[package]] @@ -4211,6 +4346,12 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" +[[package]] +name = "leb128fmt" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2" + [[package]] name = "libc" version = "0.2.180" @@ -5112,8 +5253,8 @@ checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" [[package]] name = "pocket-ic" -version = "11.0.0" -source = "git+https://github.com/dfinity/ic?rev=b0a37d0119a5df1dad84e50dc8717b77978d8f04#b0a37d0119a5df1dad84e50dc8717b77978d8f04" +version = "12.0.0" +source = "git+https://github.com/dfinity/ic?rev=142182f2ec4d916fa32e32da59239c4eb0c87bd3#142182f2ec4d916fa32e32da59239c4eb0c87bd3" dependencies = [ "backoff", "base64 0.13.1", @@ -5121,13 +5262,12 @@ dependencies = [ "flate2", "hex", "ic-certification 3.1.0", - "ic-management-canister-types", - "ic-transport-types 0.40.1", - "reqwest", + "ic-management-canister-types 0.5.0", + "ic-transport-types 0.45.0", + "reqwest 0.12.28", "schemars", "semver", "serde", - "serde_bytes", "serde_cbor", "serde_json", "sha2 0.10.9", @@ -5150,7 +5290,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25" dependencies = [ "cfg-if", - "cpufeatures", + "cpufeatures 0.2.17", "opaque-debug", "universal-hash", ] @@ -5224,6 +5364,16 @@ dependencies = [ "yansi", ] +[[package]] +name = "prettyplease" +version = "0.2.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b" +dependencies = [ + "proc-macro2", + "syn 2.0.114", +] + [[package]] name = "primeorder" version = "0.13.6" @@ -5401,6 +5551,7 @@ version = "0.11.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1906b49b0c3bc04b5fe5d86a77925ae6524a19b816ae38ce1e426255f1d8a31" dependencies = [ + "aws-lc-rs", "bytes", "getrandom 0.3.4", "lru-slab", @@ -5445,6 +5596,12 @@ version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" +[[package]] +name = "r-efi" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf" + [[package]] name = "radium" version = "0.7.0" @@ -5472,6 +5629,17 @@ dependencies = [ "rand_core 0.9.5", ] +[[package]] +name = "rand" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc266eb313df6c5c09c1c7b1fbe2510961e5bcd3add930c1e31f7ed9da0feff8" +dependencies = [ + "chacha20", + "getrandom 0.4.2", + "rand_core 0.10.0", +] + [[package]] name = "rand_chacha" version = "0.3.1" @@ -5510,6 +5678,12 @@ dependencies = [ "getrandom 0.3.4", ] +[[package]] +name = "rand_core" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c8d0fd677905edcbeedbf2edb6494d676f0e98d54d5cf9bda0b061cb8fb8aba" + [[package]] name = "rand_xorshift" version = "0.4.0" @@ -5667,11 +5841,55 @@ dependencies = [ "url", "wasm-bindgen", "wasm-bindgen-futures", - "wasm-streams", + "wasm-streams 0.4.2", "web-sys", "webpki-roots 1.0.6", ] +[[package]] +name = "reqwest" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab3f43e3283ab1488b624b44b0e988d0acea0b3214e694730a055cb6b2efa801" +dependencies = [ + "base64 0.22.1", + "bytes", + "encoding_rs", + "futures-channel", + "futures-core", + "futures-util", + "h2 0.4.13", + "http 1.4.0", + "http-body 1.0.1", + "http-body-util", + "hyper 1.8.1", + "hyper-rustls 0.27.7", + "hyper-util", + "js-sys", + "log", + "mime", + "percent-encoding", + "pin-project-lite", + "quinn", + "rustls 0.23.36", + "rustls-pki-types", + "rustls-platform-verifier", + "serde", + "serde_json", + "sync_wrapper", + "tokio", + "tokio-rustls 0.26.4", + "tokio-util", + "tower", + "tower-http", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-streams 0.5.0", + "web-sys", +] + [[package]] name = "rfc6979" version = "0.3.1" @@ -5837,6 +6055,7 @@ version = "0.23.36" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c665f33d38cea657d9614f766881e4d510e0eda4239891eea56b4cadcf01801b" dependencies = [ + "aws-lc-rs", "once_cell", "ring", "rustls-pki-types", @@ -5867,6 +6086,33 @@ dependencies = [ "zeroize", ] +[[package]] +name = "rustls-platform-verifier" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d99feebc72bae7ab76ba994bb5e121b8d83d910ca40b36e0921f53becc41784" +dependencies = [ + "core-foundation 0.10.1", + "core-foundation-sys", + "jni", + "log", + "once_cell", + "rustls 0.23.36", + "rustls-native-certs", + "rustls-platform-verifier-android", + "rustls-webpki 0.103.9", + "security-framework 3.5.1", + "security-framework-sys", + "webpki-root-certs", + "windows-sys 0.61.2", +] + +[[package]] +name = "rustls-platform-verifier-android" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f" + [[package]] name = "rustls-webpki" version = "0.101.7" @@ -5883,6 +6129,7 @@ version = "0.103.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d7df23109aa6c1567d1c575b9952556388da57401e4ace1d15f79eedad0d8f53" dependencies = [ + "aws-lc-rs", "ring", "rustls-pki-types", "untrusted", @@ -6222,7 +6469,7 @@ checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" dependencies = [ "block-buffer 0.9.0", "cfg-if", - "cpufeatures", + "cpufeatures 0.2.17", "digest 0.9.0", "opaque-debug", ] @@ -6234,7 +6481,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" dependencies = [ "cfg-if", - "cpufeatures", + "cpufeatures 0.2.17", "digest 0.10.7", ] @@ -6496,9 +6743,9 @@ dependencies = [ [[package]] name = "strum" -version = "0.27.2" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af23d6f6c1a224baef9d3f61e287d2761385a5b88fdab4eb4c6f11aeb54c4bcf" +checksum = "9628de9b8791db39ceda2b119bbe13134770b56c138ec1d3af810d045c04f9bd" [[package]] name = "strum_macros" @@ -6528,9 +6775,9 @@ dependencies = [ [[package]] name = "strum_macros" -version = "0.27.2" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7695ce3845ea4b33927c055a39dc438a45b059f7c1b3d91d38d10355fb8cbca7" +checksum = "ab85eea0270ee17587ed4156089e10b9e6880ee688791d45a905f5b1ca36f664" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -6617,6 +6864,27 @@ dependencies = [ "winapi", ] +[[package]] +name = "system-configuration" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a13f3d0daba03132c0aa9767f98351b3488edc2c100cda2d2ec2b04f3d8d3c8b" +dependencies = [ + "bitflags 2.10.0", + "core-foundation 0.9.4", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "take_mut" version = "0.2.2" @@ -6835,9 +7103,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.49.0" +version = "1.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72a2903cd7736441aac9df9d7688bd0ce48edccaadf181c3b90be801e81d3d86" +checksum = "27ad5e34374e03cfffefc301becb44e9dc3c17584f414349ebe29ed26661822d" dependencies = [ "bytes", "libc", @@ -7285,8 +7553,8 @@ dependencies = [ "leb128", "log", "walrus-macro", - "wasm-encoder", - "wasmparser", + "wasm-encoder 0.212.0", + "wasmparser 0.212.0", ] [[package]] @@ -7322,7 +7590,16 @@ version = "1.0.1+wasi-0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7" dependencies = [ - "wit-bindgen", + "wit-bindgen 0.46.0", +] + +[[package]] +name = "wasip3" +version = "0.4.0+wasi-0.3.0-rc-2026-01-06" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5" +dependencies = [ + "wit-bindgen 0.51.0", ] [[package]] @@ -7403,6 +7680,28 @@ dependencies = [ "leb128", ] +[[package]] +name = "wasm-encoder" +version = "0.244.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "990065f2fe63003fe337b932cfb5e3b80e0b4d0f5ff650e6985b1048f62c8319" +dependencies = [ + "leb128fmt", + "wasmparser 0.244.0", +] + +[[package]] +name = "wasm-metadata" +version = "0.244.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909" +dependencies = [ + "anyhow", + "indexmap 2.13.0", + "wasm-encoder 0.244.0", + "wasmparser 0.244.0", +] + [[package]] name = "wasm-opt" version = "0.116.1" @@ -7456,6 +7755,19 @@ dependencies = [ "web-sys", ] +[[package]] +name = "wasm-streams" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d1ec4f6517c9e11ae630e200b2b65d193279042e28edd4a2cda233e46670bbb" +dependencies = [ + "futures-util", + "js-sys", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + [[package]] name = "wasmparser" version = "0.212.0" @@ -7470,6 +7782,18 @@ dependencies = [ "serde", ] +[[package]] +name = "wasmparser" +version = "0.244.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe" +dependencies = [ + "bitflags 2.10.0", + "hashbrown 0.15.5", + "indexmap 2.13.0", + "semver", +] + [[package]] name = "web-sys" version = "0.3.85" @@ -7490,6 +7814,15 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "webpki-root-certs" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "804f18a4ac2676ffb4e8b5b5fa9ae38af06df08162314f96a68d2a363e21a8ca" +dependencies = [ + "rustls-pki-types", +] + [[package]] name = "webpki-roots" version = "0.25.4" @@ -7589,6 +7922,17 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" +[[package]] +name = "windows-registry" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02752bf7fbdcce7f2a27a742f798510f3e5ad88dbe84871e5168e2120c3d5720" +dependencies = [ + "windows-link", + "windows-result", + "windows-strings", +] + [[package]] name = "windows-result" version = "0.4.1" @@ -7607,6 +7951,15 @@ dependencies = [ "windows-link", ] +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.2", +] + [[package]] name = "windows-sys" version = "0.52.0" @@ -7643,6 +7996,21 @@ dependencies = [ "windows-link", ] +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + [[package]] name = "windows-targets" version = "0.52.6" @@ -7676,6 +8044,12 @@ dependencies = [ "windows_x86_64_msvc 0.53.1", ] +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + [[package]] name = "windows_aarch64_gnullvm" version = "0.52.6" @@ -7688,6 +8062,12 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53" +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + [[package]] name = "windows_aarch64_msvc" version = "0.52.6" @@ -7700,6 +8080,12 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006" +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + [[package]] name = "windows_i686_gnu" version = "0.52.6" @@ -7724,6 +8110,12 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c" +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + [[package]] name = "windows_i686_msvc" version = "0.52.6" @@ -7736,6 +8128,12 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2" +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + [[package]] name = "windows_x86_64_gnu" version = "0.52.6" @@ -7748,6 +8146,12 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + [[package]] name = "windows_x86_64_gnullvm" version = "0.52.6" @@ -7760,6 +8164,12 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + [[package]] name = "windows_x86_64_msvc" version = "0.52.6" @@ -7787,6 +8197,94 @@ version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59" +[[package]] +name = "wit-bindgen" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5" +dependencies = [ + "wit-bindgen-rust-macro", +] + +[[package]] +name = "wit-bindgen-core" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea61de684c3ea68cb082b7a88508a8b27fcc8b797d738bfc99a82facf1d752dc" +dependencies = [ + "anyhow", + "heck 0.5.0", + "wit-parser", +] + +[[package]] +name = "wit-bindgen-rust" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21" +dependencies = [ + "anyhow", + "heck 0.5.0", + "indexmap 2.13.0", + "prettyplease", + "syn 2.0.114", + "wasm-metadata", + "wit-bindgen-core", + "wit-component", +] + +[[package]] +name = "wit-bindgen-rust-macro" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c0f9bfd77e6a48eccf51359e3ae77140a7f50b1e2ebfe62422d8afdaffab17a" +dependencies = [ + "anyhow", + "prettyplease", + "proc-macro2", + "quote", + "syn 2.0.114", + "wit-bindgen-core", + "wit-bindgen-rust", +] + +[[package]] +name = "wit-component" +version = "0.244.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2" +dependencies = [ + "anyhow", + "bitflags 2.10.0", + "indexmap 2.13.0", + "log", + "serde", + "serde_derive", + "serde_json", + "wasm-encoder 0.244.0", + "wasm-metadata", + "wasmparser 0.244.0", + "wit-parser", +] + +[[package]] +name = "wit-parser" +version = "0.244.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736" +dependencies = [ + "anyhow", + "id-arena", + "indexmap 2.13.0", + "log", + "semver", + "serde", + "serde_derive", + "serde_json", + "unicode-xid", + "wasmparser 0.244.0", +] + [[package]] name = "writeable" version = "0.6.2" diff --git a/Cargo.toml b/Cargo.toml index c21c9e2c84..c418c2a65c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -26,12 +26,12 @@ future_not_send = "warn" candid = "0.10.18" candid_parser = "0.3.0" dfx-core = { path = "src/dfx-core", version = "0.3.0" } -ic-agent = "0.45.0" -ic-asset = { path = "src/canisters/frontend/ic-asset", version = "0.27.0" } +ic-agent = "0.46.0" +ic-asset = { path = "src/canisters/frontend/ic-asset", version = "0.28.0" } ic-cdk = "0.19.0-beta.2" -ic-identity-hsm = "0.45.0" -ic-utils = "0.45.0" -ic-management-canister-types = "0.5.0" +ic-identity-hsm = "0.46.0" +ic-utils = "0.46.0" +ic-management-canister-types = "0.7.1" aes-gcm = { version = "0.10.3", features = ["std"] } anyhow = "1.0.56" @@ -65,7 +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.13.2", default-features = false, features = ["rustls"] } ring = { version = "0.17.14", features = ["std"] } schemars = "0.8" sec1 = "0.3.0" diff --git a/deny.toml b/deny.toml index 0529bb78a3..e734e2e5f5 100644 --- a/deny.toml +++ b/deny.toml @@ -17,6 +17,7 @@ allow = [ "Zlib", "Unicode-DFS-2016", "Unicode-3.0", + "OpenSSL", ] unused-allowed-license = "allow" diff --git a/src/canisters/frontend/ic-asset/Cargo.toml b/src/canisters/frontend/ic-asset/Cargo.toml index bf29ddcf1c..985484240e 100644 --- a/src/canisters/frontend/ic-asset/Cargo.toml +++ b/src/canisters/frontend/ic-asset/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ic-asset" -version = "0.27.0" # sync with icx-asset +version = "0.28.0" # sync with icx-asset authors.workspace = true edition.workspace = true repository.workspace = true diff --git a/src/canisters/frontend/icx-asset/Cargo.toml b/src/canisters/frontend/icx-asset/Cargo.toml index 5f5360429f..3dbfdad5f1 100644 --- a/src/canisters/frontend/icx-asset/Cargo.toml +++ b/src/canisters/frontend/icx-asset/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "icx-asset" -version = "0.27.0" # sync with ic-asset +version = "0.28.0" # sync with ic-asset authors.workspace = true edition.workspace = true repository.workspace = true diff --git a/src/dfx/Cargo.toml b/src/dfx/Cargo.toml index e5e49e02fa..8b21d410f8 100644 --- a/src/dfx/Cargo.toml +++ b/src/dfx/Cargo.toml @@ -84,7 +84,7 @@ os_str_bytes = { version = "6.3.0", features = ["conversions"] } patch = "0.7.0" pem.workspace = true petgraph = "0.6.0" -pocket-ic = { git = "https://github.com/dfinity/ic", rev = "b0a37d0119a5df1dad84e50dc8717b77978d8f04" } +pocket-ic = { git = "https://github.com/dfinity/ic", rev = "142182f2ec4d916fa32e32da59239c4eb0c87bd3" } rand = "0.8.5" regex = "1.5.5" reqwest = { workspace = true, features = ["blocking", "json"] } diff --git a/src/dfx/assets/dfx-asset-sources.json b/src/dfx/assets/dfx-asset-sources.json index e0b5aa2e1d..155843150a 100644 --- a/src/dfx/assets/dfx-asset-sources.json +++ b/src/dfx/assets/dfx-asset-sources.json @@ -1,5 +1,5 @@ { - "replica-rev": "b0a37d0119a5df1dad84e50dc8717b77978d8f04", + "replica-rev": "142182f2ec4d916fa32e32da59239c4eb0c87bd3", "x86_64-darwin": { "motoko": { "url": "https://github.com/dfinity/motoko/releases/download/1.2.0/motoko-Darwin-x86_64-1.2.0.tar.gz", @@ -7,9 +7,9 @@ "version": "1.2.0" }, "pocket-ic": { - "url": "https://download.dfinity.systems/ic/b0a37d0119a5df1dad84e50dc8717b77978d8f04/binaries/x86_64-darwin/pocket-ic.gz", - "sha256": "087a5eebe435a1a9567f90c5acac998fc1e11067327f355fd9027124ac54c764", - "rev": "b0a37d0119a5df1dad84e50dc8717b77978d8f04" + "url": "https://download.dfinity.systems/ic/142182f2ec4d916fa32e32da59239c4eb0c87bd3/binaries/x86_64-darwin/pocket-ic.gz", + "sha256": "7feb14b17808ef5d538c71e6f49f189409d92ead590d6a6d503c2e24b201886a", + "rev": "142182f2ec4d916fa32e32da59239c4eb0c87bd3" } }, "arm64-darwin": { @@ -19,9 +19,9 @@ "version": "1.2.0" }, "pocket-ic": { - "url": "https://download.dfinity.systems/ic/b0a37d0119a5df1dad84e50dc8717b77978d8f04/binaries/arm64-darwin/pocket-ic.gz", - "sha256": "dfefeaaa2042cf4078ed4879f08b223b0e20ecfbac8a480efc2290d9626f3d0a", - "rev": "b0a37d0119a5df1dad84e50dc8717b77978d8f04" + "url": "https://download.dfinity.systems/ic/142182f2ec4d916fa32e32da59239c4eb0c87bd3/binaries/arm64-darwin/pocket-ic.gz", + "sha256": "c005d294ab22f9f1b73506e03a1af3c2cf30c5328e324c8ba94b5a01e0685dc5", + "rev": "142182f2ec4d916fa32e32da59239c4eb0c87bd3" } }, "x86_64-linux": { @@ -31,9 +31,9 @@ "version": "1.2.0" }, "pocket-ic": { - "url": "https://download.dfinity.systems/ic/b0a37d0119a5df1dad84e50dc8717b77978d8f04/binaries/x86_64-linux/pocket-ic.gz", - "sha256": "4bbf341556423cd335a9a72e4a0a6090f75efc375af4e196bcb730cc7c487a42", - "rev": "b0a37d0119a5df1dad84e50dc8717b77978d8f04" + "url": "https://download.dfinity.systems/ic/142182f2ec4d916fa32e32da59239c4eb0c87bd3/binaries/x86_64-linux/pocket-ic.gz", + "sha256": "26d01e590a7f3effff7a2ca8b2ea2b5137938b74aa7934db43234f141ce2db87", + "rev": "142182f2ec4d916fa32e32da59239c4eb0c87bd3" } }, "arm64-linux": { @@ -43,9 +43,9 @@ "version": "1.2.0" }, "pocket-ic": { - "url": "https://download.dfinity.systems/ic/b0a37d0119a5df1dad84e50dc8717b77978d8f04/binaries/arm64-linux/pocket-ic.gz", - "sha256": "424257122f79c1b755df764edd55935693bea5a4809d505cf47dddebefcb3634", - "rev": "b0a37d0119a5df1dad84e50dc8717b77978d8f04" + "url": "https://download.dfinity.systems/ic/142182f2ec4d916fa32e32da59239c4eb0c87bd3/binaries/arm64-linux/pocket-ic.gz", + "sha256": "cf4ec921f77ba91f24bcde988fb462abb7e7d00e297cfb5d47c3ccdf3f43f9d6", + "rev": "142182f2ec4d916fa32e32da59239c4eb0c87bd3" } }, "common": { diff --git a/src/dfx/src/actors/pocketic.rs b/src/dfx/src/actors/pocketic.rs index fb24bc672d..7d7de693f1 100644 --- a/src/dfx/src/actors/pocketic.rs +++ b/src/dfx/src/actors/pocketic.rs @@ -371,6 +371,7 @@ async fn initialize_pocketic( system: vec![], verified_application: vec![], application: vec![], + cloud_engine: vec![], }; match replica_config.subnet_type { ReplicaSubnetType::Application => subnet_config_set.application.push(<_>::default()), @@ -435,6 +436,7 @@ async fn initialize_pocketic( port: Some(addr.port()), domains, https_config: None, + domain_custom_provider_local_file: None, }), initial_time: Some(InitialTime::AutoProgress(AutoProgressConfig { artificial_delay_ms: Some(replica_config.artificial_delay as u64), diff --git a/src/dfx/src/commands/canister/call.rs b/src/dfx/src/commands/canister/call.rs index 89109c7867..ead1efc1f5 100644 --- a/src/dfx/src/commands/canister/call.rs +++ b/src/dfx/src/commands/canister/call.rs @@ -193,7 +193,8 @@ pub fn get_effective_canister_id( | MgmtMethod::ReadCanisterSnapshotMetadata | MgmtMethod::ReadCanisterSnapshotData | MgmtMethod::UploadCanisterSnapshotMetadata - | MgmtMethod::UploadCanisterSnapshotData => { + | MgmtMethod::UploadCanisterSnapshotData + | MgmtMethod::CanisterMetadata => { #[derive(CandidType, Deserialize)] struct In { canister_id: CanisterId, diff --git a/src/dfx/src/lib/ic_attributes/mod.rs b/src/dfx/src/lib/ic_attributes/mod.rs index ac26401b57..837fe30bd5 100644 --- a/src/dfx/src/lib/ic_attributes/mod.rs +++ b/src/dfx/src/lib/ic_attributes/mod.rs @@ -59,6 +59,7 @@ impl From .map(u64::from) .map(candid::Nat::from), log_visibility: value.log_visibility, + log_memory_limit: None, environment_variables: value.environment_variables, } } diff --git a/src/dfx/src/lib/migrate.rs b/src/dfx/src/lib/migrate.rs index 1ba63a1ba0..e7d37212b6 100644 --- a/src/dfx/src/lib/migrate.rs +++ b/src/dfx/src/lib/migrate.rs @@ -119,6 +119,7 @@ async fn migrate_canister( wasm_memory_limit: None, wasm_memory_threshold: None, log_visibility: None, + log_memory_limit: None, environment_variables: None, }, },)), diff --git a/src/dfx/src/lib/operations/canister/create_canister.rs b/src/dfx/src/lib/operations/canister/create_canister.rs index 814d216d5d..bb7add204b 100644 --- a/src/dfx/src/lib/operations/canister/create_canister.rs +++ b/src/dfx/src/lib/operations/canister/create_canister.rs @@ -215,15 +215,28 @@ async fn create_with_management_canister( builder = builder.with_controller(controller); } }; - let res = builder - .with_optional_compute_allocation(settings.compute_allocation) - .with_optional_memory_allocation(settings.memory_allocation) - .with_optional_freezing_threshold(settings.freezing_threshold) - .with_optional_reserved_cycles_limit(settings.reserved_cycles_limit) - .with_optional_wasm_memory_limit(settings.wasm_memory_limit) - .with_optional_wasm_memory_threshold(settings.wasm_memory_threshold) - .with_optional_log_visibility(settings.log_visibility) - .await; + if let Some(v) = settings.compute_allocation { + builder = builder.with_compute_allocation(v); + } + if let Some(v) = settings.memory_allocation { + builder = builder.with_memory_allocation(v); + } + if let Some(v) = settings.freezing_threshold { + builder = builder.with_freezing_threshold(v); + } + if let Some(v) = settings.reserved_cycles_limit { + builder = builder.with_reserved_cycles_limit(v); + } + if let Some(v) = settings.wasm_memory_limit { + builder = builder.with_wasm_memory_limit(v); + } + if let Some(v) = settings.wasm_memory_threshold { + builder = builder.with_wasm_memory_threshold(v); + } + if let Some(v) = settings.log_visibility { + builder = builder.with_log_visibility(v); + } + let res = builder.await; const NEEDS_WALLET: &str = "In order to create a canister on this network, you must use a wallet in order to allocate cycles to the new canister. \ To do this, remove the --no-wallet argument and try again. It is also possible to create a canister on this network \ using `dfx ledger create-canister`, but doing so will not associate the created canister with any of the canisters in your project."; diff --git a/src/dfx/src/lib/operations/cmc.rs b/src/dfx/src/lib/operations/cmc.rs index 2ef2c9487f..d8776a00e6 100644 --- a/src/dfx/src/lib/operations/cmc.rs +++ b/src/dfx/src/lib/operations/cmc.rs @@ -77,6 +77,7 @@ pub async fn notify_create( wasm_memory_limit: None, wasm_memory_threshold: None, log_visibility: None, + log_memory_limit: None, environment_variables: None, }) })