bump versions

Author: yhabib

Cargo.lock

@@ -9,24 +9,24 @@ resolver = "2"
 version = "2.0.141"
 
 [workspace.dependencies]
-ic-cdk = "0.17.1"
-ic-cdk-timers = "0.11.0"
-ic-management-canister-types = "0.4.1"
+ic-cdk = "0.19.0"
+ic-cdk-timers = "1.0.0"
+ic-management-canister-types = "0.5.0"
 
-cycles-minting-canister = { git = "https://github.com/dfinity/ic", rev = "release-2025-08-14_03-27-base" }
-dfn_candid = { git = "https://github.com/dfinity/ic", rev = "release-2025-08-14_03-27-base" }
-dfn_protobuf = { git = "https://github.com/dfinity/ic", rev = "release-2025-08-14_03-27-base" }
-ic-base-types = { git = "https://github.com/dfinity/ic", rev = "release-2025-08-14_03-27-base" }
-ic-crypto-sha2 = { git = "https://github.com/dfinity/ic", rev = "release-2025-08-14_03-27-base" }
-ic-ledger-core = { git = "https://github.com/dfinity/ic", rev = "release-2025-08-14_03-27-base" }
-ic-nervous-system-common = { git = "https://github.com/dfinity/ic", rev = "release-2025-08-14_03-27-base" }
-ic-nns-common = { git = "https://github.com/dfinity/ic", rev = "release-2025-08-14_03-27-base" }
-ic-nns-constants = { git = "https://github.com/dfinity/ic", rev = "release-2025-08-14_03-27-base" }
-ic-nns-governance = { git = "https://github.com/dfinity/ic", rev = "release-2025-08-14_03-27-base" }
-ic-sns-swap = { git = "https://github.com/dfinity/ic", rev = "release-2025-08-14_03-27-base" }
-icp-ledger = { git = "https://github.com/dfinity/ic", rev = "release-2025-08-14_03-27-base" }
-icrc-ledger-types = { git = "https://github.com/dfinity/ic", rev = "release-2025-08-14_03-27-base" }
-on_wire = { git = "https://github.com/dfinity/ic", rev = "release-2025-08-14_03-27-base" }
+cycles-minting-canister = { git = "https://github.com/dfinity/ic", rev = "release-2026-04-02_04-48-base" }
+dfn_candid = { git = "https://github.com/dfinity/ic", rev = "release-2026-04-02_04-48-base" }
+dfn_protobuf = { git = "https://github.com/dfinity/ic", rev = "release-2026-04-02_04-48-base" }
+ic-base-types = { git = "https://github.com/dfinity/ic", rev = "release-2026-04-02_04-48-base" }
+ic-crypto-sha2 = { git = "https://github.com/dfinity/ic", rev = "release-2026-04-02_04-48-base" }
+ic-ledger-core = { git = "https://github.com/dfinity/ic", rev = "release-2026-04-02_04-48-base" }
+ic-nervous-system-common = { git = "https://github.com/dfinity/ic", rev = "release-2026-04-02_04-48-base" }
+ic-nns-common = { git = "https://github.com/dfinity/ic", rev = "release-2026-04-02_04-48-base" }
+ic-nns-constants = { git = "https://github.com/dfinity/ic", rev = "release-2026-04-02_04-48-base" }
+ic-nns-governance = { git = "https://github.com/dfinity/ic", rev = "release-2026-04-02_04-48-base" }
+ic-sns-swap = { git = "https://github.com/dfinity/ic", rev = "release-2026-04-02_04-48-base" }
+icp-ledger = { git = "https://github.com/dfinity/ic", rev = "release-2026-04-02_04-48-base" }
+icrc-ledger-types = { git = "https://github.com/dfinity/ic", rev = "release-2026-04-02_04-48-base" }
+on_wire = { git = "https://github.com/dfinity/ic", rev = "release-2026-04-02_04-48-base" }
 
 [profile.release]
 lto = false

Cargo.toml

@@ -112,8 +112,8 @@
         "IDL2JSON_VERSION": "0.8.8",
         "OPTIMIZER_VERSION": "0.3.6",
         "BINSTALL_VERSION": "1.3.0",
-        "DIDC_RELEASE": "2024-05-14",
-        "DIDC_VERSION": "didc 0.4.0",
+        "DIDC_RELEASE": "2025-12-18",
+        "DIDC_VERSION": "didc 0.5.4",
         "POCKETIC_VERSION": "3.0.1",
         "CARGO_SORT_VERSION": "1.0.9",
         "SNSDEMO_RELEASE": "release-2026-04-01",

config.json

@@ -41,7 +41,7 @@ on_wire = { workspace = true }
 
 [dev-dependencies]
 anyhow = "1.0.95"
-candid_parser = "0.1.2"
+candid_parser = "0.3.0"
 ic_principal = "0.1.0"
 maplit = "1.0.2"
 pretty_assertions = "1.4.0"

rs/backend/Cargo.toml

@@ -27,7 +27,6 @@ mod canisters;
 mod constants;
 mod metrics_encoder;
 mod perf;
-mod spawn;
 mod state;
 mod stats;
 mod time;

rs/backend/src/main.rs

@@ -9,37 +9,42 @@ pub mod testing {
     use ic_cdk_timers::TimerId;
     use slotmap::SlotMap;
     use std::cell::RefCell;
+    use std::future::Future;
+    use std::pin::Pin;
     use std::time::Duration;
 
     pub struct Timer {
         pub delay: Duration,
-        pub func: Box<dyn FnOnce()>,
+        pub future: Pin<Box<dyn Future<Output = ()>>>,
     }
 
     pub struct TimerInterval {
         pub interval: Duration,
-        pub func: Box<dyn FnMut()>,
+        pub func: Box<dyn FnMut() -> Pin<Box<dyn Future<Output = ()>>>>,
     }
 
     thread_local! {
         pub static TIMERS: RefCell<SlotMap<TimerId, Timer>> = RefCell::default();
         pub static TIMER_INTERVALS: RefCell<SlotMap<TimerId, TimerInterval>> = RefCell::default();
     }
 
-    pub fn set_timer(delay: Duration, func: impl FnOnce() + 'static) -> TimerId {
+    pub fn set_timer(delay: Duration, future: impl Future<Output = ()> + 'static) -> TimerId {
         TIMERS.with(|timers| {
             timers.borrow_mut().insert(Timer {
                 delay,
-                func: Box::new(func),
+                future: Box::pin(future),
             })
         })
     }
 
-    pub fn set_timer_interval(interval: Duration, func: impl FnMut() + 'static) -> TimerId {
+    pub fn set_timer_interval<Fut>(interval: Duration, mut func: impl FnMut() -> Fut + 'static) -> TimerId
+    where
+        Fut: Future<Output = ()> + 'static,
+    {
         TIMER_INTERVALS.with(|timer_intervals| {
             timer_intervals.borrow_mut().insert(TimerInterval {
                 interval,
-                func: Box::new(func),
+                func: Box::new(move || Box::pin(func()) as Pin<Box<dyn Future<Output = ()>>>),
             })
         })
     }

rs/backend/src/timer.rs

@@ -1,7 +1,6 @@
 use crate::{
     canisters::{exchange_rate_canister, governance},
     constants::{E8S_PER_UNIT, NANOS_PER_UNIT},
-    spawn,
     state::{with_state, with_state_mut},
     time,
     timer::{set_timer, set_timer_interval},
@@ -31,25 +30,17 @@ pub fn init_timers() {
 }
 
 pub fn start_updating_exchange_rate_in_background() {
-    set_timer_interval(Duration::from_secs(UPDATE_INTERVAL_SECONDS), || {
-        spawn::spawn(update_exchange_rate());
-    });
+    set_timer_interval(Duration::from_secs(UPDATE_INTERVAL_SECONDS), || update_exchange_rate());
     // `set_timer_interval` does not run the callback immediately so we also
     // call it after 1 second to have an exchange rate available soon.
-    set_timer(Duration::from_secs(1), || {
-        spawn::spawn(update_exchange_rate());
-    });
+    set_timer(Duration::from_secs(1), update_exchange_rate());
 }
 
 fn start_updating_locked_icp_in_the_background() {
-    set_timer_interval(Duration::from_secs(UPDATE_INTERVAL_SECONDS), || {
-        spawn::spawn(update_locked_icp_e8s());
-    });
+    set_timer_interval(Duration::from_secs(UPDATE_INTERVAL_SECONDS), || update_locked_icp_e8s());
     // `set_timer_interval` does not run the callback immediately so we also
     // call it after 1 second to have an exchange rate available soon.
-    set_timer(Duration::from_secs(1), || {
-        spawn::spawn(update_locked_icp_e8s());
-    });
+    set_timer(Duration::from_secs(1), update_locked_icp_e8s());
 }
 
 /// Converts a number such that it can be interpreted as a fixed-point number

rs/backend/src/tvl.rs

@@ -1,6 +1,6 @@
 use crate::state::{init_state, with_state, with_state_mut};
 use crate::timer;
-use crate::tvl::{self, exchange_rate_canister, governance, spawn, time};
+use crate::tvl::{self, exchange_rate_canister, governance, time};
 use candid::Nat;
 use lazy_static::lazy_static;
 
@@ -398,13 +398,7 @@ async fn start_updating_exchange_rate_in_background() {
             timer.delay,
             std::time::Duration::from_secs(expected_timer_delay_seconds)
         );
-        // The timer calls spawn::spawn, which, during the test, adds the future
-        // to a queue.
-        (timer.func)();
-        // Make sure the spawned future is run.
-        let mut spawned_futures = spawn::testing::drain_spawned_futures();
-        assert_eq!(spawned_futures.len(), 1);
-        spawned_futures.pop().unwrap().await;
+        timer.future.await;
     }
 
     // Step 4: Verify the state after calling the 1-time timer.
@@ -442,13 +436,7 @@ async fn start_updating_exchange_rate_in_background() {
             timer.interval,
             std::time::Duration::from_secs(expected_timer_interval_seconds)
         );
-        // The timer calls spawn::spawn, which, during the test, adds the future
-        // to a queue.
-        (timer.func)();
-        // Make sure the spawned future is run.
-        let mut spawned_futures = spawn::testing::drain_spawned_futures();
-        assert_eq!(spawned_futures.len(), 1);
-        spawned_futures.pop().unwrap().await;
+        (timer.func)().await;
     }
 
     // Step 4: Verify the state after calling interval timer.
@@ -505,13 +493,7 @@ async fn start_updating_locked_icp_in_the_background() {
             timer.delay,
             std::time::Duration::from_secs(expected_timer_delay_seconds)
         );
-        // The timer calls spawn::spawn, which, during the test, adds the future
-        // to a queue.
-        (timer.func)();
-        // Make sure the spawned future is run.
-        let mut spawned_futures = spawn::testing::drain_spawned_futures();
-        assert_eq!(spawned_futures.len(), 1);
-        spawned_futures.pop().unwrap().await;
+        timer.future.await;
     }
 
     // Step 4: Verify the state after calling the 1-time timer.
@@ -534,13 +516,7 @@ async fn start_updating_locked_icp_in_the_background() {
             timer.interval,
             std::time::Duration::from_secs(expected_timer_interval_seconds)
         );
-        // The timer calls spawn::spawn, which, during the test, adds the future
-        // to a queue.
-        (timer.func)();
-        // Make sure the spawned future is run.
-        let mut spawned_futures = spawn::testing::drain_spawned_futures();
-        assert_eq!(spawned_futures.len(), 1);
-        spawned_futures.pop().unwrap().await;
+        (timer.func)().await;
     }
 
     // Step 4: Verify the state after calling interval timer.

rs/backend/src/tvl/tests.rs

@@ -15,8 +15,8 @@ dfn_candid = { workspace = true }
 ic-base-types = { workspace = true }
 # This next candid is 0.9.0_beta code that fixes serde Nat but has other issues.  Keep checking until the issues are fixed.
 #candid = { git = "https://github.com/dfinity/candid" , rev = "42ffed660ded37585c4b9f97e3ce90919e24c518" }
-ic-cdk = { version = "0.17.1" }
-ic-cdk-timers = "0.11.0"
+ic-cdk = { version = "0.19.0" }
+ic-cdk-timers = "1.0.0"
 ic-certified-map = { git = "https://github.com/dfinity/cdk-rs", rev = "58791941b72471e09e3d9e733f2a3d4d54e52b5a" }
 ic-management-canister-types = { workspace = true }
 ic-nervous-system-common = { workspace = true }

rs/sns_aggregator/Cargo.toml

@@ -170,7 +170,7 @@ impl FastScheduler {
 
     /// Start collecting data now.
     pub fn start(&mut self, timer_interval: Duration) {
-        let timer_id = set_timer_interval(timer_interval, || ic_cdk::spawn(Self::global_update_next()));
+        let timer_id = set_timer_interval(timer_interval, || Self::global_update_next());
         let old_timer = self.update_timer.replace(timer_id);
         if let Some(id) = old_timer {
             clear_timer(id);
@@ -192,7 +192,7 @@ impl FastScheduler {
     /// Note: We request both the delay and the timestamp to avoid making a syscall for data that
     /// is almost certainly already available to the caller.
     pub fn global_start_at(start_seconds: u64, delay: Duration) {
-        let start_timer = set_timer(delay, Self::global_start);
+        let start_timer = set_timer(delay, async { Self::global_start() });
         if let Some((_, old_timer)) = STATE.with(|state| {
             state
                 .fast_scheduler