Skip to content

Commit 4308a20

Browse files
Upgrade rand 0.10, reqwest 0.13, strum 0.28, flume 0.12 (#608)
- rand 0.10: Rng -> RngExt, RngCore -> Rng across all crates - reqwest 0.13: rustls-tls feature renamed to rustls - Keep rusqlite at 0.31 due to bdk_wallet libsqlite3-sys conflict
1 parent 9c347ba commit 4308a20

File tree

12 files changed

+699
-180
lines changed

12 files changed

+699
-180
lines changed

rust/Cargo.lock

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

rust/Cargo.toml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,14 @@ hmac = "0.12.1"
4646
hkdf = "0.12.4"
4747
sha2 = "0.10.8"
4848
zeroize = "1.8.1"
49-
rand = "0.9"
49+
rand = "0.10"
5050

5151
# bdk / bitcoin
5252
bitcoin = { version = "0.32" }
53-
bdk_wallet = { version = "2.0", features = ["keys-bip39", "file_store", "rusqlite"] }
54-
bip39 = { version = "2.0.0", features = ["zeroize"] }
55-
bip329 = { version = "0.4.0" }
56-
pubport = { version = "0.5.0" }
53+
bdk_wallet = { version = "2.3", features = ["keys-bip39", "file_store", "rusqlite"] }
54+
bip39 = { version = "2.2", features = ["zeroize"] }
55+
bip329 = { version = "0.4" }
56+
pubport = { version = "0.5" }
5757

5858
# bitcoin nodes
5959
bdk_esplora = { version = "0.22", features = ["async-https-rustls", "tokio"], default-features = false }
@@ -72,7 +72,7 @@ numfmt = { git = "https://github.com/bitcoinppl/numfmt" }
7272
num-bigint = "0.4"
7373

7474
# http client
75-
reqwest = { version = "0.12", features = ["json", "rustls-tls"], default-features = false }
75+
reqwest = { version = "0.13", features = ["json", "rustls"], default-features = false }
7676

7777
# time
7878
jiff = { version = "0.2", features = [] }
@@ -97,7 +97,7 @@ dirs = "6.0"
9797

9898
# derive stuff
9999
derive_more = { version = "2.0" }
100-
strum = { version = "0.27", features = ["derive"] }
100+
strum = { version = "0.28", features = ["derive"] }
101101

102102
# extensions
103103
tap = "1.0"
@@ -160,7 +160,7 @@ sha2 = { workspace = true }
160160
argon2 = { version = "0.5.0", features = ["password-hash"] }
161161

162162
# concurrency
163-
flume = { version = "0.11", features = ["async"] }
163+
flume = { version = "0.12", features = ["async"] }
164164
parking_lot = { workspace = true, features = ["deadlock_detection"] }
165165
once_cell = { workspace = true }
166166

@@ -234,7 +234,7 @@ hmac = { workspace = true }
234234
ahash = { workspace = true }
235235

236236
# http client
237-
reqwest = { workspace = true, features = ["json", "rustls-tls"], default-features = false }
237+
reqwest = { workspace = true, features = ["json", "rustls"], default-features = false }
238238

239239
# parsing
240240
winnow = { workspace = true }

rust/crates/cove-bdk/src/coin_selection/deterministic_random_draw.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use bdk_wallet::{
33
bitcoin::{Amount, FeeRate, Script, key::rand::RngCore},
44
coin_selection::{CoinSelectionAlgorithm, CoinSelectionResult, InsufficientFunds},
55
};
6-
use rand::{RngCore as _, SeedableRng as _};
6+
use rand::{Rng as _, SeedableRng as _};
77

88
use crate::util::select_sorted_utxos;
99

rust/crates/cove-bip39/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ mod test {
7979

8080
use bip39::Mnemonic;
8181
use num_bigint::BigUint;
82-
use rand::Rng as _;
82+
use rand::RngExt as _;
8383

8484
use super::generate_possible_final_words;
8585
use crate::split_and_encode_phrase;

rust/crates/cove-cspp/src/master_key.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use rand::Rng as _;
1+
use rand::RngExt as _;
22
use zeroize::{Zeroize, ZeroizeOnDrop};
33

44
#[derive(Zeroize, ZeroizeOnDrop)]

rust/crates/cove-types/src/transaction/sent_and_received.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use super::TransactionDirection;
22
use crate::{amount::Amount, unit::BitcoinUnit};
33
use bitcoin::Amount as BdkAmount;
4-
use rand::Rng as _;
4+
use rand::RngExt as _;
55

66
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, uniffi::Object)]
77
pub struct SentAndReceived {

rust/crates/cove-util/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ where
1919
}
2020

2121
pub fn generate_random_chain_code() -> [u8; 32] {
22-
use rand::Rng as _;
22+
use rand::RngExt as _;
2323

2424
let rng = &mut rand::rng();
2525
let mut chain_code = [0u8; 32];

rust/src/database/historical_price/record.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ mod tests {
262262
}
263263
}
264264

265-
fn random_record(rng: &mut impl rand::Rng) -> HistoricalPriceRecord {
265+
fn random_record(rng: &mut impl rand::RngExt) -> HistoricalPriceRecord {
266266
HistoricalPriceRecord {
267267
time: 1745268220,
268268
usd: rng.random_range(0.0..500_000.0),

rust/src/manager/wallet_manager/actor.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ use cove_types::{
4747
use cove_util::result_ext::ResultExt as _;
4848
use eyre::Result;
4949
use flume::Sender;
50-
use rand::Rng as _;
50+
use rand::RngExt as _;
5151
use std::{
5252
sync::Arc,
5353
time::{Duration, UNIX_EPOCH},

rust/src/mnemonic/number_of_bip39_words.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use bip39::Mnemonic;
2-
use rand::Rng as _;
2+
use rand::RngExt as _;
33

44
#[derive(Debug, Copy, Clone, Hash, Eq, PartialEq, uniffi::Enum)]
55
pub enum NumberOfBip39Words {

0 commit comments

Comments
 (0)