diff --git a/Cargo.Bazel.json.lock b/Cargo.Bazel.json.lock index caa630671c0a..a8126e792b0a 100644 --- a/Cargo.Bazel.json.lock +++ b/Cargo.Bazel.json.lock @@ -1,5 +1,5 @@ { - "checksum": "dbadba2b42a800ac952738bf5cbe73467c6a330b18e8c94701019bb1813dcb90", + "checksum": "02dd24efe2a88000b51518682fe98076835ae12881f8f6b00350ba1509d5cd34", "crates": { "abnf 0.12.0": { "name": "abnf", @@ -11474,7 +11474,7 @@ "target": "canbench_rs" }, { - "id": "candid 0.10.22", + "id": "candid 0.10.20", "target": "candid" }, { @@ -11581,7 +11581,7 @@ "deps": { "common": [ { - "id": "candid 0.10.22", + "id": "candid 0.10.20", "target": "candid" }, { @@ -11668,14 +11668,14 @@ ], "license_file": null }, - "candid 0.10.22": { + "candid 0.10.20": { "name": "candid", - "version": "0.10.22", + "version": "0.10.20", "package_url": "https://github.com/dfinity/candid", "repository": { "Http": { - "url": "https://static.crates.io/crates/candid/0.10.22/download", - "sha256": "3b64a1b8e8c368f8ffd2aaa64c7189d0a84783ba162f64de647cefedb4f12c88" + "url": "https://static.crates.io/crates/candid/0.10.20/download", + "sha256": "8037a01ec09d6c06883a38bad4f47b8d06158ad360b841e0ae5707c9884dfaf6" } }, "targets": [ @@ -11760,7 +11760,7 @@ } ], "selects": { - "cfg(not(target_family = \"wasm\"))": [ + "cfg(not(target_arch = \"wasm32\"))": [ { "id": "stacker 0.1.15", "target": "stacker" @@ -11772,7 +11772,7 @@ "proc_macro_deps": { "common": [ { - "id": "candid_derive 0.10.22", + "id": "candid_derive 0.10.20", "target": "candid_derive" }, { @@ -11807,7 +11807,7 @@ ] } }, - "version": "0.10.22" + "version": "0.10.20" }, "license": "Apache-2.0", "license_ids": [ @@ -11815,14 +11815,14 @@ ], "license_file": "LICENSE" }, - "candid_derive 0.10.22": { + "candid_derive 0.10.20": { "name": "candid_derive", - "version": "0.10.22", + "version": "0.10.20", "package_url": "https://github.com/dfinity/candid", "repository": { "Http": { - "url": "https://static.crates.io/crates/candid_derive/0.10.22/download", - "sha256": "8a3ad1d26683b72c7fd16c8b2e3ebacf8785c9532389286c89971c1770ee57ce" + "url": "https://static.crates.io/crates/candid_derive/0.10.20/download", + "sha256": "fb45f4d5eff3805598ee633dd80f8afb306c023249d34b5b7dfdc2080ea1df2e" } }, "targets": [ @@ -11866,7 +11866,7 @@ "selects": {} }, "edition": "2021", - "version": "0.10.22" + "version": "0.10.20" }, "license": "Apache-2.0", "license_ids": [ @@ -11922,7 +11922,7 @@ "target": "anyhow" }, { - "id": "candid 0.10.22", + "id": "candid 0.10.20", "target": "candid" }, { @@ -12031,7 +12031,7 @@ "deps": { "common": [ { - "id": "candid 0.10.22", + "id": "candid 0.10.20", "target": "candid" }, { @@ -20773,7 +20773,7 @@ "target": "bytes" }, { - "id": "candid 0.10.22", + "id": "candid 0.10.20", "target": "candid" }, { @@ -21372,7 +21372,7 @@ "target": "canbench_rs" }, { - "id": "candid 0.10.22", + "id": "candid 0.10.20", "target": "candid" }, { @@ -26526,7 +26526,7 @@ "deps": { "common": [ { - "id": "candid 0.10.22", + "id": "candid 0.10.20", "target": "candid" }, { @@ -26602,7 +26602,7 @@ "deps": { "common": [ { - "id": "candid 0.10.22", + "id": "candid 0.10.20", "target": "candid" }, { @@ -34608,7 +34608,7 @@ "target": "cached" }, { - "id": "candid 0.10.22", + "id": "candid 0.10.20", "target": "candid" }, { @@ -34836,7 +34836,7 @@ "target": "cached" }, { - "id": "candid 0.10.22", + "id": "candid 0.10.20", "target": "candid" }, { @@ -35076,7 +35076,7 @@ "target": "bytes" }, { - "id": "candid 0.10.22", + "id": "candid 0.10.20", "target": "candid" }, { @@ -35408,7 +35408,7 @@ "target": "axum" }, { - "id": "candid 0.10.22", + "id": "candid 0.10.20", "target": "candid" }, { @@ -35570,7 +35570,7 @@ "deps": { "common": [ { - "id": "candid 0.10.22", + "id": "candid 0.10.20", "target": "candid" }, { @@ -35676,7 +35676,7 @@ "deps": { "common": [ { - "id": "candid 0.10.22", + "id": "candid 0.10.20", "target": "candid" }, { @@ -35750,7 +35750,7 @@ "deps": { "common": [ { - "id": "candid 0.10.22", + "id": "candid 0.10.20", "target": "candid" }, { @@ -35837,7 +35837,7 @@ "deps": { "common": [ { - "id": "candid 0.10.22", + "id": "candid 0.10.20", "target": "candid" }, { @@ -35900,7 +35900,7 @@ "deps": { "common": [ { - "id": "candid 0.10.22", + "id": "candid 0.10.20", "target": "candid" }, { @@ -36075,7 +36075,7 @@ "deps": { "common": [ { - "id": "candid 0.10.22", + "id": "candid 0.10.20", "target": "candid" }, { @@ -36234,7 +36234,7 @@ "target": "cached" }, { - "id": "candid 0.10.22", + "id": "candid 0.10.20", "target": "candid" }, { @@ -36458,7 +36458,7 @@ "target": "base64" }, { - "id": "candid 0.10.22", + "id": "candid 0.10.20", "target": "candid" }, { @@ -36588,7 +36588,7 @@ "target": "axum" }, { - "id": "candid 0.10.22", + "id": "candid 0.10.20", "target": "candid" }, { @@ -36722,7 +36722,7 @@ "deps": { "common": [ { - "id": "candid 0.10.22", + "id": "candid 0.10.20", "target": "candid" }, { @@ -36796,7 +36796,7 @@ "target": "arc_swap" }, { - "id": "candid 0.10.22", + "id": "candid 0.10.20", "target": "candid" }, { @@ -36886,7 +36886,7 @@ "deps": { "common": [ { - "id": "candid 0.10.22", + "id": "candid 0.10.20", "target": "candid" }, { @@ -37109,7 +37109,7 @@ "target": "bytes" }, { - "id": "candid 0.10.22", + "id": "candid 0.10.20", "target": "candid" }, { @@ -37351,7 +37351,7 @@ "target": "base64" }, { - "id": "candid 0.10.22", + "id": "candid 0.10.20", "target": "candid" }, { @@ -37433,7 +37433,7 @@ "target": "bytes" }, { - "id": "candid 0.10.22", + "id": "candid 0.10.20", "target": "candid" }, { @@ -37583,7 +37583,7 @@ "deps": { "common": [ { - "id": "candid 0.10.22", + "id": "candid 0.10.20", "target": "candid" }, { @@ -37638,7 +37638,7 @@ "deps": { "common": [ { - "id": "candid 0.10.22", + "id": "candid 0.10.20", "target": "candid" }, { @@ -37693,7 +37693,7 @@ "deps": { "common": [ { - "id": "candid 0.10.22", + "id": "candid 0.10.20", "target": "candid" }, { @@ -37841,7 +37841,7 @@ "target": "base64" }, { - "id": "candid 0.10.22", + "id": "candid 0.10.20", "target": "candid" }, { @@ -38135,7 +38135,7 @@ "deps": { "common": [ { - "id": "candid 0.10.22", + "id": "candid 0.10.20", "target": "candid" }, { @@ -38194,7 +38194,7 @@ "deps": { "common": [ { - "id": "candid 0.10.22", + "id": "candid 0.10.20", "target": "candid" }, { @@ -38282,7 +38282,7 @@ "deps": { "common": [ { - "id": "candid 0.10.22", + "id": "candid 0.10.20", "target": "candid" }, { @@ -38376,7 +38376,7 @@ "deps": { "common": [ { - "id": "candid 0.10.22", + "id": "candid 0.10.20", "target": "candid" }, { @@ -38480,7 +38480,7 @@ "deps": { "common": [ { - "id": "candid 0.10.22", + "id": "candid 0.10.20", "target": "candid" }, { @@ -38741,7 +38741,7 @@ "target": "anyhow" }, { - "id": "candid 0.10.22", + "id": "candid 0.10.20", "target": "candid" }, { @@ -38894,7 +38894,7 @@ "target": "anyhow" }, { - "id": "candid 0.10.22", + "id": "candid 0.10.20", "target": "candid" }, { @@ -38969,7 +38969,7 @@ "deps": { "common": [ { - "id": "candid 0.10.22", + "id": "candid 0.10.20", "target": "candid" }, { @@ -39234,7 +39234,7 @@ "target": "anyhow" }, { - "id": "candid 0.10.22", + "id": "candid 0.10.20", "target": "candid" }, { @@ -39305,7 +39305,7 @@ "target": "anyhow" }, { - "id": "candid 0.10.22", + "id": "candid 0.10.20", "target": "candid" }, { @@ -58185,7 +58185,7 @@ "target": "base64" }, { - "id": "candid 0.10.22", + "id": "candid 0.10.20", "target": "candid" }, { @@ -98514,7 +98514,7 @@ "cached 0.49.2", "canbench 0.4.0", "canbench-rs 0.4.0", - "candid 0.10.22", + "candid 0.10.20", "candid_parser 0.1.4", "cargo_metadata 0.14.2", "cc 1.2.48", diff --git a/Cargo.Bazel.toml.lock b/Cargo.Bazel.toml.lock index d985271f4ab3..3ab0aa755a49 100644 --- a/Cargo.Bazel.toml.lock +++ b/Cargo.Bazel.toml.lock @@ -1991,9 +1991,9 @@ dependencies = [ [[package]] name = "candid" -version = "0.10.22" +version = "0.10.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b64a1b8e8c368f8ffd2aaa64c7189d0a84783ba162f64de647cefedb4f12c88" +checksum = "8037a01ec09d6c06883a38bad4f47b8d06158ad360b841e0ae5707c9884dfaf6" dependencies = [ "anyhow", "binread", @@ -2014,9 +2014,9 @@ dependencies = [ [[package]] name = "candid_derive" -version = "0.10.22" +version = "0.10.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a3ad1d26683b72c7fd16c8b2e3ebacf8785c9532389286c89971c1770ee57ce" +checksum = "fb45f4d5eff3805598ee633dd80f8afb306c023249d34b5b7dfdc2080ea1df2e" dependencies = [ "lazy_static", "proc-macro2", diff --git a/Cargo.lock b/Cargo.lock index 525bbae67471..6f714216e0b1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1935,9 +1935,9 @@ dependencies = [ [[package]] name = "candid" -version = "0.10.22" +version = "0.10.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b64a1b8e8c368f8ffd2aaa64c7189d0a84783ba162f64de647cefedb4f12c88" +checksum = "8037a01ec09d6c06883a38bad4f47b8d06158ad360b841e0ae5707c9884dfaf6" dependencies = [ "anyhow", "binread", @@ -1967,9 +1967,9 @@ dependencies = [ [[package]] name = "candid_derive" -version = "0.10.22" +version = "0.10.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a3ad1d26683b72c7fd16c8b2e3ebacf8785c9532389286c89971c1770ee57ce" +checksum = "fb45f4d5eff3805598ee633dd80f8afb306c023249d34b5b7dfdc2080ea1df2e" dependencies = [ "lazy_static", "proc-macro2", diff --git a/Cargo.toml b/Cargo.toml index 14ad3b2b5415..466d5613955e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -611,7 +611,7 @@ build-info = { git = "https://github.com/dfinity-lab/build-info", rev = "701a696 build-info-build = { git = "https://github.com/dfinity-lab/build-info", rev = "701a696844fba5c87df162fbbc1ccef96f27c9d7", default-features = false } bytes = "1.9.0" canbench-rs = "0.4.0" -candid = { version = "0.10.22" } +candid = { version = "0.10.20" } candid_parser = { version = "0.1.2" } chrono = { version = "0.4.42", default-features = false, features = [ "alloc", diff --git a/bazel/rust.MODULE.bazel b/bazel/rust.MODULE.bazel index 13941104c807..a3fec11841e5 100644 --- a/bazel/rust.MODULE.bazel +++ b/bazel/rust.MODULE.bazel @@ -246,7 +246,7 @@ crate.spec( ) crate.spec( package = "candid", - version = "^0.10.22", + version = "^0.10.20", ) crate.spec( package = "cargo_metadata", diff --git a/rs/ledger_suite/icrc1/ledger/canbench_results/canbench_u256.yml b/rs/ledger_suite/icrc1/ledger/canbench_results/canbench_u256.yml index 94b37f74f8ca..b41d106916f7 100644 --- a/rs/ledger_suite/icrc1/ledger/canbench_results/canbench_u256.yml +++ b/rs/ledger_suite/icrc1/ledger/canbench_results/canbench_u256.yml @@ -2,70 +2,70 @@ benches: bench_icrc1_transfers: total: calls: 1 - instructions: 53880685942 - heap_increase: 262 + instructions: 54416296904 + heap_increase: 264 stable_memory_increase: 256 scopes: icrc103_get_allowances: calls: 1 - instructions: 6558575 + instructions: 6447843 heap_increase: 0 stable_memory_increase: 0 icrc1_transfer: calls: 1 - instructions: 12838964801 - heap_increase: 31 + instructions: 12925814586 + heap_increase: 32 stable_memory_increase: 0 icrc2_approve: calls: 1 - instructions: 19151075183 - heap_increase: 28 + instructions: 19344327170 + heap_increase: 29 stable_memory_increase: 128 icrc2_transfer_from: calls: 1 - instructions: 21172821486 + instructions: 21428424367 heap_increase: 3 stable_memory_increase: 0 icrc3_get_blocks: calls: 1 - instructions: 9111344 + instructions: 8924170 heap_increase: 0 stable_memory_increase: 0 post_upgrade: calls: 1 - instructions: 357875918 + instructions: 357456809 heap_increase: 71 stable_memory_increase: 0 pre_upgrade: calls: 1 - instructions: 151083619 + instructions: 151084681 heap_increase: 129 stable_memory_increase: 128 upgrade: calls: 1 - instructions: 508962182 + instructions: 508544206 heap_increase: 200 stable_memory_increase: 128 bench_upgrade_baseline: total: calls: 1 - instructions: 8695408 + instructions: 8694844 heap_increase: 258 stable_memory_increase: 128 scopes: post_upgrade: calls: 1 - instructions: 8614463 + instructions: 8613900 heap_increase: 129 stable_memory_increase: 0 pre_upgrade: calls: 1 - instructions: 78040 + instructions: 78039 heap_increase: 129 stable_memory_increase: 128 upgrade: calls: 1 - instructions: 8694511 + instructions: 8693947 heap_increase: 258 stable_memory_increase: 128 version: 0.4.0 diff --git a/rs/rust_canisters/canister_creator/test/test.rs b/rs/rust_canisters/canister_creator/test/test.rs index 5e76c4263adb..700fba129252 100644 --- a/rs/rust_canisters/canister_creator/test/test.rs +++ b/rs/rust_canisters/canister_creator/test/test.rs @@ -1,21 +1,16 @@ use canister_test::*; use ic_state_machine_tests::StateMachine; -// 1. This constant has been obtained empirically by running the tests. +// This constant has been obtained empirically by running the tests. // The old value of the const was 1_820_000. -// -// 2. Since, we updated the default stack size for Wasm from 1MiB to 3MiB +// Since, we updated the default stack size for Wasm from 1MiB to 3MiB // The new memory usage is 1_820_000 - 1_048_576 + 3_145_728 = 3_991_081 -// -// 3. After increasing the size of a canister history entry by 32B, +// After increasing the size of a canister history entry by 32B, // and having a total of 1_001 canister creation entries and // 1 canister code deployment entry (for the creator canister), // the memory usage grew by extra 1_002 x 32 = 32_064B // to 3_991_081 + 32_064 = 4_023_145. -// -// 4. Bumping the candid version to v.0.10.22 increased the memory -// further from 4_023_145 to 4_024_201 which is 1_056 bytes. -const CANISTER_CREATOR_CANISTER_MEMORY_USAGE_BYTES: u64 = 4_024_201; +const CANISTER_CREATOR_CANISTER_MEMORY_USAGE_BYTES: u64 = 4_023_145; const HELLO_WORLD_WAT: &str = r#" (module