From 3f504d7500a1e9df278942170a4eb4aab3042293 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Stuczy=C5=84ski?= Date: Mon, 18 Dec 2023 19:08:39 +0000 Subject: [PATCH] fixed builds of other binaries --- explorer-api/src/main.rs | 2 +- gateway/src/node/mod.rs | 4 +++- mixnode/src/node/mod.rs | 2 +- nym-wallet/Cargo.lock | 2 +- nym-wallet/nym-wallet-types/src/network/qa.rs | 1 + nym-wallet/nym-wallet-types/src/network/sandbox.rs | 1 + nym-wallet/src-tauri/Cargo.toml | 2 +- service-providers/network-statistics/src/api/mod.rs | 2 +- 8 files changed, 10 insertions(+), 6 deletions(-) diff --git a/explorer-api/src/main.rs b/explorer-api/src/main.rs index 1c00c1548f..8cb98280af 100644 --- a/explorer-api/src/main.rs +++ b/explorer-api/src/main.rs @@ -79,7 +79,7 @@ impl ExplorerApi { self.wait_for_interrupt(shutdown).await } - async fn wait_for_interrupt(&self, shutdown: TaskManager) { + async fn wait_for_interrupt(&self, mut shutdown: TaskManager) { let _res = shutdown.catch_interrupt().await; log::info!("Stopping explorer API"); } diff --git a/gateway/src/node/mod.rs b/gateway/src/node/mod.rs index 44da516aea..497c6c6872 100644 --- a/gateway/src/node/mod.rs +++ b/gateway/src/node/mod.rs @@ -388,7 +388,9 @@ impl Gateway { )) } - async fn wait_for_interrupt(shutdown: TaskManager) -> Result<(), Box> { + async fn wait_for_interrupt( + mut shutdown: TaskManager, + ) -> Result<(), Box> { let res = shutdown.catch_interrupt().await; log::info!("Stopping nym gateway"); res diff --git a/mixnode/src/node/mod.rs b/mixnode/src/node/mod.rs index 5dca2113dc..1667b108fd 100644 --- a/mixnode/src/node/mod.rs +++ b/mixnode/src/node/mod.rs @@ -215,7 +215,7 @@ impl MixNode { }) } - async fn wait_for_interrupt(&self, shutdown: TaskManager) { + async fn wait_for_interrupt(&self, mut shutdown: TaskManager) { let _res = shutdown.catch_interrupt().await; log::info!("Stopping nym mixnode"); } diff --git a/nym-wallet/Cargo.lock b/nym-wallet/Cargo.lock index fdb976b948..d35a3c4c6a 100644 --- a/nym-wallet/Cargo.lock +++ b/nym-wallet/Cargo.lock @@ -3593,7 +3593,7 @@ dependencies = [ "bip39", "cfg-if", "colored 2.0.4", - "cosmrs 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cosmrs 0.15.0 (git+https://github.com/jstuczyn/cosmos-rust?branch=nym-temp/all-validator-features)", "cosmwasm-std", "dirs 4.0.0", "dotenvy", diff --git a/nym-wallet/nym-wallet-types/src/network/qa.rs b/nym-wallet/nym-wallet-types/src/network/qa.rs index f036b51c4d..85aa00bd5e 100644 --- a/nym-wallet/nym-wallet-types/src/network/qa.rs +++ b/nym-wallet/nym-wallet-types/src/network/qa.rs @@ -35,6 +35,7 @@ pub(crate) fn validators() -> Vec { vec![ValidatorDetails::new( "https://qa-validator.qa.nymte.ch/", Some("https://qa-nym-api.qa.nymte.ch/api"), + Some("wss://qa-validator.qa.nymte.ch/websocket"), )] } diff --git a/nym-wallet/nym-wallet-types/src/network/sandbox.rs b/nym-wallet/nym-wallet-types/src/network/sandbox.rs index 1186c07eac..2d1bc9e0fa 100644 --- a/nym-wallet/nym-wallet-types/src/network/sandbox.rs +++ b/nym-wallet/nym-wallet-types/src/network/sandbox.rs @@ -32,6 +32,7 @@ pub(crate) fn validators() -> Vec { vec![ValidatorDetails::new( "https://rpc.sandbox.nymtech.net", Some("https://sandbox-nym-api1.nymtech.net/api"), + Some("wss://rpc.sandbox.nymtech.net/websocket"), )] } diff --git a/nym-wallet/src-tauri/Cargo.toml b/nym-wallet/src-tauri/Cargo.toml index 1182ef2d1c..854aa1d57f 100644 --- a/nym-wallet/src-tauri/Cargo.toml +++ b/nym-wallet/src-tauri/Cargo.toml @@ -49,7 +49,7 @@ base64 = "0.13" zeroize = { version = "1.5", features = ["zeroize_derive", "serde"] } cosmwasm-std = "1.3.0" -cosmrs = "=0.15.0" +cosmrs = { git = "https://github.com/jstuczyn/cosmos-rust", branch ="nym-temp/all-validator-features" } nym-validator-client = { path = "../../common/client-libs/validator-client" } nym-crypto = { path = "../../common/crypto", features = ["asymmetric"] } diff --git a/service-providers/network-statistics/src/api/mod.rs b/service-providers/network-statistics/src/api/mod.rs index 74e47c7108..fc32cc8d7b 100644 --- a/service-providers/network-statistics/src/api/mod.rs +++ b/service-providers/network-statistics/src/api/mod.rs @@ -35,7 +35,7 @@ impl NetworkStatisticsAPI { pub async fn run(self) { let rocket_shutdown_handle = self.rocket.shutdown(); - let shutdown = TaskManager::new(10); + let mut shutdown = TaskManager::new(10); tokio::spawn(self.rocket.launch()); shutdown.catch_interrupt().await.ok();