Skip to content

Commit db21f4e

Browse files
altkdfaltkdf
authored
chore: bump ic_cdk to v0.18.3 (#137)
1 parent 7e7075a commit db21f4e

21 files changed

Lines changed: 188 additions & 383 deletions

File tree

‎Cargo.lock‎

Lines changed: 46 additions & 34 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ documentation = "https://docs.rs/ic-vetkeys"
2525
anyhow = "1.0.95"
2626
candid = "0.10.2"
2727
hex = "0.4.3"
28-
ic-cdk = "0.17.2"
29-
ic-cdk-macros = "0.17.1"
28+
ic-cdk = "0.18.3"
29+
ic-cdk-macros = "0.18.3"
3030
ic-stable-structures = "0.6.8"
3131
lazy_static = "1.5.0"
3232
pocket-ic = "9.0.0"

‎backend/rs/canisters/ic_vetkeys_encrypted_maps_canister/src/lib.rs‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
use std::cell::RefCell;
22

33
use candid::Principal;
4+
use ic_cdk::management_canister::{VetKDCurve, VetKDKeyId};
45
use ic_cdk::{init, query, update};
56
use ic_stable_structures::memory_manager::{MemoryId, MemoryManager, VirtualMemory};
67
use ic_stable_structures::storable::Blob;
78
use ic_stable_structures::DefaultMemoryImpl;
89
use ic_vetkeys::encrypted_maps::{EncryptedMapData, EncryptedMaps, VetKey, VetKeyVerificationKey};
910
use ic_vetkeys::types::{AccessRights, ByteBuf, EncryptedMapValue, TransportKey};
10-
use ic_vetkeys::vetkd_api_types::{VetKDCurve, VetKDKeyId};
1111

1212
type Memory = VirtualMemory<DefaultMemoryImpl>;
1313
type MapId = (Principal, ByteBuf);
@@ -43,7 +43,7 @@ fn get_accessible_shared_map_names() -> Vec<(Principal, ByteBuf)> {
4343
encrypted_maps
4444
.as_ref()
4545
.unwrap()
46-
.get_accessible_shared_map_names(ic_cdk::caller())
46+
.get_accessible_shared_map_names(ic_cdk::api::msg_caller())
4747
.into_iter()
4848
.map(|map_id| (map_id.0, ByteBuf::from(map_id.1.as_ref().to_vec())))
4949
.collect()
@@ -61,7 +61,7 @@ fn get_shared_user_access_for_map(
6161
encrypted_maps
6262
.as_ref()
6363
.unwrap()
64-
.get_shared_user_access_for_map(ic_cdk::caller(), key_id)
64+
.get_shared_user_access_for_map(ic_cdk::api::msg_caller(), key_id)
6565
})
6666
}
6767

@@ -76,7 +76,7 @@ fn get_encrypted_values_for_map(
7676
encrypted_maps
7777
.as_ref()
7878
.unwrap()
79-
.get_encrypted_values_for_map(ic_cdk::caller(), map_id)
79+
.get_encrypted_values_for_map(ic_cdk::api::msg_caller(), map_id)
8080
});
8181
result.map(|map_values| {
8282
map_values
@@ -93,7 +93,7 @@ fn get_all_accessible_encrypted_values() -> Vec<(MapId, Vec<(ByteBuf, EncryptedM
9393
encrypted_maps
9494
.as_ref()
9595
.unwrap()
96-
.get_all_accessible_encrypted_values(ic_cdk::caller())
96+
.get_all_accessible_encrypted_values(ic_cdk::api::msg_caller())
9797
})
9898
.into_iter()
9999
.map(|((owner, map_name), encrypted_values)| {
@@ -114,7 +114,7 @@ fn get_all_accessible_encrypted_maps() -> Vec<EncryptedMapData<AccessRights>> {
114114
encrypted_maps
115115
.as_ref()
116116
.unwrap()
117-
.get_all_accessible_encrypted_maps(ic_cdk::caller())
117+
.get_all_accessible_encrypted_maps(ic_cdk::api::msg_caller())
118118
})
119119
}
120120

@@ -128,7 +128,7 @@ fn get_encrypted_value(
128128
let map_id = (map_owner, map_name);
129129
ENCRYPTED_MAPS.with_borrow(|encrypted_maps| {
130130
encrypted_maps.as_ref().unwrap().get_encrypted_value(
131-
ic_cdk::caller(),
131+
ic_cdk::api::msg_caller(),
132132
map_id,
133133
bytebuf_to_blob(map_key)?,
134134
)
@@ -146,7 +146,7 @@ fn remove_map_values(
146146
encrypted_maps
147147
.as_mut()
148148
.unwrap()
149-
.remove_map_values(ic_cdk::caller(), map_id)
149+
.remove_map_values(ic_cdk::api::msg_caller(), map_id)
150150
});
151151
result.map(|removed| {
152152
removed
@@ -162,7 +162,7 @@ fn get_owned_non_empty_map_names() -> Vec<ByteBuf> {
162162
encrypted_maps
163163
.as_ref()
164164
.unwrap()
165-
.get_owned_non_empty_map_names(ic_cdk::caller())
165+
.get_owned_non_empty_map_names(ic_cdk::api::msg_caller())
166166
.into_iter()
167167
.map(|map_name| ByteBuf::from(map_name.as_slice().to_vec()))
168168
.collect()
@@ -180,7 +180,7 @@ fn insert_encrypted_value(
180180
let map_id = (map_owner, map_name);
181181
ENCRYPTED_MAPS.with_borrow_mut(|encrypted_maps| {
182182
encrypted_maps.as_mut().unwrap().insert_encrypted_value(
183-
ic_cdk::caller(),
183+
ic_cdk::api::msg_caller(),
184184
map_id,
185185
bytebuf_to_blob(map_key)?,
186186
value,
@@ -198,7 +198,7 @@ fn remove_encrypted_value(
198198
let map_id = (map_owner, map_name);
199199
ENCRYPTED_MAPS.with_borrow_mut(|encrypted_maps| {
200200
encrypted_maps.as_mut().unwrap().remove_encrypted_value(
201-
ic_cdk::caller(),
201+
ic_cdk::api::msg_caller(),
202202
map_id,
203203
bytebuf_to_blob(map_key)?,
204204
)
@@ -228,7 +228,7 @@ async fn get_encrypted_vetkey(
228228
Ok(ENCRYPTED_MAPS
229229
.with_borrow(|encrypted_maps| {
230230
encrypted_maps.as_ref().unwrap().get_encrypted_vetkey(
231-
ic_cdk::caller(),
231+
ic_cdk::api::msg_caller(),
232232
map_id,
233233
transport_key,
234234
)
@@ -248,7 +248,7 @@ fn get_user_rights(
248248
encrypted_maps
249249
.as_ref()
250250
.unwrap()
251-
.get_user_rights(ic_cdk::caller(), map_id, user)
251+
.get_user_rights(ic_cdk::api::msg_caller(), map_id, user)
252252
})
253253
}
254254

@@ -263,7 +263,7 @@ fn set_user_rights(
263263
let map_id = (map_owner, map_name);
264264
ENCRYPTED_MAPS.with_borrow_mut(|encrypted_maps| {
265265
encrypted_maps.as_mut().unwrap().set_user_rights(
266-
ic_cdk::caller(),
266+
ic_cdk::api::msg_caller(),
267267
map_id,
268268
user,
269269
access_rights,
@@ -283,7 +283,7 @@ fn remove_user(
283283
encrypted_maps
284284
.as_mut()
285285
.unwrap()
286-
.remove_user(ic_cdk::caller(), map_id, user)
286+
.remove_user(ic_cdk::api::msg_caller(), map_id, user)
287287
})
288288
}
289289

‎backend/rs/canisters/ic_vetkeys_manager_canister/src/lib.rs‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
use std::cell::RefCell;
22

33
use candid::Principal;
4+
use ic_cdk::management_canister::{VetKDCurve, VetKDKeyId};
45
use ic_cdk::{init, query, update};
56
use ic_stable_structures::memory_manager::{MemoryId, MemoryManager, VirtualMemory};
67
use ic_stable_structures::storable::Blob;
78
use ic_stable_structures::DefaultMemoryImpl;
89
use ic_vetkeys::key_manager::{KeyManager, VetKey, VetKeyVerificationKey};
910
use ic_vetkeys::types::{AccessRights, ByteBuf, TransportKey};
10-
use ic_vetkeys::vetkd_api_types::{VetKDCurve, VetKDKeyId};
1111

1212
type Memory = VirtualMemory<DefaultMemoryImpl>;
1313

@@ -40,7 +40,7 @@ fn get_accessible_shared_key_ids() -> Vec<(Principal, ByteBuf)> {
4040
KEY_MANAGER.with_borrow(|km| {
4141
km.as_ref()
4242
.unwrap()
43-
.get_accessible_shared_key_ids(ic_cdk::caller())
43+
.get_accessible_shared_key_ids(ic_cdk::api::msg_caller())
4444
.into_iter()
4545
.map(|key_id| (key_id.0, ByteBuf::from(key_id.1.as_ref().to_vec())))
4646
.collect()
@@ -57,7 +57,7 @@ fn get_shared_user_access_for_key(
5757
KEY_MANAGER.with_borrow(|km| {
5858
km.as_ref()
5959
.unwrap()
60-
.get_shared_user_access_for_key(ic_cdk::caller(), key_id)
60+
.get_shared_user_access_for_key(ic_cdk::api::msg_caller(), key_id)
6161
})
6262
}
6363

@@ -78,9 +78,11 @@ async fn get_encrypted_vetkey(
7878
let key_id = (key_owner, key_name);
7979
Ok(KEY_MANAGER
8080
.with_borrow(|km| {
81-
km.as_ref()
82-
.unwrap()
83-
.get_encrypted_vetkey(ic_cdk::caller(), key_id, transport_key)
81+
km.as_ref().unwrap().get_encrypted_vetkey(
82+
ic_cdk::api::msg_caller(),
83+
key_id,
84+
transport_key,
85+
)
8486
})?
8587
.await)
8688
}
@@ -96,7 +98,7 @@ fn get_user_rights(
9698
KEY_MANAGER.with_borrow(|km| {
9799
km.as_ref()
98100
.unwrap()
99-
.get_user_rights(ic_cdk::caller(), key_id, user)
101+
.get_user_rights(ic_cdk::api::msg_caller(), key_id, user)
100102
})
101103
}
102104

@@ -112,7 +114,7 @@ fn set_user_rights(
112114
KEY_MANAGER.with_borrow_mut(|km| {
113115
km.as_mut()
114116
.unwrap()
115-
.set_user_rights(ic_cdk::caller(), key_id, user, access_rights)
117+
.set_user_rights(ic_cdk::api::msg_caller(), key_id, user, access_rights)
116118
})
117119
}
118120

@@ -127,7 +129,7 @@ fn remove_user(
127129
KEY_MANAGER.with_borrow_mut(|km| {
128130
km.as_mut()
129131
.unwrap()
130-
.remove_user(ic_cdk::caller(), key_id, user)
132+
.remove_user(ic_cdk::api::msg_caller(), key_id, user)
131133
})
132134
}
133135

0 commit comments

Comments
 (0)