Skip to content

Commit 3a51b94

Browse files
zenshzensh
committed
chore: update backend dependencies
1 parent a27f105 commit 3a51b94

File tree

12 files changed

+662
-368
lines changed

12 files changed

+662
-368
lines changed

‎Cargo.lock‎

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

‎Cargo.toml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ license = "MIT OR Apache-2.0"
3232
[workspace.dependencies]
3333
async-trait = "0.1"
3434
bytes = "1"
35-
base64 = "0.21"
35+
base64 = "0.22"
3636
candid = "0.10"
3737
ciborium = "0.2"
3838
log = "0.4"
@@ -47,18 +47,18 @@ hmac = "0.12"
4747
sha2 = "0.10"
4848
sha3 = "0.10"
4949
num-traits = "0.2"
50-
ic-agent = "0.40"
50+
ic-agent = "0.44"
5151
ic-cdk = "0.18"
5252
ic-cdk-timers = "0.12"
53-
ic-stable-structures = "0.6"
53+
ic-stable-structures = "0.7"
5454
icrc-ledger-types = "0.1"
55-
ic_auth_types = "0.5"
56-
ic_auth_verifier = { version = "0.5" }
57-
ic_cose_types = "0.8"
55+
ic_auth_types = "0.6"
56+
ic_auth_verifier = { version = "0.6" }
57+
ic_cose_types = "0.9"
5858
ic-certification = "3.0"
59-
ic-oss-types = "1.1"
59+
ic-oss-types = "1.2"
6060
ic-canister-sig-creation = "1.3"
61-
ic-ed25519 = { version = "0.2" }
61+
ic-ed25519 = { version = "0.3" }
6262
chrono = { version = "0.4", features = ["serde"] }
6363
clap = { version = "=4.5", features = ["derive"] }
6464
ic-dummy-getrandom-for-wasm = "0.1"

‎src/ic_dmsg_minter/src/store.rs‎

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,13 @@ pub struct State {
2121
impl Storable for State {
2222
const BOUND: Bound = Bound::Unbounded;
2323

24-
fn to_bytes(&self) -> Cow<[u8]> {
24+
fn into_bytes(self) -> Vec<u8> {
25+
let mut buf = vec![];
26+
into_writer(&self, &mut buf).expect("failed to encode State data");
27+
buf
28+
}
29+
30+
fn to_bytes(&self) -> Cow<'_, [u8]> {
2531
let mut buf = vec![];
2632
into_writer(self, &mut buf).expect("failed to encode State data");
2733
Cow::Owned(buf)
@@ -41,7 +47,13 @@ impl Storable for Linker {
4147
is_fixed_size: false,
4248
};
4349

44-
fn to_bytes(&self) -> Cow<[u8]> {
50+
fn into_bytes(self) -> Vec<u8> {
51+
let mut buf = vec![];
52+
into_writer(&self, &mut buf).expect("failed to encode Linker data");
53+
buf
54+
}
55+
56+
fn to_bytes(&self) -> Cow<'_, [u8]> {
4557
let mut buf = vec![];
4658
into_writer(self, &mut buf).expect("failed to encode Linker data");
4759
Cow::Owned(buf)
@@ -65,7 +77,14 @@ impl Storable for LinkLog {
6577
is_fixed_size: false,
6678
};
6779

68-
fn to_bytes(&self) -> Cow<[u8]> {
80+
fn into_bytes(self) -> Vec<u8> {
81+
let mut buf = vec![];
82+
into_writer(&(&self.linker, &self.rewards, &self.minted_at), &mut buf)
83+
.expect("failed to encode LinkLog data");
84+
buf
85+
}
86+
87+
fn to_bytes(&self) -> Cow<'_, [u8]> {
6988
let mut buf = vec![];
7089
into_writer(&(&self.linker, &self.rewards, &self.minted_at), &mut buf)
7190
.expect("failed to encode LinkLog data");
@@ -98,7 +117,7 @@ thread_local! {
98117
StableCell::init(
99118
MEMORY_MANAGER.with_borrow(|m| m.get(STATE_MEMORY_ID)),
100119
Vec::new()
101-
).expect("failed to init STATE store")
120+
)
102121
);
103122

104123
static LINKER_STORE: RefCell<StableBTreeMap<Linker, u64, Memory>> = RefCell::new(
@@ -111,7 +130,7 @@ thread_local! {
111130
StableLog::init(
112131
MEMORY_MANAGER.with_borrow(|m| m.get(LINKER_BLK_INDEX_MEMORY_ID)),
113132
MEMORY_MANAGER.with_borrow(|m| m.get(LINKER_BLK_DATA_MEMORY_ID)),
114-
).expect("failed to init Linker store")
133+
)
115134
);
116135
}
117136

@@ -142,9 +161,7 @@ pub mod state {
142161
STATE_STORE.with(|r| {
143162
let mut buf = vec![];
144163
into_writer(&(*h.borrow()), &mut buf).expect("failed to encode STATE_STORE data");
145-
r.borrow_mut()
146-
.set(buf)
147-
.expect("failed to set STATE_STORE data");
164+
r.borrow_mut().set(buf);
148165
});
149166
});
150167
}

‎src/ic_message/src/store.rs‎

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,13 @@ impl State {
8080
impl Storable for State {
8181
const BOUND: Bound = Bound::Unbounded;
8282

83-
fn to_bytes(&self) -> Cow<[u8]> {
83+
fn into_bytes(self) -> Vec<u8> {
84+
let mut buf = vec![];
85+
into_writer(&self, &mut buf).expect("failed to encode State data");
86+
buf
87+
}
88+
89+
fn to_bytes(&self) -> Cow<'_, [u8]> {
8490
let mut buf = vec![];
8591
into_writer(self, &mut buf).expect("failed to encode State data");
8692
Cow::Owned(buf)
@@ -121,7 +127,13 @@ impl User {
121127
impl Storable for User {
122128
const BOUND: Bound = Bound::Unbounded;
123129

124-
fn to_bytes(&self) -> Cow<[u8]> {
130+
fn into_bytes(self) -> Vec<u8> {
131+
let mut buf = vec![];
132+
into_writer(&self, &mut buf).expect("failed to encode User data");
133+
buf
134+
}
135+
136+
fn to_bytes(&self) -> Cow<'_, [u8]> {
125137
let mut buf = vec![];
126138
into_writer(self, &mut buf).expect("failed to encode User data");
127139
Cow::Owned(buf)
@@ -148,7 +160,7 @@ thread_local! {
148160
StableCell::init(
149161
MEMORY_MANAGER.with_borrow(|m| m.get(STATE_MEMORY_ID)),
150162
Vec::new()
151-
).expect("failed to init STATE store")
163+
)
152164
);
153165

154166
static NAME_STORE: RefCell<StableBTreeMap<String, Principal, Memory>> = RefCell::new(
@@ -167,7 +179,7 @@ thread_local! {
167179
StableLog::init(
168180
MEMORY_MANAGER.with_borrow(|m| m.get(NAME_BLK_INDEX_MEMORY_ID)),
169181
MEMORY_MANAGER.with_borrow(|m| m.get(NAME_BLK_DATA_MEMORY_ID)),
170-
).expect("failed to init NameBlock store")
182+
)
171183
);
172184
}
173185

@@ -205,7 +217,7 @@ pub mod state {
205217
STATE_STORE.with_borrow_mut(|r| {
206218
let mut buf = vec![];
207219
into_writer(h, &mut buf).expect("failed to encode STATE_STORE data");
208-
r.set(buf).expect("failed to set STATE_STORE data");
220+
r.set(buf);
209221
});
210222
});
211223
}

‎src/ic_message_channel/src/store.rs‎

Lines changed: 30 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,13 @@ pub struct State {
4848
impl Storable for State {
4949
const BOUND: Bound = Bound::Unbounded;
5050

51-
fn to_bytes(&self) -> Cow<[u8]> {
51+
fn into_bytes(self) -> Vec<u8> {
52+
let mut buf = vec![];
53+
into_writer(&self, &mut buf).expect("failed to encode State data");
54+
buf
55+
}
56+
57+
fn to_bytes(&self) -> Cow<'_, [u8]> {
5258
let mut buf = vec![];
5359
into_writer(self, &mut buf).expect("failed to encode State data");
5460
Cow::Owned(buf)
@@ -219,7 +225,13 @@ impl ChannelSetting {
219225
impl Storable for Channel {
220226
const BOUND: Bound = Bound::Unbounded;
221227

222-
fn to_bytes(&self) -> Cow<[u8]> {
228+
fn into_bytes(self) -> Vec<u8> {
229+
let mut buf = vec![];
230+
into_writer(&self, &mut buf).expect("failed to encode Channel data");
231+
buf
232+
}
233+
234+
fn to_bytes(&self) -> Cow<'_, [u8]> {
223235
let mut buf = vec![];
224236
into_writer(self, &mut buf).expect("failed to encode Channel data");
225237
Cow::Owned(buf)
@@ -260,7 +272,13 @@ impl Message {
260272
impl Storable for Message {
261273
const BOUND: Bound = Bound::Unbounded;
262274

263-
fn to_bytes(&self) -> Cow<[u8]> {
275+
fn into_bytes(self) -> Vec<u8> {
276+
let mut buf = vec![];
277+
into_writer(&self, &mut buf).expect("failed to encode Message data");
278+
buf
279+
}
280+
281+
fn to_bytes(&self) -> Cow<'_, [u8]> {
264282
let mut buf = vec![];
265283
into_writer(self, &mut buf).expect("failed to encode Message data");
266284
Cow::Owned(buf)
@@ -280,7 +298,13 @@ impl Storable for MessageId {
280298
is_fixed_size: false,
281299
};
282300

283-
fn to_bytes(&self) -> Cow<[u8]> {
301+
fn into_bytes(self) -> Vec<u8> {
302+
let mut buf = vec![];
303+
into_writer(&self, &mut buf).expect("failed to encode MessageId data");
304+
buf
305+
}
306+
307+
fn to_bytes(&self) -> Cow<'_, [u8]> {
284308
let mut buf = vec![];
285309
into_writer(self, &mut buf).expect("failed to encode MessageId data");
286310
Cow::Owned(buf)
@@ -305,7 +329,7 @@ thread_local! {
305329
StableCell::init(
306330
MEMORY_MANAGER.with_borrow(|m| m.get(STATE_MEMORY_ID)),
307331
Vec::new()
308-
).expect("failed to init STATE store")
332+
)
309333
);
310334

311335
static CHANNEL_STORE: RefCell<StableBTreeMap<u32, Channel, Memory>> = RefCell::new(
@@ -377,9 +401,7 @@ pub mod state {
377401
STATE_STORE.with(|r| {
378402
let mut buf = vec![];
379403
into_writer(&(*h.borrow()), &mut buf).expect("failed to encode STATE_STORE data");
380-
r.borrow_mut()
381-
.set(buf)
382-
.expect("failed to set STATE_STORE data");
404+
r.borrow_mut().set(buf);
383405
});
384406
});
385407
}

‎src/ic_message_profile/src/store.rs‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,13 @@ pub struct State {
3535
impl Storable for State {
3636
const BOUND: Bound = Bound::Unbounded;
3737

38-
fn to_bytes(&self) -> Cow<[u8]> {
38+
fn into_bytes(self) -> Vec<u8> {
39+
let mut buf = vec![];
40+
into_writer(&self, &mut buf).expect("failed to encode State data");
41+
buf
42+
}
43+
44+
fn to_bytes(&self) -> Cow<'_, [u8]> {
3945
let mut buf = vec![];
4046
into_writer(self, &mut buf).expect("failed to encode State data");
4147
Cow::Owned(buf)
@@ -126,7 +132,13 @@ pub struct ChannelSetting {
126132
impl Storable for Profile {
127133
const BOUND: Bound = Bound::Unbounded;
128134

129-
fn to_bytes(&self) -> Cow<[u8]> {
135+
fn into_bytes(self) -> Vec<u8> {
136+
let mut buf = vec![];
137+
into_writer(&self, &mut buf).expect("failed to encode Profile data");
138+
buf
139+
}
140+
141+
fn to_bytes(&self) -> Cow<'_, [u8]> {
130142
let mut buf = vec![];
131143
into_writer(self, &mut buf).expect("failed to encode Profile data");
132144
Cow::Owned(buf)
@@ -151,7 +163,7 @@ thread_local! {
151163
StableCell::init(
152164
MEMORY_MANAGER.with_borrow(|m| m.get(STATE_MEMORY_ID)),
153165
Vec::new()
154-
).expect("failed to init STATE store")
166+
)
155167
);
156168

157169
static PROFILE_STORE: RefCell<StableBTreeMap<Principal, Profile, Memory>> = RefCell::new(
@@ -196,9 +208,7 @@ pub mod state {
196208
STATE_STORE.with(|r| {
197209
let mut buf = vec![];
198210
into_writer(&(*h.borrow()), &mut buf).expect("failed to encode STATE_STORE data");
199-
r.borrow_mut()
200-
.set(buf)
201-
.expect("failed to set STATE_STORE data");
211+
r.borrow_mut().set(buf);
202212
});
203213
});
204214
}

‎src/ic_name_identity/src/store.rs‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,13 @@ impl Delegations {
101101
impl Storable for Delegations {
102102
const BOUND: Bound = Bound::Unbounded;
103103

104-
fn to_bytes(&self) -> Cow<[u8]> {
104+
fn into_bytes(self) -> Vec<u8> {
105+
let mut buf = vec![];
106+
into_writer(&self, &mut buf).expect("failed to encode Delegations data");
107+
buf
108+
}
109+
110+
fn to_bytes(&self) -> Cow<'_, [u8]> {
105111
let mut buf = vec![];
106112
into_writer(&self, &mut buf).expect("failed to encode Delegations data");
107113
Cow::Owned(buf)
@@ -117,7 +123,13 @@ pub struct Names(BTreeSet<String>);
117123
impl Storable for Names {
118124
const BOUND: Bound = Bound::Unbounded;
119125

120-
fn to_bytes(&self) -> Cow<[u8]> {
126+
fn into_bytes(self) -> Vec<u8> {
127+
let mut buf = vec![];
128+
into_writer(&self.0, &mut buf).expect("failed to encode Names data");
129+
buf
130+
}
131+
132+
fn to_bytes(&self) -> Cow<'_, [u8]> {
121133
let mut buf = vec![];
122134
into_writer(&self.0, &mut buf).expect("failed to encode Names data");
123135
Cow::Owned(buf)
@@ -145,7 +157,7 @@ thread_local! {
145157
StableCell::init(
146158
MEMORY_MANAGER.with_borrow(|m| m.get(STATE_MEMORY_ID)),
147159
Vec::new()
148-
).expect("failed to init STATE store")
160+
)
149161
);
150162

151163
static NAME_DELEGATIONS_STORE: RefCell<StableBTreeMap<String, Delegations, Memory>> = RefCell::new(
@@ -188,9 +200,7 @@ pub mod state {
188200
STATE_STORE.with(|r| {
189201
let mut buf = vec![];
190202
into_writer(&(*h.borrow()), &mut buf).expect("failed to encode STATE_STORE data");
191-
r.borrow_mut()
192-
.set(buf)
193-
.expect("failed to set STATE_STORE data");
203+
r.borrow_mut().set(buf);
194204
});
195205
});
196206
}

0 commit comments

Comments
 (0)