Skip to content

Introduces query for contract build information #919

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

Merged
merged 3 commits into from
Nov 25, 2021
Merged
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
14 changes: 12 additions & 2 deletions common/client-libs/validator-client/src/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,12 @@ use mixnet_contract::ContractSettingsParams;

use crate::{validator_api, ValidatorClientError};
use coconut_interface::{BlindSignRequestBody, BlindedSignatureResponse, VerificationKeyResponse};
use mixnet_contract::{GatewayBond, MixNodeBond, MixnodeRewardingStatusResponse};
use mixnet_contract::{GatewayBond, MixNodeBond};
#[cfg(feature = "nymd-client")]
use mixnet_contract::{RawDelegationData, RewardingIntervalResponse};
use mixnet_contract::{
MixnetContractVersion, MixnodeRewardingStatusResponse, RawDelegationData,
RewardingIntervalResponse,
};
use url::Url;

#[cfg(feature = "nymd-client")]
Expand Down Expand Up @@ -174,6 +177,13 @@ impl<C> Client<C> {
Ok(self.nymd.get_contract_settings().await?)
}

pub async fn get_mixnet_contract_version(&self) -> Result<MixnetContractVersion, NymdError>
where
C: CosmWasmClient + Sync,
{
Ok(self.nymd.get_mixnet_contract_version().await?)
}

pub async fn get_current_rewarding_interval(
&self,
) -> Result<RewardingIntervalResponse, ValidatorClientError>
Expand Down
18 changes: 14 additions & 4 deletions common/client-libs/validator-client/src/nymd/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ use cosmrs::rpc::{Error as TendermintRpcError, HttpClientUrl};
use cosmwasm_std::{Coin, Uint128};
use mixnet_contract::{
Addr, ContractSettingsParams, Delegation, ExecuteMsg, Gateway, GatewayOwnershipResponse,
IdentityKey, LayerDistribution, MixNode, MixOwnershipResponse, MixnodeRewardingStatusResponse,
PagedAllDelegationsResponse, PagedGatewayResponse, PagedMixDelegationsResponse,
PagedMixnodeResponse, PagedReverseMixDelegationsResponse, QueryMsg, RawDelegationData,
RewardingIntervalResponse,
IdentityKey, LayerDistribution, MixNode, MixOwnershipResponse, MixnetContractVersion,
MixnodeRewardingStatusResponse, PagedAllDelegationsResponse, PagedGatewayResponse,
PagedMixDelegationsResponse, PagedMixnodeResponse, PagedReverseMixDelegationsResponse,
QueryMsg, RawDelegationData, RewardingIntervalResponse,
};
use serde::Serialize;
use std::collections::HashMap;
Expand Down Expand Up @@ -218,6 +218,16 @@ impl<C> NymdClient<C> {
.await
}

pub async fn get_mixnet_contract_version(&self) -> Result<MixnetContractVersion, NymdError>
where
C: CosmWasmClient + Sync,
{
let request = QueryMsg::GetContractVersion {};
self.client
.query_contract_smart(self.contract_address()?, &request)
.await
}

pub async fn get_current_rewarding_interval(
&self,
) -> Result<RewardingIntervalResponse, NymdError>
Expand Down
1 change: 1 addition & 0 deletions common/mixnet-contract/src/msg.rs
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ pub enum ExecuteMsg {
#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
#[serde(rename_all = "snake_case")]
pub enum QueryMsg {
GetContractVersion {},
GetMixNodes {
limit: Option<u32>,
start_after: Option<IdentityKey>,
Expand Down
21 changes: 21 additions & 0 deletions common/mixnet-contract/src/types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,27 @@ pub struct MixnodeRewardingStatusResponse {
pub status: Option<RewardingStatus>,
}

#[derive(Debug, Serialize, Deserialize)]
pub struct MixnetContractVersion {
// VERGEN_BUILD_TIMESTAMP
pub build_timestamp: String,

// VERGEN_BUILD_SEMVER
pub build_version: String,

// VERGEN_GIT_SHA
pub commit_sha: String,

// VERGEN_GIT_COMMIT_TIMESTAMP
pub commit_timestamp: String,

// VERGEN_GIT_BRANCH
pub commit_branch: String,

// VERGEN_RUSTC_SEMVER
pub rustc_version: String,
}

// type aliases for better reasoning about available data
pub type IdentityKey = String;
pub type IdentityKeyRef<'a> = &'a str;
Expand Down
Loading