GRIN/nym
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: updated refs to cheddar rev of nym repo (#5955)

Browse Source 
* chore: updated refs to cheddar rev of nym repo

* update statistics-api version
This commit is contained in:
Jędrzej Stuczyński
2025-08-19 09:28:42 +01:00
committed by GitHub
parent 5b716633de
commit c133e0e88b
8 changed files with 565 additions and 1379 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.lock
Generated
+523 -1283
View File
File diff suppressed because it is too large Load Diff
nym-node-status-api/nym-node-status-agent/Cargo.toml
+3 -8
View File
@@ -17,15 +17,10 @@ readme.workspace = true
anyhow = { workspace = true }
clap = { workspace = true, features = ["derive", "env"] }
futures = { workspace = true }
# nym-bin-common = { path = "../../common/bin-common", features = ["models"] }
nym-bin-common = { git = "https://github.com/nymtech/nym.git", branch = "release/2025.11-cheddar", features = [
"models",
] }
nym-bin-common = { path = "../../common/bin-common", features = ["models"] }
nym-crypto = { path = "../../common/crypto", features = ["asymmetric", "rand"] }
nym-node-status-client = { path = "../nym-node-status-client" }
nym-crypto = { git = "https://github.com/nymtech/nym.git", branch = "release/2025.11-cheddar", features = [
"asymmetric",
"rand",
] }
rand = { workspace = true }
tokio = { workspace = true, features = [
"macros",
nym-node-status-api/nym-node-status-api/Cargo.toml
+14 -32
View File
@@ -20,42 +20,24 @@ bip39 = { workspace = true }
celes = { workspace = true }
clap = { workspace = true, features = ["cargo", "derive", "env", "string"] }
cosmwasm-std = { workspace = true }
envy = { workspace = true }
futures-util = { workspace = true }
itertools = { workspace = true }
moka = { workspace = true, features = ["future"] }
# TODO dz had to switch to cheddar versions because develop is ahead of current
# Nym API: revert after Cheddar is out
nym-contracts-common = { git = "https://github.com/nymtech/nym.git", branch = "release/2025.11-cheddar" }
nym-mixnet-contract-common = { git = "https://github.com/nymtech/nym.git", branch = "release/2025.11-cheddar" }
nym-bin-common = { git = "https://github.com/nymtech/nym.git", branch = "release/2025.11-cheddar", features = [
"openapi",
] }
nym-contracts-common = { path = "../../common/cosmwasm-smart-contracts/contracts-common" }
nym-mixnet-contract-common = { path = "../../common/cosmwasm-smart-contracts/mixnet-contract", features = ["utoipa"] }
nym-bin-common = { path = "../../common/bin-common", features = ["models"] }
nym-node-status-client = { path = "../nym-node-status-client" }
nym-crypto = { git = "https://github.com/nymtech/nym.git", branch = "release/2025.11-cheddar" }
nym-http-api-client = { git = "https://github.com/nymtech/nym.git", branch = "release/2025.11-cheddar" }
nym-http-api-common = { git = "https://github.com/nymtech/nym.git", branch = "release/2025.11-cheddar", features = [
"middleware",
] }
nym-network-defaults = { git = "https://github.com/nymtech/nym.git", branch = "release/2025.11-cheddar" }
nym-serde-helpers = { git = "https://github.com/nymtech/nym.git", branch = "release/2025.11-cheddar" }
nym-statistics-common = { git = "https://github.com/nymtech/nym.git", branch = "release/2025.11-cheddar" }
# nym-contracts-common = { path = "../../common/cosmwasm-smart-contracts/contracts-common" }
# nym-mixnet-contract-common = { path = "../../common/cosmwasm-smart-contracts/mixnet-contract", features = ["utoipa"] }
# nym-bin-common = { path = "../../common/bin-common", features = ["models"] }
# nym-node-status-client = { path = "../nym-node-status-client" }
# nym-crypto = { path = "../../common/crypto", features = ["asymmetric", "serde"] }
# nym-http-api-client = { path = "../../common/http-api-client" }
# nym-http-api-common = { path = "../../common/http-api-common", features = ["middleware"]}
# nym-network-defaults = { path = "../../common/network-defaults" }
# nym-serde-helpers = { path = "../../common/serde-helpers" }
# nym-statistics-common = { path = "../../common/statistics" }
# nym-validator-client = { path = "../../common/client-libs/validator-client" }
nym-validator-client = { git = "https://github.com/nymtech/nym.git", branch = "release/2025.11-cheddar" }
# nym-task = { path = "../../common/task" }
# nym-node-requests = { path = "../../nym-node/nym-node-requests", features = ["openapi"] }
nym-task = { git = "https://github.com/nymtech/nym.git", branch = "release/2025.11-cheddar" }
nym-node-requests = { git = "https://github.com/nymtech/nym.git", branch = "release/2025.11-cheddar" }
nym-crypto = { path = "../../common/crypto", features = ["asymmetric", "serde"] }
nym-http-api-client = { path = "../../common/http-api-client" }
nym-http-api-common = { path = "../../common/http-api-common", features = ["middleware"] }
nym-network-defaults = { path = "../../common/network-defaults" }
nym-serde-helpers = { path = "../../common/serde-helpers" }
nym-statistics-common = { path = "../../common/statistics" }
nym-validator-client = { path = "../../common/client-libs/validator-client" }
nym-task = { path = "../../common/task" }
nym-node-requests = { path = "../../nym-node/nym-node-requests", features = ["openapi"] }
rand = { workspace = true }
rand_chacha = { workspace = true }
regex = { workspace = true }
nym-node-status-api/nym-node-status-api/src/metrics_scraper/mod.rs
+1 -1
View File
@@ -57,7 +57,7 @@ async fn run(
.clone()
.expect("rust sdk mainnet default missing api_url");
let nym_api = nym_http_api_client::ClientBuilder::new_with_url(default_api_url)
let nym_api = nym_http_api_client::ClientBuilder::new_with_urls(vec![default_api_url.into()])
.no_hickory_dns()
.with_timeout(nym_api_client_timeout)
.build::<&str>()?;
nym-node-status-api/nym-node-status-api/src/monitor/mod.rs
+5 -4
View File
@@ -105,10 +105,11 @@ impl Monitor {
.clone()
.expect("rust sdk mainnet default missing api_url");
let nym_api = nym_http_api_client::ClientBuilder::new_with_url(default_api_url)
.no_hickory_dns()
.with_timeout(self.nym_api_client_timeout)
.build::<&str>()?;
let nym_api =
nym_http_api_client::ClientBuilder::new_with_urls(vec![default_api_url.into()])
.no_hickory_dns()
.with_timeout(self.nym_api_client_timeout)
.build::<&str>()?;
let api_client = NymApiClient::from(nym_api);
nym-node-status-api/nym-node-status-client/Cargo.toml
+2 -6
View File
@@ -16,12 +16,8 @@ readme.workspace = true
[dependencies]
anyhow = { workspace = true }
bincode = { workspace = true }
nym-crypto = { git = "https://github.com/nymtech/nym.git", branch = "release/2025.11-cheddar", features = [
"asymmetric",
"serde",
] }
nym-http-api-client = { git = "https://github.com/nymtech/nym.git", branch = "release/2025.11-cheddar" }
reqwest = { workspace = true }
nym-crypto = { path = "../../common/crypto", features = ["asymmetric", "serde", ] }
reqwest = { workspace = true, features = ["json"] }
serde = { workspace = true, features = ["derive"] }
serde_json = { workspace = true }
time = { workspace = true }
nym-statistics-api/Cargo.toml
+3 -3
View File
@@ -3,7 +3,7 @@
[package]
name = "nym-statistics-api"
version = "0.1.4"
version = "0.1.5"
authors.workspace = true
repository.workspace = true
homepage.workspace = true
@@ -48,8 +48,8 @@ nym-statistics-common = { path = "../common/statistics", features = [
] }
nym-task = { path = "../common/task" }
nym-http-api-client = { git = "https://github.com/nymtech/nym", branch = "release/2025.11-cheddar" }
nym-validator-client = { git = "https://github.com/nymtech/nym", branch = "release/2025.11-cheddar" } # current develop is incompatible with current deployed API
nym-http-api-client = { path = "../common/http-api-client" }
nym-validator-client = { path = "../common/client-libs/validator-client" }
[build-dependencies]
anyhow = { workspace = true }
nym-wallet/Cargo.lock
Generated
+14 -42
View File
@@ -40,7 +40,7 @@ dependencies = [
"serde",
"serde_json",
"serde_repr",
"strum 0.23.0",
"strum",
"tap",
"tauri",
"tauri-build",
@@ -2799,15 +2799,6 @@ version = "0.15.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
[[package]]
name = "heck"
version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c"
dependencies = [
"unicode-segmentation",
]
[[package]]
name = "heck"
version = "0.4.1"
@@ -4123,7 +4114,8 @@ dependencies = [
"nym-network-defaults",
"rand 0.8.5",
"serde",
"strum 0.26.3",
"strum",
"strum_macros",
"thiserror 2.0.12",
"time",
"utoipa",
@@ -4304,7 +4296,8 @@ dependencies = [
"schemars",
"serde",
"serde_json",
"strum 0.26.3",
"strum",
"strum_macros",
"thiserror 2.0.12",
"time",
"utoipa",
@@ -4410,7 +4403,8 @@ dependencies = [
"serde",
"serde_json",
"sha2 0.10.9",
"strum 0.26.3",
"strum",
"strum_macros",
"thiserror 2.0.12",
"ts-rs",
"url",
@@ -4508,7 +4502,8 @@ dependencies = [
"nym-vesting-contract-common",
"serde",
"serde_json",
"strum 0.23.0",
"strum",
"strum_macros",
"ts-rs",
]
@@ -6630,45 +6625,22 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
[[package]]
name = "strum"
version = "0.23.0"
version = "0.27.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cae14b91c7d11c9a851d3fbc80a963198998c2a64eec840477fa92d8ce9b70bb"
checksum = "af23d6f6c1a224baef9d3f61e287d2761385a5b88fdab4eb4c6f11aeb54c4bcf"
dependencies = [
"strum_macros 0.23.1",
]
[[package]]
name = "strum"
version = "0.26.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06"
dependencies = [
"strum_macros 0.26.4",
"strum_macros",
]
[[package]]
name = "strum_macros"
version = "0.23.1"
version = "0.27.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5bb0dc7ee9c15cea6199cde9a127fa16a4c5819af85395457ad72d68edc85a38"
dependencies = [
"heck 0.3.3",
"proc-macro2",
"quote",
"rustversion",
"syn 1.0.109",
]
[[package]]
name = "strum_macros"
version = "0.26.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be"
checksum = "7695ce3845ea4b33927c055a39dc438a45b059f7c1b3d91d38d10355fb8cbca7"
dependencies = [
"heck 0.5.0",
"proc-macro2",
"quote",
"rustversion",
"syn 2.0.100",
]