Merge branch 'main' into aw/only-schema

Author: aumetra

CHANGELOG.md

@@ -98,6 +98,9 @@ and this project adheres to
   compiled with Rust 1.82 or newer to be stored. ([#2473])
 - cosmwasm-std: Removed IBC fees ([#2479])
 - cosmwasm-schema: Remove unused result types from trait definition (#[2495])
+- cosmwasm-std: Split up `Validator` type into `Validator` and
+  `ValidatorMetadata` to allow adding more fields to `ValidatorResponse` in the
+  future. ([#2501])
 
 ## Fixed
 
@@ -146,6 +149,7 @@ and this project adheres to
 [#2480]: https://github.com/CosmWasm/cosmwasm/pull/2480
 [#2484]: https://github.com/CosmWasm/cosmwasm/pull/2484
 [#2495]: https://github.com/CosmWasm/cosmwasm/pull/2495
+[#2501]: https://github.com/CosmWasm/cosmwasm/pull/2501
 
 ## [2.2.0] - 2024-12-17
 

SECURITY.md

@@ -1,5 +1,5 @@
 # Security Policy
 
-This repository is maintained by Confio as part of the CosmWasm stack. Please
-see https://github.com/CosmWasm/advisories/blob/main/SECURITY.md for our
-security policy.
+This repository is part of the CosmWasm stack. Please see
+https://github.com/CosmWasm/advisories/blob/main/SECURITY.md for its security
+policy.

contracts/reflect/README.md

@@ -72,5 +72,5 @@ And [Importing](./Importing.md) contains information about pulling in other
 contracts or crates that have been published.
 
 Please replace this README file with information about your specific project.
-You can keep the `Developing.md` and `Publishing.md` files as useful referenced,
+You can keep the `Developing.md` and `Publishing.md` files as useful references,
 but please set some proper description in the README.

packages/go-gen/tests/cosmwasm_std__AllValidatorsResponse.go

@@ -1,9 +1,9 @@
 // AllValidatorsResponse is the expected response to AllValidatorsQuery
 type AllValidatorsResponse struct {
-	Validators Array[Validator] `json:"validators"`
+	Validators Array[ValidatorMetadata] `json:"validators"`
 }
 
-type Validator struct {
+type ValidatorMetadata struct {
 	Address string `json:"address"`
 	// decimal string, eg "0.02"
 	Commission string `json:"commission"`

packages/std/src/query/staking.rs

@@ -166,12 +166,12 @@ impl FullDelegation {
 )]
 #[non_exhaustive]
 pub struct AllValidatorsResponse {
-    pub validators: Vec<Validator>,
+    pub validators: Vec<ValidatorMetadata>,
 }
 
 impl QueryResponseType for AllValidatorsResponse {}
 
-impl_hidden_constructor!(AllValidatorsResponse, validators: Vec<Validator>);
+impl_hidden_constructor!(AllValidatorsResponse, validators: Vec<ValidatorMetadata>);
 
 /// The data format returned from StakingRequest::Validator query
 #[derive(
@@ -191,7 +191,7 @@ impl_hidden_constructor!(ValidatorResponse, validator: Option<Validator>);
     Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema, cw_schema::Schemaifier,
 )]
 #[non_exhaustive]
-pub struct Validator {
+pub struct ValidatorMetadata {
     /// The operator address of the validator (e.g. cosmosvaloper1...).
     /// See https://github.com/cosmos/cosmos-sdk/blob/v0.47.4/proto/cosmos/staking/v1beta1/staking.proto#L95-L96
     /// for more information.
@@ -206,13 +206,30 @@ pub struct Validator {
 }
 
 impl_hidden_constructor!(
-    Validator,
+    ValidatorMetadata,
     address: String,
     commission: Decimal,
     max_commission: Decimal,
     max_change_rate: Decimal
 );
 
+/// Instances are created in the querier.
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
+#[non_exhaustive]
+pub struct Validator {
+    /// The operator address of the validator (e.g. cosmosvaloper1...).
+    /// See https://github.com/cosmos/cosmos-sdk/blob/v0.47.4/proto/cosmos/staking/v1beta1/staking.proto#L95-L96
+    /// for more information.
+    ///
+    /// This uses `String` instead of `Addr` since the bech32 address prefix is different from
+    /// the ones that regular user accounts use.
+    pub address: String,
+    pub commission: Decimal,
+    pub max_commission: Decimal,
+    /// The maximum daily increase of the commission
+    pub max_change_rate: Decimal,
+}
+
 impl Validator {
     /// Creates a new validator.
     ///
@@ -232,3 +249,24 @@ impl Validator {
         }
     }
 }
+
+impl_hidden_constructor!(
+    Validator,
+    address: String,
+    commission: Decimal,
+    max_commission: Decimal,
+    max_change_rate: Decimal
+);
+
+// Validator should contain all data that ValidatorMetadata has + maybe some additional data
+// that is expensive to query, so we can convert ValidatorMetadata to Validator easily.
+impl From<Validator> for ValidatorMetadata {
+    fn from(validator: Validator) -> Self {
+        ValidatorMetadata {
+            address: validator.address,
+            commission: validator.commission,
+            max_commission: validator.max_commission,
+            max_change_rate: validator.max_change_rate,
+        }
+    }
+}

packages/std/src/testing/mock.rs

@@ -1204,7 +1204,7 @@ impl StakingQuerier {
             }
             StakingQuery::AllValidators {} => {
                 let res = AllValidatorsResponse {
-                    validators: self.validators.clone(),
+                    validators: self.validators.iter().cloned().map(Into::into).collect(),
                 };
                 to_json_binary(&res).into()
             }
@@ -2508,7 +2508,7 @@ mod tests {
             .unwrap()
             .unwrap();
         let vals: AllValidatorsResponse = from_json(raw).unwrap();
-        assert_eq!(vals.validators, vec![val1, val2]);
+        assert_eq!(vals.validators, vec![val1.into(), val2.into()]);
     }
 
     #[cfg(feature = "staking")]

packages/std/src/traits.rs

@@ -14,7 +14,8 @@ use crate::query::SupplyResponse;
 #[cfg(feature = "staking")]
 use crate::query::{
     AllDelegationsResponse, AllValidatorsResponse, BondedDenomResponse, Delegation,
-    DelegationResponse, FullDelegation, StakingQuery, Validator, ValidatorResponse,
+    DelegationResponse, FullDelegation, StakingQuery, Validator, ValidatorMetadata,
+    ValidatorResponse,
 };
 #[cfg(feature = "cosmwasm_1_3")]
 use crate::query::{
@@ -593,7 +594,7 @@ impl<'a, C: CustomQuery> QuerierWrapper<'a, C> {
     }
 
     #[cfg(feature = "staking")]
-    pub fn query_all_validators(&self) -> StdResult<Vec<Validator>> {
+    pub fn query_all_validators(&self) -> StdResult<Vec<ValidatorMetadata>> {
         let request = StakingQuery::AllValidators {}.into();
         let res: AllValidatorsResponse = self.query(&request)?;
         Ok(res.validators)

packages/vm/src/cache.rs

@@ -347,7 +347,7 @@ where
 
     /// Pins a Module that was previously stored via [`Cache::store_code`].
     ///
-    /// The module is lookup first in the file system cache. If not found,
+    /// The module is looked up first in the file system cache. If not found,
     /// the code is loaded from the file system, compiled, and stored into the
     /// pinned cache.
     ///