Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

unconditionally announce noise x25519 public key #4907

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions nym-node/src/cli/helpers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -203,14 +203,6 @@ pub(crate) struct MixnetArgs {
env = NYMNODE_NYXD_URLS_ARG
)]
pub(crate) nyxd_urls: Option<Vec<Url>>,

/// Specifies whether this node should **NOT** use noise protocol in the connections (currently not implemented)
#[clap(
hide = true,
long,
env = NYMNODE_UNSAFE_DISABLE_NOISE
)]
pub(crate) unsafe_disable_noise: bool,
}

impl MixnetArgs {
Expand All @@ -229,9 +221,6 @@ impl MixnetArgs {
if let Some(nyxd_urls) = self.nyxd_urls {
section.nyxd_urls = nyxd_urls
}
if self.unsafe_disable_noise {
section.debug.unsafe_disable_noise = true
}
section
}
}
Expand Down
5 changes: 0 additions & 5 deletions nym-node/src/config/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -446,9 +446,6 @@ pub struct MixnetDebug {

/// Maximum number of packets that can be stored waiting to get sent to a particular connection.
pub maximum_connection_buffer_size: usize,

/// Specifies whether this node should **NOT** use noise protocol in the connections (currently not implemented)
pub unsafe_disable_noise: bool,
}

impl MixnetDebug {
Expand All @@ -465,8 +462,6 @@ impl Default for MixnetDebug {
packet_forwarding_maximum_backoff: Self::DEFAULT_PACKET_FORWARDING_MAXIMUM_BACKOFF,
initial_connection_timeout: Self::DEFAULT_INITIAL_CONNECTION_TIMEOUT,
maximum_connection_buffer_size: Self::DEFAULT_MAXIMUM_CONNECTION_BUFFER_SIZE,
// to be changed by @SW once the implementation is there
unsafe_disable_noise: true,
}
}
}
Expand Down
1 change: 0 additions & 1 deletion nym-node/src/config/old_configs/old_config_v3.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1005,7 +1005,6 @@ pub async fn try_upgrade_config_v3<P: AsRef<Path>>(
.packet_forwarding_maximum_backoff,
initial_connection_timeout: old_cfg.mixnet.debug.initial_connection_timeout,
maximum_connection_buffer_size: old_cfg.mixnet.debug.maximum_connection_buffer_size,
unsafe_disable_noise: old_cfg.mixnet.debug.unsafe_disable_noise,
},
},
storage_paths: NymNodePaths {
Expand Down
1 change: 0 additions & 1 deletion nym-node/src/env.rs
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ pub mod vars {
pub const NYMNODE_MIXNET_BIND_ADDRESS_ARG: &str = "NYMNODE_MIXNET_BIND_ADDRESS";
pub const NYMNODE_NYM_APIS_ARG: &str = "NYMNODE_NYM_APIS";
pub const NYMNODE_NYXD_URLS_ARG: &str = "NYMNODE_NYXD";
pub const NYMNODE_UNSAFE_DISABLE_NOISE: &str = "UNSAFE_DISABLE_NOISE";

// wireguard:
pub const NYMNODE_WG_ENABLED_ARG: &str = "NYMNODE_WG_ENABLED";
Expand Down
8 changes: 1 addition & 7 deletions nym-node/src/node/http/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,13 @@ pub(crate) fn sign_host_details(
x25519_noise: &x25519::PublicKey,
ed22519_identity: &ed25519::KeyPair,
) -> Result<api_requests::v1::node::models::SignedHostInformation, NymNodeError> {
let x25519_noise = if config.mixnet.debug.unsafe_disable_noise {
String::new()
} else {
x25519_noise.to_base58_string()
};

let host_info = api_requests::v1::node::models::HostInformation {
ip_address: config.host.public_ips.clone(),
hostname: config.host.hostname.clone(),
keys: api_requests::v1::node::models::HostKeys {
ed25519_identity: ed22519_identity.public_key().to_base58_string(),
x25519_sphinx: x22519_sphinx.to_base58_string(),
x25519_noise,
x25519_noise: x25519_noise.to_base58_string(),
},
};

Expand Down
Loading