From deec1c427c75644509a8f49999b36406afe81c9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Onur=20=C3=96zkan?= Date: Wed, 30 Jul 2025 08:49:54 +0300 Subject: [PATCH 1/9] remove instant MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Onur Özkan --- Cargo.lock | 4 ---- Cargo.toml | 1 - mm2src/mm2_main/Cargo.toml | 1 - 3 files changed, 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a66c9cd509..efaf7ce9f7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2998,9 +2998,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" dependencies = [ "cfg-if 1.0.0", - "js-sys", - "wasm-bindgen", - "web-sys", ] [[package]] @@ -4229,7 +4226,6 @@ dependencies = [ "http 0.2.12", "hw_common", "hyper", - "instant", "itertools", "js-sys", "kdf_walletconnect", diff --git a/Cargo.toml b/Cargo.toml index b0853f7316..0e75118f12 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -132,7 +132,6 @@ lightning = "0.0.113" lightning-background-processor = "0.0.113" lightning-invoice = { version = "0.21.0", features = ["serde"] } lightning-net-tokio = "0.0.113" -instant = "0.1.12" log = "0.4" metrics = "0.21" metrics-exporter-prometheus = "0.12.1" diff --git a/mm2src/mm2_main/Cargo.toml b/mm2src/mm2_main/Cargo.toml index 6d2aa30c6f..d1a314850f 100644 --- a/mm2src/mm2_main/Cargo.toml +++ b/mm2src/mm2_main/Cargo.toml @@ -111,7 +111,6 @@ uuid.workspace = true [target.'cfg(target_arch = "wasm32")'.dependencies] # TODO: Removing this causes `wasm-pack` to fail when starting a web session (even though we don't use this crate). # Investigate why. -instant = { workspace = true, features = ["wasm-bindgen"] } js-sys.workspace = true mm2_db = { path = "../mm2_db" } mm2_test_helpers = { path = "../mm2_test_helpers" } From 005a70dad2c87d34ec6526aefa28d6d1629b2f0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Onur=20=C3=96zkan?= Date: Wed, 30 Jul 2025 09:00:24 +0300 Subject: [PATCH 2/9] remove `dirs` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Onur Özkan --- Cargo.lock | 176 ++++++------------ Cargo.toml | 1 - mm2src/coins/Cargo.toml | 1 - mm2src/coins/qrc20.rs | 2 +- mm2src/coins/utxo.rs | 6 +- .../utxo/utxo_builder/utxo_coin_builder.rs | 2 +- mm2src/mm2_main/Cargo.toml | 1 - 7 files changed, 62 insertions(+), 127 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index efaf7ce9f7..2d2f6a2008 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -298,7 +298,7 @@ checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5" dependencies = [ "proc-macro2", "quote 1.0.37", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -409,12 +409,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" -[[package]] -name = "base64" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7" - [[package]] name = "base64" version = "0.13.0" @@ -855,7 +849,7 @@ dependencies = [ "heck 0.4.0", "proc-macro2", "quote 1.0.37", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -903,11 +897,10 @@ dependencies = [ "chrono", "common", "cosmrs", - "crossbeam 0.8.2", + "crossbeam 0.8.4", "crypto", "db_common", "derive_more", - "dirs", "ed25519-dalek 1.0.1", "enum_derives", "ethabi", @@ -1064,7 +1057,7 @@ dependencies = [ "cc", "cfg-if 1.0.0", "chrono", - "crossbeam 0.8.2", + "crossbeam 0.8.4", "derive_more", "env_logger", "findshlibs", @@ -1125,7 +1118,7 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" dependencies = [ - "crossbeam-utils 0.8.16", + "crossbeam-utils 0.8.21", ] [[package]] @@ -1235,16 +1228,15 @@ dependencies = [ [[package]] name = "crossbeam" -version = "0.8.2" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2801af0d36612ae591caa9568261fddce32ce6e08a7275ea334a06a4ad021a2c" +checksum = "1137cd7e7fc0fb5d3c5a8678be38ec56e819125d8d7907411fe24ccb943faca8" dependencies = [ - "cfg-if 1.0.0", - "crossbeam-channel 0.5.1", - "crossbeam-deque 0.8.1", - "crossbeam-epoch 0.9.5", - "crossbeam-queue 0.3.8", - "crossbeam-utils 0.8.16", + "crossbeam-channel 0.5.15", + "crossbeam-deque 0.8.6", + "crossbeam-epoch 0.9.18", + "crossbeam-queue 0.3.12", + "crossbeam-utils 0.8.21", ] [[package]] @@ -1259,12 +1251,11 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.1" +version = "0.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4" +checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2" dependencies = [ - "cfg-if 1.0.0", - "crossbeam-utils 0.8.16", + "crossbeam-utils 0.8.21", ] [[package]] @@ -1280,13 +1271,12 @@ dependencies = [ [[package]] name = "crossbeam-deque" -version = "0.8.1" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" +checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51" dependencies = [ - "cfg-if 1.0.0", - "crossbeam-epoch 0.9.5", - "crossbeam-utils 0.8.16", + "crossbeam-epoch 0.9.18", + "crossbeam-utils 0.8.21", ] [[package]] @@ -1300,21 +1290,17 @@ dependencies = [ "crossbeam-utils 0.7.2", "lazy_static", "maybe-uninit", - "memoffset 0.5.6", + "memoffset", "scopeguard", ] [[package]] name = "crossbeam-epoch" -version = "0.9.5" +version = "0.9.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" dependencies = [ - "cfg-if 1.0.0", - "crossbeam-utils 0.8.16", - "lazy_static", - "memoffset 0.6.4", - "scopeguard", + "crossbeam-utils 0.8.21", ] [[package]] @@ -1330,12 +1316,11 @@ dependencies = [ [[package]] name = "crossbeam-queue" -version = "0.3.8" +version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" +checksum = "0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115" dependencies = [ - "cfg-if 1.0.0", - "crossbeam-utils 0.8.16", + "crossbeam-utils 0.8.21", ] [[package]] @@ -1351,12 +1336,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.16" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if 1.0.0", -] +checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" [[package]] name = "crunchy" @@ -1530,7 +1512,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote 1.0.37", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1656,7 +1638,7 @@ name = "db_common" version = "0.1.0" dependencies = [ "common", - "crossbeam-channel 0.5.1", + "crossbeam-channel 0.5.15", "futures 0.3.28", "hex", "log", @@ -1695,7 +1677,7 @@ dependencies = [ "proc-macro2", "quote 1.0.37", "rustc_version 0.4.0", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -1728,17 +1710,6 @@ dependencies = [ "dirs-sys", ] -[[package]] -name = "dirs" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901" -dependencies = [ - "libc", - "redox_users 0.3.4", - "winapi", -] - [[package]] name = "dirs-sys" version = "0.3.6" @@ -1746,7 +1717,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "03d86534ed367a67548dc68113a0f5db55432fdfbb6e6f9d77704397d95d5780" dependencies = [ "libc", - "redox_users 0.4.0", + "redox_users", "winapi", ] @@ -2295,7 +2266,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote 1.0.37", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -3565,7 +3536,7 @@ dependencies = [ "proc-macro-warning", "proc-macro2", "quote 1.0.37", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -3881,15 +3852,6 @@ dependencies = [ "autocfg 1.1.0", ] -[[package]] -name = "memoffset" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9" -dependencies = [ - "autocfg 1.1.0", -] - [[package]] name = "memory-db" version = "0.29.0" @@ -3938,7 +3900,7 @@ checksum = "ddece26afd34c31585c74a4db0630c376df271c285d682d1e55012197830b6df" dependencies = [ "proc-macro2", "quote 1.0.37", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -3948,8 +3910,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "111cb375987443c3de8d503580b536f77dc8416d32db62d9456db5d93bd7ac47" dependencies = [ "aho-corasick 0.7.18", - "crossbeam-epoch 0.9.5", - "crossbeam-utils 0.8.16", + "crossbeam-epoch 0.9.18", + "crossbeam-utils 0.8.21", "hashbrown 0.13.2", "indexmap 1.9.3", "metrics", @@ -4204,11 +4166,10 @@ dependencies = [ "coins_activation", "common", "crc32fast", - "crossbeam 0.8.2", + "crossbeam 0.8.4", "crypto", "db_common", "derive_more", - "dirs", "either", "enum-primitive-derive", "enum_derives", @@ -4696,7 +4657,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote 1.0.37", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -4999,7 +4960,7 @@ checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c" dependencies = [ "proc-macro2", "quote 1.0.37", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -5099,7 +5060,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" dependencies = [ "proc-macro2", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -5144,7 +5105,7 @@ checksum = "70550716265d1ec349c41f70dd4f964b4fd88394efe4405f0c1da679c4799a07" dependencies = [ "proc-macro2", "quote 1.0.37", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -5206,7 +5167,7 @@ dependencies = [ "prost", "prost-types", "regex", - "syn 2.0.77", + "syn 2.0.87", "tempfile", ] @@ -5220,7 +5181,7 @@ dependencies = [ "itertools", "proc-macro2", "quote 1.0.37", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -5275,7 +5236,7 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a17e662a7a8291a865152364c20c7abc5e60486ab2001e8ec10b24862de0b9ab" dependencies = [ - "crossbeam-utils 0.8.16", + "crossbeam-utils 0.8.21", "libc", "mach2", "once_cell", @@ -5599,17 +5560,6 @@ dependencies = [ "bitflags 1.3.2", ] -[[package]] -name = "redox_users" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09b23093265f8d200fa7b4c2c76297f47e681c655f6f1285a8780d6a022f7431" -dependencies = [ - "getrandom 0.1.14", - "redox_syscall 0.1.56", - "rust-argon2", -] - [[package]] name = "redox_users" version = "0.4.0" @@ -5928,18 +5878,6 @@ dependencies = [ "time 0.3.41", ] -[[package]] -name = "rust-argon2" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bc8af4bda8e1ff4932523b94d3dd20ee30a87232323eda55903ffd71d2fb017" -dependencies = [ - "base64 0.11.0", - "blake2b_simd", - "constant_time_eq", - "crossbeam-utils 0.7.2", -] - [[package]] name = "rust-ini" version = "0.13.0" @@ -6370,7 +6308,7 @@ checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote 1.0.37", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -6950,7 +6888,7 @@ dependencies = [ "proc-macro2", "quote 1.0.37", "rustversion", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -6998,9 +6936,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.77" +version = "2.0.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d" dependencies = [ "proc-macro2", "quote 1.0.37", @@ -7216,7 +7154,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote 1.0.37", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -7341,7 +7279,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote 1.0.37", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -7508,7 +7446,7 @@ dependencies = [ "proc-macro2", "prost-build", "quote 1.0.37", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -7563,7 +7501,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote 1.0.37", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -8010,7 +7948,7 @@ dependencies = [ "log", "proc-macro2", "quote 1.0.37", - "syn 2.0.77", + "syn 2.0.87", "wasm-bindgen-shared", ] @@ -8045,7 +7983,7 @@ checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" dependencies = [ "proc-macro2", "quote 1.0.37", - "syn 2.0.77", + "syn 2.0.87", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -8080,7 +8018,7 @@ checksum = "17d5042cc5fa009658f9a7333ef24291b1291a25b6382dd68862a7f3b969f69b" dependencies = [ "proc-macro2", "quote 1.0.37", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] @@ -8763,7 +8701,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote 1.0.37", - "syn 2.0.77", + "syn 2.0.87", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 0e75118f12..ab934746da 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -84,7 +84,6 @@ compatible-time = { version = "1.1.0", package = "web-time" } crc32fast = { version = "1.3.2", features = ["std", "nightly"] } derive_more = "0.99.20" directories = "5.0" -dirs = "1" ed25519-dalek = { version = "1.0.1", features = ["serde"] } either = "1.6" enum-primitive-derive = "0.2" diff --git a/mm2src/coins/Cargo.toml b/mm2src/coins/Cargo.toml index dc4b797973..54564746c1 100644 --- a/mm2src/coins/Cargo.toml +++ b/mm2src/coins/Cargo.toml @@ -138,7 +138,6 @@ web-sys = { workspace = true, features = ["console", "Headers", "Request", "Requ zcash_proofs = { workspace = true, features = ["local-prover"] } [target.'cfg(not(target_arch = "wasm32"))'.dependencies] -dirs.workspace = true bitcoin.workspace = true hyper = { workspace = true, features = ["client", "http2", "server", "tcp"] } hyper-rustls = { workspace = true, default-features = false, features = ["http1", "http2", "webpki-tokio"] } diff --git a/mm2src/coins/qrc20.rs b/mm2src/coins/qrc20.rs index b6014cb3e4..dcd30b8853 100644 --- a/mm2src/coins/qrc20.rs +++ b/mm2src/coins/qrc20.rs @@ -275,7 +275,7 @@ impl UtxoCoinBuilderCommonOps for Qrc20CoinBuilder<'_> { }; if rel_to_home { - let home = dirs::home_dir().or_mm_err(|| UtxoCoinBuildError::CantDetectUserHome)?; + let home = std::env::home_dir().or_mm_err(|| UtxoCoinBuildError::CantDetectUserHome)?; Ok(home.join(confpath)) } else { Ok(confpath.into()) diff --git a/mm2src/coins/utxo.rs b/mm2src/coins/utxo.rs index 9d114d3365..4d70a5b2fe 100644 --- a/mm2src/coins/utxo.rs +++ b/mm2src/coins/utxo.rs @@ -56,8 +56,6 @@ use common::log::LogOnError; use common::{now_sec, now_sec_u32}; use crypto::{DerivationPath, HDPathToCoin, Secp256k1ExtendedPublicKey}; use derive_more::Display; -#[cfg(not(target_arch = "wasm32"))] -use dirs::home_dir; use futures::channel::mpsc::{Receiver as AsyncReceiver, Sender as AsyncSender}; use futures::compat::Future01CompatExt; use futures::lock::{Mutex as AsyncMutex, MutexGuard as AsyncMutexGuard}; @@ -91,6 +89,8 @@ use spv_validation::storage::BlockHeaderStorageError; use std::array::TryFromSliceError; use std::collections::{HashMap, HashSet}; use std::convert::TryInto; +#[cfg(not(target_arch = "wasm32"))] +use std::env::home_dir; use std::hash::Hash; use std::num::{NonZeroU64, TryFromIntError}; use std::ops::Deref; @@ -1458,7 +1458,7 @@ pub fn zcash_params_path() -> PathBuf { #[cfg(not(target_arch = "wasm32"))] pub fn coin_daemon_data_dir(name: &str, is_asset_chain: bool) -> PathBuf { // komodo/util.cpp/GetDefaultDataDir - let mut data_dir = match dirs::home_dir() { + let mut data_dir = match std::env::home_dir() { Some(hd) => hd, None => Path::new("/").to_path_buf(), }; diff --git a/mm2src/coins/utxo/utxo_builder/utxo_coin_builder.rs b/mm2src/coins/utxo/utxo_builder/utxo_coin_builder.rs index 6b8d52ce9a..fbb5b1dca1 100644 --- a/mm2src/coins/utxo/utxo_builder/utxo_coin_builder.rs +++ b/mm2src/coins/utxo/utxo_builder/utxo_coin_builder.rs @@ -38,7 +38,7 @@ use std::sync::Mutex; cfg_native! { use crate::utxo::coin_daemon_data_dir; use crate::utxo::rpc_clients::{ConcurrentRequestMap, NativeClient, NativeClientImpl}; - use dirs::home_dir; + use std::env::home_dir; use std::path::{Path, PathBuf}; use std::sync::Arc; } diff --git a/mm2src/mm2_main/Cargo.toml b/mm2src/mm2_main/Cargo.toml index d1a314850f..ca53ff41c9 100644 --- a/mm2src/mm2_main/Cargo.toml +++ b/mm2src/mm2_main/Cargo.toml @@ -121,7 +121,6 @@ wasm-bindgen-test.workspace = true web-sys = { workspace = true, features = ["console"] } [target.'cfg(not(target_arch = "wasm32"))'.dependencies] -dirs.workspace = true futures-rustls.workspace = true hyper = { workspace = true, features = ["client", "http2", "server", "tcp"] } rcgen.workspace = true From 9aae9be75083d740ed58b0916428a27866562474 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Onur=20=C3=96zkan?= Date: Wed, 30 Jul 2025 09:40:43 +0300 Subject: [PATCH 3/9] bump tokio MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Onur Özkan --- Cargo.lock | 90 ++++++++++++++++++++++++++++++++---------------------- Cargo.toml | 2 +- 2 files changed, 55 insertions(+), 37 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2d2f6a2008..33ca85d52f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -311,7 +311,7 @@ dependencies = [ "futures-sink", "futures-util", "memchr", - "pin-project-lite 0.2.9", + "pin-project-lite 0.2.16", ] [[package]] @@ -356,7 +356,7 @@ dependencies = [ "memchr", "mime", "percent-encoding", - "pin-project-lite 0.2.9", + "pin-project-lite 0.2.16", "rustversion", "serde", "sync_wrapper", @@ -2255,7 +2255,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" dependencies = [ "futures-core", - "pin-project-lite 0.2.9", + "pin-project-lite 0.2.16", ] [[package]] @@ -2337,7 +2337,7 @@ dependencies = [ "futures-sink", "futures-task", "memchr", - "pin-project-lite 0.2.9", + "pin-project-lite 0.2.16", "pin-utils", "slab", ] @@ -2698,7 +2698,7 @@ checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ "bytes", "http 0.2.12", - "pin-project-lite 0.2.9", + "pin-project-lite 0.2.16", ] [[package]] @@ -2756,7 +2756,7 @@ dependencies = [ "httparse", "httpdate", "itoa", - "pin-project-lite 0.2.9", + "pin-project-lite 0.2.16", "socket2 0.4.9", "tokio", "tower-service", @@ -2799,7 +2799,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" dependencies = [ "hyper", - "pin-project-lite 0.2.9", + "pin-project-lite 0.2.16", "tokio", "tokio-io-timeout", ] @@ -2981,6 +2981,17 @@ dependencies = [ "windows-sys 0.45.0", ] +[[package]] +name = "io-uring" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d93587f37623a1a17d94ef2bc9ada592f5465fe7732084ab7beefabe5c77c0c4" +dependencies = [ + "bitflags 2.8.0", + "cfg-if 1.0.0", + "libc", +] + [[package]] name = "ipconfig" version = "0.3.0" @@ -3215,9 +3226,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.169" +version = "0.2.174" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" +checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776" [[package]] name = "libm" @@ -3958,14 +3969,13 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.6" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" +checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c" dependencies = [ "libc", - "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.45.0", + "windows-sys 0.59.0", ] [[package]] @@ -4971,9 +4981,9 @@ checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777" [[package]] name = "pin-project-lite" -version = "0.2.9" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" [[package]] name = "pin-utils" @@ -5006,7 +5016,7 @@ dependencies = [ "cfg-if 1.0.0", "concurrent-queue 2.2.0", "hermit-abi 0.4.0", - "pin-project-lite 0.2.9", + "pin-project-lite 0.2.16", "rustix 0.38.44", "tracing", "windows-sys 0.59.0", @@ -5684,7 +5694,7 @@ dependencies = [ "log", "mime", "percent-encoding", - "pin-project-lite 0.2.9", + "pin-project-lite 0.2.16", "rustls 0.20.4", "rustls-pemfile 0.2.1", "serde", @@ -6562,12 +6572,9 @@ checksum = "68a406c1882ed7f29cd5e248c9848a80e7cb6ae0fea82346d2746f2f941c07e1" [[package]] name = "slab" -version = "0.4.8" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" -dependencies = [ - "autocfg 1.1.0", -] +checksum = "04dc19736151f35336d325007ac991178d504a119863a2fcb3758cdb5e52c50d" [[package]] name = "smallvec" @@ -6653,6 +6660,16 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "socket2" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "233504af464074f9d066d7b5416c5f9b894a5862a6506e306f7b816cdd6f1807" +dependencies = [ + "libc", + "windows-sys 0.59.0", +] + [[package]] name = "soketto" version = "0.7.0" @@ -7245,20 +7262,21 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.28.2" +version = "1.47.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2" +checksum = "43864ed400b6043a4757a25c7a64a8efde741aed79a056a2fb348a406701bb35" dependencies = [ - "autocfg 1.1.0", + "backtrace", "bytes", + "io-uring", "libc", "mio", - "num_cpus", - "pin-project-lite 0.2.9", + "pin-project-lite 0.2.16", "signal-hook-registry", - "socket2 0.4.9", + "slab", + "socket2 0.6.0", "tokio-macros", - "windows-sys 0.48.0", + "windows-sys 0.59.0", ] [[package]] @@ -7267,15 +7285,15 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf" dependencies = [ - "pin-project-lite 0.2.9", + "pin-project-lite 0.2.16", "tokio", ] [[package]] name = "tokio-macros" -version = "2.1.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8" dependencies = [ "proc-macro2", "quote 1.0.37", @@ -7310,7 +7328,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "50145484efff8818b5ccd256697f36863f587da82cf8b409c53adf1e840798e3" dependencies = [ "futures-core", - "pin-project-lite 0.2.9", + "pin-project-lite 0.2.16", "tokio", ] @@ -7356,7 +7374,7 @@ dependencies = [ "bytes", "futures-core", "futures-sink", - "pin-project-lite 0.2.9", + "pin-project-lite 0.2.16", "tokio", "tracing", ] @@ -7459,7 +7477,7 @@ dependencies = [ "futures-util", "indexmap 1.9.3", "pin-project", - "pin-project-lite 0.2.9", + "pin-project-lite 0.2.16", "rand 0.8.5", "slab", "tokio", @@ -7488,7 +7506,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" dependencies = [ "cfg-if 1.0.0", - "pin-project-lite 0.2.9", + "pin-project-lite 0.2.16", "tracing-attributes", "tracing-core", ] diff --git a/Cargo.toml b/Cargo.toml index ab934746da..724a96b553 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -197,7 +197,7 @@ tiny-bip39 = "0.8.0" thiserror = "1.0.40" time = "0.3.36" timed-map = { version = "1.5", features = ["rustc-hash", "serde", "wasm"] } -tokio = { version = "1.20", default-features = false } +tokio = { version = "1.47", default-features = false } tokio-rustls = { version = "0.24", default-features = false } tokio-tungstenite-wasm = { git = "https://github.com/KomodoPlatform/tokio-tungstenite-wasm", rev = "8fc7e2f", default-features = false, features = ["rustls-tls-native-roots"]} tonic = { version = "0.10", default-features = false } From 5dbb130b1414a22d04c346d82897b68b0a1792a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Onur=20=C3=96zkan?= Date: Wed, 30 Jul 2025 09:44:24 +0300 Subject: [PATCH 4/9] re-org clap dep stack MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Onur Özkan --- Cargo.lock | 94 ++++++------------------------------------------------ Cargo.toml | 2 +- 2 files changed, 10 insertions(+), 86 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 33ca85d52f..e751ee45a5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -118,55 +118,12 @@ dependencies = [ "libc", ] -[[package]] -name = "anstream" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "is-terminal", - "utf8parse", -] - [[package]] name = "anstyle" version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd" -[[package]] -name = "anstyle-parse" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8bdeb6047d8983be085bab0ba1472e6dc604e7041dbf6fcd5e71523014fae9" -dependencies = [ - "windows-sys 0.59.0", -] - -[[package]] -name = "anstyle-wincon" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c677ab05e09154296dd37acecd46420c17b9713e8366facafa8fc0885167cf4c" -dependencies = [ - "anstyle", - "windows-sys 0.48.0", -] - [[package]] name = "anyhow" version = "1.0.89" @@ -818,35 +775,31 @@ dependencies = [ [[package]] name = "clap" -version = "4.2.7" +version = "4.5.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34d21f9bf1b425d2968943631ec91202fe5e837264063503708b83013f8fc938" +checksum = "ed87a9d530bb41a67537289bafcac159cb3ee28460e0a4571123d2a778a6a882" dependencies = [ "clap_builder", "clap_derive", - "once_cell", ] [[package]] name = "clap_builder" -version = "4.2.7" +version = "4.5.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "914c8c79fb560f238ef6429439a30023c862f7a28e688c58f7203f12b29970bd" +checksum = "64f4f3f3c77c94aff3c7e9aac9a2ca1974a5adf392a8bb751e827d6d127ab966" dependencies = [ - "anstream", "anstyle", - "bitflags 1.3.2", "clap_lex", - "strsim", ] [[package]] name = "clap_derive" -version = "4.2.0" +version = "4.5.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4" +checksum = "ef4f52386a59ca4c860f7393bcf8abd8dfd91ecccc0f774635ff68e92eeef491" dependencies = [ - "heck 0.4.0", + "heck 0.5.0", "proc-macro2", "quote 1.0.37", "syn 2.0.87", @@ -854,9 +807,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.4.1" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1" +checksum = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675" [[package]] name = "cloudabi" @@ -1039,12 +992,6 @@ dependencies = [ "url", ] -[[package]] -name = "colorchoice" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75" - [[package]] name = "common" version = "0.1.0" @@ -2578,12 +2525,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" -[[package]] -name = "hermit-abi" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c" - [[package]] name = "hex" version = "0.4.3" @@ -3010,17 +2951,6 @@ version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f" -[[package]] -name = "is-terminal" -version = "0.4.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9" -dependencies = [ - "hermit-abi 0.5.2", - "libc", - "windows-sys 0.59.0", -] - [[package]] name = "itertools" version = "0.10.3" @@ -7796,12 +7726,6 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" -[[package]] -name = "utf8parse" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" - [[package]] name = "utxo_signer" version = "0.1.0" diff --git a/Cargo.toml b/Cargo.toml index 724a96b553..b92e53175c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -76,7 +76,7 @@ cc = "1.0" cipher = "0.4.4" chrono = "0.4.23" cfg-if = "1.0" -clap = { version = "4.2", features = ["derive"] } +clap = { version = "4.5", default-features = false, features = ["derive", "std"] } cosmrs = { version = "0.16", default-features = false } crossbeam = "0.8" crossbeam-channel = "0.5.1" From 50ea8c4016820feacaf7cf9f8a520df11b8e4805 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Onur=20=C3=96zkan?= Date: Wed, 30 Jul 2025 09:51:44 +0300 Subject: [PATCH 5/9] bump env_logger and reduce dep-stack MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Onur Özkan --- Cargo.lock | 35 ++++++++++++----------------------- Cargo.toml | 2 +- 2 files changed, 13 insertions(+), 24 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e751ee45a5..c2cdf43d92 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -271,17 +271,6 @@ dependencies = [ "pin-project-lite 0.2.16", ] -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.14", - "libc", - "winapi", -] - [[package]] name = "autocfg" version = "0.1.7" @@ -1830,17 +1819,23 @@ dependencies = [ "syn 1.0.95", ] +[[package]] +name = "env_filter" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "186e05a59d4c50738528153b83b0b0194d3a29507dfec16eccd4b342903397d0" +dependencies = [ + "log", +] + [[package]] name = "env_logger" -version = "0.9.3" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" +checksum = "6c012a26a7f605efc424dd53697843a72be7dc86ad2d01f7814337794a12231d" dependencies = [ - "atty", - "humantime", + "env_filter", "log", - "regex", - "termcolor", ] [[package]] @@ -2654,12 +2649,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6456b8a6c8f33fee7d958fcd1b60d55b11940a79e63ae87013e6d22e26034440" -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - [[package]] name = "hw_common" version = "0.1.0" diff --git a/Cargo.toml b/Cargo.toml index b92e53175c..e8bae8338c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -87,7 +87,7 @@ directories = "5.0" ed25519-dalek = { version = "1.0.1", features = ["serde"] } either = "1.6" enum-primitive-derive = "0.2" -env_logger = "0.9.3" +env_logger = { version = "0.11", default-features = false } ethabi = "17.0.0" ethcore-transaction = { git = "https://github.com/KomodoPlatform/mm2-parity-ethereum.git", rev = "mm2-v2.1.1" } ethereum-types = { version = "0.13", default-features = false, features = ["std", "serialize"] } From 2906e99a11a792fb91184bc8729eed80cd7ef563 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Onur=20=C3=96zkan?= Date: Wed, 30 Jul 2025 10:39:57 +0300 Subject: [PATCH 6/9] bump from yanked `futures-util` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Onur Özkan --- Cargo.lock | 28 ++++++++++++++-------------- Cargo.toml | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c2cdf43d92..8d4f66826b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2148,9 +2148,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.28" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" dependencies = [ "futures-core", "futures-sink", @@ -2158,9 +2158,9 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" [[package]] name = "futures-cpupool" @@ -2186,9 +2186,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" [[package]] name = "futures-lite" @@ -2202,9 +2202,9 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.28" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote 1.0.37", @@ -2234,15 +2234,15 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.28" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" [[package]] name = "futures-ticker" @@ -2267,9 +2267,9 @@ dependencies = [ [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ "futures 0.1.29", "futures-channel", diff --git a/Cargo.toml b/Cargo.toml index e8bae8338c..56b3f12640 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -102,7 +102,7 @@ futures01 = { version = "0.1", package = "futures" } futures-rustls = { version = "0.24", default-features = false } futures-ticker = "0.0.3" futures-timer = "3.0" -futures-util = { version = "0.3", default-features = false, features = ["sink", "std"] } +futures-util = { version = "0.3.31", default-features = false, features = ["sink", "std"] } fnv = "1.0.6" group = "0.8.0" gstuff = { version = "0.7" } From 4faffeac7154dc8b38070c627178e9316eff806e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Onur=20=C3=96zkan?= Date: Wed, 30 Jul 2025 10:55:57 +0300 Subject: [PATCH 7/9] bump chrono MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Onur Özkan --- Cargo.lock | 53 +++++++++++----------- Cargo.toml | 2 +- mm2src/coins/tendermint/ibc/transfer_v1.rs | 8 ++-- mm2src/coins/tendermint/tendermint_coin.rs | 1 + mm2src/common/common.rs | 6 ++- mm2src/mm2_bin_lib/Cargo.toml | 2 +- mm2src/mm2_test_helpers/Cargo.toml | 4 +- 7 files changed, 40 insertions(+), 36 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8d4f66826b..9d46655477 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -109,6 +109,12 @@ dependencies = [ "memchr", ] +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + [[package]] name = "android_system_properties" version = "0.1.5" @@ -737,18 +743,17 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.23" +version = "0.4.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" +checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d" dependencies = [ + "android-tzdata", "iana-time-zone", "js-sys", - "num-integer", "num-traits", "serde", - "time 0.1.43", "wasm-bindgen", - "winapi", + "windows-link", ] [[package]] @@ -919,7 +924,7 @@ dependencies = [ "sia-rust", "spv_validation", "tendermint-rpc", - "time 0.3.41", + "time", "timed-map", "tokio", "tokio-rustls 0.24.1", @@ -5461,7 +5466,7 @@ checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b" dependencies = [ "pem", "ring 0.16.20", - "time 0.3.41", + "time", "yasna", ] @@ -5804,7 +5809,7 @@ dependencies = [ "hashlink", "libsqlite3-sys", "smallvec 1.6.1", - "time 0.3.41", + "time", ] [[package]] @@ -6474,7 +6479,7 @@ dependencies = [ "num-bigint", "num-traits", "thiserror", - "time 0.3.41", + "time", ] [[package]] @@ -6975,7 +6980,7 @@ dependencies = [ "subtle", "subtle-encoding", "tendermint-proto", - "time 0.3.41", + "time", "zeroize", ] @@ -7008,7 +7013,7 @@ dependencies = [ "serde", "serde_bytes", "subtle-encoding", - "time 0.3.41", + "time", ] [[package]] @@ -7034,7 +7039,7 @@ dependencies = [ "tendermint-config", "tendermint-proto", "thiserror", - "time 0.3.41", + "time", "url", "uuid", "walkdir", @@ -7093,16 +7098,6 @@ dependencies = [ "syn 2.0.87", ] -[[package]] -name = "time" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" -dependencies = [ - "libc", - "winapi", -] - [[package]] name = "time" version = "0.3.41" @@ -8116,6 +8111,12 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-link" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a" + [[package]] name = "windows-result" version = "0.1.2" @@ -8481,7 +8482,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd" dependencies = [ - "time 0.3.41", + "time", ] [[package]] @@ -8510,7 +8511,7 @@ dependencies = [ "protobuf-codegen-pure", "rand_core 0.5.1", "subtle", - "time 0.3.41", + "time", "zcash_note_encryption", "zcash_primitives", ] @@ -8530,7 +8531,7 @@ dependencies = [ "protobuf", "rand_core 0.5.1", "rusqlite", - "time 0.3.41", + "time", "tokio", "zcash_client_backend", "zcash_extras", @@ -8548,7 +8549,7 @@ dependencies = [ "jubjub", "protobuf", "rand_core 0.5.1", - "time 0.3.41", + "time", "zcash_client_backend", "zcash_primitives", ] diff --git a/Cargo.toml b/Cargo.toml index 56b3f12640..c3396f2129 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -74,7 +74,7 @@ byteorder = "1.3" cbc = "0.1.2" cc = "1.0" cipher = "0.4.4" -chrono = "0.4.23" +chrono = { version = "0.4.41", default-features = false } cfg-if = "1.0" clap = { version = "4.5", default-features = false, features = ["derive", "std"] } cosmrs = { version = "0.16", default-features = false } diff --git a/mm2src/coins/tendermint/ibc/transfer_v1.rs b/mm2src/coins/tendermint/ibc/transfer_v1.rs index e6c6a28ea5..b8422b8a52 100644 --- a/mm2src/coins/tendermint/ibc/transfer_v1.rs +++ b/mm2src/coins/tendermint/ibc/transfer_v1.rs @@ -31,10 +31,10 @@ impl MsgTransfer { sender: AccountId, receiver: AccountId, token: Coin, - ) -> Self { - let timestamp_as_nanos = common::get_utc_timestamp_nanos() as u64; + ) -> Result { + let timestamp_as_nanos = common::get_utc_timestamp_nanos()? as u64; - Self { + Ok(Self { source_port: IBC_OUT_SOURCE_PORT.to_owned(), source_channel, sender, @@ -43,7 +43,7 @@ impl MsgTransfer { timeout_height: None, timeout_timestamp: timestamp_as_nanos + IBC_OUT_TIMEOUT_IN_NANOS, // memo: Some(memo.clone()), - } + }) } } diff --git a/mm2src/coins/tendermint/tendermint_coin.rs b/mm2src/coins/tendermint/tendermint_coin.rs index ce8035a33d..397518d14a 100644 --- a/mm2src/coins/tendermint/tendermint_coin.rs +++ b/mm2src/coins/tendermint/tendermint_coin.rs @@ -4322,6 +4322,7 @@ pub(crate) async fn create_withdraw_msg_as_any( amount: amount.into(), }, ) + .map_to_mm(|e| WithdrawError::InternalError(e.to_string()))? .to_any() } else { MsgSend { diff --git a/mm2src/common/common.rs b/mm2src/common/common.rs index 766b1af79e..5612c023fe 100644 --- a/mm2src/common/common.rs +++ b/mm2src/common/common.rs @@ -1201,8 +1201,10 @@ pub fn get_utc_timestamp() -> i64 { } #[inline(always)] -pub fn get_utc_timestamp_nanos() -> i64 { - Utc::now().timestamp_nanos() +pub fn get_utc_timestamp_nanos() -> Result { + Utc::now() + .timestamp_nanos_opt() + .ok_or("Failed to get timestamp in nanoseconds; the system clock may be unreliable.".to_owned()) } #[inline(always)] diff --git a/mm2src/mm2_bin_lib/Cargo.toml b/mm2src/mm2_bin_lib/Cargo.toml index 17b8f2ba59..f9d2b5c30b 100644 --- a/mm2src/mm2_bin_lib/Cargo.toml +++ b/mm2src/mm2_bin_lib/Cargo.toml @@ -41,7 +41,7 @@ num-traits.workspace = true serde_json = { workspace = true, features = ["preserve_order", "raw_value"] } [build-dependencies] -chrono.workspace = true +chrono = { workspace = true, features = ["now"] } gstuff.workspace = true regex.workspace = true diff --git a/mm2src/mm2_test_helpers/Cargo.toml b/mm2src/mm2_test_helpers/Cargo.toml index f0e4cc5baf..d727180f56 100644 --- a/mm2src/mm2_test_helpers/Cargo.toml +++ b/mm2src/mm2_test_helpers/Cargo.toml @@ -30,9 +30,9 @@ serde_json = { version = "1", features = ["preserve_order", "raw_value"] } uuid = { version = "1.2.2", features = ["fast-rng", "serde", "v4"] } [target.'cfg(target_arch = "wasm32")'.dependencies] -chrono = { version = "0.4", features = ["wasmbind"] } +chrono = { version = "0.4.41", default-features = false, features = ["wasmbind"] } gstuff = { version = "0.7" } [target.'cfg(not(target_arch = "wasm32"))'.dependencies] -chrono = "0.4" +chrono = { version = "0.4.41", default-features = false } gstuff = { version = "0.7" } From cf694527a5c141257b9bf8ecdbe1785acd7fc30d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Onur=20=C3=96zkan?= Date: Mon, 4 Aug 2025 09:06:27 +0300 Subject: [PATCH 8/9] drop various duplicated dependencies MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Onur Özkan --- Cargo.lock | 162 ++++++++--------------------------------------------- Cargo.toml | 2 +- 2 files changed, 23 insertions(+), 141 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9d46655477..42d49b3f86 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -186,7 +186,7 @@ dependencies = [ "futures-lite", "parking 2.1.0", "polling", - "rustix 0.38.44", + "rustix", "slab", "tracing", "waker-fn", @@ -1858,17 +1858,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" -[[package]] -name = "errno" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" -dependencies = [ - "errno-dragonfly", - "libc", - "winapi", -] - [[package]] name = "errno" version = "0.3.10" @@ -1879,16 +1868,6 @@ dependencies = [ "windows-sys 0.59.0", ] -[[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", - "libc", -] - [[package]] name = "ethabi" version = "17.2.0" @@ -2001,6 +1980,12 @@ dependencies = [ "instant", ] +[[package]] +name = "fastrand" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" + [[package]] name = "ff" version = "0.8.0" @@ -2906,16 +2891,6 @@ dependencies = [ "cfg-if 1.0.0", ] -[[package]] -name = "io-lifetimes" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfa919a82ea574332e2de6e74b4c36e74d41982b335080fa59d4ef31be20fdf3" -dependencies = [ - "libc", - "windows-sys 0.45.0", -] - [[package]] name = "io-uring" version = "0.7.9" @@ -3677,12 +3652,6 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8dd5a6d5999d9907cda8ed67bbd137d3af8085216c2ac62de5be860bd41f304a" -[[package]] -name = "linux-raw-sys" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" - [[package]] name = "linux-raw-sys" version = "0.4.15" @@ -4941,7 +4910,7 @@ dependencies = [ "concurrent-queue 2.2.0", "hermit-abi 0.4.0", "pin-project-lite 0.2.16", - "rustix 0.38.44", + "rustix", "tracing", "windows-sys 0.59.0", ] @@ -5854,20 +5823,6 @@ dependencies = [ "semver 1.0.6", ] -[[package]] -name = "rustix" -version = "0.36.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd5c6ff11fecd55b40746d1995a02f2eb375bf8c00d192d521ee09f42bef37bc" -dependencies = [ - "bitflags 1.3.2", - "errno 0.2.8", - "io-lifetimes", - "libc", - "linux-raw-sys 0.1.4", - "windows-sys 0.45.0", -] - [[package]] name = "rustix" version = "0.38.44" @@ -5875,9 +5830,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" dependencies = [ "bitflags 2.8.0", - "errno 0.3.10", + "errno", "libc", - "linux-raw-sys 0.4.15", + "linux-raw-sys", "windows-sys 0.59.0", ] @@ -6524,7 +6479,7 @@ dependencies = [ "async-task", "blocking", "concurrent-queue 1.1.1", - "fastrand", + "fastrand 1.7.0", "futures-io", "futures-util", "libc", @@ -6942,15 +6897,14 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tempfile" -version = "3.4.0" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af18f7ae1acd354b992402e9ec5864359d693cd8a79dcbef59f76891701c1e95" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if 1.0.0", - "fastrand", - "redox_syscall 0.2.10", - "rustix 0.36.9", - "windows-sys 0.42.0", + "fastrand 2.3.0", + "rustix", + "windows-sys 0.52.0", ] [[package]] @@ -8139,30 +8093,6 @@ dependencies = [ "windows_x86_64_msvc 0.32.0", ] -[[package]] -name = "windows-sys" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" -dependencies = [ - "windows_aarch64_gnullvm 0.42.1", - "windows_aarch64_msvc 0.42.1", - "windows_i686_gnu 0.42.1", - "windows_i686_msvc 0.42.1", - "windows_x86_64_gnu 0.42.1", - "windows_x86_64_gnullvm 0.42.1", - "windows_x86_64_msvc 0.42.1", -] - -[[package]] -name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets 0.42.1", -] - [[package]] name = "windows-sys" version = "0.48.0" @@ -8174,26 +8104,20 @@ dependencies = [ [[package]] name = "windows-sys" -version = "0.59.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ "windows-targets 0.52.6", ] [[package]] -name = "windows-targets" -version = "0.42.1" +name = "windows-sys" +version = "0.59.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" dependencies = [ - "windows_aarch64_gnullvm 0.42.1", - "windows_aarch64_msvc 0.42.1", - "windows_i686_gnu 0.42.1", - "windows_i686_msvc 0.42.1", - "windows_x86_64_gnu 0.42.1", - "windows_x86_64_gnullvm 0.42.1", - "windows_x86_64_msvc 0.42.1", + "windows-targets 0.52.6", ] [[package]] @@ -8227,12 +8151,6 @@ dependencies = [ "windows_x86_64_msvc 0.52.6", ] -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" - [[package]] name = "windows_aarch64_gnullvm" version = "0.48.0" @@ -8251,12 +8169,6 @@ version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d8e92753b1c443191654ec532f14c199742964a061be25d77d7a96f09db20bf5" -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" - [[package]] name = "windows_aarch64_msvc" version = "0.48.0" @@ -8275,12 +8187,6 @@ version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a711c68811799e017b6038e0922cb27a5e2f43a2ddb609fe0b6f3eeda9de615" -[[package]] -name = "windows_i686_gnu" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" - [[package]] name = "windows_i686_gnu" version = "0.48.0" @@ -8305,12 +8211,6 @@ version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "146c11bb1a02615db74680b32a68e2d61f553cc24c4eb5b4ca10311740e44172" -[[package]] -name = "windows_i686_msvc" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" - [[package]] name = "windows_i686_msvc" version = "0.48.0" @@ -8329,12 +8229,6 @@ version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c912b12f7454c6620635bbff3450962753834be2a594819bd5e945af18ec64bc" -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" - [[package]] name = "windows_x86_64_gnu" version = "0.48.0" @@ -8347,12 +8241,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" - [[package]] name = "windows_x86_64_gnullvm" version = "0.48.0" @@ -8371,12 +8259,6 @@ version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "504a2476202769977a040c6364301a3f65d0cc9e3fb08600b2bda150a0488316" -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" - [[package]] name = "windows_x86_64_msvc" version = "0.48.0" diff --git a/Cargo.toml b/Cargo.toml index c3396f2129..1f8adea7a2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -189,7 +189,7 @@ sp-trie = { version = "6.0", default-features = false } sql-builder = "3.1.1" syn = "1.0" sysinfo = "0.28" -tempfile = "3.4.0" +tempfile = "3.7.1" # using the same version as cosmrs tendermint-rpc = { version = "0.35", default-features = false } testcontainers = "0.15.0" From bcd6cb115a219e5a9ec23dce1b8c7318eabf0cf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Onur=20=C3=96zkan?= Date: Mon, 4 Aug 2025 10:20:32 +0300 Subject: [PATCH 9/9] fix wasm test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Onur Özkan --- Cargo.lock | 4 ++++ mm2src/mm2_main/Cargo.toml | 1 + 2 files changed, 5 insertions(+) diff --git a/Cargo.lock b/Cargo.lock index 42d49b3f86..3a17fa3349 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2889,6 +2889,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" dependencies = [ "cfg-if 1.0.0", + "js-sys", + "wasm-bindgen", + "web-sys", ] [[package]] @@ -4090,6 +4093,7 @@ dependencies = [ "http 0.2.12", "hw_common", "hyper", + "instant", "itertools", "js-sys", "kdf_walletconnect", diff --git a/mm2src/mm2_main/Cargo.toml b/mm2src/mm2_main/Cargo.toml index ca53ff41c9..fb15d8b373 100644 --- a/mm2src/mm2_main/Cargo.toml +++ b/mm2src/mm2_main/Cargo.toml @@ -111,6 +111,7 @@ uuid.workspace = true [target.'cfg(target_arch = "wasm32")'.dependencies] # TODO: Removing this causes `wasm-pack` to fail when starting a web session (even though we don't use this crate). # Investigate why. +instant = { version = "0.1.12", features = ["wasm-bindgen"] } js-sys.workspace = true mm2_db = { path = "../mm2_db" } mm2_test_helpers = { path = "../mm2_test_helpers" }