Release/nym wallet v1.0.4 (#1248)

* Bumped up version numbers to 1.0.1

* Updated changelog attempting to use new format

* Bumped up wallet version number

* Updated changelog attempting to use new format

* Updated tauri version

.github/workflows/nym-release-publish.yml

@@ -44,3 +44,4 @@ jobs:
             target/release/nym-mixnode
             target/release/nym-socks5-client
             target/release/nym-validator-api
+            target/release/nym-network-requester

CHANGELOG.md

@@ -1,5 +1,30 @@
 # Changelog
 
+## [Unreleased]
+
+## [nym-wallet-v1.0.4](https://github.com/nymtech/nym/tree/nym-wallet-v1.0.4) (2022-05-04)
+
+### Changed
+
+- all: the default behaviour of validator client is changed to use `broadcast_sync` and poll for transaction inclusion instead of using `broadcast_commit` to deal with timeouts ([#1246])
+
+## [v1.0.1](https://github.com/nymtech/nym/tree/v1.0.1) (2022-05-04)
+
+### Added
+
+- validator-api: introduced endpoint for getting average mixnode uptime ([#1238])
+
+### Changed
+
+- all: the default behaviour of validator client is changed to use `broadcast_sync` and poll for transaction inclusion instead of using `broadcast_commit` to deal with timeouts ([#1246])
+
+### Fixed
+
+- nym-network-requester: is included in the Github Actions for building release binaries
+
+[#1238]: https://github.com/nymtech/nym/pull/1238
+[#1246]: https://github.com/nymtech/nym/pull/1246
+
 ## [v1.0.0](https://github.com/nymtech/nym/tree/v1.0.0) (2022-05-03)
 
 [Full Changelog](https://github.com/nymtech/nym/compare/v0.12.1...v1.0.0)

Cargo.lock

@@ -581,7 +581,7 @@ dependencies = [
 
 [[package]]
 name = "client-core"
-version = "1.0.0"
+version = "1.0.1"
 dependencies = [
  "config",
  "crypto",
@@ -1594,7 +1594,7 @@ dependencies = [
 
 [[package]]
 name = "explorer-api"
-version = "1.0.0"
+version = "1.0.1"
 dependencies = [
  "chrono",
  "humantime-serde",
@@ -3043,7 +3043,7 @@ dependencies = [
 
 [[package]]
 name = "nym-client"
-version = "1.0.0"
+version = "1.0.1"
 dependencies = [
  "clap 2.34.0",
  "client-core",
@@ -3078,7 +3078,7 @@ dependencies = [
 
 [[package]]
 name = "nym-gateway"
-version = "1.0.0"
+version = "1.0.1"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -3124,7 +3124,7 @@ dependencies = [
 
 [[package]]
 name = "nym-mixnode"
-version = "1.0.0"
+version = "1.0.1"
 dependencies = [
  "anyhow",
  "bs58",
@@ -3162,7 +3162,7 @@ dependencies = [
 
 [[package]]
 name = "nym-network-requester"
-version = "1.0.0"
+version = "1.0.1"
 dependencies = [
  "clap 2.34.0",
  "dirs",
@@ -3183,7 +3183,7 @@ dependencies = [
 
 [[package]]
 name = "nym-socks5-client"
-version = "1.0.0"
+version = "1.0.1"
 dependencies = [
  "clap 2.34.0",
  "client-core",
@@ -3219,7 +3219,7 @@ dependencies = [
 
 [[package]]
 name = "nym-validator-api"
-version = "1.0.0"
+version = "1.0.1"
 dependencies = [
  "anyhow",
  "async-trait",

Cargo.toml

@@ -9,6 +9,9 @@ overflow-checks = true
 [profile.dev]
 panic = "abort"
 
+[profile.test]
+opt-level = 2
+
 [workspace]
 
 resolver = "2"

clients/client-core/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "client-core"
-version = "1.0.0"
+version = "1.0.1"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>"]
 edition = "2021"
 

clients/native/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "nym-client"
-version = "1.0.0"
+version = "1.0.1"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>", "Jędrzej Stuczyński <andrew@nymtech.net>"]
 edition = "2021"
 rust-version = "1.56"

clients/socks5/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "nym-socks5-client"
-version = "1.0.0"
+version = "1.0.1"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>"]
 edition = "2021"
 rust-version = "1.56"

clients/webassembly/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "nym-client-wasm"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>", "Jedrzej Stuczynski <andrew@nymtech.net>"]
-version = "1.0.0"
+version = "1.0.1"
 edition = "2021"
 keywords = ["nym", "sphinx", "wasm", "webassembly", "privacy", "client"]
 license = "Apache-2.0"

common/client-libs/validator-client/src/client.rs

@@ -5,6 +5,9 @@ use crate::{validator_api, ValidatorClientError};
 use coconut_interface::{BlindSignRequestBody, BlindedSignatureResponse, VerificationKeyResponse};
 use mixnet_contract_common::{GatewayBond, IdentityKeyRef, MixNodeBond};
 use url::Url;
+
+#[cfg(feature = "nymd-client")]
+use validator_api_requests::models::UptimeResponse;
 use validator_api_requests::models::{
     CoreNodeStatusResponse, MixnodeStatusResponse, RewardEstimationResponse,
     StakeSaturationResponse,
@@ -582,6 +585,12 @@ impl<C> Client<C> {
         Ok(delegations)
     }
 
+    pub async fn get_mixnode_avg_uptimes(
+        &self,
+    ) -> Result<Vec<UptimeResponse>, ValidatorClientError> {
+        Ok(self.validator_api.get_mixnode_avg_uptimes().await?)
+    }
+
     pub async fn blind_sign(
         &self,
         request_body: &BlindSignRequestBody,

common/client-libs/validator-client/src/nymd/cosmwasm_client/client.rs

@@ -30,12 +30,26 @@ use cosmwasm_std::Coin as CosmWasmCoin;
 use prost::Message;
 use serde::{Deserialize, Serialize};
 use std::convert::{TryFrom, TryInto};
+use std::time::Duration;
 
 #[async_trait]
-impl CosmWasmClient for HttpClient {}
+impl CosmWasmClient for HttpClient {
+    fn broadcast_polling_rate(&self) -> Duration {
+        Duration::from_secs(4)
+    }
+
+    fn broadcast_timeout(&self) -> Duration {
+        Duration::from_secs(60)
+    }
+}
 
 #[async_trait]
 pub trait CosmWasmClient: rpc::Client {
+    // this should probably get redesigned, but I'm leaving those like that temporarily to fix
+    // the underlying issue more quickly
+    fn broadcast_polling_rate(&self) -> Duration;
+    fn broadcast_timeout(&self) -> Duration;
+
     // helper method to remove duplicate code involved in making abci requests with protobuf messages
     // TODO: perhaps it should have an additional argument to determine whether the response should
     // require proof?
@@ -253,6 +267,42 @@ pub trait CosmWasmClient: rpc::Client {
         Ok(rpc::Client::broadcast_tx_commit(self, tx).await?)
     }
 
+    async fn broadcast_tx(&self, tx: Transaction) -> Result<TxResponse, NymdError> {
+        let broadcasted = CosmWasmClient::broadcast_tx_sync(self, tx).await?;
+
+        if broadcasted.code.is_err() {
+            let code_val = broadcasted.code.value();
+            return Err(NymdError::BroadcastTxErrorDeliverTx {
+                hash: broadcasted.hash,
+                height: None,
+                code: code_val,
+                raw_log: broadcasted.log.to_string(),
+            });
+        }
+
+        let tx_hash = broadcasted.hash;
+
+        let start = tokio::time::Instant::now();
+        loop {
+            log::debug!(
+                "Polling for result of including {} in a block...",
+                broadcasted.hash
+            );
+            if tokio::time::Instant::now().duration_since(start) >= self.broadcast_timeout() {
+                return Err(NymdError::BroadcastTimeout {
+                    hash: tx_hash,
+                    timeout: self.broadcast_timeout(),
+                });
+            }
+
+            if let Ok(poll_res) = self.get_tx(tx_hash).await {
+                return Ok(poll_res);
+            }
+
+            tokio::time::sleep(self.broadcast_polling_rate()).await;
+        }
+    }
+
     async fn get_codes(&self) -> Result<Vec<Code>, NymdError> {
         let path = Some("/cosmwasm.wasm.v1.Query/Codes".parse().unwrap());
 

common/client-libs/validator-client/src/nymd/cosmwasm_client/helpers.rs

@@ -19,7 +19,7 @@ impl CheckResponse for broadcast::tx_commit::Response {
         if self.check_tx.code.is_err() {
             return Err(NymdError::BroadcastTxErrorCheckTx {
                 hash: self.hash,
-                height: self.height,
+                height: Some(self.height),
                 code: self.check_tx.code.value(),
                 raw_log: self.check_tx.log.value().to_owned(),
             });
@@ -28,7 +28,7 @@ impl CheckResponse for broadcast::tx_commit::Response {
         if self.deliver_tx.code.is_err() {
             return Err(NymdError::BroadcastTxErrorDeliverTx {
                 hash: self.hash,
-                height: self.height,
+                height: Some(self.height),
                 code: self.deliver_tx.code.value(),
                 raw_log: self.deliver_tx.log.value().to_owned(),
             });
@@ -38,6 +38,21 @@ impl CheckResponse for broadcast::tx_commit::Response {
     }
 }
 
+impl CheckResponse for crate::nymd::TxResponse {
+    fn check_response(self) -> Result<Self, NymdError> {
+        if self.tx_result.code.is_err() {
+            return Err(NymdError::BroadcastTxErrorDeliverTx {
+                hash: self.hash,
+                height: Some(self.height),
+                code: self.tx_result.code.value(),
+                raw_log: self.tx_result.log.value().to_owned(),
+            });
+        }
+
+        Ok(self)
+    }
+}
+
 pub(crate) fn compress_wasm_code(code: &[u8]) -> Result<Vec<u8>, NymdError> {
     // using compression level 9, same as cosmjs, that optimises for size
     let mut encoder = GzEncoder::new(Vec::new(), Compression::best());

common/client-libs/validator-client/src/nymd/cosmwasm_client/signing_client.rs

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use std::convert::TryInto;
+use std::time::Duration;
 
 use async_trait::async_trait;
 use cosmrs::bank::MsgSend;
@@ -24,7 +25,7 @@ use crate::nymd::cosmwasm_client::types::*;
 use crate::nymd::error::NymdError;
 use crate::nymd::fee::{Fee, DEFAULT_SIMULATED_GAS_MULTIPLIER};
 use crate::nymd::wallet::DirectSecp256k1HdWallet;
-use crate::nymd::{CosmosCoin, GasPrice};
+use crate::nymd::{CosmosCoin, GasPrice, TxResponse};
 
 // we need to have **a** valid secp256k1 signature for simulation purposes.
 // it doesn't matter what it is as long as it parses correctly
@@ -35,6 +36,9 @@ const DUMMY_SECP256K1_SIGNATURE: &[u8] = &[
     91,
 ];
 
+const DEFAULT_BROADCAST_POLLING_RATE: Duration = Duration::from_secs(4);
+const DEFAULT_BROADCAST_TIMEOUT: Duration = Duration::from_secs(60);
+
 #[async_trait]
 pub trait SigningCosmWasmClient: CosmWasmClient {
     fn signer(&self) -> &DirectSecp256k1HdWallet;
@@ -111,12 +115,12 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
         .map_err(|_| NymdError::SerializationError("MsgStoreCode".to_owned()))?;
 
         let tx_res = self
-            .sign_and_broadcast_commit(sender_address, vec![upload_msg], fee, memo)
+            .sign_and_broadcast(sender_address, vec![upload_msg], fee, memo)
             .await?
             .check_response()?;
 
-        let logs = parse_raw_logs(tx_res.deliver_tx.log)?;
-        let gas_info = GasInfo::new(tx_res.deliver_tx.gas_wanted, tx_res.deliver_tx.gas_used);
+        let logs = parse_raw_logs(tx_res.tx_result.log)?;
+        let gas_info = GasInfo::new(tx_res.tx_result.gas_wanted, tx_res.tx_result.gas_used);
 
         // TODO: should those strings be extracted into some constants?
         // the reason I think unwrap here is fine is that if the transaction succeeded and those
@@ -172,12 +176,12 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
         .map_err(|_| NymdError::SerializationError("MsgInstantiateContract".to_owned()))?;
 
         let tx_res = self
-            .sign_and_broadcast_commit(sender_address, vec![init_msg], fee, memo)
+            .sign_and_broadcast(sender_address, vec![init_msg], fee, memo)
             .await?
             .check_response()?;
 
-        let logs = parse_raw_logs(tx_res.deliver_tx.log)?;
-        let gas_info = GasInfo::new(tx_res.deliver_tx.gas_wanted, tx_res.deliver_tx.gas_used);
+        let logs = parse_raw_logs(tx_res.tx_result.log)?;
+        let gas_info = GasInfo::new(tx_res.tx_result.gas_wanted, tx_res.tx_result.gas_used);
 
         // TODO: should those strings be extracted into some constants?
         // the reason I think unwrap here is fine is that if the transaction succeeded and those
@@ -214,14 +218,14 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
         .map_err(|_| NymdError::SerializationError("MsgUpdateAdmin".to_owned()))?;
 
         let tx_res = self
-            .sign_and_broadcast_commit(sender_address, vec![change_admin_msg], fee, memo)
+            .sign_and_broadcast(sender_address, vec![change_admin_msg], fee, memo)
             .await?
             .check_response()?;
 
-        let gas_info = GasInfo::new(tx_res.deliver_tx.gas_wanted, tx_res.deliver_tx.gas_used);
+        let gas_info = GasInfo::new(tx_res.tx_result.gas_wanted, tx_res.tx_result.gas_used);
 
         Ok(ChangeAdminResult {
-            logs: parse_raw_logs(tx_res.deliver_tx.log)?,
+            logs: parse_raw_logs(tx_res.tx_result.log)?,
             transaction_hash: tx_res.hash,
             gas_info,
         })
@@ -242,14 +246,14 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
         .map_err(|_| NymdError::SerializationError("MsgClearAdmin".to_owned()))?;
 
         let tx_res = self
-            .sign_and_broadcast_commit(sender_address, vec![change_admin_msg], fee, memo)
+            .sign_and_broadcast(sender_address, vec![change_admin_msg], fee, memo)
             .await?
             .check_response()?;
 
-        let gas_info = GasInfo::new(tx_res.deliver_tx.gas_wanted, tx_res.deliver_tx.gas_used);
+        let gas_info = GasInfo::new(tx_res.tx_result.gas_wanted, tx_res.tx_result.gas_used);
 
         Ok(ChangeAdminResult {
-            logs: parse_raw_logs(tx_res.deliver_tx.log)?,
+            logs: parse_raw_logs(tx_res.tx_result.log)?,
             transaction_hash: tx_res.hash,
             gas_info,
         })
@@ -277,14 +281,14 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
         .map_err(|_| NymdError::SerializationError("MsgMigrateContract".to_owned()))?;
 
         let tx_res = self
-            .sign_and_broadcast_commit(sender_address, vec![migrate_msg], fee, memo)
+            .sign_and_broadcast(sender_address, vec![migrate_msg], fee, memo)
             .await?
             .check_response()?;
 
-        let gas_info = GasInfo::new(tx_res.deliver_tx.gas_wanted, tx_res.deliver_tx.gas_used);
+        let gas_info = GasInfo::new(tx_res.tx_result.gas_wanted, tx_res.tx_result.gas_used);
 
         Ok(MigrateResult {
-            logs: parse_raw_logs(tx_res.deliver_tx.log)?,
+            logs: parse_raw_logs(tx_res.tx_result.log)?,
             transaction_hash: tx_res.hash,
             gas_info,
         })
@@ -312,14 +316,14 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
         .map_err(|_| NymdError::SerializationError("MsgExecuteContract".to_owned()))?;
 
         let tx_res = self
-            .sign_and_broadcast_commit(sender_address, vec![execute_msg], fee, memo)
+            .sign_and_broadcast(sender_address, vec![execute_msg], fee, memo)
             .await?
             .check_response()?;
 
-        let gas_info = GasInfo::new(tx_res.deliver_tx.gas_wanted, tx_res.deliver_tx.gas_used);
+        let gas_info = GasInfo::new(tx_res.tx_result.gas_wanted, tx_res.tx_result.gas_used);
 
         Ok(ExecuteResult {
-            logs: parse_raw_logs(tx_res.deliver_tx.log)?,
+            logs: parse_raw_logs(tx_res.tx_result.log)?,
             transaction_hash: tx_res.hash,
             gas_info,
         })
@@ -352,14 +356,14 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
             .collect::<Result<_, _>>()?;
 
         let tx_res = self
-            .sign_and_broadcast_commit(sender_address, messages, fee, memo)
+            .sign_and_broadcast(sender_address, messages, fee, memo)
             .await?
             .check_response()?;
 
-        let gas_info = GasInfo::new(tx_res.deliver_tx.gas_wanted, tx_res.deliver_tx.gas_used);
+        let gas_info = GasInfo::new(tx_res.tx_result.gas_wanted, tx_res.tx_result.gas_used);
 
         Ok(ExecuteResult {
-            logs: parse_raw_logs(tx_res.deliver_tx.log)?,
+            logs: parse_raw_logs(tx_res.tx_result.log)?,
             transaction_hash: tx_res.hash,
             gas_info,
         })
@@ -372,7 +376,7 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
         amount: Vec<Coin>,
         fee: Fee,
         memo: impl Into<String> + Send + 'static,
-    ) -> Result<broadcast::tx_commit::Response, NymdError> {
+    ) -> Result<TxResponse, NymdError> {
         let send_msg = MsgSend {
             from_address: sender_address.clone(),
             to_address: recipient_address.clone(),
@@ -381,7 +385,7 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
         .to_any()
         .map_err(|_| NymdError::SerializationError("MsgSend".to_owned()))?;
 
-        self.sign_and_broadcast_commit(sender_address, vec![send_msg], fee, memo)
+        self.sign_and_broadcast(sender_address, vec![send_msg], fee, memo)
             .await?
             .check_response()
     }
@@ -392,7 +396,7 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
         msgs: I,
         fee: Fee,
         memo: impl Into<String> + Send + 'static,
-    ) -> Result<broadcast::tx_commit::Response, NymdError>
+    ) -> Result<TxResponse, NymdError>
     where
         I: IntoIterator<Item = (AccountId, Vec<Coin>)> + Send,
     {
@@ -409,7 +413,7 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
             })
             .collect::<Result<_, _>>()?;
 
-        self.sign_and_broadcast_commit(sender_address, messages, fee, memo)
+        self.sign_and_broadcast(sender_address, messages, fee, memo)
             .await?
             .check_response()
     }
@@ -421,7 +425,7 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
         amount: Coin,
         fee: Fee,
         memo: impl Into<String> + Send + 'static,
-    ) -> Result<broadcast::tx_commit::Response, NymdError> {
+    ) -> Result<TxResponse, NymdError> {
         let delegate_msg = MsgDelegate {
             delegator_address: delegator_address.to_owned(),
             validator_address: validator_address.to_owned(),
@@ -430,7 +434,7 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
         .to_any()
         .map_err(|_| NymdError::SerializationError("MsgDelegate".to_owned()))?;
 
-        self.sign_and_broadcast_commit(delegator_address, vec![delegate_msg], fee, memo)
+        self.sign_and_broadcast(delegator_address, vec![delegate_msg], fee, memo)
             .await?
             .check_response()
     }
@@ -442,7 +446,7 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
         amount: Coin,
         fee: Fee,
         memo: impl Into<String> + Send + 'static,
-    ) -> Result<broadcast::tx_commit::Response, NymdError> {
+    ) -> Result<TxResponse, NymdError> {
         let undelegate_msg = MsgUndelegate {
             delegator_address: delegator_address.to_owned(),
             validator_address: validator_address.to_owned(),
@@ -451,7 +455,7 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
         .to_any()
         .map_err(|_| NymdError::SerializationError("MsgUndelegate".to_owned()))?;
 
-        self.sign_and_broadcast_commit(delegator_address, vec![undelegate_msg], fee, memo)
+        self.sign_and_broadcast(delegator_address, vec![undelegate_msg], fee, memo)
             .await?
             .check_response()
     }
@@ -462,7 +466,7 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
         validator_address: &AccountId,
         fee: Fee,
         memo: impl Into<String> + Send + 'static,
-    ) -> Result<broadcast::tx_commit::Response, NymdError> {
+    ) -> Result<TxResponse, NymdError> {
         let withdraw_msg = MsgWithdrawDelegatorReward {
             delegator_address: delegator_address.to_owned(),
             validator_address: validator_address.to_owned(),
@@ -470,7 +474,7 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
         .to_any()
         .map_err(|_| NymdError::SerializationError("MsgWithdrawDelegatorReward".to_owned()))?;
 
-        self.sign_and_broadcast_commit(delegator_address, vec![withdraw_msg], fee, memo)
+        self.sign_and_broadcast(delegator_address, vec![withdraw_msg], fee, memo)
             .await?
             .check_response()
     }
@@ -573,6 +577,27 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
         CosmWasmClient::broadcast_tx_commit(self, tx_bytes.into()).await
     }
 
+    /// Broadcast a transaction to the network and monitors its inclusion in a block.
+    async fn sign_and_broadcast(
+        &self,
+        signer_address: &AccountId,
+        messages: Vec<Any>,
+        fee: Fee,
+        memo: impl Into<String> + Send + 'static,
+    ) -> Result<TxResponse, NymdError> {
+        let memo = memo.into();
+        let fee = self
+            .determine_transaction_fee(signer_address, &messages, fee, &memo)
+            .await?;
+
+        let tx_raw = self.sign(signer_address, messages, fee, memo).await?;
+        let tx_bytes = tx_raw
+            .to_bytes()
+            .map_err(|_| NymdError::SerializationError("Tx".to_owned()))?;
+
+        self.broadcast_tx(tx_bytes.into()).await
+    }
+
     fn sign_direct(
         &self,
         signer_address: &AccountId,
@@ -638,6 +663,9 @@ pub struct Client {
     rpc_client: HttpClient,
     signer: DirectSecp256k1HdWallet,
     gas_price: GasPrice,
+
+    broadcast_polling_rate: Duration,
+    broadcast_timeout: Duration,
 }
 
 impl Client {
@@ -654,8 +682,18 @@ impl Client {
             rpc_client,
             signer,
             gas_price,
+            broadcast_polling_rate: DEFAULT_BROADCAST_POLLING_RATE,
+            broadcast_timeout: DEFAULT_BROADCAST_TIMEOUT,
         })
     }
+
+    pub fn set_broadcast_polling_rate(&mut self, broadcast_polling_rate: Duration) {
+        self.broadcast_polling_rate = broadcast_polling_rate
+    }
+
+    pub fn set_broadcast_timeout(&mut self, broadcast_timeout: Duration) {
+        self.broadcast_timeout = broadcast_timeout
+    }
 }
 
 #[async_trait]
@@ -669,7 +707,15 @@ impl rpc::Client for Client {
 }
 
 #[async_trait]
-impl CosmWasmClient for Client {}
+impl CosmWasmClient for Client {
+    fn broadcast_polling_rate(&self) -> Duration {
+        self.broadcast_polling_rate
+    }
+
+    fn broadcast_timeout(&self) -> Duration {
+        self.broadcast_timeout
+    }
+}
 
 #[async_trait]
 impl SigningCosmWasmClient for Client {

common/client-libs/validator-client/src/nymd/error.rs

@@ -5,6 +5,7 @@ use crate::nymd::cosmwasm_client::types::ContractCodeId;
 use cosmrs::tendermint::{abci, block};
 use cosmrs::{bip32, tx, AccountId};
 use std::io;
+use std::time::Duration;
 use thiserror::Error;
 
 pub use cosmrs::rpc::error::{
@@ -81,21 +82,21 @@ pub enum NymdError {
     MalformedLogString,
 
     #[error(
-    "Error when broadcasting tx {hash} at height {height}. Error occurred during CheckTx phase. Code: {code}; Raw log: {raw_log}"
+    "Error when broadcasting tx {hash} at height {height:?}. Error occurred during CheckTx phase. Code: {code}; Raw log: {raw_log}"
     )]
     BroadcastTxErrorCheckTx {
         hash: tx::Hash,
-        height: block::Height,
+        height: Option<block::Height>,
         code: u32,
         raw_log: String,
     },
 
     #[error(
-    "Error when broadcasting tx {hash} at height {height}. Error occurred during DeliverTx phase. Code: {code}; Raw log: {raw_log}"
+    "Error when broadcasting tx {hash} at height {height:?}. Error occurred during DeliverTx phase. Code: {code}; Raw log: {raw_log}"
     )]
     BroadcastTxErrorDeliverTx {
         hash: tx::Hash,
-        height: block::Height,
+        height: Option<block::Height>,
         code: u32,
         raw_log: String,
     },
@@ -117,6 +118,9 @@ pub enum NymdError {
 
     #[error("This account does not have BaseAccount information available to it")]
     NoBaseAccountInformationAvailable,
+
+    #[error("Transaction with ID {hash} has been submitted but not yet found on the chain. You might want to check for it later. There was a total wait of {} seconds", .timeout.as_secs())]
+    BroadcastTimeout { hash: tx::Hash, timeout: Duration },
 }
 
 impl NymdError {

common/client-libs/validator-client/src/nymd/mod.rs

@@ -8,7 +8,6 @@ use crate::nymd::cosmwasm_client::types::{
 };
 use crate::nymd::error::NymdError;
 use crate::nymd::wallet::DirectSecp256k1HdWallet;
-use cosmrs::rpc::endpoint::broadcast;
 use cosmrs::rpc::Error as TendermintRpcError;
 use cosmrs::rpc::HttpClientUrl;
 use cosmwasm_std::{Coin, Uint128};
@@ -23,12 +22,14 @@ use mixnet_contract_common::{
     PagedRewardedSetResponse, QueryMsg, RewardedSetUpdateDetails,
 };
 use serde::Serialize;
+use std::collections::HashMap;
 use std::convert::TryInto;
 
 pub use crate::nymd::cosmwasm_client::client::CosmWasmClient;
 pub use crate::nymd::cosmwasm_client::signing_client::SigningCosmWasmClient;
 pub use crate::nymd::fee::Fee;
 use crate::nymd::fee::DEFAULT_SIMULATED_GAS_MULTIPLIER;
+pub use cosmrs::bank::MsgSend;
 pub use cosmrs::rpc::endpoint::tx::Response as TxResponse;
 pub use cosmrs::rpc::endpoint::validators::Response as ValidatorResponse;
 pub use cosmrs::rpc::HttpClient as QueryNymdClient;
@@ -43,7 +44,6 @@ pub use cosmrs::tx::{self, Gas};
 pub use cosmrs::Coin as CosmosCoin;
 pub use cosmrs::{AccountId, Decimal, Denom};
 pub use signing_client::Client as SigningNymdClient;
-use std::collections::HashMap;
 pub use traits::{VestingQueryClient, VestingSigningClient};
 
 pub mod cosmwasm_client;
@@ -640,7 +640,7 @@ impl<C> NymdClient<C> {
         recipient: &AccountId,
         amount: Vec<CosmosCoin>,
         memo: impl Into<String> + Send + 'static,
-    ) -> Result<broadcast::tx_commit::Response, NymdError>
+    ) -> Result<TxResponse, NymdError>
     where
         C: SigningCosmWasmClient + Sync,
     {
@@ -655,7 +655,7 @@ impl<C> NymdClient<C> {
         &self,
         msgs: Vec<(AccountId, Vec<CosmosCoin>)>,
         memo: impl Into<String> + Send + 'static,
-    ) -> Result<broadcast::tx_commit::Response, NymdError>
+    ) -> Result<TxResponse, NymdError>
     where
         C: SigningCosmWasmClient + Sync,
     {

common/client-libs/validator-client/src/validator_api/mod.rs

@@ -10,7 +10,7 @@ use std::collections::HashMap;
 use url::Url;
 use validator_api_requests::models::{
     CoreNodeStatusResponse, InclusionProbabilityResponse, MixnodeStatusResponse,
-    RewardEstimationResponse, StakeSaturationResponse,
+    RewardEstimationResponse, StakeSaturationResponse, UptimeResponse,
 };
 
 pub mod error;
@@ -253,6 +253,36 @@ impl Client {
         .await
     }
 
+    pub async fn get_mixnode_avg_uptime(
+        &self,
+        identity: IdentityKeyRef<'_>,
+    ) -> Result<UptimeResponse, ValidatorAPIError> {
+        self.query_validator_api(
+            &[
+                routes::API_VERSION,
+                routes::STATUS_ROUTES,
+                routes::MIXNODE,
+                identity,
+                routes::AVG_UPTIME,
+            ],
+            NO_PARAMS,
+        )
+        .await
+    }
+
+    pub async fn get_mixnode_avg_uptimes(&self) -> Result<Vec<UptimeResponse>, ValidatorAPIError> {
+        self.query_validator_api(
+            &[
+                routes::API_VERSION,
+                routes::STATUS_ROUTES,
+                routes::MIXNODES,
+                routes::AVG_UPTIME,
+            ],
+            NO_PARAMS,
+        )
+        .await
+    }
+
     pub async fn blind_sign(
         &self,
         request_body: &BlindSignRequestBody,

common/client-libs/validator-client/src/validator_api/routes.rs

@@ -26,5 +26,6 @@ pub const SINCE_ARG: &str = "since";
 
 pub const STATUS: &str = "status";
 pub const REWARD_ESTIMATION: &str = "reward-estimation";
+pub const AVG_UPTIME: &str = "avg_uptime";
 pub const STAKE_SATURATION: &str = "stake-saturation";
 pub const INCLUSION_CHANCE: &str = "inclusion-probability";

common/crypto/dkg/benches/benchmarks.rs

@@ -68,6 +68,7 @@ pub fn creating_dealing_for_3_parties(c: &mut Criterion) {
                     threshold,
                     epoch,
                     &receivers,
+                    None,
                 )
             })
         })
@@ -89,6 +90,7 @@ pub fn verifying_dealing_made_for_3_parties_and_recovering_share(c: &mut Criteri
         threshold,
         epoch,
         &receivers,
+        None,
     );
 
     let first_key = dks.get_mut(0).unwrap();
@@ -99,7 +101,7 @@ pub fn verifying_dealing_made_for_3_parties_and_recovering_share(c: &mut Criteri
         |b| {
             b.iter(|| {
                 assert!(dealing
-                    .verify(&params, epoch, threshold, &receivers)
+                    .verify(&params, epoch, threshold, &receivers, None)
                     .is_ok());
                 black_box(decrypt_share(first_key, 0, &dealing.ciphertexts, epoch, None).unwrap());
             })
@@ -128,6 +130,7 @@ pub fn creating_dealing_for_20_parties(c: &mut Criterion) {
                         threshold,
                         epoch,
                         &receivers,
+                        None,
                     )
                 })
             })
@@ -150,6 +153,7 @@ pub fn verifying_dealing_made_for_20_parties_and_recovering_share(c: &mut Criter
         threshold,
         epoch,
         &receivers,
+        None,
     );
 
     let first_key = dks.get_mut(0).unwrap();
@@ -160,7 +164,7 @@ pub fn verifying_dealing_made_for_20_parties_and_recovering_share(c: &mut Criter
         |b| {
             b.iter(|| {
                 assert!(dealing
-                    .verify(&params, epoch, threshold, &receivers)
+                    .verify(&params, epoch, threshold, &receivers, None)
                     .is_ok());
                 black_box(decrypt_share(first_key, 0, &dealing.ciphertexts, epoch, None).unwrap());
             })
@@ -189,6 +193,7 @@ pub fn creating_dealing_for_100_parties(c: &mut Criterion) {
                         threshold,
                         epoch,
                         &receivers,
+                        None,
                     )
                 })
             })
@@ -211,6 +216,7 @@ pub fn verifying_dealing_made_for_100_parties_and_recovering_share(c: &mut Crite
         threshold,
         epoch,
         &receivers,
+        None,
     );
 
     let first_key = dks.get_mut(0).unwrap();
@@ -221,7 +227,7 @@ pub fn verifying_dealing_made_for_100_parties_and_recovering_share(c: &mut Crite
         |b| {
             b.iter(|| {
                 assert!(dealing
-                    .verify(&params, epoch, threshold, &receivers)
+                    .verify(&params, epoch, threshold, &receivers, None)
                     .is_ok());
                 black_box(decrypt_share(first_key, 0, &dealing.ciphertexts, epoch, None).unwrap());
             })

explorer-api/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "explorer-api"
-version = "1.0.0"
+version = "1.0.1"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

explorer-api/src/mix_node/models.rs

@@ -28,6 +28,7 @@ pub(crate) struct PrettyDetailedMixNodeBond {
     pub owner: Addr,
     pub layer: Layer,
     pub mix_node: MixNode,
+    pub avg_uptime: Option<u8>,
 }
 
 pub(crate) struct MixNodeCache {

explorer-api/src/mix_nodes/models.rs

@@ -9,7 +9,9 @@ use serde::Serialize;
 use tokio::sync::RwLock;
 
 use mixnet_contract_common::MixNodeBond;
+use validator_client::models::UptimeResponse;
 
+use crate::cache::Cache;
 use crate::mix_node::models::{MixnodeStatus, PrettyDetailedMixNodeBond};
 use crate::mix_nodes::location::{Location, LocationCache, LocationCacheItem};
 use crate::mix_nodes::CACHE_ENTRY_TTL;
@@ -76,10 +78,16 @@ impl MixNodesResult {
     }
 }
 
+#[derive(Clone, Debug)]
+pub(crate) struct MixNodeHealth {
+    avg_uptime: u8,
+}
+
 #[derive(Clone)]
 pub(crate) struct ThreadsafeMixNodesCache {
     mixnodes: Arc<RwLock<MixNodesResult>>,
     locations: Arc<RwLock<LocationCache>>,
+    mixnode_health: Arc<RwLock<Cache<MixNodeHealth>>>,
 }
 
 impl ThreadsafeMixNodesCache {
@@ -87,6 +95,7 @@ impl ThreadsafeMixNodesCache {
         ThreadsafeMixNodesCache {
             mixnodes: Arc::new(RwLock::new(MixNodesResult::new())),
             locations: Arc::new(RwLock::new(LocationCache::new())),
+            mixnode_health: Arc::new(RwLock::new(Cache::new())),
         }
     }
 
@@ -94,6 +103,7 @@ impl ThreadsafeMixNodesCache {
         ThreadsafeMixNodesCache {
             mixnodes: Arc::new(RwLock::new(MixNodesResult::new())),
             locations: Arc::new(RwLock::new(locations)),
+            mixnode_health: Arc::new(RwLock::new(Cache::new())),
         }
     }
 
@@ -132,9 +142,11 @@ impl ThreadsafeMixNodesCache {
     ) -> Option<PrettyDetailedMixNodeBond> {
         let mixnodes_guard = self.mixnodes.read().await;
         let location_guard = self.locations.read().await;
+        let mixnode_health_guard = self.mixnode_health.read().await;
 
         let bond = mixnodes_guard.get_mixnode(identity_key);
         let location = location_guard.get(identity_key);
+        let health = mixnode_health_guard.get(identity_key);
 
         match bond {
             Some(bond) => Some(PrettyDetailedMixNodeBond {
@@ -145,6 +157,7 @@ impl ThreadsafeMixNodesCache {
                 owner: bond.owner,
                 layer: bond.layer,
                 mix_node: bond.mix_node,
+                avg_uptime: health.map(|m| m.avg_uptime),
             }),
             None => None,
         }
@@ -153,6 +166,7 @@ impl ThreadsafeMixNodesCache {
     pub(crate) async fn get_detailed_mixnodes(&self) -> Vec<PrettyDetailedMixNodeBond> {
         let mixnodes_guard = self.mixnodes.read().await;
         let location_guard = self.locations.read().await;
+        let mixnode_health_guard = self.mixnode_health.read().await;
 
         mixnodes_guard
             .all_mixnodes
@@ -160,6 +174,7 @@ impl ThreadsafeMixNodesCache {
             .map(|bond| {
                 let location = location_guard.get(&bond.mix_node.identity_key);
                 let copy = bond.clone();
+                let health = mixnode_health_guard.get(&bond.mix_node.identity_key);
                 PrettyDetailedMixNodeBond {
                     location: location.and_then(|l| l.location.clone()),
                     status: mixnodes_guard.determine_node_status(&bond.mix_node.identity_key),
@@ -168,6 +183,7 @@ impl ThreadsafeMixNodesCache {
                     owner: copy.owner,
                     layer: copy.layer,
                     mix_node: copy.mix_node,
+                    avg_uptime: health.map(|m| m.avg_uptime),
                 }
             })
             .collect()
@@ -188,4 +204,14 @@ impl ThreadsafeMixNodesCache {
         guard.active_mixnodes = active_nodes;
         guard.valid_until = SystemTime::now() + CACHE_ENTRY_TTL;
     }
+
+    pub(crate) async fn update_health_cache(&self, all_uptimes: Vec<UptimeResponse>) {
+        let mut mixnode_health = self.mixnode_health.write().await;
+        for uptime in all_uptimes {
+            let health = MixNodeHealth {
+                avg_uptime: uptime.avg_uptime,
+            };
+            mixnode_health.set(&uptime.identity, health);
+        }
+    }
 }

explorer-api/src/tasks.rs

@@ -4,6 +4,7 @@
 use std::future::Future;
 
 use mixnet_contract_common::{GatewayBond, MixNodeBond};
+use validator_client::models::UptimeResponse;
 use validator_client::nymd::error::NymdError;
 use validator_client::nymd::{Paging, QueryNymdClient, ValidatorResponse};
 use validator_client::ValidatorClientError;
@@ -88,6 +89,17 @@ impl ExplorerApiTasks {
             .await
     }
 
+    async fn retrieve_all_mixnode_avg_uptimes(
+        &self,
+    ) -> Result<Vec<UptimeResponse>, ValidatorClientError> {
+        self.state
+            .inner
+            .validator_client
+            .0
+            .get_mixnode_avg_uptimes()
+            .await
+    }
+
     async fn update_mixnode_cache(&self) {
         let all_bonds = self.retrieve_all_mixnodes().await;
         let rewarded_nodes = self
@@ -109,6 +121,21 @@ impl ExplorerApiTasks {
             .await;
     }
 
+    async fn update_mixnode_health_cache(&self) {
+        match self.retrieve_all_mixnode_avg_uptimes().await {
+            Ok(response) => {
+                self.state
+                    .inner
+                    .mixnodes
+                    .update_health_cache(response)
+                    .await
+            }
+            Err(e) => {
+                error!("Failed to get mixnode avg uptimes: {:?}", e)
+            }
+        }
+    }
+
     async fn update_validators_cache(&self) {
         match self.retrieve_all_validators().await {
             Ok(response) => self.state.inner.validators.update_cache(response).await,
@@ -145,6 +172,9 @@ impl ExplorerApiTasks {
 
                 info!("Updating mix node cache...");
                 self.update_mixnode_cache().await;
+
+                info!("Updating mix node health cache...");
+                self.update_mixnode_health_cache().await;
                 info!("Done");
             }
         });

gateway/Cargo.toml

@@ -3,7 +3,7 @@
 
 [package]
 name = "nym-gateway"
-version = "1.0.0"
+version = "1.0.1"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>", "Jędrzej Stuczyński <andrew@nymtech.net>"]
 description = "Implementation of the Nym Mixnet Gateway"
 edition = "2021"

mixnode/Cargo.toml

@@ -3,7 +3,7 @@
 
 [package]
 name = "nym-mixnode"
-version = "1.0.0"
+version = "1.0.1"
 authors = [
     "Dave Hrycyszyn <futurechimp@users.noreply.github.com>",
     "Jędrzej Stuczyński <andrew@nymtech.net>",

nym-wallet/Cargo.lock

@@ -2946,7 +2946,7 @@ dependencies = [
 
 [[package]]
 name = "nym_wallet"
-version = "1.0.3"
+version = "1.0.4"
 dependencies = [
  "aes-gcm",
  "argon2",

nym-wallet/src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "nym_wallet"
-version = "1.0.3"
+version = "1.0.4"
 description = "Nym Native Wallet"
 authors = ["Nym Technologies SA"]
 license = ""

nym-wallet/src-tauri/src/operations/mixnet/send.rs

@@ -5,9 +5,8 @@ use crate::state::State;
 use serde::{Deserialize, Serialize};
 use std::str::FromStr;
 use std::sync::Arc;
-use tendermint_rpc::endpoint::broadcast::tx_commit::Response;
 use tokio::sync::RwLock;
-use validator_client::nymd::{AccountId, CosmosCoin};
+use validator_client::nymd::{AccountId, CosmosCoin, TxResponse};
 
 #[cfg_attr(test, derive(ts_rs::TS))]
 #[cfg_attr(test, ts(export, export_to = "../src/types/rust/tauritxresult.ts"))]
@@ -34,13 +33,13 @@ pub struct TransactionDetails {
 }
 
 impl TauriTxResult {
-  fn new(t: Response, details: TransactionDetails) -> TauriTxResult {
+  fn new(t: TxResponse, details: TransactionDetails) -> TauriTxResult {
     TauriTxResult {
       block_height: t.height.value(),
-      code: t.check_tx.code.value(),
+      code: t.tx_result.code.value(),
       details,
-      gas_used: t.check_tx.gas_used.value(),
-      gas_wanted: t.check_tx.gas_wanted.value(),
+      gas_used: t.tx_result.gas_used.value(),
+      gas_wanted: t.tx_result.gas_wanted.value(),
       tx_hash: t.hash.to_string(),
     }
   }

nym-wallet/src-tauri/tauri.conf.json

@@ -1,7 +1,7 @@
 {
   "package": {
     "productName": "nym-wallet",
-    "version": "1.0.3"
+    "version": "1.0.4"
   },
   "build": {
     "distDir": "../dist",

service-providers/network-requester/Cargo.toml

@@ -3,7 +3,7 @@
 
 [package]
 name = "nym-network-requester"
-version = "1.0.0"
+version = "1.0.1"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>", "Jędrzej Stuczyński <andrew@nymtech.net>"]
 edition = "2021"
 

validator-api/Cargo.toml

@@ -3,7 +3,7 @@
 
 [package]
 name = "nym-validator-api"
-version = "1.0.0"
+version = "1.0.1"
 authors = [
     "Dave Hrycyszyn <futurechimp@users.noreply.github.com>",
     "Jędrzej Stuczyński <andrew@nymtech.net>",

validator-api/src/node_status_api/mod.rs

@@ -30,6 +30,8 @@ pub(crate) fn stage_full() -> AdHoc {
                 routes::get_mixnode_reward_estimation,
                 routes::get_mixnode_stake_saturation,
                 routes::get_mixnode_inclusion_probability,
+                routes::get_mixnode_avg_uptime,
+                routes::get_mixnode_avg_uptimes,
             ],
         )
     })

validator-api/src/node_status_api/routes.rs

@@ -8,13 +8,14 @@ use crate::node_status_api::models::{
 use crate::storage::ValidatorApiStorage;
 use crate::ValidatorCache;
 use mixnet_contract_common::reward_params::{NodeRewardParams, RewardParams};
+use mixnet_contract_common::Interval;
 use rocket::http::Status;
 use rocket::serde::json::Json;
 use rocket::State;
 use rocket_okapi::openapi;
 use validator_api_requests::models::{
     CoreNodeStatusResponse, InclusionProbabilityResponse, MixnodeStatusResponse,
-    RewardEstimationResponse, StakeSaturationResponse,
+    RewardEstimationResponse, StakeSaturationResponse, UptimeResponse,
 };
 
 use super::models::Uptime;
@@ -237,3 +238,56 @@ pub(crate) async fn get_mixnode_inclusion_probability(
         Json(None)
     }
 }
+
+async fn average_mixnode_uptime(
+    identity: &str,
+    current_epoch: Option<Interval>,
+    storage: &State<ValidatorApiStorage>,
+) -> Result<Uptime, ErrorResponse> {
+    Ok(if let Some(epoch) = current_epoch {
+        storage
+            .get_average_mixnode_uptime_in_the_last_24hrs(identity, epoch.end_unix_timestamp())
+            .await
+            .map_err(|err| ErrorResponse::new(err.to_string(), Status::NotFound))?
+    } else {
+        Uptime::default()
+    })
+}
+
+#[openapi(tag = "mixnode")]
+#[get("/mixnode/<identity>/avg_uptime")]
+pub(crate) async fn get_mixnode_avg_uptime(
+    cache: &State<ValidatorCache>,
+    storage: &State<ValidatorApiStorage>,
+    identity: String,
+) -> Result<Json<UptimeResponse>, ErrorResponse> {
+    let current_epoch = cache.current_epoch().await.into_inner();
+    let uptime = average_mixnode_uptime(&identity, current_epoch, storage).await?;
+
+    Ok(Json(UptimeResponse {
+        identity,
+        avg_uptime: uptime.u8(),
+    }))
+}
+
+#[openapi(tag = "mixnode")]
+#[get("/mixnodes/avg_uptime")]
+pub(crate) async fn get_mixnode_avg_uptimes(
+    cache: &State<ValidatorCache>,
+    storage: &State<ValidatorApiStorage>,
+) -> Result<Json<Vec<UptimeResponse>>, ErrorResponse> {
+    let mixnodes = cache.mixnodes().await;
+    let current_epoch = cache.current_epoch().await.into_inner();
+
+    let mut response = Vec::new();
+    for mixnode in mixnodes {
+        let uptime = average_mixnode_uptime(mixnode.identity(), current_epoch, storage).await?;
+
+        response.push(UptimeResponse {
+            identity: mixnode.identity().to_string(),
+            avg_uptime: uptime.u8(),
+        })
+    }
+
+    Ok(Json(response))
+}

validator-api/validator-api-requests/src/models.rs

@@ -63,6 +63,12 @@ pub struct RewardEstimationResponse {
     pub as_at: i64,
 }
 
+#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
+pub struct UptimeResponse {
+    pub identity: String,
+    pub avg_uptime: u8,
+}
+
 #[derive(Clone, Copy, Debug, Serialize, Deserialize, JsonSchema)]
 #[cfg_attr(test, derive(ts_rs::TS))]
 #[cfg_attr(