Skip to content

chore: remove deprecated ic-cdk imports in ic-icrc1-index-ng #10324

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gregorydemay wants to merge 3 commits into
base: master
Choose a base branch
from
+31 −18
Open

chore: remove deprecated ic-cdk imports in ic-icrc1-index-ng #10324

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
65424e4
chore: DEFI-2304 remove deprecated ic-cdk imports in ic-icrc1-index-ng
gregorydemay May 27, 2026
7307247
chore: address Copilot review on icrc1-index-ng
gregorydemay May 27, 2026
1c8c846
docs: explain why the deprecated retrieve_blocks_from_ledger_interval…
gregorydemay Jun 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 22 additions & 18 deletions rs/ledger_suite/icrc1/index-ng/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#![allow(deprecated)]
use candid::{CandidType, Decode, Encode, Nat, Principal};
use ic_canister_log::{export as export_logs, log};
use ic_canister_profiler::{SpanName, SpanStats, measure_span};
use ic_cdk::call::Call;
use ic_cdk::trap;
use ic_cdk::{init, post_upgrade, query};
use ic_crypto_sha2::Sha256;
Expand Down Expand Up @@ -317,6 +317,7 @@ fn balance_key(account: Account) -> (AccountDataType, (Blob<29>, [u8; 32])) {

#[init]
fn init(index_arg: Option<IndexArg>) {
#[allow(deprecated)]
Comment thread
gregorydemay marked this conversation as resolved.
let InitArg {
ledger_id,
retrieve_blocks_from_ledger_interval_seconds,
Expand Down Expand Up @@ -372,7 +373,7 @@ fn post_upgrade(index_arg: Option<IndexArg>) {
// storage scheme. This trick allows SNSes to update the legacy
// index to index-ng.
if let Ok(old_state) = ciborium::de::from_reader::<LegacyIndexState, _>(
ic_cdk::api::stable::StableReader::default().take(MAX_LEGACY_STATE_BYTES),
ic_cdk::stable::StableReader::default().take(MAX_LEGACY_STATE_BYTES),
) {
log!(
P1,
Expand All @@ -388,6 +389,7 @@ fn post_upgrade(index_arg: Option<IndexArg>) {
Some(IndexArg::Upgrade(upgrade)) => {
log!(P1, "Possible upgrade configuration changes: {:#?}", upgrade,);

#[allow(deprecated)]
Comment thread
gregorydemay marked this conversation as resolved.
let UpgradeArg {
ledger_id,
retrieve_blocks_from_ledger_interval_seconds,
Expand Down Expand Up @@ -515,14 +517,15 @@ async fn get_supported_standards_from_ledger() -> Vec<String> {
P1,
"[get_supported_standards_from_ledger]: making the call..."
);
let res = ic_cdk::api::call::call::<_, (Vec<StandardRecord>,)>(
ledger_id,
"icrc1_supported_standards",
(),
)
.await;
let res: Result<Vec<StandardRecord>, String> =
match Call::unbounded_wait(ledger_id, "icrc1_supported_standards").await {
Ok(response) => response
.candid::<Vec<StandardRecord>>()
.map_err(|err| err.to_string()),
Err(err) => Err(err.to_string()),
};
match res {
Ok((res,)) => {
Ok(res) => {
let supported_standard_names = res.into_iter().map(|s| s.name).collect::<Vec<_>>();
log!(
P1,
Expand All @@ -532,14 +535,13 @@ async fn get_supported_standards_from_ledger() -> Vec<String> {
);
supported_standard_names
}
Err((code, msg)) => {
Err(err) => {
// log the error but do not propagate it
log!(
P0,
"[get_supported_standards_from_ledger]: failed to call get_supported_standards_from_ledger on ledger {}. Error code: {:?} message: {}",
"[get_supported_standards_from_ledger]: failed to call get_supported_standards_from_ledger on ledger {}: {}",
Comment thread
gregorydemay marked this conversation as resolved.
Outdated
ledger_id,
code,
msg
err,
);
vec![]
}
Expand All @@ -559,9 +561,11 @@ where
{
let req = measure_span(&PROFILING_DATA, encode_span_name, || Encode!(i))
.map_err(|err| format!("failed to candid encode the input {i:?}: {err}"))?;
let res = ic_cdk::api::call::call_raw(id, method, &req, 0)
let res = Call::unbounded_wait(id, method)
.with_raw_args(&req)
Comment thread
gregorydemay marked this conversation as resolved.
Outdated
.await
.map_err(|(code, str)| format!("code: {code:#?} message: {str}"))?;
.map(|response| response.into_bytes())
.map_err(|err| format!("{err}"))?;
measure_span(&PROFILING_DATA, decode_span_name, || Decode!(&res, O))
.map_err(|err| format!("failed to candid decode the output: {err}"))
}
Expand Down Expand Up @@ -1404,12 +1408,12 @@ fn http_request(req: HttpRequest) -> HttpResponse {
pub fn encode_metrics(w: &mut ic_metrics_encoder::MetricsEncoder<Vec<u8>>) -> std::io::Result<()> {
w.encode_gauge(
"index_stable_memory_pages",
ic_cdk::api::stable::stable_size() as f64,
ic_cdk::stable::stable_size() as f64,
"Size of the stable memory allocated by this canister measured in 64K Wasm pages.",
)?;
w.encode_gauge(
"stable_memory_bytes",
(ic_cdk::api::stable::stable_size() * 64 * 1024) as f64,
(ic_cdk::stable::stable_size() * 64 * 1024) as f64,
"Size of the stable memory allocated by this canister measured in bytes.",
)?;
w.encode_gauge(
Expand All @@ -1418,7 +1422,7 @@ pub fn encode_metrics(w: &mut ic_metrics_encoder::MetricsEncoder<Vec<u8>>) -> st
"Size of the heap memory allocated by this canister measured in bytes.",
)?;

let cycle_balance = ic_cdk::api::canister_balance128() as f64;
let cycle_balance = ic_cdk::api::canister_cycle_balance() as f64;
w.encode_gauge(
"index_cycle_balance",
cycle_balance,
Expand Down
Loading