From 4a807083dd196f973775018fa27444a973f8a44a Mon Sep 17 00:00:00 2001 From: Adam Spofford Date: Mon, 13 Apr 2026 14:35:11 -0700 Subject: [PATCH 1/3] Update to b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4 --- Cargo.lock | 373 ++++++++++++++++--------------- Cargo.toml | 28 +-- candid/governance.did | 64 +++++- candid/ledger.did | 14 +- candid/registry.did | 53 ++++- candid/sns-governance.did | 1 + candid/sns-root.did | 1 + src/lib/format/nns_governance.rs | 63 +++++- src/lib/signing.rs | 10 - 9 files changed, 389 insertions(+), 218 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index eccdfa79..5e885983 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -292,18 +292,13 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "attestation" version = "0.0.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "candid", "der", "getrandom 0.2.17", "hex", - "ic-interfaces-registry", - "ic-protobuf", - "ic-registry-client-helpers", - "ic-types", "ic-utils", - "itertools 0.12.1", "prost", "rand 0.8.5", "serde", @@ -809,7 +804,7 @@ dependencies = [ [[package]] name = "candid-utils" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "candid", "candid_parser", @@ -849,7 +844,7 @@ dependencies = [ [[package]] name = "canlog" version = "0.2.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "candid", "ic-canister-log 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -862,7 +857,7 @@ dependencies = [ [[package]] name = "canlog_derive" version = "0.1.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "darling 0.20.11", "proc-macro2", @@ -1242,7 +1237,7 @@ dependencies = [ [[package]] name = "cycles-minting-canister" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "async-trait", "build-info", @@ -1264,6 +1259,7 @@ dependencies = [ "ic-nns-common", "ic-nns-constants", "ic-types", + "ic-types-cycles", "ic-xrc-types", "icp-ledger", "icrc-ledger-types", @@ -1464,7 +1460,7 @@ dependencies = [ [[package]] name = "dfn_candid" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "candid", "dfn_core", @@ -1477,7 +1473,7 @@ dependencies = [ [[package]] name = "dfn_core" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "ic-base-types", "on_wire", @@ -1486,7 +1482,7 @@ dependencies = [ [[package]] name = "dfn_http" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "candid", "dfn_candid", @@ -1498,7 +1494,7 @@ dependencies = [ [[package]] name = "dfn_http_metrics" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "dfn_candid", "dfn_core", @@ -1511,7 +1507,7 @@ dependencies = [ [[package]] name = "dfn_protobuf" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "on_wire", "prost", @@ -1787,7 +1783,7 @@ checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" [[package]] name = "fe-derive" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "hex", "num-bigint-dig 0.9.1", @@ -2358,7 +2354,7 @@ dependencies = [ [[package]] name = "ic-base-types" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "byte-unit", "bytes", @@ -2379,7 +2375,7 @@ dependencies = [ [[package]] name = "ic-btc-checker" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "askama", "base64 0.13.1", @@ -2389,7 +2385,7 @@ dependencies = [ "futures", "hex", "ic-btc-interface", - "ic-canister-log 0.2.0 (git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d)", + "ic-canister-log 0.2.0 (git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4)", "ic-cdk", "ic-http-types", "ic-management-canister-types", @@ -2403,9 +2399,9 @@ dependencies = [ [[package]] name = "ic-btc-interface" -version = "0.2.3" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb974b1626d8a45dad7d1e2383829c6b08c5fd53b42d9f0938a51f2f0e057c7e" +checksum = "7b07cca9319498684a7477a77a66d87377ecd698b5465a3b8523484fcca16bff" dependencies = [ "candid", "datasize", @@ -2416,10 +2412,10 @@ dependencies = [ [[package]] name = "ic-btc-replica-types" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "candid", - "ic-error-types 0.2.0 (git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d)", + "ic-error-types 0.2.0 (git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4)", "ic-interfaces-adapter-client", "ic-protobuf", "serde", @@ -2429,7 +2425,7 @@ dependencies = [ [[package]] name = "ic-canister-client-sender" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "ic-base-types", "ic-ed25519", @@ -2451,7 +2447,7 @@ dependencies = [ [[package]] name = "ic-canister-log" version = "0.2.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "serde", ] @@ -2459,7 +2455,7 @@ dependencies = [ [[package]] name = "ic-canister-profiler" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "ic-metrics-encoder", "ic0", @@ -2557,7 +2553,7 @@ dependencies = [ [[package]] name = "ic-ckbtc-minter" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "async-trait", "bech32 0.9.1", @@ -2599,7 +2595,7 @@ dependencies = [ [[package]] name = "ic-crypto-internal-bls12-381-type" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "cached 0.49.3", "hex", @@ -2618,7 +2614,7 @@ dependencies = [ [[package]] name = "ic-crypto-internal-hmac" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "ic-crypto-sha2", ] @@ -2626,7 +2622,7 @@ dependencies = [ [[package]] name = "ic-crypto-internal-multi-sig-bls12381" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "base64 0.13.1", "hex", @@ -2646,7 +2642,7 @@ dependencies = [ [[package]] name = "ic-crypto-internal-seed" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "hex", "ic-crypto-sha2", @@ -2659,7 +2655,7 @@ dependencies = [ [[package]] name = "ic-crypto-internal-threshold-sig-bls12381" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "base64 0.13.1", "cached 0.49.3", @@ -2684,7 +2680,7 @@ dependencies = [ [[package]] name = "ic-crypto-internal-threshold-sig-canister-threshold-sig" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "curve25519-dalek", "fe-derive", @@ -2713,7 +2709,7 @@ dependencies = [ [[package]] name = "ic-crypto-internal-types" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "hex", "ic-protobuf", @@ -2729,7 +2725,7 @@ dependencies = [ [[package]] name = "ic-crypto-node-key-validation" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "hex", "ic-base-types", @@ -2747,7 +2743,7 @@ dependencies = [ [[package]] name = "ic-crypto-secrets-containers" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "serde", "zeroize", @@ -2756,7 +2752,7 @@ dependencies = [ [[package]] name = "ic-crypto-sha2" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "sha2 0.10.9", ] @@ -2764,7 +2760,7 @@ dependencies = [ [[package]] name = "ic-crypto-tls-cert-validation" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "hex", "ic-ed25519", @@ -2777,7 +2773,7 @@ dependencies = [ [[package]] name = "ic-crypto-tree-hash" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "ic-crypto-internal-types", "ic-crypto-sha2", @@ -2790,7 +2786,7 @@ dependencies = [ [[package]] name = "ic-crypto-utils-basic-sig" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "ic-base-types", "ic-ed25519", @@ -2800,7 +2796,7 @@ dependencies = [ [[package]] name = "ic-crypto-utils-ni-dkg" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "ic-crypto-internal-types", "ic-protobuf", @@ -2810,7 +2806,7 @@ dependencies = [ [[package]] name = "ic-dummy-getrandom-for-wasm" version = "0.1.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "getrandom 0.2.17", ] @@ -2818,7 +2814,7 @@ dependencies = [ [[package]] name = "ic-ed25519" version = "0.6.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "curve25519-dalek", "ed25519-dalek", @@ -2845,7 +2841,7 @@ dependencies = [ [[package]] name = "ic-error-types" version = "0.2.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "ic-heap-bytes", "regex-lite", @@ -2857,7 +2853,7 @@ dependencies = [ [[package]] name = "ic-heap-bytes" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "candid", "ic-heap-bytes-derive", @@ -2869,7 +2865,7 @@ dependencies = [ [[package]] name = "ic-heap-bytes-derive" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "darling 0.20.11", "proc-macro2", @@ -2880,7 +2876,7 @@ dependencies = [ [[package]] name = "ic-http-types" version = "0.1.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "candid", "serde", @@ -2890,7 +2886,7 @@ dependencies = [ [[package]] name = "ic-icrc1" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "candid", "ciborium", @@ -2912,12 +2908,12 @@ dependencies = [ [[package]] name = "ic-icrc1-index-ng" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "candid", "ciborium", "ic-base-types", - "ic-canister-log 0.2.0 (git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d)", + "ic-canister-log 0.2.0 (git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4)", "ic-canister-profiler", "ic-cdk", "ic-cdk-timers", @@ -2939,14 +2935,14 @@ dependencies = [ [[package]] name = "ic-icrc1-ledger" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "async-trait", "candid", "ciborium", "hex", "ic-base-types", - "ic-canister-log 0.2.0 (git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d)", + "ic-canister-log 0.2.0 (git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4)", "ic-cdk", "ic-cdk-timers", "ic-certification 3.1.0", @@ -2969,7 +2965,7 @@ dependencies = [ [[package]] name = "ic-icrc1-tokens-u64" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "candid", "ic-ledger-core", @@ -2995,31 +2991,21 @@ dependencies = [ [[package]] name = "ic-interfaces-adapter-client" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "strum_macros", "thiserror 2.0.18", ] -[[package]] -name = "ic-interfaces-registry" -version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" -dependencies = [ - "ic-types", - "prost", - "serde", -] - [[package]] name = "ic-ledger-canister-core" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "async-trait", "candid", "ic-base-types", - "ic-canister-log 0.2.0 (git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d)", + "ic-canister-log 0.2.0 (git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4)", "ic-cdk", "ic-ledger-core", "ic-ledger-hash-of", @@ -3033,7 +3019,7 @@ dependencies = [ [[package]] name = "ic-ledger-core" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "candid", "ic-ledger-hash-of", @@ -3047,7 +3033,7 @@ dependencies = [ [[package]] name = "ic-ledger-hash-of" version = "0.1.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "candid", "hex", @@ -3057,7 +3043,7 @@ dependencies = [ [[package]] name = "ic-limits" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" [[package]] name = "ic-management-canister-types" @@ -3073,13 +3059,13 @@ dependencies = [ [[package]] name = "ic-management-canister-types-private" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "candid", "ic-base-types", "ic-btc-interface", "ic-btc-replica-types", - "ic-error-types 0.2.0 (git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d)", + "ic-error-types 0.2.0 (git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4)", "ic-protobuf", "ic-utils", "num-traits", @@ -3099,12 +3085,12 @@ checksum = "8b5c7628eac357aecda461130f8074468be5aa4d258a002032d82d817f79f1f8" [[package]] name = "ic-nervous-system-access-list" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" [[package]] name = "ic-nervous-system-canisters" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "async-trait", "candid", @@ -3120,12 +3106,13 @@ dependencies = [ "icrc-ledger-types", "mockall", "prost", + "rust_decimal", ] [[package]] name = "ic-nervous-system-chunks" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "ic-crypto-sha2", "ic-stable-structures", @@ -3136,13 +3123,13 @@ dependencies = [ [[package]] name = "ic-nervous-system-clients" version = "0.0.1" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "async-trait", "candid", "dfn_core", "ic-base-types", - "ic-error-types 0.2.0 (git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d)", + "ic-error-types 0.2.0 (git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4)", "ic-ledger-core", "ic-management-canister-types-private", "ic-nervous-system-canisters", @@ -3160,12 +3147,12 @@ dependencies = [ [[package]] name = "ic-nervous-system-collections-union-multi-map" version = "0.0.1" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" [[package]] name = "ic-nervous-system-common" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "base64 0.13.1", "build-info-build", @@ -3173,7 +3160,7 @@ dependencies = [ "bytes", "dfn_core", "ic-base-types", - "ic-canister-log 0.2.0 (git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d)", + "ic-canister-log 0.2.0 (git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4)", "ic-crypto-sha2", "ic-http-types", "ic-ledger-core", @@ -3194,12 +3181,12 @@ dependencies = [ [[package]] name = "ic-nervous-system-common-build-metadata" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" [[package]] name = "ic-nervous-system-common-test-keys" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "ic-base-types", "ic-canister-client-sender", @@ -3212,12 +3199,12 @@ dependencies = [ [[package]] name = "ic-nervous-system-common-validation" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" [[package]] name = "ic-nervous-system-governance" version = "0.0.1" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "ic-base-types", "ic-stable-structures", @@ -3229,7 +3216,7 @@ dependencies = [ [[package]] name = "ic-nervous-system-initial-supply" version = "0.0.1" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "async-trait", "candid", @@ -3243,7 +3230,7 @@ dependencies = [ [[package]] name = "ic-nervous-system-linear-map" version = "0.0.1" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "rust_decimal", ] @@ -3251,12 +3238,12 @@ dependencies = [ [[package]] name = "ic-nervous-system-lock" version = "0.0.1" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" [[package]] name = "ic-nervous-system-long-message" version = "0.0.1" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "candid", "ic-cdk", @@ -3267,7 +3254,7 @@ dependencies = [ [[package]] name = "ic-nervous-system-proto" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "candid", "comparable", @@ -3280,16 +3267,25 @@ dependencies = [ [[package]] name = "ic-nervous-system-proxied-canister-calls-tracker" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "ic-base-types", "ic-cdk", ] +[[package]] +name = "ic-nervous-system-query-instruction-logger" +version = "0.0.1" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" +dependencies = [ + "quote", + "syn 2.0.117", +] + [[package]] name = "ic-nervous-system-rate-limits" version = "0.0.1" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "ic-stable-structures", "serde", @@ -3298,7 +3294,7 @@ dependencies = [ [[package]] name = "ic-nervous-system-root" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "candid", "dfn_core", @@ -3316,7 +3312,7 @@ dependencies = [ [[package]] name = "ic-nervous-system-runtime" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "async-trait", "candid", @@ -3329,17 +3325,17 @@ dependencies = [ [[package]] name = "ic-nervous-system-string" version = "0.0.1" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" [[package]] name = "ic-nervous-system-temporary" version = "0.0.1" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" [[package]] name = "ic-nervous-system-time-helpers" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "ic-cdk", ] @@ -3347,7 +3343,7 @@ dependencies = [ [[package]] name = "ic-nervous-system-timer-task" version = "0.0.1" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "async-trait", "candid", @@ -3362,7 +3358,7 @@ dependencies = [ [[package]] name = "ic-nervous-system-timers" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "ic-cdk-timers", "slotmap", @@ -3371,7 +3367,7 @@ dependencies = [ [[package]] name = "ic-nervous-system-timestamp" version = "0.0.1" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "time", ] @@ -3379,7 +3375,7 @@ dependencies = [ [[package]] name = "ic-neurons-fund" version = "0.0.1" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "ic-cdk", "ic-nervous-system-common", @@ -3393,7 +3389,7 @@ dependencies = [ [[package]] name = "ic-nns-common" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "candid", "comparable", @@ -3414,7 +3410,7 @@ dependencies = [ [[package]] name = "ic-nns-constants" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "ic-base-types", "maplit", @@ -3423,7 +3419,7 @@ dependencies = [ [[package]] name = "ic-nns-governance" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "async-trait", "build-info", @@ -3457,6 +3453,7 @@ dependencies = [ "ic-nervous-system-lock", "ic-nervous-system-long-message", "ic-nervous-system-proto", + "ic-nervous-system-query-instruction-logger", "ic-nervous-system-rate-limits", "ic-nervous-system-root", "ic-nervous-system-runtime", @@ -3468,6 +3465,7 @@ dependencies = [ "ic-nns-common", "ic-nns-constants", "ic-nns-governance-api", + "ic-nns-governance-conversions", "ic-nns-governance-derive-self-describing", "ic-nns-governance-init", "ic-nns-handler-lifeline-interface", @@ -3506,7 +3504,7 @@ dependencies = [ [[package]] name = "ic-nns-governance-api" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "candid", "hex", @@ -3526,10 +3524,19 @@ dependencies = [ "strum_macros", ] +[[package]] +name = "ic-nns-governance-conversions" +version = "0.9.0" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" +dependencies = [ + "ic-nns-governance-api", + "ic-protobuf", +] + [[package]] name = "ic-nns-governance-derive-self-describing" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "proc-macro2", "quote", @@ -3539,7 +3546,7 @@ dependencies = [ [[package]] name = "ic-nns-governance-init" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "csv", "ic-base-types", @@ -3555,7 +3562,7 @@ dependencies = [ [[package]] name = "ic-nns-handler-lifeline-interface" version = "0.1.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "candid", "ic-crypto-sha2", @@ -3565,7 +3572,7 @@ dependencies = [ [[package]] name = "ic-nns-handler-root-interface" version = "0.1.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "async-trait", "candid", @@ -3581,7 +3588,7 @@ dependencies = [ [[package]] name = "ic-node-rewards-canister-api" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "candid", "chrono", @@ -3596,13 +3603,13 @@ dependencies = [ [[package]] name = "ic-protobuf" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "bincode", "candid", "comparable", "erased-serde", - "ic-error-types 0.2.0 (git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d)", + "ic-error-types 0.2.0 (git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4)", "prost", "serde", "serde_json", @@ -3613,7 +3620,7 @@ dependencies = [ [[package]] name = "ic-registry-canister-api" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "attestation", "candid", @@ -3629,7 +3636,7 @@ dependencies = [ [[package]] name = "ic-registry-canister-chunkify" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "ic-cdk", "ic-nervous-system-chunks", @@ -3638,38 +3645,10 @@ dependencies = [ "prost", ] -[[package]] -name = "ic-registry-client-helpers" -version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" -dependencies = [ - "ic-base-types", - "ic-interfaces-registry", - "ic-limits", - "ic-management-canister-types-private", - "ic-protobuf", - "ic-registry-common-proto", - "ic-registry-keys", - "ic-registry-provisional-whitelist", - "ic-registry-routing-table", - "ic-registry-subnet-features", - "ic-types", - "serde_cbor", - "thiserror 2.0.18", -] - -[[package]] -name = "ic-registry-common-proto" -version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" -dependencies = [ - "prost", -] - [[package]] name = "ic-registry-keys" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "candid", "hex", @@ -3682,7 +3661,7 @@ dependencies = [ [[package]] name = "ic-registry-node-provider-rewards" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "ic-base-types", "ic-cdk", @@ -3690,18 +3669,21 @@ dependencies = [ ] [[package]] -name = "ic-registry-provisional-whitelist" +name = "ic-registry-resource-limits" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ - "ic-base-types", + "candid", + "clap", "ic-protobuf", + "ic-types", + "serde", ] [[package]] name = "ic-registry-routing-table" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "candid", "ic-base-types", @@ -3712,7 +3694,7 @@ dependencies = [ [[package]] name = "ic-registry-subnet-features" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "candid", "ic-management-canister-types-private", @@ -3723,7 +3705,7 @@ dependencies = [ [[package]] name = "ic-registry-subnet-type" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "candid", "ic-protobuf", @@ -3735,7 +3717,7 @@ dependencies = [ [[package]] name = "ic-registry-transport" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "async-trait", "candid", @@ -3750,7 +3732,7 @@ dependencies = [ [[package]] name = "ic-secp256k1" version = "0.3.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "hex-literal", "hmac", @@ -3768,7 +3750,7 @@ dependencies = [ [[package]] name = "ic-sns-governance" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "async-trait", "base64 0.13.1", @@ -3781,7 +3763,7 @@ dependencies = [ "futures", "hex", "ic-base-types", - "ic-canister-log 0.2.0 (git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d)", + "ic-canister-log 0.2.0 (git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4)", "ic-canister-profiler", "ic-cdk", "ic-cdk-timers", @@ -3838,7 +3820,7 @@ dependencies = [ [[package]] name = "ic-sns-governance-api" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "bytes", "candid", @@ -3863,7 +3845,7 @@ dependencies = [ [[package]] name = "ic-sns-governance-proposal-criticality" version = "0.0.1" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "ic-nervous-system-proto", ] @@ -3871,7 +3853,7 @@ dependencies = [ [[package]] name = "ic-sns-governance-proposals-amount-total-limit" version = "0.0.1" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "ic-sns-governance-token-valuation", "num-traits", @@ -3882,7 +3864,7 @@ dependencies = [ [[package]] name = "ic-sns-governance-token-valuation" version = "0.0.1" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "async-trait", "candid", @@ -3904,7 +3886,7 @@ dependencies = [ [[package]] name = "ic-sns-init" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "base64 0.13.1", "candid", @@ -3932,7 +3914,7 @@ dependencies = [ [[package]] name = "ic-sns-root" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "async-trait", "build-info", @@ -3941,7 +3923,7 @@ dependencies = [ "comparable", "futures", "ic-base-types", - "ic-canister-log 0.2.0 (git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d)", + "ic-canister-log 0.2.0 (git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4)", "ic-cdk", "ic-cdk-timers", "ic-http-types", @@ -3962,7 +3944,7 @@ dependencies = [ [[package]] name = "ic-sns-swap" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "async-trait", "build-info", @@ -3971,7 +3953,7 @@ dependencies = [ "comparable", "hex", "ic-base-types", - "ic-canister-log 0.2.0 (git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d)", + "ic-canister-log 0.2.0 (git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4)", "ic-cdk", "ic-cdk-timers", "ic-http-types", @@ -4001,7 +3983,7 @@ dependencies = [ [[package]] name = "ic-sns-swap-proto-library" version = "0.0.1" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "candid", "comparable", @@ -4016,7 +3998,7 @@ dependencies = [ [[package]] name = "ic-sns-wasm" version = "1.0.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "async-trait", "candid", @@ -4038,6 +4020,7 @@ dependencies = [ "ic-sns-init", "ic-sns-root", "ic-types", + "ic-types-cycles", "ic-utils", "ic-wasm", "icrc-ledger-types", @@ -4076,7 +4059,7 @@ dependencies = [ [[package]] name = "ic-types" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "base64 0.13.1", "bincode", @@ -4088,15 +4071,17 @@ dependencies = [ "ic-crypto-internal-types", "ic-crypto-sha2", "ic-crypto-tree-hash", - "ic-error-types 0.2.0 (git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d)", + "ic-error-types 0.2.0 (git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4)", "ic-heap-bytes", "ic-limits", "ic-management-canister-types-private", "ic-protobuf", + "ic-types-cycles", "ic-utils", "ic-validate-eq", "ic-validate-eq-derive", "maplit", + "more-asserts", "once_cell", "phantom_newtype", "prost", @@ -4112,10 +4097,24 @@ dependencies = [ "thousands", ] +[[package]] +name = "ic-types-cycles" +version = "0.9.0" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" +dependencies = [ + "candid", + "ic-heap-bytes", + "ic-protobuf", + "serde", + "strum", + "strum_macros", + "thousands", +] + [[package]] name = "ic-utils" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "hex", "scoped_threadpool", @@ -4126,12 +4125,12 @@ dependencies = [ [[package]] name = "ic-utils-ensure" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" [[package]] name = "ic-validate-eq" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "ic-validate-eq-derive", ] @@ -4139,7 +4138,7 @@ dependencies = [ [[package]] name = "ic-validate-eq-derive" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "quote", "syn 2.0.117", @@ -4224,7 +4223,7 @@ dependencies = [ [[package]] name = "icp-ledger" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "candid", "comparable", @@ -4250,7 +4249,7 @@ dependencies = [ [[package]] name = "icrc-cbor" version = "0.1.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "candid", "minicbor", @@ -4261,7 +4260,7 @@ dependencies = [ [[package]] name = "icrc-ledger-client" version = "0.1.4" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "async-trait", "candid", @@ -4271,7 +4270,7 @@ dependencies = [ [[package]] name = "icrc-ledger-client-cdk" version = "0.1.4" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "async-trait", "candid", @@ -4281,8 +4280,8 @@ dependencies = [ [[package]] name = "icrc-ledger-types" -version = "0.1.12" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +version = "0.1.13" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "base32", "candid", @@ -4668,7 +4667,7 @@ dependencies = [ [[package]] name = "ledger-canister" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "candid", "candid_parser", @@ -4676,7 +4675,7 @@ dependencies = [ "dfn_protobuf", "hex", "ic-base-types", - "ic-canister-log 0.2.0 (git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d)", + "ic-canister-log 0.2.0 (git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4)", "ic-cdk", "ic-http-types", "ic-icrc1", @@ -4958,6 +4957,12 @@ dependencies = [ "syn 2.0.117", ] +[[package]] +name = "more-asserts" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fafa6961cabd9c63bcd77a45d7e3b7f3b552b70417831fb0f56db717e72407e" + [[package]] name = "multimap" version = "0.10.1" @@ -5103,7 +5108,7 @@ dependencies = [ [[package]] name = "on_wire" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" [[package]] name = "once_cell" @@ -5317,7 +5322,7 @@ dependencies = [ [[package]] name = "phantom_newtype" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "candid", "ic-heap-bytes", @@ -6005,7 +6010,7 @@ checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a" [[package]] name = "registry-canister" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "attestation", "build-info", @@ -6042,6 +6047,7 @@ dependencies = [ "ic-registry-canister-chunkify", "ic-registry-keys", "ic-registry-node-provider-rewards", + "ic-registry-resource-limits", "ic-registry-routing-table", "ic-registry-subnet-features", "ic-registry-subnet-type", @@ -6058,6 +6064,7 @@ dependencies = [ "rand 0.8.5", "rand_chacha 0.3.1", "serde", + "strum", "url", ] @@ -6115,10 +6122,12 @@ dependencies = [ [[package]] name = "rewards-calculation" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "chrono", "ic-base-types", + "ic-cdk", + "ic-nns-constants", "ic-protobuf", "itertools 0.12.1", "lazy_static", @@ -6817,7 +6826,7 @@ dependencies = [ [[package]] name = "sns-treasury-manager" version = "0.9.0" -source = "git+https://github.com/dfinity/ic?rev=007c473c9c7fc820c49eea5c823cdd4b9404119d#007c473c9c7fc820c49eea5c823cdd4b9404119d" +source = "git+https://github.com/dfinity/ic?rev=b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4#b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" dependencies = [ "candid", "derivative", diff --git a/Cargo.toml b/Cargo.toml index 845e1eb8..9c83a7d1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,20 +13,20 @@ license = "Apache-2.0" # ./scripts/point-to-ic-repo-commit-id.sh be used. That also updates the files # in the candid directory. (This core would be unnecessary if this code also # lived in the ic repo.) -ic-base-types = { git = "https://github.com/dfinity/ic", rev = "007c473c9c7fc820c49eea5c823cdd4b9404119d" } -ic-ckbtc-minter = { git = "https://github.com/dfinity/ic", rev = "007c473c9c7fc820c49eea5c823cdd4b9404119d" } -ic-nervous-system-common = { git = "https://github.com/dfinity/ic", rev = "007c473c9c7fc820c49eea5c823cdd4b9404119d" } -ic-nns-common = { git = "https://github.com/dfinity/ic", rev = "007c473c9c7fc820c49eea5c823cdd4b9404119d" } -ic-nns-constants = { git = "https://github.com/dfinity/ic", rev = "007c473c9c7fc820c49eea5c823cdd4b9404119d" } -ic-nns-governance = { git = "https://github.com/dfinity/ic", rev = "007c473c9c7fc820c49eea5c823cdd4b9404119d" } -ic-nns-governance-api = { git = "https://github.com/dfinity/ic", rev = "007c473c9c7fc820c49eea5c823cdd4b9404119d" } -ic-sns-governance = { git = "https://github.com/dfinity/ic", rev = "007c473c9c7fc820c49eea5c823cdd4b9404119d" } -ic-sns-root = { git = "https://github.com/dfinity/ic", rev = "007c473c9c7fc820c49eea5c823cdd4b9404119d" } -ic-sns-swap = { git = "https://github.com/dfinity/ic", rev = "007c473c9c7fc820c49eea5c823cdd4b9404119d" } -ic-sns-wasm = { git = "https://github.com/dfinity/ic", rev = "007c473c9c7fc820c49eea5c823cdd4b9404119d" } -icp-ledger = { git = "https://github.com/dfinity/ic", rev = "007c473c9c7fc820c49eea5c823cdd4b9404119d" } -icrc-ledger-types = { git = "https://github.com/dfinity/ic", rev = "007c473c9c7fc820c49eea5c823cdd4b9404119d" } -ledger-canister = { git = "https://github.com/dfinity/ic", rev = "007c473c9c7fc820c49eea5c823cdd4b9404119d" } +ic-base-types = { git = "https://github.com/dfinity/ic", rev = "b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" } +ic-ckbtc-minter = { git = "https://github.com/dfinity/ic", rev = "b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" } +ic-nervous-system-common = { git = "https://github.com/dfinity/ic", rev = "b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" } +ic-nns-common = { git = "https://github.com/dfinity/ic", rev = "b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" } +ic-nns-constants = { git = "https://github.com/dfinity/ic", rev = "b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" } +ic-nns-governance = { git = "https://github.com/dfinity/ic", rev = "b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" } +ic-nns-governance-api = { git = "https://github.com/dfinity/ic", rev = "b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" } +ic-sns-governance = { git = "https://github.com/dfinity/ic", rev = "b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" } +ic-sns-root = { git = "https://github.com/dfinity/ic", rev = "b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" } +ic-sns-swap = { git = "https://github.com/dfinity/ic", rev = "b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" } +ic-sns-wasm = { git = "https://github.com/dfinity/ic", rev = "b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" } +icp-ledger = { git = "https://github.com/dfinity/ic", rev = "b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" } +icrc-ledger-types = { git = "https://github.com/dfinity/ic", rev = "b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" } +ledger-canister = { git = "https://github.com/dfinity/ic", rev = "b4b0230aa1ed1c94d3674a9a27d60b724edb5cd4" } candid = "0.10.2" candid_parser = "0.1.2" diff --git a/candid/governance.did b/candid/governance.did index ed3554ce..017a2eee 100644 --- a/candid/governance.did +++ b/candid/governance.did @@ -24,6 +24,7 @@ type Action = variant { BlessAlternativeGuestOsVersion : BlessAlternativeGuestOsVersion; TakeCanisterSnapshot : TakeCanisterSnapshot; LoadCanisterSnapshot : LoadCanisterSnapshot; + CreateCanisterAndInstallCode : CreateCanisterAndInstallCode; }; type AddHotKey = record { @@ -66,6 +67,7 @@ type CanisterSettings = record { freezing_threshold : opt nat64; controllers : opt Controllers; log_visibility : opt int32; + snapshot_visibility : opt int32; wasm_memory_limit : opt nat64; memory_allocation : opt nat64; compute_allocation : opt nat64; @@ -231,6 +233,20 @@ type Countries = record { iso_codes : vec text; }; +type CreateCanisterAndInstallCode = record { + host_subnet_id : opt principal; + canister_settings : opt CanisterSettings; + wasm_module_hash : opt blob; + install_arg_hash : opt blob; +}; + +type CreateCanisterAndInstallCodeRequest = record { + host_subnet_id : opt principal; + canister_settings : opt CanisterSettings; + wasm_module : opt WasmModule; + install_arg : opt blob; +}; + type CreateServiceNervousSystem = record { url : opt text; governance_parameters : opt GovernanceParameters; @@ -380,6 +396,7 @@ type GovernanceCachedMetrics = record { timestamp_seconds : nat64; seed_neuron_count : nat64; spawning_neurons_count : nat64; + total_maturity_disbursements_in_progress_e8s_equivalent : nat64; non_self_authenticating_controller_neuron_subset_metrics : opt NeuronSubsetMetrics; public_neuron_subset_metrics : opt NeuronSubsetMetrics; @@ -434,6 +451,9 @@ type InstallCode = record { type InstallCodeRequest = record { arg : opt blob; + // If we add support for chunked WASMs later, the WasmModule type should + // probably be used in place of this field in order to be consistent with + // CreateCanisterAndInstallCodeRequest. wasm_module : opt blob; skip_stopping_before_installing : opt bool; canister_id : opt principal; @@ -775,6 +795,12 @@ type Neuron = record { // Per NNS policy, this is opt. Nevertheless, it will never be null. potential_voting_power : opt nat64; + // Base value (in e8s) used for the "8-year gang" dissolve delay bonus. For neurons that had the + // maximum dissolve delay of 8 years before the maximum was reduced, this is set to the total + // staked value net of fees (including staked maturity) captured at the time of migration. + // For all other neurons, this is 0. + eight_year_gang_bonus_base_e8s : opt nat64; + // The maturity disbursements in progress, i.e. the disbursements that are initiated but not // finalized. The finalization happens 7 days after the disbursement is initiated. maturity_disbursements_in_progress : opt vec MaturityDisbursement; @@ -869,6 +895,8 @@ type NeuronInfo = record { voting_power_refreshed_timestamp_seconds : opt nat64; deciding_voting_power : opt nat64; potential_voting_power : opt nat64; + // See analogous field in Neuron. + eight_year_gang_bonus_base_e8s : opt nat64; }; type NeuronStakeTransfer = record { @@ -1041,6 +1069,7 @@ type ProposalActionRequest = variant { BlessAlternativeGuestOsVersion : BlessAlternativeGuestOsVersion; TakeCanisterSnapshot : TakeCanisterSnapshot; LoadCanisterSnapshot : LoadCanisterSnapshot; + CreateCanisterAndInstallCode : CreateCanisterAndInstallCodeRequest; }; // Creates a rented subnet from a rental request (in the Subnet Rental @@ -1403,6 +1432,10 @@ type CustomProposalCriticality = record { additional_critical_native_action_ids : opt vec nat64; }; +type WasmModule = variant { + Inlined : blob; +}; + type WaitForQuietState = record { current_deadline_timestamp_seconds : nat64; }; @@ -1504,7 +1537,35 @@ type SelfDescribingValue = variant { type GetPendingProposalsRequest = record { return_self_describing_action : opt bool; -} +}; + +// Request to create a new neuron using ICRC-2 transfer_from. +// The caller must have previously approved the governance canister to spend the specified amount. +type CreateNeuronRequest = record { + // Required. The amount of ICP to stake in e8s. + amount_e8s : opt nat64; + // The subaccount of the caller to transfer ICP from. Defaults to the default subaccount. + source_subaccount: opt blob; + // The controller of the new neuron. Defaults to the caller. + controller : opt principal; + // The followees to set for the new neuron. Defaults to the network's default followees. + followees : opt SetFollowing; + // The dissolve delay in seconds. Defaults to 7 days. Clamped to [0, 8 years]. + dissolve_delay_seconds : opt nat64; + // Whether the neuron should start dissolving immediately. Defaults to false. + dissolving : opt bool; + // Whether to automatically stake maturity. Defaults to false. + auto_stake_maturity : opt bool; +}; + +type CreatedNeuron = record { + neuron_id : opt NeuronId; +}; + +type CreateNeuronResponse = variant { + Ok : CreatedNeuron; + Err : GovernanceError; +}; service : (Governance) -> { claim_gtc_neurons : (principal, vec NeuronId) -> (Result); @@ -1545,6 +1606,7 @@ service : (Governance) -> { list_proposals : (ListProposalInfoRequest) -> (ListProposalInfoResponse) query; list_neuron_votes : (ListNeuronVotesRequest) -> (ListNeuronVotesResponse) query; manage_neuron : (ManageNeuronRequest) -> (ManageNeuronResponse); + create_neuron : (CreateNeuronRequest) -> (CreateNeuronResponse); settle_community_fund_participation : (SettleCommunityFundParticipation) -> ( Result, ); diff --git a/candid/ledger.did b/candid/ledger.did index 77d6201c..67426b1a 100644 --- a/candid/ledger.did +++ b/candid/ledger.did @@ -345,9 +345,21 @@ type Value = variant { Blob : blob }; +type ChangeArchiveOptions = record { + trigger_threshold : opt nat64; + num_blocks_to_archive : opt nat64; + node_max_memory_size_bytes : opt nat64; + max_message_size_bytes : opt nat64; + controller_id : opt principal; + more_controller_ids : opt vec principal; + cycles_for_archive_creation : opt nat64; + max_transactions_per_response : opt nat64 +}; + type UpgradeArgs = record { icrc1_minting_account : opt Account; - feature_flags : opt FeatureFlags + feature_flags : opt FeatureFlags; + change_archive_options : opt ChangeArchiveOptions }; type LedgerCanisterPayload = variant { diff --git a/candid/registry.did b/candid/registry.did index 0d5d2bb0..285bf36b 100644 --- a/candid/registry.did +++ b/candid/registry.did @@ -81,10 +81,16 @@ type CompleteCanisterMigrationPayload = record { migration_trace : vec principal; }; +type ResourceLimits = record { + maximum_state_size : opt nat64; + maximum_state_delta : opt nat64; +}; + type CreateSubnetPayload = record { unit_delay_millis : nat64; features : SubnetFeatures; max_ingress_bytes_per_message : nat64; + max_ingress_bytes_per_block: opt nat64; dkg_dealings_per_block : nat64; max_block_payload_size : nat64; start_as_nns : bool; @@ -105,6 +111,8 @@ type CreateSubnetPayload = record { subnet_admins: opt vec principal; + resource_limits : opt ResourceLimits; + // TODO(NNS1-2444): The fields below are deprecated and they are not read anywhere. ingress_bytes_per_block_soft_cap : nat64; gossip_max_artifact_streams_per_peer : nat32; @@ -125,6 +133,15 @@ type CreateSubnetResponse = variant { Err: text; }; +type DeleteSubnetPayload = record { + subnet_id : principal; +}; + +type DeleteSubnetResponse = variant { + Ok; + Err: text; +}; + type CanisterCyclesCostSchedule = variant { Normal; Free; @@ -354,7 +371,7 @@ type SubnetFeatures = record { sev_enabled : opt bool; }; -type SubnetType = variant { application; verified_application; system }; +type SubnetType = variant { application; verified_application; system; cloud_engine }; type UpdateApiBoundaryNodesVersionPayload = record { version : text; @@ -443,6 +460,7 @@ type UpdateSubnetPayload = record { unit_delay_millis : opt nat64; max_duplicity : opt nat32; features : opt SubnetFeatures; + resource_limits : opt ResourceLimits; set_gossip_config_to_default : bool; halt_at_cup_height : opt bool; pfn_evaluation_period_ms : opt nat32; @@ -453,6 +471,7 @@ type UpdateSubnetPayload = record { start_as_nns : opt bool; is_halted : opt bool; max_ingress_messages_per_block : opt nat64; + max_ingress_bytes_per_block: opt nat64; max_number_of_canisters : opt nat64; retransmission_request_ms : opt nat32; dkg_interval_length : opt nat64; @@ -482,6 +501,11 @@ type UpdateUnassignedNodesConfigPayload = record { ssh_readonly_access : opt vec text; }; +type MigrateNodeOperatorPayload = record { + new_node_operator_id : opt principal; + old_node_operator_id : opt principal; +}; + type SwapNodeInSubnetDirectlyPayload = record { new_node_id : opt principal; old_node_id : opt principal; @@ -503,6 +527,11 @@ type SetSubnetOperationalLevelPayload = record { // Similar to ssh_read_only_access, except that this targets one node at a // time, not all the nodes in the subnet. ssh_node_state_write_access : opt vec NodeSshAccess; + + // Replica version IDs to recall for this subnet. If specified, these versions + // will replace the subnet's recalled_replica_version_ids list, preventing + // the subnet from upgrading to these versions. + recalled_replica_version_ids : opt vec text; }; type NodeSshAccess = record { @@ -513,6 +542,24 @@ type NodeSshAccess = record { public_keys : opt vec text; }; +type SplitSubnetPayload = record { + source_subnet_id: principal; + destination_canister_ranges: vec CanisterIdRange; + destination_node_ids: vec principal; +}; + +type OperationType = variant { + Add: vec principal; + Remove: vec principal; + Clear: record {}; +}; + +type UpdateSubnetAdminsPayload = record { + subnet_id: principal; + // opt for future compatibility when removing operation types. + operation_type: opt OperationType; +}; + service : { add_api_boundary_nodes : (AddApiBoundaryNodesPayload) -> (); add_firewall_rules : (AddFirewallRulesPayload) -> (); @@ -524,6 +571,7 @@ service : { clear_provisional_whitelist : () -> (); complete_canister_migration : (CompleteCanisterMigrationPayload) -> (); create_subnet : (CreateSubnetPayload) -> (CreateSubnetResponse); + delete_subnet : (DeleteSubnetPayload) -> (DeleteSubnetResponse); deploy_guestos_to_all_subnet_nodes : ( DeployGuestosToAllSubnetNodesPayload ) -> (); @@ -539,6 +587,7 @@ service : { get_node_providers_monthly_xdr_rewards : (opt GetNodeProvidersMonthlyXdrRewardsRequest) -> (GetNodeProvidersMonthlyXdrRewardsResponse) query; get_subnet_for_canister : (GetSubnetForCanisterRequest) -> (GetSubnetForCanisterResponse) query; migrate_canisters: (MigrateCanistersPayload) -> (MigrateCanistersResponse); + migrate_node_operator_directly : (MigrateNodeOperatorPayload) -> (); prepare_canister_migration : (PrepareCanisterMigrationPayload) -> (); recover_subnet : (RecoverSubnetPayload) -> (); remove_api_boundary_nodes : (RemoveApiBoundaryNodesPayload) -> (); @@ -571,6 +620,8 @@ service : { UpdateSshReadOnlyAccessForAllUnassignedNodesPayload ) -> (); update_subnet : (UpdateSubnetPayload) -> (); + update_subnet_admins : (UpdateSubnetAdminsPayload) -> (); update_unassigned_nodes_config : (UpdateUnassignedNodesConfigPayload) -> (); swap_node_in_subnet_directly : (SwapNodeInSubnetDirectlyPayload) -> (); + split_subnet : (SplitSubnetPayload) -> (); }; diff --git a/candid/sns-governance.did b/candid/sns-governance.did index 71e5e5c3..2fa7a484 100644 --- a/candid/sns-governance.did +++ b/candid/sns-governance.did @@ -458,6 +458,7 @@ type ManageDappCanisterSettings = record { canister_ids : vec principal; reserved_cycles_limit : opt nat64; log_visibility : opt int32; + snapshot_visibility : opt int32; wasm_memory_limit : opt nat64; memory_allocation : opt nat64; compute_allocation : opt nat64; diff --git a/candid/sns-root.did b/candid/sns-root.did index 2acd56a5..87630b53 100644 --- a/candid/sns-root.did +++ b/candid/sns-root.did @@ -141,6 +141,7 @@ type ManageDappCanisterSettingsRequest = record { canister_ids : vec principal; reserved_cycles_limit : opt nat64; log_visibility : opt int32; + snapshot_visibility : opt int32; wasm_memory_limit : opt nat64; memory_allocation : opt nat64; compute_allocation : opt nat64; diff --git a/src/lib/format/nns_governance.rs b/src/lib/format/nns_governance.rs index f8b6963e..d8397baa 100644 --- a/src/lib/format/nns_governance.rs +++ b/src/lib/format/nns_governance.rs @@ -12,15 +12,17 @@ use ic_nns_constants::{ }; use ic_nns_governance::{ pb::v1::{ - install_code::CanisterInstallMode, stop_or_start_canister::CanisterAction, - update_canister_settings::LogVisibility, InstallCode, NeuronType, NnsFunction, - ProposalRewardStatus, ProposalStatus, StopOrStartCanister, Topic, UpdateCanisterSettings, - Visibility, + canister_settings::LogVisibility as PbLogVisibility, + canister_settings::SnapshotVisibility as PbSnapshotVisibility, + install_code::CanisterInstallMode, stop_or_start_canister::CanisterAction, InstallCode, + NeuronType, NnsFunction, ProposalRewardStatus, ProposalStatus, StopOrStartCanister, Topic, + UpdateCanisterSettings, Visibility, }, proposals::call_canister::CallCanister, }; use ic_nns_governance_api::{ add_or_remove_node_provider::Change, + canister_settings::LogVisibility, claim_or_refresh_neuron_from_account_response::Result as ClaimResult, manage_neuron::{ configure::Operation, ManageNeuronProposalCommand as ProposalCommand, NeuronIdOrSubaccount, @@ -29,9 +31,9 @@ use ic_nns_governance_api::{ neuron::DissolveState, proposal::Action, reward_node_provider::{RewardMode, RewardToAccount}, - update_canister_settings::CanisterSettings, - ClaimOrRefreshNeuronFromAccountResponse, GovernanceError, ListNeuronsResponse, - ListProposalInfoResponse, ManageNeuronResponse, NeuronInfo, NeuronState, ProposalInfo, Vote, + CanisterSettings, ClaimOrRefreshNeuronFromAccountResponse, GovernanceError, + ListNeuronsResponse, ListProposalInfoResponse, ManageNeuronResponse, NeuronInfo, NeuronState, + ProposalInfo, Vote, }; use indicatif::HumanBytes; use itertools::Itertools; @@ -186,6 +188,15 @@ Created {creation} if info.visibility.is_some() { writeln!(fmt, "Neuron visibility: {visibility:?}")?; } + if let Some(bonus_base) = info.eight_year_gang_bonus_base_e8s { + if bonus_base > 0 { + writeln!( + fmt, + "8 Year Gang bonus base: {} ICP", + e8s_to_tokens(bonus_base.into()) + )?; + } + } write!( fmt, "Accurate as of {}", @@ -260,6 +271,15 @@ pub fn display_list_neurons(blob: &[u8]) -> AnyhowResult { .unwrap_or_else(|| "never".to_string()) )?; + if let Some(bonus_base) = neuron.eight_year_gang_bonus_base_e8s { + if bonus_base > 0 { + writeln!( + fmt, + "8 Year Gang bonus base: {} ICP", + e8s_to_tokens(bonus_base.into()) + )?; + } + } if let Some(timestamp) = neuron.spawn_at_timestamp_seconds { writeln!( fmt, @@ -1063,6 +1083,22 @@ fn display_proposal_info(proposal_info: ProposalInfo) -> AnyhowResult { } } } + Action::CreateCanisterAndInstallCode(a) => { + write!(fmt, "Create canister and install code")?; + if let Some(subnet) = a.host_subnet_id { + write!(fmt, " on subnet {subnet}")?; + } + fmt.push('\n'); + if let Some(settings) = a.canister_settings { + fmt.push_str(&display_canister_settings(settings)?); + } + if let Some(hash) = a.wasm_module_hash { + writeln!(fmt, "WASM module hash: {}", hex::encode(hash))?; + } + if let Some(hash) = a.install_arg_hash { + writeln!(fmt, "Install arg hash: {}", hex::encode(hash))?; + } + } } } } else { @@ -1201,7 +1237,7 @@ fn display_canister_settings(settings: CanisterSettings) -> AnyhowResult writeln!( fmt, "Freezing threshold: {} cycles", - format_t_cycles(freezing.into()) + format_t_cycles(candid::Nat::from(freezing)) )?; } if let Some(memory) = settings.memory_allocation { @@ -1214,7 +1250,16 @@ fn display_canister_settings(settings: CanisterSettings) -> AnyhowResult writeln!( fmt, "Log visibility: {:?}", - LogVisibility::try_from(visibility).unwrap_or(LogVisibility::Unspecified) + PbLogVisibility::try_from(visibility) + .map(LogVisibility::from) + .unwrap_or(LogVisibility::Unspecified) + )?; + } + if let Some(visibility) = settings.snapshot_visibility { + writeln!( + fmt, + "Snapshot visibility: {:?}", + PbSnapshotVisibility::try_from(visibility).unwrap_or(PbSnapshotVisibility::Unspecified) )?; } if let Some(limit) = settings.wasm_memory_limit { diff --git a/src/lib/signing.rs b/src/lib/signing.rs index b07fd149..fc2214c5 100644 --- a/src/lib/signing.rs +++ b/src/lib/signing.rs @@ -13,16 +13,6 @@ use std::time::Duration; use super::ledger::LedgerIdentity; use super::{get_agent, get_default_role}; -#[derive(Debug)] -pub struct MessageError(String); - -impl std::fmt::Display for MessageError { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "{}", &self.0) - } -} -impl std::error::Error for MessageError {} - /// Represents a signed message with the corresponding request id. #[derive(Clone)] pub struct SignedMessageWithRequestId { From a2448c3b09d5a5e8f630e8c3dbe2afc1c95ace18 Mon Sep 17 00:00:00 2001 From: Adam Spofford Date: Mon, 13 Apr 2026 16:05:33 -0700 Subject: [PATCH 2/3] unused --- src/commands/neuron_manage.rs | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/commands/neuron_manage.rs b/src/commands/neuron_manage.rs index 2ea28c94..fc65a7b7 100644 --- a/src/commands/neuron_manage.rs +++ b/src/commands/neuron_manage.rs @@ -30,11 +30,6 @@ pub const ONE_DAY_SECONDS: u32 = 24 * 60 * 60; pub const ONE_YEAR_SECONDS: u32 = (4 * 365 + 1) * ONE_DAY_SECONDS / 4; pub const ONE_MONTH_SECONDS: u32 = ONE_YEAR_SECONDS / 12; -#[derive(CandidType)] -pub struct AccountIdentifier { - hash: Vec, -} - #[derive(Debug, Clone, Copy, ValueEnum)] enum EnableState { Enabled, From a1eea6f6b0bf69934a3899d70a45434710f11e68 Mon Sep 17 00:00:00 2001 From: Adam Spofford Date: Mon, 13 Apr 2026 16:14:19 -0700 Subject: [PATCH 3/3] . --- src/commands/neuron_manage.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/commands/neuron_manage.rs b/src/commands/neuron_manage.rs index fc65a7b7..4787e378 100644 --- a/src/commands/neuron_manage.rs +++ b/src/commands/neuron_manage.rs @@ -5,7 +5,7 @@ use crate::lib::{ AnyhowResult, AuthInfo, ParsedNnsAccount, ROLE_NNS_GOVERNANCE, }; use anyhow::{anyhow, bail, ensure, Context}; -use candid::{CandidType, Encode, Principal}; +use candid::{Encode, Principal}; use clap::{Parser, ValueEnum}; use ic_base_types::PrincipalId; use ic_nns_common::pb::v1::{NeuronId, ProposalId};