From a5d8a5071ffa44d021474e57e152bceb01895015 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Stuczy=C5=84ski?= Date: Fri, 13 Oct 2023 12:16:12 +0100 Subject: [PATCH] nym-api using new default port for queries --- Cargo.lock | 1 + common/network-defaults/src/lib.rs | 3 +++ nym-api/src/node_describe_cache/mod.rs | 6 +++++- nym-node/Cargo.toml | 1 + nym-node/src/config/mod.rs | 3 ++- 5 files changed, 12 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8f4ff4b282..34c50d173a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6875,6 +6875,7 @@ dependencies = [ "hmac 0.12.1", "hyper", "mime", + "nym-config", "nym-crypto", "nym-node-requests", "nym-task", diff --git a/common/network-defaults/src/lib.rs b/common/network-defaults/src/lib.rs index fe353b16ae..b45b5483e9 100644 --- a/common/network-defaults/src/lib.rs +++ b/common/network-defaults/src/lib.rs @@ -462,6 +462,9 @@ pub const DEFAULT_NYM_API_PORT: u16 = 8080; pub const NYM_API_VERSION: &str = "v1"; +// NYM-NODE +pub const DEFAULT_NYM_NODE_HTTP_PORT: u16 = 8080; + // REWARDING /// We'll be assuming a few more things, profit margin and cost function. Since we don't have reliable package measurement, we'll be using uptime. We'll also set the value of 1 Nym to 1 $, to be able to translate interval costs to Nyms. We'll also assume a cost of 40$ per interval(month), converting that to Nym at our 1$ rate translates to 40_000_000 uNyms diff --git a/nym-api/src/node_describe_cache/mod.rs b/nym-api/src/node_describe_cache/mod.rs index 9b9e91f7d8..7948fbf2ed 100644 --- a/nym-api/src/node_describe_cache/mod.rs +++ b/nym-api/src/node_describe_cache/mod.rs @@ -8,6 +8,7 @@ use crate::support::config; use crate::support::config::DEFAULT_NODE_DESCRIBE_BATCH_SIZE; use futures_util::{stream, StreamExt}; use nym_api_requests::models::NymNodeDescription; +use nym_config::defaults::DEFAULT_NYM_NODE_HTTP_PORT; use nym_contracts_common::IdentityKey; use nym_mixnet_contract_common::Gateway; use nym_node_requests::api::client::{NymNodeApiClientError, NymNodeApiClientExt}; @@ -74,7 +75,10 @@ impl NodeDescriptionProvider { async fn get_gateway_description( gateway: Gateway, ) -> Result<(IdentityKey, NymNodeDescription), NodeDescribeCacheError> { - let client = match nym_node_requests::api::Client::new_url(&gateway.host, None) { + let client = match nym_node_requests::api::Client::new_url( + format!("{}:{}", gateway.host, DEFAULT_NYM_NODE_HTTP_PORT), + None, + ) { Ok(client) => client, Err(err) => { return Err(NodeDescribeCacheError::MalformedHost { diff --git a/nym-node/Cargo.toml b/nym-node/Cargo.toml index c157b95974..71d13c10e0 100644 --- a/nym-node/Cargo.toml +++ b/nym-node/Cargo.toml @@ -44,6 +44,7 @@ utoipa-swagger-ui = { workspace = true, features = ["axum"] } #utoipa-redoc = { version = "0.1.0", features = ["axum"] } #utoipa-rapidoc = { version = "0.1.0", features = ["axum"] } +nym-config = { path = "../common/config" } nym-crypto = { path = "../common/crypto", features = ["asymmetric" ]} nym-node-requests = { path = "nym-node-requests", default-features = false, features = ["openapi", "wireguard-verify"]} nym-task = { path = "../common/task" } diff --git a/nym-node/src/config/mod.rs b/nym-node/src/config/mod.rs index a19cd2eeae..7202ba3c81 100644 --- a/nym-node/src/config/mod.rs +++ b/nym-node/src/config/mod.rs @@ -1,6 +1,7 @@ // Copyright 2023 - Nym Technologies SA // SPDX-License-Identifier: Apache-2.0 +use nym_config::defaults::DEFAULT_NYM_NODE_HTTP_PORT; use serde::{Deserialize, Serialize}; use serde_helpers::*; use std::net::{IpAddr, Ipv4Addr, SocketAddr}; @@ -10,7 +11,7 @@ pub mod persistence; mod serde_helpers; pub const DEFAULT_WIREGUARD_PORT: u16 = 51820; -pub const DEFAULT_HTTP_PORT: u16 = 8080; +pub const DEFAULT_HTTP_PORT: u16 = DEFAULT_NYM_NODE_HTTP_PORT; // TODO: this is very much a WIP. we need proper ssl certificate support here #[derive(Debug, Deserialize, PartialEq, Serialize)]