Update ic-cdk and ic dependencies (#1219)

This PR updates ic-cdk to v0.7 and ic to the latest master.
The most notable change in ic-cdk is that the timers feature
is now its own crate ic-cdk-timers.

In addition, all other dependencies were upgraded within their minor version.

Author: Frederik Rothenberger

Cargo.lock

@@ -15,7 +15,7 @@ crate-type = ["cdylib"]
 base64 = "0.21"
 lazy_static = "1.4"
 candid = "0.8"
-ic-cdk = "0.6"
+ic-cdk = "0.7"
 ic-cdk-macros = "0.6"
 ic-certified-map = "0.3"
 sha2 = "^0.10" # set bound to match ic-certified-map bound

demos/test-app/Cargo.lock

@@ -11,7 +11,8 @@ edition = "2021"
 internet_identity_interface = { path = "../internet_identity_interface" }
 # ic dependencies
 candid = "0.8"
-ic-cdk = { version = "0.6", features = ["timers"] }
+ic-cdk = "0.7"
+ic-cdk-timers = "0.1"
 ic-cdk-macros = "0.6"
 ic-metrics-encoder = "1"
 ic-stable-structures = "0.5"

demos/test-app/Cargo.toml

@@ -41,9 +41,9 @@ use ic_cdk::api::call::CallResult;
 use ic_cdk::api::management_canister::main::{canister_status, CanisterIdRecord};
 use ic_cdk::api::stable::stable64_size;
 use ic_cdk::api::time;
-use ic_cdk::timer::set_timer_interval;
 use ic_cdk::{call, caller, id, print, trap};
 use ic_cdk_macros::{init, post_upgrade, query, update};
+use ic_cdk_timers::set_timer_interval;
 use ic_metrics_encoder::MetricsEncoder;
 use ic_stable_structures::memory_manager::{MemoryId, MemoryManager, VirtualMemory};
 use ic_stable_structures::{

src/archive/Cargo.toml

@@ -19,7 +19,7 @@ internet_identity_interface = { path = "../internet_identity_interface" }
 
 # All IC deps
 candid = "0.8"
-ic-cdk = "0.6"
+ic-cdk = "0.7"
 ic-types = { git = "https://github.com/dfinity/ic" }
 ic-sdk-certification = { package="ic-certification", version="0.23" }
 ic-certification = { git = "https://github.com/dfinity/ic" }

src/archive/src/main.rs

@@ -26,7 +26,7 @@ captcha = "0.0.9"
 
 # All IC deps
 candid = "0.8"
-ic-cdk = "0.6"
+ic-cdk = "0.7"
 ic-cdk-macros = "0.6"
 ic-certified-map = "0.3"
 ic-metrics-encoder = "1"

src/canister_tests/Cargo.toml

@@ -3,6 +3,8 @@
 // This file describes which assets are used and how (content, content type and content encoding).
 
 use crate::{http, state};
+use base64::engine::general_purpose::STANDARD as BASE64;
+use base64::Engine;
 use ic_cdk::api;
 use lazy_static::lazy_static;
 use sha2::Digest;
@@ -49,7 +51,7 @@ lazy_static! {
     // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy/script-src
     pub static ref JS_SETUP_SCRIPT_SRI_HASH: String = {
         let hash = &sha2::Sha256::digest(JS_SETUP_SCRIPT.as_bytes());
-        let hash = base64::encode(hash);
+        let hash = BASE64.encode(hash);
         format!("sha256-{hash}")
     };
 

src/internet_identity/Cargo.toml

@@ -1,6 +1,8 @@
 use crate::archive::ArchiveState;
 use crate::assets::ContentType;
 use crate::{assets, state, LABEL_ASSETS, LABEL_SIG};
+use base64::engine::general_purpose::STANDARD as BASE64;
+use base64::Engine;
 use ic_cdk::api::stable::stable64_size;
 use ic_cdk::api::{data_certificate, time};
 use ic_cdk::trap;
@@ -311,8 +313,8 @@ fn make_asset_certificate_header(asset_name: &str) -> (String, String) {
             "IC-Certificate".to_string(),
             format!(
                 "certificate=:{}:, tree=:{}:",
-                base64::encode(&certificate),
-                base64::encode(serializer.into_inner())
+                BASE64.encode(&certificate),
+                BASE64.encode(serializer.into_inner())
             ),
         )
     })

src/internet_identity/src/assets.rs

@@ -9,4 +9,4 @@ edition = "2021"
 serde_bytes = "0.11"
 candid = "0.8"
 serde = "1"
-ic-cdk = "0.6"
+ic-cdk = "0.7"