diff --git a/Cargo.lock b/Cargo.lock index def19342ded..e94e434b18e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2429,7 +2429,7 @@ dependencies = [ "maxminddb", "nym-bin-common 0.6.0", "nym-contracts-common 0.5.0", - "nym-explorer-api-requests", + "nym-explorer-api-requests 0.1.0", "nym-mixnet-contract-common 0.6.0", "nym-network-defaults 0.1.0", "nym-task", @@ -4559,6 +4559,34 @@ dependencies = [ "utoipa", ] +[[package]] +name = "nym-api-requests" +version = "0.1.0" +source = "git+https://github.com/nymtech/nym?branch=release/2024.13-magura#317f7fffa986dff856e5b980b15872620bc052f0" +dependencies = [ + "bs58", + "cosmrs 0.17.0-pre", + "cosmwasm-std", + "ecdsa", + "getset", + "nym-compact-ecash 0.1.0 (git+https://github.com/nymtech/nym?branch=release/2024.13-magura)", + "nym-credentials-interface 0.1.0 (git+https://github.com/nymtech/nym?branch=release/2024.13-magura)", + "nym-crypto 0.4.0 (git+https://github.com/nymtech/nym?branch=release/2024.13-magura)", + "nym-ecash-time 0.1.0 (git+https://github.com/nymtech/nym?branch=release/2024.13-magura)", + "nym-mixnet-contract-common 0.6.0 (git+https://github.com/nymtech/nym?branch=release/2024.13-magura)", + "nym-network-defaults 0.1.0 (git+https://github.com/nymtech/nym?branch=release/2024.13-magura)", + "nym-node-requests 0.1.0 (git+https://github.com/nymtech/nym?branch=release/2024.13-magura)", + "nym-serde-helpers 0.1.0 (git+https://github.com/nymtech/nym?branch=release/2024.13-magura)", + "schemars", + "serde", + "serde_json", + "sha2 0.10.8", + "tendermint 0.37.0", + "thiserror", + "time", + "utoipa", +] + [[package]] name = "nym-async-file-watcher" version = "0.1.0" @@ -4689,6 +4717,21 @@ dependencies = [ "vergen", ] +[[package]] +name = "nym-bin-common" +version = "0.6.0" +source = "git+https://github.com/nymtech/nym?branch=release/2024.13-magura#317f7fffa986dff856e5b980b15872620bc052f0" +dependencies = [ + "const-str", + "log", + "pretty_env_logger", + "schemars", + "semver 1.0.23", + "serde", + "utoipa", + "vergen", +] + [[package]] name = "nym-bity-integration" version = "0.1.0" @@ -4849,7 +4892,7 @@ dependencies = [ "nym-credentials-interface 0.1.0", "nym-crypto 0.4.0", "nym-ecash-time 0.1.0", - "nym-explorer-client", + "nym-explorer-client 0.1.0", "nym-gateway-client", "nym-gateway-requests", "nym-id", @@ -5088,6 +5131,29 @@ dependencies = [ "zeroize", ] +[[package]] +name = "nym-compact-ecash" +version = "0.1.0" +source = "git+https://github.com/nymtech/nym?branch=release/2024.13-magura#317f7fffa986dff856e5b980b15872620bc052f0" +dependencies = [ + "bincode", + "bls12_381", + "bs58", + "cfg-if", + "digest 0.9.0", + "ff", + "group", + "itertools 0.13.0", + "nym-network-defaults 0.1.0 (git+https://github.com/nymtech/nym?branch=release/2024.13-magura)", + "nym-pemstore 0.3.0 (git+https://github.com/nymtech/nym?branch=release/2024.13-magura)", + "rand", + "serde", + "sha2 0.9.9", + "subtle 2.5.0", + "thiserror", + "zeroize", +] + [[package]] name = "nym-config" version = "0.1.0" @@ -5115,6 +5181,20 @@ dependencies = [ "url", ] +[[package]] +name = "nym-config" +version = "0.1.0" +source = "git+https://github.com/nymtech/nym?branch=release/2024.13-magura#317f7fffa986dff856e5b980b15872620bc052f0" +dependencies = [ + "dirs", + "handlebars", + "log", + "nym-network-defaults 0.1.0 (git+https://github.com/nymtech/nym?branch=release/2024.13-magura)", + "serde", + "toml 0.8.14", + "url", +] + [[package]] name = "nym-contracts-common" version = "0.5.0" @@ -5145,6 +5225,21 @@ dependencies = [ "vergen", ] +[[package]] +name = "nym-contracts-common" +version = "0.5.0" +source = "git+https://github.com/nymtech/nym?branch=release/2024.13-magura#317f7fffa986dff856e5b980b15872620bc052f0" +dependencies = [ + "bs58", + "cosmwasm-schema", + "cosmwasm-std", + "cw-storage-plus", + "schemars", + "serde", + "thiserror", + "vergen", +] + [[package]] name = "nym-country-group" version = "0.1.0" @@ -5281,6 +5376,22 @@ dependencies = [ "time", ] +[[package]] +name = "nym-credentials-interface" +version = "0.1.0" +source = "git+https://github.com/nymtech/nym?branch=release/2024.13-magura#317f7fffa986dff856e5b980b15872620bc052f0" +dependencies = [ + "bls12_381", + "nym-compact-ecash 0.1.0 (git+https://github.com/nymtech/nym?branch=release/2024.13-magura)", + "nym-ecash-time 0.1.0 (git+https://github.com/nymtech/nym?branch=release/2024.13-magura)", + "nym-network-defaults 0.1.0 (git+https://github.com/nymtech/nym?branch=release/2024.13-magura)", + "rand", + "serde", + "strum 0.26.3", + "thiserror", + "time", +] + [[package]] name = "nym-crypto" version = "0.4.0" @@ -5326,6 +5437,23 @@ dependencies = [ "zeroize", ] +[[package]] +name = "nym-crypto" +version = "0.4.0" +source = "git+https://github.com/nymtech/nym?branch=release/2024.13-magura#317f7fffa986dff856e5b980b15872620bc052f0" +dependencies = [ + "bs58", + "ed25519-dalek", + "nym-pemstore 0.3.0 (git+https://github.com/nymtech/nym?branch=release/2024.13-magura)", + "nym-sphinx-types 0.2.0 (git+https://github.com/nymtech/nym?branch=release/2024.13-magura)", + "serde", + "serde_bytes", + "subtle-encoding", + "thiserror", + "x25519-dalek", + "zeroize", +] + [[package]] name = "nym-data-observatory" version = "0.1.0" @@ -5427,6 +5555,14 @@ dependencies = [ "time", ] +[[package]] +name = "nym-ecash-time" +version = "0.1.0" +source = "git+https://github.com/nymtech/nym?branch=release/2024.13-magura#317f7fffa986dff856e5b980b15872620bc052f0" +dependencies = [ + "time", +] + [[package]] name = "nym-execute" version = "0.1.0" @@ -5459,6 +5595,18 @@ dependencies = [ "utoipa", ] +[[package]] +name = "nym-exit-policy" +version = "0.1.0" +source = "git+https://github.com/nymtech/nym?branch=release/2024.13-magura#317f7fffa986dff856e5b980b15872620bc052f0" +dependencies = [ + "serde", + "serde_json", + "thiserror", + "tracing", + "utoipa", +] + [[package]] name = "nym-explorer-api-requests" version = "0.1.0" @@ -5471,11 +5619,23 @@ dependencies = [ "ts-rs", ] +[[package]] +name = "nym-explorer-api-requests" +version = "0.1.0" +source = "git+https://github.com/nymtech/nym?branch=release/2024.13-magura#317f7fffa986dff856e5b980b15872620bc052f0" +dependencies = [ + "nym-api-requests 0.1.0 (git+https://github.com/nymtech/nym?branch=release/2024.13-magura)", + "nym-contracts-common 0.5.0 (git+https://github.com/nymtech/nym?branch=release/2024.13-magura)", + "nym-mixnet-contract-common 0.6.0 (git+https://github.com/nymtech/nym?branch=release/2024.13-magura)", + "schemars", + "serde", +] + [[package]] name = "nym-explorer-client" version = "0.1.0" dependencies = [ - "nym-explorer-api-requests", + "nym-explorer-api-requests 0.1.0", "reqwest 0.12.4", "serde", "thiserror", @@ -5484,6 +5644,19 @@ dependencies = [ "url", ] +[[package]] +name = "nym-explorer-client" +version = "0.1.0" +source = "git+https://github.com/nymtech/nym?branch=release/2024.13-magura#317f7fffa986dff856e5b980b15872620bc052f0" +dependencies = [ + "log", + "nym-explorer-api-requests 0.1.0 (git+https://github.com/nymtech/nym?branch=release/2024.13-magura)", + "reqwest 0.12.4", + "serde", + "thiserror", + "url", +] + [[package]] name = "nym-ffi-shared" version = "0.2.0" @@ -5910,6 +6083,27 @@ dependencies = [ "time", ] +[[package]] +name = "nym-mixnet-contract-common" +version = "0.6.0" +source = "git+https://github.com/nymtech/nym?branch=release/2024.13-magura#317f7fffa986dff856e5b980b15872620bc052f0" +dependencies = [ + "bs58", + "cosmwasm-schema", + "cosmwasm-std", + "cw-controllers", + "cw-storage-plus", + "humantime-serde", + "log", + "nym-contracts-common 0.5.0 (git+https://github.com/nymtech/nym?branch=release/2024.13-magura)", + "schemars", + "serde", + "serde-json-wasm", + "serde_repr", + "thiserror", + "time", +] + [[package]] name = "nym-mixnode" version = "1.1.37" @@ -6041,6 +6235,19 @@ dependencies = [ "utoipa", ] +[[package]] +name = "nym-network-defaults" +version = "0.1.0" +source = "git+https://github.com/nymtech/nym?branch=release/2024.13-magura#317f7fffa986dff856e5b980b15872620bc052f0" +dependencies = [ + "dotenvy", + "log", + "schemars", + "serde", + "url", + "utoipa", +] + [[package]] name = "nym-network-monitor" version = "0.1.0" @@ -6246,6 +6453,27 @@ dependencies = [ "utoipa", ] +[[package]] +name = "nym-node-requests" +version = "0.1.0" +source = "git+https://github.com/nymtech/nym?branch=release/2024.13-magura#317f7fffa986dff856e5b980b15872620bc052f0" +dependencies = [ + "base64 0.22.1", + "celes", + "humantime 2.1.0", + "humantime-serde", + "nym-bin-common 0.6.0 (git+https://github.com/nymtech/nym?branch=release/2024.13-magura)", + "nym-crypto 0.4.0 (git+https://github.com/nymtech/nym?branch=release/2024.13-magura)", + "nym-exit-policy 0.1.0 (git+https://github.com/nymtech/nym?branch=release/2024.13-magura)", + "nym-wireguard-types 0.1.0 (git+https://github.com/nymtech/nym?branch=release/2024.13-magura)", + "schemars", + "serde", + "serde_json", + "thiserror", + "time", + "utoipa", +] + [[package]] name = "nym-node-status-agent" version = "0.1.0" @@ -6264,7 +6492,7 @@ dependencies = [ [[package]] name = "nym-node-status-api" -version = "0.1.0" +version = "0.1.2" dependencies = [ "anyhow", "axum 0.7.7", @@ -6276,7 +6504,7 @@ dependencies = [ "moka", "nym-bin-common 0.6.0", "nym-common-models", - "nym-explorer-client", + "nym-explorer-client 0.1.0 (git+https://github.com/nymtech/nym?branch=release/2024.13-magura)", "nym-network-defaults 0.1.0 (git+https://github.com/nymtech/nym?branch=pre-dir-v2-fork)", "nym-node-requests 0.1.0 (git+https://github.com/nymtech/nym?branch=pre-dir-v2-fork)", "nym-task", @@ -6409,6 +6637,14 @@ dependencies = [ "pem", ] +[[package]] +name = "nym-pemstore" +version = "0.3.0" +source = "git+https://github.com/nymtech/nym?branch=release/2024.13-magura#317f7fffa986dff856e5b980b15872620bc052f0" +dependencies = [ + "pem", +] + [[package]] name = "nym-sdk" version = "0.1.0" @@ -6485,6 +6721,17 @@ dependencies = [ "time", ] +[[package]] +name = "nym-serde-helpers" +version = "0.1.0" +source = "git+https://github.com/nymtech/nym?branch=release/2024.13-magura#317f7fffa986dff856e5b980b15872620bc052f0" +dependencies = [ + "base64 0.22.1", + "bs58", + "serde", + "time", +] + [[package]] name = "nym-service-provider-requests-common" version = "0.1.0" @@ -6798,6 +7045,15 @@ dependencies = [ "thiserror", ] +[[package]] +name = "nym-sphinx-types" +version = "0.2.0" +source = "git+https://github.com/nymtech/nym?branch=release/2024.13-magura#317f7fffa986dff856e5b980b15872620bc052f0" +dependencies = [ + "sphinx-packet", + "thiserror", +] + [[package]] name = "nym-statistics-common" version = "0.1.0" @@ -7139,6 +7395,20 @@ dependencies = [ "x25519-dalek", ] +[[package]] +name = "nym-wireguard-types" +version = "0.1.0" +source = "git+https://github.com/nymtech/nym?branch=release/2024.13-magura#317f7fffa986dff856e5b980b15872620bc052f0" +dependencies = [ + "base64 0.22.1", + "log", + "nym-config 0.1.0 (git+https://github.com/nymtech/nym?branch=release/2024.13-magura)", + "nym-network-defaults 0.1.0 (git+https://github.com/nymtech/nym?branch=release/2024.13-magura)", + "serde", + "thiserror", + "x25519-dalek", +] + [[package]] name = "nymvisor" version = "0.1.8" diff --git a/nym-node-status-api/Cargo.toml b/nym-node-status-api/Cargo.toml index 4cc9ff5d283..f39d7acd574 100644 --- a/nym-node-status-api/Cargo.toml +++ b/nym-node-status-api/Cargo.toml @@ -3,7 +3,7 @@ [package] name = "nym-node-status-api" -version = "0.1.0" +version = "0.1.2" authors.workspace = true repository.workspace = true homepage.workspace = true @@ -23,7 +23,8 @@ futures-util = { workspace = true } moka = { workspace = true, features = ["future"] } nym-bin-common = { path = "../common/bin-common", features = ["models"]} nym-common-models = { path = "../common/models" } -nym-explorer-client = { path = "../explorer-api/explorer-client" } +# nym-explorer-client = { path = "../explorer-api/explorer-client" } +nym-explorer-client = { git = "https://github.com/nymtech/nym", branch = "release/2024.13-magura" } # TODO dz: before Nym API client breaking changes. Update to latest develop once new Nym API is live nym-network-defaults = { git = "https://github.com/nymtech/nym", branch = "pre-dir-v2-fork" } nym-validator-client = { git = "https://github.com/nymtech/nym", branch = "pre-dir-v2-fork" } diff --git a/nym-node-status-api/launch_node_status_api.sh b/nym-node-status-api/launch_node_status_api.sh index f9ebd364a9b..e732caf37ea 100755 --- a/nym-node-status-api/launch_node_status_api.sh +++ b/nym-node-status-api/launch_node_status_api.sh @@ -7,7 +7,7 @@ export RUST_LOG=${RUST_LOG:-debug} export NYM_API_CLIENT_TIMEOUT=60 export EXPLORER_CLIENT_TIMEOUT=60 -export ENVIRONMENT="mainnet.env" +export ENVIRONMENT="qa.env" function run_bare() { # export necessary env vars diff --git a/nym-node-status-api/src/monitor/mod.rs b/nym-node-status-api/src/monitor/mod.rs index 680a9ce312a..14a3aec0d1a 100644 --- a/nym-node-status-api/src/monitor/mod.rs +++ b/nym-node-status-api/src/monitor/mod.rs @@ -91,7 +91,7 @@ async fn run( let explorer_client = ExplorerClient::new_with_timeout(default_explorer_url, explorer_client_timeout)?; let explorer_gateways = explorer_client - .get_gateways() + .unstable_get_gateways() .await .log_error("get_gateways")?;