Repository navigation
fix: correctly map canister error calls - #11171
Conversation
This makes all the ic-cdk error mapping helpers exhaustive and ensures canister errors are reported correctly; for instance, a "insuffient cycles balance" error should _not_ be treated as a transient error. See code for exact behavior.
|
✅ No security or compliance issues detected. Reviewed everything up to 09905ea. Security Overview
Detected Code Changes
|
|
✅ No security or compliance issues detected. Reviewed everything up to 09905ea. Security Overview
Detected Code Changes
|
I'm not sure about this: the corresponding error code is mapped to SysTransient in the protocol for asynchronous errors and the synchronous error is reported as the return value of 2 (SysTransient) of the corresponding system API; so I wouldn't remap the reject code in the helper. |
mraszyk
left a comment
There was a problem hiding this comment.
The link https://internetcomputer.org/docs/references/ic-interface-spec#reject-codes does not work for me: use https://docs.internetcomputer.org/references/ic-interface-spec/https-interface/#reject-codes
There's also a reject code SYS_UNKNOWN (6) produced by the protocol which is different from Unknown meaning that the reject code could not be parsed.
daniel-wong-dfinity-org-twin
left a comment
There was a problem hiding this comment.
Sorry if I'm beating a dead horse, but I would like to again advocate for minimizing copy & paste.
…-exhaustive # Conflicts: # packages/pocket-ic/test_canister/src/canister.rs
* Keep mapping InsufficientLiquidCycleBalance to SysTransient: the protocol itself classifies an insufficient cycles balance as transient (both as the return value of ic0.call_perform and in ic-error-types), so don't remap it to SysFatal. * Deduplicate the IcCdkCallError -> (reject code, message) mapping into ic_nervous_system_runtime::into_reject_code_and_message and use it from the CMC, NNS root (impl & interface), SNS-W, SNS governance and SNS swap canisters. * pocket-ic test canister: report Unknown for all errors without a system-assigned reject code, including CandidDecodeFailed. * Distinguish SYS_UNKNOWN (reject code 6) from unparseable reject codes in the test canisters' RejectionCode enums. * Fix the interface-spec reject-codes links. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
The proxy canister's wasm changed (its RejectionCode gained a SysUnknown variant and its error mapping became exhaustive), which perturbed the split-finder's near-tied MILP solution: the totals of all load metrics are unchanged, but the canister partition it picks differs. Refresh the expected per-half values accordingly, as the test itself prescribes. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Upgrade the rust toolchain from 1.99.1 to 1.100.0. See: https://blog.rust-lang.org/2026/11/12/Rust-1.100.0/. The `cargo clippy` fixes this needs are in the PR below this one in the stack (dfinity#12142). This PR is therefore the version bump in `rust-toolchain.toml` and `bazel/rust.MODULE.bazel`, plus: * checksums for the 1.100.0 archives our builds download, which rules_rust 0.75.0 doesn't have, * the removal of the `clippy::double_must_use` allow, which 1.100.0 no longer needs, * an off-by-one fix in the `subnet_splitting` integration test that 1.100.0's codegen exposes, * the test data that the new codegen shifts. ## Canbench Five of the eight canbench suites moved beyond their noise thresholds, all towards *fewer* instructions. Heap and stable-memory increases are unchanged everywhere, and only `instructions` lines changed in the results files. | suite | totals beyond the noise threshold | change of all totals | results file | | --- | --- | --- | --- | | ckBTC minter | 0 of 7 (but 7 scopes) | -0.26% to -0.74% | regenerated | | ckETH minter | 1 of 1 | -5.20% | regenerated | | ICRC-1 ledger (u64) | 1 of 2 (and 5 of its scopes) | -0.22% to -3.76% | regenerated | | ICRC-1 ledger (u256) | 1 of 2 (and 5 of its scopes) | -0.22% to -3.73% | regenerated | | registry | 2 of 14 | +0.10% to -5.34% | regenerated | | ICP ledger | 0 of 1 | -0.55% | unchanged | | NNS governance | 0 of 28 (5% threshold) | +1.67% to -2.11% | unchanged | | SNS governance | 0 of 1 | +0.01% | unchanged | **`//rs/bitcoin/ckbtc/minter:ckbtc_minter_canbench_test`** was regenerated with `bazel run //rs/bitcoin/ckbtc/minter:ckbtc_minter_canbench_update`. All 7 benchmark totals stay within the noise threshold (-0.26% to -0.74%), but 7 small `::greedy` scopes moved beyond it. They more than undo the +9% to +11% that 1.99.0 added to the same scopes (dfinity#11735): | status | name | calls | ins | ins Δ% | HI | HI Δ% | SMI | SMI Δ% | |--------|----------------------------------------------------|-------|--------|---------|----|--------|-----|---------| | - | `build_unsigned_transaction_2_100k_sats::greedy` | 1 | 4.15K | -13.35% | 0 | 0.00% | 0 | 0.00% | | - | `build_estimate_retrieve_btc_fee_1_50k_sats::greedy` | 1 | 4.10K | -13.48% | 0 | 0.00% | 0 | 0.00% | | - | `build_unsigned_transaction_1_50k_sats::greedy` | 1 | 4.10K | -13.48% | 0 | 0.00% | 0 | 0.00% | | - | `build_unsigned_transaction_6_10_btc::greedy` | 1 | 11.50K | -14.29% | 0 | 0.00% | 0 | 0.00% | | - | `build_unsigned_transaction_4_10m_sats::greedy` | 1 | 3.81K | -14.38% | 0 | 0.00% | 0 | 0.00% | | - | `build_unsigned_transaction_5_1_btc::greedy` | 1 | 3.81K | -14.38% | 0 | 0.00% | 0 | 0.00% | | - | `build_unsigned_transaction_3_1m_sats::greedy` | 1 | 2.62K | -20.09% | 0 | 0.00% | 0 | 0.00% | **`//rs/ethereum/cketh/minter:cketh_minter_canbench_test`** was regenerated with `bazel run //rs/ethereum/cketh/minter:cketh_minter_canbench_update`. Its only benchmark moved beyond the noise threshold: | status | name | calls | ins | ins Δ% | HI | HI Δ% | SMI | SMI Δ% | |--------|--------------------|-------|-------|---------|-----|--------|-----|---------| | - | `bench_post_upgrade` | | 1.14B | -5.20% | 290 | 0.00% | 0 | 0.00% | **`//rs/ledger_suite/icrc1/ledger:canbench_u64_test`** and **`:canbench_u256_test`** were regenerated with `bazel run //rs/ledger_suite/icrc1/ledger:canbench_u64_update` and `:canbench_u256_update`. Both moved the same way. u64: | status | name | calls | ins | ins Δ% | HI | HI Δ% | SMI | SMI Δ% | |--------|-----------------------------------------------|-------|---------|---------|-----|--------|-----|---------| | - | `bench_icrc1_transfers` | | 48.23B | -3.76% | 264 | 0.00% | 256 | 0.00% | | - | `bench_icrc1_transfers::icrc2_transfer_from` | 1 | 18.87B | -4.76% | 3 | 0.00% | 0 | 0.00% | | - | `bench_icrc1_transfers::upgrade` | 1 | 473.43M | -4.91% | 202 | 0.00% | 128 | 0.00% | | - | `bench_icrc1_transfers::icrc2_approve` | 1 | 16.78B | -5.65% | 28 | 0.00% | 128 | 0.00% | | - | `bench_icrc1_transfers::post_upgrade` | 1 | 323.70M | -6.73% | 73 | 0.00% | 0 | 0.00% | | - | `bench_icrc1_transfers::icrc103_get_allowances` | 1 | 3.94M | -26.26% | 0 | 0.00% | 0 | 0.00% | u256: | status | name | calls | ins | ins Δ% | HI | HI Δ% | SMI | SMI Δ% | |--------|-----------------------------------------------|-------|---------|---------|-----|--------|-----|---------| | - | `bench_icrc1_transfers` | | 49.77B | -3.73% | 262 | 0.00% | 256 | 0.00% | | - | `bench_icrc1_transfers::icrc2_transfer_from` | 1 | 19.32B | -4.72% | 3 | 0.00% | 0 | 0.00% | | - | `bench_icrc1_transfers::upgrade` | 1 | 468.90M | -4.75% | 200 | 0.00% | 128 | 0.00% | | - | `bench_icrc1_transfers::icrc2_approve` | 1 | 17.32B | -5.58% | 28 | 0.00% | 128 | 0.00% | | - | `bench_icrc1_transfers::post_upgrade` | 1 | 318.12M | -6.85% | 71 | 0.00% | 0 | 0.00% | | - | `bench_icrc1_transfers::icrc103_get_allowances` | 1 | 4.84M | -22.50% | 0 | 0.00% | 0 | 0.00% | **`//rs/registry/canister:registry-canbench_test`** was regenerated with `bazel run //rs/registry/canister:registry-canbench_update`. Two of its 14 benchmarks moved beyond the noise threshold: | status | name | calls | ins | ins Δ% | HI | HI Δ% | SMI | SMI Δ% | |--------|-------------------------------------------------------------|-------|---------|---------|-----|--------|-----|---------| | - | `get_subnet_for_canister_100_times_100` | | 27.17M | -3.28% | 0 | 0.00% | 0 | 0.00% | | - | `measure_routing_table_invariant_checks_shards_and_unsharded` | | 211.57M | -5.34% | 138 | 0.00% | 0 | 0.00% | The other three suites (ICP ledger, NNS governance, SNS governance) stay within their noise thresholds, so their results files are unchanged. ## `subnet_splitting` **`//rs/recovery/subnet_splitting:integration_test`** has no `_update` target, and it needed two commits: 1. **A bound fix.** On 1.100.0 the split-finder's optimal split uses all 10 allowed cuts, and puts both the first and the last canister on the side it reports, so it reports 6 ranges. The test allowed only `MAX_CUTS.div_ceil(2)` = 5. But 10 cuts make up to 11 segments that alternate between the two subnets, so one side can get 6 of them. The test now allows `MAX_CUTS / 2 + 1`, and its failure message gives that bound and the ranges (it used to say "at most 10"). 2. **A re-pin.** All ten expected values were re-pinned by hand from one 1.100.0 reference run, in that run's source/destination orientation. As with 1.99.0 (dfinity#11735), what changed is the *partition*, not the workload: * Every total is identical: canisters 20, ingress messages 39, remote 10, local 28, http outcalls 10, heartbeats 694. Total instructions moved by 0.004% and total state size by 0.23%. * Both partitions balance instructions ~50/50, which the test also checks. Source / destination as each run reports them (which group is which is arbitrary): | metric | 1.99.1 | 1.100.0 | | --- | --- | --- | | `states_sizes_bytes` | 3712908 / 5569325 | 5044173 / 4259662 | | `instructions_executed` | 144307301 / 145741551 | 145713211 / 144348562 | | `canisters_installed` | 8 / 12 | 11 / 9 | | `ingress_messages_executed` | 15 / 24 | 21 / 18 | | `remote_subnet_messages_executed_lower_bound` | 4 / 6 | 5 / 5 | | `local_subnet_messages_executed_upper_bound` | 11 / 17 | 15 / 13 | | `http_outcalls_executed` | 4 / 6 | 6 / 4 | | `heartbeats_and_global_timers_executed` | 368 / 326 | 341 / 353 | The test is deterministic: 3/3 uncached runs on 1.100.0 give identical estimates. But it pins the exact solution of a degenerate optimisation, and it has now been re-pinned six times since September, mostly for unrelated changes (dfinity#11171, dfinity#11534, dfinity#11735, dfinity#11774, dfinity#12043, dfinity#11932). Asserting on the totals and on the ~50/50 instruction balance would make it robust. ## Clippy allows `ci/scripts/rust-lint.sh` and the PocketIC Windows lint (`.github/workflows/pocket-ic-tests-windows.yml`) no longer pass `--allow clippy::double_must_use`, and `rust-lint.sh` drops the comment that explained both allows. Clippy 0.1.100 ships the fix for the `#[async_trait]` false positive ([rust-lang/rust-clippy#17547](rust-lang/rust-clippy#17547)), and without the allow the lint reports nothing in the workspace. `redundant_field_names` stays allowed: 0.1.100 still flags the same 41 sites in thiserror and derive-new output, and the fix ([rust-lang/rust#164816](rust-lang/rust#164816)) ships in 1.101. ## Toolchain checksums and repin rules_rust 0.75.0 (released 2026-10-26, still the latest) ships checksums for 1.99.1 but not for 1.100.0, and it downloads an archive unverified when it has no checksum for it. So `rust.toolchain` now passes `sha256s` for the 21 archives of 1.100.0 that builds on our supported hosts (`aarch64-apple-darwin`, `aarch64-unknown-linux-gnu` and `x86_64-unknown-linux-gnu`) download between them: * `rustc`, `cargo`, `clippy`, `llvm-tools` and `rust-analyzer` for each of the three hosts * `rust-std` for the three hosts and for the targets they cross-compile to: `wasm32-unknown-unknown`, and `x86_64-apple-darwin`, which the darwin CI job builds `pocket-ic-server` for (`--platforms=//:macos-intel`) * `rust-src` rules_rust also registers toolchains for 8 other hosts and for the `wasm32-wasip1` and `wasm32-wasip2` targets. But Bazel only downloads a toolchain when a build selects it, and our builds never select those. Neither does CI's target selection: its `rdeps(//..., …)` queries load the closure of `bazel query 'deps(//...)'`, which contains none of the Rust toolchain repositories. A build on another host, or for a new target, would download those archives unverified, so the comment above the dict says what to add when supporting one. An exception on a supported host: building `//:rustfmt` (alone or as part of `//...`) with `--platforms=//:macos-intel` also fetches the `x86_64-apple-darwin` tools unverified, because rules_rust's rustfmt rule makes the target platform an execution platform. Nothing in the repo or CI does that. The checksums are the `xz_hash`es from the GPG-signed `channel-rust-1.100.0.toml`. They match the `.sha256` files at the exact URLs rules_rust downloads from, and the archives themselves, each of which has a valid signature. The dict can go once a rules_rust release ships these checksums. A key that doesn't match what rules_rust looks up is silently ignored, so the keys were checked against Bazel too: * Force-fetching the 8 toolchain repositories those builds use, through an empty repository cache, downloads and verifies 19 of the 21 archives on x86_64 Linux. The other 2 are `rust-analyzer` for the two arm64 hosts, which only those hosts fetch. None of them triggers the "canonical reproducible form" DEBUG message that Bazel prints when a rules_rust toolchain repository downloads an archive it has no checksum for. As a control, the `wasm32-wasip2` repository, which our builds don't use, does: the `sha256s` it suggests adds its `rust-std`, which isn't in the dict. * Corrupting a single checksum makes the fetch fail with `Checksum was … but wanted …`. Tried for `rust-std` for `x86_64-apple-darwin` and `wasm32-unknown-unknown`, `rustc` for `aarch64-unknown-linux-gnu`, `llvm-tools` for `aarch64-apple-darwin`, and `rust-analyzer` for `x86_64-unknown-linux-gnu`. * On x86_64 Linux, `bazel build //... --nobuild` fetches no Rust toolchain archive without a checksum. No repin is needed. The `Cargo.Bazel.*.lock` digests hash the `cargo`/`rustc` of rules_rust's own host tools (1.99.1 in rules_rust 0.75.0), not the version selected by `rust.toolchain`, and no third-party crate changed. Bazel accepts the existing lock files. ## Also checked, since tests won't necessarily catch these * **Never type** ([rust#155499](rust-lang/rust#155499)): `!` is stable, `Infallible` is now an alias for it, and the never-type fallback is `!` on all editions. Only 5 crates are not on edition 2024 under Cargo (`rate_limits` and four `guest_upgrade` crates; Bazel already builds them as 2024), and they compile cleanly. The only `impl From<Infallible>` (`ic-protobuf`'s `ProxyDecodeError`) compiles too. * **`Iterator::{min,max}(_by_key)`** ([rust#160203](rust-lang/rust#160203)) now call `Ord::{min,max}` and `PartialOrd::{lt,le,gt,ge}`, so they can only behave differently for types that override those inconsistently with `cmp`. No first-party type overrides them. * **Wasm and LLVM**: the `wasm32-unknown-unknown` target spec is identical on both toolchains, and LLVM stays on 23 (23.1.1 → 23.1.5), so the LLVM-bitcode caveat from dfinity#11735 is unchanged. * **Cargo's build-directory layout** changed. The only code that parses build paths, `canister_sandbox`'s profile detection, matches `/target/<profile>/` and still does. Bazel is unaffected. * **Cargo's new `[lints.cargo]`**: the warn-by-default `unused_dependencies` lint now reports 30 dependencies in 24 manifests during `cargo clippy --workspace --all-targets`, plus an unused workspace dependency (`ring`) and a redundant `homepage` (`ic-management-canister-types`). These are warnings, so CI doesn't fail on them. Some are false positives: the lint only sees the host target, so dependencies used only on `wasm32`, like `ic-dummy-getrandom-for-wasm`, look unused. This PR leaves them to their owners. * **rustfmt**: stable 1.11.0 accepts the tree unchanged. ## Testing * `./ci/scripts/rust-lint.sh` exits 0 on 1.100.0. * All 8 canbench tests and the `subnet_splitting` integration test pass. * `bazel build` of all 2,091 Rust targets, including the 110 wasm canisters, succeeds on 1.100.0. That covers the `wasm32`-only code and Bazel-only crates that `cargo clippy` doesn't see. * `bazel build //... --nobuild` analyzes all 3,387 targets, and buildifier is clean. * After merging dfinity#12142's review changes, on 1.100.0: `rust-lint.sh`, `cargo check` of `ic-sns-governance` and `ic-admin`, and `bazel build` of the 6 directly affected targets pass, and so do 60 of the 61 non-system tests within two hops of the changed files. The other one, `golden_state_swap_upgrade_twice`, can't fetch its golden state over SSH from the dev environment. * CI with `CI_ALL_BAZEL_TARGETS` passed on 5546a65. The commits since (the checksums, the `rust-lint.sh` comment and the merged dfinity#12142 review changes) get the default diff-based CI. 🤖 Generated with [Claude Code](https://claude.com/claude-code) --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
This makes all the ic-cdk error mapping helpers exhaustive and ensures canister errors are reported correctly; for instance, a "insuffient cycles balance" error should not be treated as a transient error.
See code for exact behavior.