diff --git a/Cargo.lock b/Cargo.lock index 22e7b11d6a..31845ee323 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -12229,11 +12229,10 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "ts-rs" -version = "10.1.0" +version = "12.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e640d9b0964e9d39df633548591090ab92f7a4567bc31d3891af23471a3365c6" +checksum = "756050066659291d47a554a9f558125db17428b073c5ffce1daf5dcb0f7231d8" dependencies = [ - "lazy_static", "thiserror 2.0.12", "ts-rs-macros", ] @@ -12255,9 +12254,9 @@ dependencies = [ [[package]] name = "ts-rs-macros" -version = "10.1.0" +version = "12.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e9d8656589772eeec2cf7a8264d9cda40fb28b9bc53118ceb9e8c07f8f38730" +checksum = "38d90eea51bc7988ef9e674bf80a85ba6804739e535e9cab48e4bb34a8b652aa" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index e52e338e17..fe4f17ab63 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -376,7 +376,7 @@ tracing-opentelemetry = "0.32.1" tracing-subscriber = "0.3.20" tracing-indicatif = "0.3.9" tracing-test = "0.2.5" -ts-rs = "10.1.0" +ts-rs = "12.0.1" tungstenite = { version = "0.20.1", default-features = false } typed-builder = "0.23.0" uniffi = "0.29.2" diff --git a/nym-wallet/Cargo.lock b/nym-wallet/Cargo.lock index b3d10fd034..0d8b48e1b2 100644 --- a/nym-wallet/Cargo.lock +++ b/nym-wallet/Cargo.lock @@ -8534,20 +8534,19 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "ts-rs" -version = "10.1.0" +version = "12.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e640d9b0964e9d39df633548591090ab92f7a4567bc31d3891af23471a3365c6" +checksum = "756050066659291d47a554a9f558125db17428b073c5ffce1daf5dcb0f7231d8" dependencies = [ - "lazy_static", "thiserror 2.0.12", "ts-rs-macros", ] [[package]] name = "ts-rs-macros" -version = "10.1.0" +version = "12.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e9d8656589772eeec2cf7a8264d9cda40fb28b9bc53118ceb9e8c07f8f38730" +checksum = "38d90eea51bc7988ef9e674bf80a85ba6804739e535e9cab48e4bb34a8b652aa" dependencies = [ "proc-macro2", "quote", diff --git a/nym-wallet/nym-wallet-types/Cargo.toml b/nym-wallet/nym-wallet-types/Cargo.toml index 1ebcaa9df8..b07382912a 100644 --- a/nym-wallet/nym-wallet-types/Cargo.toml +++ b/nym-wallet/nym-wallet-types/Cargo.toml @@ -12,7 +12,7 @@ serde_json = "1.0" strum = { version = "0.27.2", features = ["derive"] } strum_macros = "0.27.2" -ts-rs = "10.0.0" +ts-rs = "12.0.1" cosmwasm-std = "=2.2.2" cosmrs = { version = "0.22.0" } diff --git a/nym-wallet/src-tauri/Cargo.toml b/nym-wallet/src-tauri/Cargo.toml index 6327991107..ace8911a78 100644 --- a/nym-wallet/src-tauri/Cargo.toml +++ b/nym-wallet/src-tauri/Cargo.toml @@ -71,7 +71,7 @@ nym-store-cipher = { path = "../../common/store-cipher", features = ["json"] } nym-crypto = { path = "../../common/crypto", features = ["rand"] } rand_chacha = "0.3" tempfile = "3.3.0" -ts-rs = "10.0.0" +ts-rs = "12.0.1" [features] default = ["custom-protocol"] diff --git a/tools/ts-rs-cli/src/main.rs b/tools/ts-rs-cli/src/main.rs index 546d6bd316..4b21ada952 100644 --- a/tools/ts-rs-cli/src/main.rs +++ b/tools/ts-rs-cli/src/main.rs @@ -46,17 +46,23 @@ use nym_wallet_types::interval::Interval; use nym_wallet_types::network::Network; use nym_wallet_types::network_config::{Validator, ValidatorUrl, ValidatorUrls}; use std::path::Path; +use std::sync::OnceLock; use ts_rs::TS; use walkdir::WalkDir; +fn ts_rs_config() -> &'static ts_rs::Config { + static TS_RS_CONFIG: OnceLock = OnceLock::new(); + TS_RS_CONFIG.get_or_init(ts_rs::Config::default) +} + macro_rules! do_export { ($a:ty) => {{ - match <$a>::export() { + match <$a>::export(ts_rs_config()) { Ok(()) => { - println!("✅ {}", <$a>::name()); + println!("✅ {}", <$a>::name(ts_rs_config())); } Err(e) => { - println!("❌ {} failed: {}", <$a>::name(), e); + println!("❌ {} failed: {}", <$a>::name(ts_rs_config()), e); } } }};