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

fixed build and lints of other crates

Browse Source
This commit is contained in:
Jędrzej Stuczyński
2023-10-12 11:30:50 +01:00
parent a6f0fbff3d
commit d77bcbb241
18 changed files with 131 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/client-core/src/init/types.rs
+2 -7
View File
@@ -178,8 +178,9 @@ impl<T> From<PersistedGatewayDetails<T>> for GatewayDetails<T> {
}
}
#[derive(Clone)]
#[derive(Clone, Default)]
pub enum GatewaySelectionSpecification<T = EmptyCustomDetails> {
#[default]
/// Uniformly choose a random remote gateway.
UniformRemote,
@@ -198,12 +199,6 @@ pub enum GatewaySelectionSpecification<T = EmptyCustomDetails> {
},
}
impl<T> Default for GatewaySelectionSpecification<T> {
fn default() -> Self {
GatewaySelectionSpecification::UniformRemote
}
}
impl<T> GatewaySelectionSpecification<T> {
pub fn new(gateway_identity: Option<String>, latency_based_selection: Option<bool>) -> Self {
if let Some(identity) = gateway_identity {
common/mixnode-common/src/verloc/packet.rs
+2 -2
View File
@@ -23,7 +23,7 @@ impl EchoPacket {
.chain(keys.public_key().to_bytes().iter().cloned())
.collect::<Vec<_>>();
let signature = keys.private_key().sign(&bytes_to_sign);
let signature = keys.private_key().sign(bytes_to_sign);
EchoPacket {
sequence_number,
@@ -67,7 +67,7 @@ impl EchoPacket {
pub(crate) fn construct_reply(self, private_key: &identity::PrivateKey) -> ReplyPacket {
let bytes = self.to_bytes();
let signature = private_key.sign(&bytes);
let signature = private_key.sign(bytes);
ReplyPacket {
base_packet: self,
signature,
common/nymsphinx/src/receiver.rs
+2 -1
View File
@@ -294,7 +294,8 @@ mod message_receiver {
owner: "foomp4".to_string(),
host: "1.2.3.4".parse().unwrap(),
mix_host: "1.2.3.4:1789".parse().unwrap(),
clients_port: 9000,
clients_ws_port: 9000,
clients_wss_port: None,
identity_key: identity::PublicKey::from_base58_string(
"FioFa8nMmPpQnYi7JyojoTuwGLeyNS8BF4ChPr29zUML",
)
contracts/mixnet-vesting-integration-tests/src/support/setup.rs
+1 -1
View File
@@ -243,7 +243,7 @@ impl TestSetup {
ContractMessageContent::new(Addr::unchecked(owner), proxy, vec![stake], payload);
let sign_payload = SignableMixNodeBondingMsg::new(signing_nonce, content);
let plaintext = sign_payload.to_plaintext().unwrap();
let signature = keypair.private_key().sign(&plaintext);
let signature = keypair.private_key().sign(plaintext);
let msg_signature = MessageSignature::from(signature.to_bytes().as_ref());
(mixnode, msg_signature)
contracts/mixnet/src/support/tests/mod.rs
+2 -2
View File
@@ -206,7 +206,7 @@ pub mod test_helpers {
let sig_bytes = family_owner_keys
.private_key()
.sign(&msg.to_plaintext().unwrap())
.sign(msg.to_plaintext().unwrap())
.to_bytes();
MessageSignature::from(sig_bytes.as_ref())
}
@@ -956,7 +956,7 @@ pub mod test_helpers {
match message.algorithm {
SigningAlgorithm::Ed25519 => {
let plaintext = message.to_plaintext().unwrap();
let signature = private_key.sign(&plaintext);
let signature = private_key.sign(plaintext);
MessageSignature::from(signature.to_bytes().as_ref())
}
SigningAlgorithm::Secp256k1 => {
contracts/name-service/src/test_helpers/signing.rs
+1 -1
View File
@@ -29,7 +29,7 @@ pub fn ed25519_sign_message<T: Serialize + SigningPurpose>(
match message.algorithm {
SigningAlgorithm::Ed25519 => {
let plaintext = message.to_plaintext().unwrap();
let signature = private_key.sign(&plaintext);
let signature = private_key.sign(plaintext);
MessageSignature::from(signature.to_bytes().as_ref())
}
SigningAlgorithm::Secp256k1 => {
contracts/service-provider-directory/src/test_helpers/signing.rs
+1 -1
View File
@@ -31,7 +31,7 @@ pub fn ed25519_sign_message<T: Serialize + SigningPurpose>(
match message.algorithm {
SigningAlgorithm::Ed25519 => {
let plaintext = message.to_plaintext().unwrap();
let signature = private_key.sign(&plaintext);
let signature = private_key.sign(plaintext);
MessageSignature::from(signature.to_bytes().as_ref())
}
SigningAlgorithm::Secp256k1 => {
gateway/gateway-requests/src/registration/handshake/state.rs
+2 -2
View File
@@ -137,7 +137,7 @@ impl<'a, S> State<'a, S> {
.chain(remote_ephemeral_key.to_bytes().iter().cloned())
.collect();
let signature = self.identity.private_key().sign(&message);
let signature = self.identity.private_key().sign(message);
let zero_iv = stream_cipher::zero_iv::<GatewayEncryptionAlgorithm>();
stream_cipher::encrypt::<GatewayEncryptionAlgorithm>(
self.derived_shared_keys.as_ref().unwrap().encryption_key(),
@@ -191,7 +191,7 @@ impl<'a, S> State<'a, S> {
self.remote_pubkey
.as_ref()
.unwrap()
.verify(&signed_payload, &signature)
.verify(signed_payload, &signature)
.map_err(|_| HandshakeError::InvalidSignature)
}
nym-api/src/nym_contract_cache/routes.rs
+2 -2
View File
@@ -119,13 +119,13 @@ pub async fn get_blacklisted_gateways(
pub async fn get_interval_reward_params(
cache: &State<NymContractCache>,
) -> Json<Option<RewardingParams>> {
Json(cache.interval_reward_params().await.clone())
Json(*cache.interval_reward_params().await)
}
#[openapi(tag = "contract-cache")]
#[get("/epoch/current")]
pub async fn get_current_epoch(cache: &State<NymContractCache>) -> Json<Option<Interval>> {
Json(cache.current_interval().await.clone())
Json(*cache.current_interval().await)
}
#[openapi(tag = "contract-cache")]
nym-connect/desktop/src-tauri/src/operations/directory/gateways.rs
+1 -1
View File
@@ -17,7 +17,7 @@ use url::Url;
const GATEWAY_PERFORMANCE_SCORE_THRESHOLD: u64 = 90;
async fn fetch_all_gateways() -> Result<Vec<GatewayBondAnnotated>> {
let api_client = ApiClient::new(Url::from_str(&std::env::var(NYM_API)?)?);
let api_client = ApiClient::new(Url::from_str(&std::env::var(NYM_API)?)?, None);
let gateways = api_client.get_gateways_detailed().await?;
if gateways.is_empty() {
Err(BackendError::NoGatewaysFoundInDirectory)
nym-node/nym-node-requests/src/api/v1/gateway/client_interfaces/mod.rs
+1 -1
View File
@@ -1,4 +1,4 @@
// Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
// SPDX-License-Identifier: Apache-2.0
pub mod wireguard;
pub mod wireguard;
nym-node/nym-node-requests/src/api/v1/gateway/client_interfaces/wireguard/mod.rs
+1 -1
View File
@@ -1,4 +1,4 @@
// Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
// SPDX-License-Identifier: Apache-2.0
pub mod models;
pub mod models;
nym-node/nym-node-requests/src/api/v1/gateway/mod.rs
+1 -1
View File
@@ -1,5 +1,5 @@
// Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
// SPDX-License-Identifier: Apache-2.0
pub mod client_interfaces;
pub mod models;
pub mod client_interfaces;
nym-node/src/http/router/api/v1/gateway/client_interfaces/wireguard/mod.rs
+1 -1
View File
@@ -229,7 +229,7 @@ mod test {
assert_eq!(
ro_clients
.values()
.map(|c| c.pub_key().clone())
.map(|c| c.pub_key())
.collect::<Vec<ClientPublicKey>>(),
clients
)
nym-node/src/lib.rs
+1 -1
View File
@@ -6,7 +6,7 @@
// this crate will eventually get converted into proper binary
pub mod config;
pub mod error;
pub mod http;
pub mod wireguard;
pub mod config;
nym-wallet/Cargo.lock
Generated
+107 -14
View File
@@ -282,9 +282,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
[[package]]
name = "base64"
version = "0.21.2"
version = "0.21.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d"
checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2"
[[package]]
name = "base64ct"
@@ -1066,6 +1066,33 @@ dependencies = [
"zeroize",
]
[[package]]
name = "curve25519-dalek"
version = "4.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e89b8c6a2e4b1f45971ad09761aafb85514a84744b67a95e32c3cc1352d1f65c"
dependencies = [
"cfg-if",
"cpufeatures",
"curve25519-dalek-derive",
"fiat-crypto",
"platforms",
"rustc_version",
"subtle 2.4.1",
"zeroize",
]
[[package]]
name = "curve25519-dalek-derive"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.28",
]
[[package]]
name = "curve25519-dalek-ng"
version = "4.1.1"
@@ -1455,7 +1482,7 @@ version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d"
dependencies = [
"curve25519-dalek",
"curve25519-dalek 3.2.0",
"ed25519 1.5.3",
"rand 0.7.3",
"serde",
@@ -1469,7 +1496,7 @@ version = "3.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7c24f403d068ad0b359e577a77f92392118be3f3c927538f2bb544a5ecd828c6"
dependencies = [
"curve25519-dalek",
"curve25519-dalek 3.2.0",
"hashbrown 0.12.3",
"hex",
"rand_core 0.6.4",
@@ -1663,6 +1690,12 @@ dependencies = [
"subtle 2.4.1",
]
[[package]]
name = "fiat-crypto"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d0870c84016d4b481be5c9f323c24f65e31e901ae618f0e80f4308fb00de1d2d"
[[package]]
name = "field-offset"
version = "0.3.6"
@@ -2399,6 +2432,9 @@ dependencies = [
"serde",
"serde_json",
"thiserror",
"tracing",
"url",
"wasmtimer",
]
[[package]]
@@ -3148,6 +3184,7 @@ dependencies = [
"getset",
"nym-coconut-interface",
"nym-mixnet-contract-common",
"nym-node-requests",
"schemars",
"serde",
]
@@ -3162,6 +3199,7 @@ dependencies = [
"clap_complete_fig",
"log",
"pretty_env_logger",
"schemars",
"semver 0.11.0",
"serde",
"vergen",
@@ -3254,7 +3292,7 @@ dependencies = [
"rand 0.7.3",
"subtle-encoding",
"thiserror",
"x25519-dalek",
"x25519-dalek 1.1.1",
"zeroize",
]
@@ -3361,6 +3399,20 @@ dependencies = [
"url",
]
[[package]]
name = "nym-node-requests"
version = "0.1.0"
dependencies = [
"base64 0.21.4",
"nym-bin-common",
"nym-crypto",
"schemars",
"serde",
"serde_json",
"thiserror",
"x25519-dalek 2.0.0",
]
[[package]]
name = "nym-pemstore"
version = "0.3.0"
@@ -4049,13 +4101,19 @@ version = "0.3.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
[[package]]
name = "platforms"
version = "3.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4503fa043bf02cee09a9582e9554b4c6403b2ef55e4612e96561d294419429f8"
[[package]]
name = "plist"
version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bdc0001cfea3db57a2e24bc0d818e9e20e554b5f97fabb9bc231dc240269ae06"
dependencies = [
"base64 0.21.2",
"base64 0.21.4",
"indexmap 1.9.3",
"line-wrap",
"quick-xml",
@@ -4399,11 +4457,11 @@ checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2"
[[package]]
name = "reqwest"
version = "0.11.18"
version = "0.11.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55"
checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b"
dependencies = [
"base64 0.21.2",
"base64 0.21.4",
"bytes",
"encoding_rs",
"futures-core",
@@ -4424,6 +4482,7 @@ dependencies = [
"serde",
"serde_json",
"serde_urlencoded",
"system-configuration",
"tokio",
"tokio-native-tls",
"tower-service",
@@ -5043,7 +5102,7 @@ dependencies = [
"bs58 0.4.0",
"byteorder",
"chacha",
"curve25519-dalek",
"curve25519-dalek 3.2.0",
"digest 0.9.0",
"hkdf",
"hmac 0.11.0",
@@ -5199,6 +5258,27 @@ dependencies = [
"unicode-ident",
]
[[package]]
name = "system-configuration"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
dependencies = [
"bitflags 1.3.2",
"core-foundation",
"system-configuration-sys",
]
[[package]]
name = "system-configuration-sys"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9"
dependencies = [
"core-foundation-sys",
"libc",
]
[[package]]
name = "system-deps"
version = "5.0.0"
@@ -6556,11 +6636,12 @@ dependencies = [
[[package]]
name = "winreg"
version = "0.10.1"
version = "0.50.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d"
checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1"
dependencies = [
"winapi",
"cfg-if",
"windows-sys 0.48.0",
]
[[package]]
@@ -6646,11 +6727,23 @@ version = "1.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a0c105152107e3b96f6a00a65e86ce82d9b125230e1c4302940eca58ff71f4f"
dependencies = [
"curve25519-dalek",
"curve25519-dalek 3.2.0",
"rand_core 0.5.1",
"zeroize",
]
[[package]]
name = "x25519-dalek"
version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fb66477291e7e8d2b0ff1bcb900bf29489a9692816d79874bea351e7a8b6de96"
dependencies = [
"curve25519-dalek 4.1.1",
"rand_core 0.6.4",
"serde",
"zeroize",
]
[[package]]
name = "xattr"
version = "1.0.1"
nym-wallet/src-tauri/src/operations/helpers.rs
+2 -2
View File
@@ -107,7 +107,7 @@ pub(crate) async fn verify_mixnode_bonding_sign_payload<P: AddressAndNonceProvid
}
// TODO: possibly provide better error message if this check fails
identity_key.verify(&plaintext, &signature)?;
identity_key.verify(plaintext, &signature)?;
Ok(())
}
@@ -150,7 +150,7 @@ pub(crate) async fn verify_gateway_bonding_sign_payload<P: AddressAndNonceProvid
}
// TODO: possibly provide better error message if this check fails
identity_key.verify(&plaintext, &signature)?;
identity_key.verify(plaintext, &signature)?;
Ok(())
}
sdk/lib/socks5-listener/src/lib.rs
+1 -3
View File
@@ -272,9 +272,7 @@ where
let storage = MobileClientStorage::new(&config);
let socks5_client =
Socks5NymClient::new(config.core, storage, None).with_gateway_setup(GatewaySetup::New {
specification: GatewaySelectionSpecification::UniformRemote {
must_use_tls: false,
},
specification: GatewaySelectionSpecification::UniformRemote,
available_gateways: current_gateways(&mut rng, &nym_apis).await?,
overwrite_data: false,
});