bump dependencies

Cargo.toml

@@ -149,8 +149,8 @@ chrono = "0.4"
 clap = "4.5"
 ctor = "0.2"
 criterion = "0.5"
-crossterm = "0.27"
-derive_more = "0.99"
+crossterm = "0.28"
+derive_more = { version = "1.0", features = ["full"] }
 directories = "5.0"
 humantime = "2.1"
 dyn-clone = "1.0"
@@ -174,11 +174,11 @@ indoc = "2.0"
 itertools = "0.13"
 jsonrpsee = { version = "0.22", default-features = false }
 lazy_static = "1.4"
-libtest-mimic = "0.7"
+libtest-mimic = "0.8"
 log = "0.4"
 loom = "0.7"
 merkletree-mintlayer = "0.1"
-mockall = "0.12"
+mockall = "0.13"
 num = "0.4"
 num-derive = "0.4"
 num-traits = "0.2"
@@ -202,8 +202,8 @@ replace_with = "0.1"
 rfd = { version = "0.14", default-features = false }
 ripemd = "0.1"
 rlimit = "0.10"
-rstest = "0.21"
-rusqlite = "0.31"
+rstest = "0.23"
+rusqlite = "0.32"
 schnorrkel = "0.11"
 serde = "1.0"
 serde_json = "1.0"
@@ -234,8 +234,8 @@ tokio-util = { version = "0.7", default-features = false }
 toml = "0.8"
 tower = "0.4"
 tower-http-axum = { package = "tower-http", version = "0.5" }
-trust-dns-client = "0.23"
-trust-dns-server = "0.23"
+hickory-client = "0.24"
+hickory-server = "0.24"
 variant_count = "1.1"
 zeroize = "1.5"
 

chainstate/src/detail/block_invalidation/mod.rs

@@ -360,13 +360,13 @@ pub enum BlockInvalidatorError {
 
 #[derive(Debug, Display, PartialEq, Eq, Clone)]
 pub enum DbCommittingContext {
-    #[display(fmt = "committing block {}", _0)]
+    #[display("committing block {}", _0)]
     Block(Id<Block>),
-    #[display(fmt = "committing block status for block {}", _0)]
+    #[display("committing block status for block {}", _0)]
     InvalidatedBlockTreeStatuses(Id<Block>),
-    #[display(fmt = "committing cleared blocks statuses (root block: {})", _0)]
+    #[display("committing cleared blocks statuses (root block: {})", _0)]
     ClearedBlockTreeStatuses(Id<Block>),
-    #[display(fmt = "committing block tree disconnection (root block: {})", _0)]
+    #[display("committing block tree disconnection (root block: {})", _0)]
     BlockTreeDisconnection(Id<Block>),
 }
 

chainstate/src/detail/error.rs

@@ -120,9 +120,9 @@ pub enum BlockError {
 // implement the Error trait.
 #[derive(Debug, Display, PartialEq, Eq, Clone)]
 pub enum DbCommittingContext {
-    #[display(fmt = "committing block {}", _0)]
+    #[display("committing block {}", _0)]
     Block(Id<Block>),
-    #[display(fmt = "committing block status for block {}", _0)]
+    #[display("committing block status for block {}", _0)]
     BlockStatus(Id<Block>),
 }
 

dns-server/Cargo.toml

@@ -30,8 +30,8 @@ itertools.workspace = true
 parity-scale-codec.workspace = true
 thiserror.workspace = true
 tokio = { workspace = true, default-features = false }
-trust-dns-client.workspace = true
-trust-dns-server.workspace = true
+hickory-client.workspace = true
+hickory-server.workspace = true
 
 [dev-dependencies]
 networking = { path = "../networking" }

dns-server/src/config.rs

@@ -19,7 +19,7 @@ use std::{
 };
 
 use clap::Parser;
-use trust_dns_client::rr::Name;
+use hickory_client::rr::Name;
 use utils_networking::IpOrSocketAddress;
 
 use common::primitives::per_thousand::PerThousand;

dns-server/src/dns_server/mod.rs

@@ -23,18 +23,14 @@ use std::{
 
 use common::{chain::ChainConfig, primitives::per_thousand::PerThousand};
 use futures::never::Never;
-use itertools::Itertools;
-use logging::log;
-use randomness::{make_pseudo_rng, Rng, SliceRandom};
-use tokio::{net::UdpSocket, sync::mpsc};
-use trust_dns_client::{
+use hickory_client::{
     proto::rr::{LowerName, RrKey},
     rr::{
         rdata::{NS, SOA},
         Name, RData, RecordSet, RecordType,
     },
 };
-use trust_dns_server::{
+use hickory_server::{
     authority::{
         AuthLookup, Authority, Catalog, LookupError, LookupOptions, MessageRequest, UpdateResult,
         ZoneType,
@@ -43,6 +39,10 @@ use trust_dns_server::{
     store::in_memory::InMemoryAuthority,
     ServerFuture,
 };
+use itertools::Itertools;
+use logging::log;
+use randomness::{make_pseudo_rng, Rng, SliceRandom};
+use tokio::{net::UdpSocket, sync::mpsc};
 use utils::{atomics::RelaxedAtomicU32, make_config_setting};
 
 use crate::{
@@ -122,7 +122,7 @@ impl DnsServer {
     pub async fn run(self) -> crate::Result<Never> {
         let DnsServer {
             auth,
-            server,
+            mut server,
             mut cmd_rx,
         } = self;
 

dns-server/src/dns_server/tests.rs

@@ -19,8 +19,8 @@ use std::{
     sync::Arc,
 };
 
-use trust_dns_client::rr::{RData, RecordType};
-use trust_dns_server::{
+use hickory_client::rr::{RData, RecordType};
+use hickory_server::{
     authority::{Authority, ZoneType},
     store::in_memory::InMemoryAuthority,
 };

dns-server/src/error.rs

@@ -15,9 +15,9 @@
 
 use std::net::AddrParseError;
 
+use hickory_client::proto::error::ProtoError;
 use p2p::{error::P2pError, peer_manager::peerdb_common};
 use thiserror::Error;
-use trust_dns_client::proto::error::ProtoError;
 use utils::try_as::TryAsRef;
 
 #[derive(Error, Debug)]

wallet/types/src/seed_phrase.rs

@@ -117,7 +117,9 @@ pub struct SeedPhrase {
 impl SeedPhrase {
     pub fn new(mnemonic: zeroize::Zeroizing<bip39::Mnemonic>) -> Self {
         Self {
-            mnemonic: zeroize::Zeroizing::new(mnemonic.word_iter().map(|w| w.into()).collect()),
+            mnemonic: zeroize::Zeroizing::new(
+                bip39::Mnemonic::words(&mnemonic).map(|w| w.into()).collect(),
+            ),
         }
     }