Add cosmwasm_3_0 capability

Author: chipshort

docs/CAPABILITIES-BUILT-IN.md

@@ -33,3 +33,5 @@ might define others.
   `migrate` entrypoint, as well as IBC Fees support with `IbcMsg::PayPacketFee`,
   `IbcMsg::PayPacketFeeAsync` and `IbcQuery::FeeEnabledChannel`. Only chains
   running CosmWasm `2.2.0` or higher support this.
+- `cosmwasm_3_0` enables `WasmQuery::RawRange`. Only chains running CosmWasm
+  `3.0.0` or higher support this.

packages/std/Cargo.toml

@@ -9,7 +9,7 @@ license = "Apache-2.0"
 readme = "README.md"
 
 [package.metadata.docs.rs]
-features = ["cosmwasm_2_2", "staking", "stargate", "ibc2"]
+features = ["cosmwasm_3_0", "staking", "stargate", "ibc2"]
 
 [features]
 default = ["exports", "iterator", "std"]
@@ -55,6 +55,9 @@ cosmwasm_2_1 = ["cosmwasm_2_0"]
 # This enables functionality that is only available on 2.2 chains.
 # It adds `IbcMsg::PayPacketFee` and `IbcMsg::PayPacketFeeAsync`.
 cosmwasm_2_2 = ["cosmwasm_2_1"]
+# This enables functionality that is only available on 3.0 chains.
+# It adds `WasmQuery::RawRange`.
+cosmwasm_3_0 = ["cosmwasm_2_2"]
 
 [dependencies]
 base64 = "0.22.0"

packages/std/src/exports/exports.rs

@@ -82,6 +82,10 @@ extern "C" fn requires_cosmwasm_2_1() {}
 #[no_mangle]
 extern "C" fn requires_cosmwasm_2_2() {}
 
+#[cfg(feature = "cosmwasm_3_0")]
+#[no_mangle]
+extern "C" fn requires_cosmwasm_3_0() {}
+
 /// interface_version_* exports mark which Wasm VM interface level this contract is compiled for.
 /// They can be checked by cosmwasm_vm.
 /// Update this whenever the Wasm VM interface breaks.

packages/std/src/query/wasm.rs

@@ -1,11 +1,12 @@
-use core::ops::RangeBounds;
-
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
+use crate::prelude::*;
+#[cfg(all(feature = "cosmwasm_3_0", feature = "iterator"))]
 use crate::storage_keys::{range_to_bounds, ToByteVec};
-use crate::{prelude::*, Order};
 use crate::{Addr, Binary, Checksum};
+#[cfg(all(feature = "cosmwasm_3_0", feature = "iterator"))]
+use core::ops::RangeBounds;
 
 use super::query_response::QueryResponseType;
 
@@ -42,6 +43,7 @@ pub enum WasmQuery {
     /// Please keep in mind that the contract you are querying might change its storage layout using
     /// migrations, which could break your queries, so it is recommended to only use this for
     /// contracts you control.
+    #[cfg(all(feature = "cosmwasm_3_0", feature = "iterator"))]
     RawRange {
         /// The address of the contract to query
         contract_addr: String,
@@ -59,19 +61,20 @@ pub enum WasmQuery {
         /// on the full JSON size of the response type.
         limit: u16,
         /// The order in which you want to receive the key-value pairs.
-        order: Order,
+        order: crate::Order,
     },
 }
 
 impl WasmQuery {
     /// Creates a new [`WasmQuery::RawRange`] from the given parameters.
     ///
     /// This takes a [`RangeBounds`] to allow for specifying the range in a more idiomatic way.
+    #[cfg(all(feature = "cosmwasm_3_0", feature = "iterator"))]
     pub fn raw_range<'a, R, B>(
         contract_addr: impl Into<String>,
         range: R,
         limit: u16,
-        order: Order,
+        order: crate::Order,
     ) -> Self
     where
         R: RangeBounds<&'a B>,
@@ -224,7 +227,10 @@ mod tests {
     }
 
     #[test]
+    #[cfg(all(feature = "cosmwasm_3_0", feature = "iterator"))]
     fn raw_range_constructor_works() {
+        use crate::Order;
+
         let query = WasmQuery::raw_range(
             "contract_addr",
             &b"asdf"[..]..&b"asdz"[..],

packages/std/src/storage_keys/mod.rs

@@ -1,7 +1,9 @@
 mod length_prefixed;
+#[cfg(all(feature = "cosmwasm_3_0", feature = "iterator"))]
 mod range;
 
 // Please note that the entire storage_keys module is public. So be careful
 // when adding elements here.
 pub use length_prefixed::{namespace_with_key, to_length_prefixed, to_length_prefixed_nested};
+#[cfg(all(feature = "cosmwasm_3_0", feature = "iterator"))]
 pub(crate) use range::{range_to_bounds, ToByteVec};

packages/std/src/testing/mock.rs

@@ -946,7 +946,7 @@ impl Default for WasmQuerier {
                 WasmQuery::CodeInfo { code_id, .. } => {
                     SystemError::NoSuchCode { code_id: *code_id }
                 }
-                // #[cfg(feature = "cosmwasm_3_0")]
+                #[cfg(all(feature = "cosmwasm_3_0", feature = "iterator"))]
                 WasmQuery::RawRange { contract_addr, .. } => SystemError::NoSuchContract {
                     addr: contract_addr.clone(),
                 },
@@ -1422,10 +1422,7 @@ mod tests {
     use crate::coins;
     #[cfg(feature = "cosmwasm_1_3")]
     use crate::DenomUnit;
-    use crate::{
-        coin, instantiate2_address, query::RawRangeResponse, ContractInfoResponse, HexBinary,
-        Response, Storage,
-    };
+    use crate::{coin, instantiate2_address, ContractInfoResponse, HexBinary, Response, Storage};
     #[cfg(feature = "staking")]
     use crate::{Decimal, Delegation};
     use base64::{engine::general_purpose, Engine};
@@ -2823,6 +2820,7 @@ mod tests {
                         SystemResult::Err(SystemError::NoSuchCode { code_id })
                     }
                 }
+                #[cfg(all(feature = "cosmwasm_3_0", feature = "iterator"))]
                 WasmQuery::RawRange {
                     contract_addr,
                     start,
@@ -2852,7 +2850,7 @@ mod tests {
                         } else {
                             None
                         };
-                        let raw_range_response = RawRangeResponse { data, next_key };
+                        let raw_range_response = crate::RawRangeResponse { data, next_key };
 
                         SystemResult::Ok(ContractResult::Ok(
                             to_json_binary(&raw_range_response).unwrap(),
@@ -2936,7 +2934,7 @@ mod tests {
             }
         }
 
-        // #[cfg(feature = "cosmwasm_3_0")]
+        #[cfg(all(feature = "cosmwasm_3_0", feature = "iterator"))]
         {
             let result = querier.query(&WasmQuery::RawRange {
                 contract_addr: contract_addr.clone().into(),

packages/vm/src/testing/instance.rs

@@ -98,7 +98,7 @@ impl MockInstanceOptions<'_> {
     fn default_capabilities() -> HashSet<String> {
         #[allow(unused_mut)]
         let mut out = capabilities_from_csv(
-            "ibc2,iterator,staking,cosmwasm_1_1,cosmwasm_1_2,cosmwasm_1_3,cosmwasm_1_4,cosmwasm_2_0,cosmwasm_2_1,cosmwasm_2_2",
+            "ibc2,iterator,staking,cosmwasm_1_1,cosmwasm_1_2,cosmwasm_1_3,cosmwasm_1_4,cosmwasm_2_0,cosmwasm_2_1,cosmwasm_2_2,cosmwasm_3_0",
         );
         #[cfg(feature = "stargate")]
         out.insert("stargate".to_string());