Add FeeEnabledChannel query

Author: chipshort

packages/std/src/ibc.rs

@@ -113,7 +113,10 @@ pub enum IbcMsg {
     /// ```
     #[cfg(feature = "cosmwasm_2_2")]
     PayPacketFee {
-        src: IbcEndpoint,
+        /// The port id on the chain where the packet is sent from (this chain).
+        port_id: String,
+        /// The channel id on the chain where the packet is sent from (this chain).
+        channel_id: String,
         fee: IbcFee,
         /// Allowlist of relayer addresses that can receive the fee.
         /// This is currently not implemented and *must* be empty.
@@ -124,7 +127,11 @@ pub enum IbcMsg {
     /// The fees are taken from the contract's balance immediately and locked until the packet is handled.
     #[cfg(feature = "cosmwasm_2_2")]
     PayPacketFeeAsync {
-        src: IbcEndpoint,
+        /// The port id on the chain where the packet is sent from (this chain).
+        port_id: String,
+        /// The channel id on the chain where the packet is sent from (this chain).
+        channel_id: String,
+        /// The sequence number of the packet that should be incentivized.
         sequence: u64,
         fee: IbcFee,
         /// Allowlist of relayer addresses that can receive the fee.

packages/std/src/lib.rs

@@ -92,8 +92,9 @@ pub use crate::query::{
     ContractInfoResponse, CustomQuery, DecCoin, Delegation, DelegationResponse,
     DelegationRewardsResponse, DelegationTotalRewardsResponse, DelegatorReward,
     DelegatorValidatorsResponse, DelegatorWithdrawAddressResponse, DenomMetadataResponse,
-    DistributionQuery, FullDelegation, GrpcQuery, IbcQuery, ListChannelsResponse, PortIdResponse,
-    QueryRequest, StakingQuery, SupplyResponse, Validator, ValidatorResponse, WasmQuery,
+    DistributionQuery, FeeEnabledChannelResponse, FullDelegation, GrpcQuery, IbcQuery,
+    ListChannelsResponse, PortIdResponse, QueryRequest, StakingQuery, SupplyResponse, Validator,
+    ValidatorResponse, WasmQuery,
 };
 #[cfg(all(feature = "stargate", feature = "cosmwasm_1_2"))]
 pub use crate::results::WeightedVoteOption;

packages/std/src/query/ibc.rs

@@ -5,7 +5,8 @@ use crate::ibc::IbcChannel;
 use crate::prelude::*;
 
 /// These are queries to the various IBC modules to see the state of the contract's
-/// IBC connection. These will return errors if the contract is not "ibc enabled"
+/// IBC connection.
+/// Most of these will return errors if the contract is not "ibc enabled"
 #[non_exhaustive]
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
 #[serde(rename_all = "snake_case")]
@@ -28,7 +29,16 @@ pub enum IbcQuery {
         channel_id: String,
         port_id: Option<String>,
     },
-    // TODO: Add more
+    /// Queries whether the given channel supports IBC fees.
+    /// If port_id is omitted, it will default to the contract's own channel.
+    /// (To save a PortId{} call)
+    ///
+    /// Returns a `FeeEnabledChannelResponse`.
+    #[cfg(feature = "cosmwasm_2_2")]
+    FeeEnabledChannel {
+        port_id: Option<String>,
+        channel_id: String,
+    },
 }
 
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
@@ -54,3 +64,11 @@ pub struct ChannelResponse {
 }
 
 impl_response_constructor!(ChannelResponse, channel: Option<IbcChannel>);
+
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
+#[non_exhaustive]
+pub struct FeeEnabledChannelResponse {
+    pub fee_enabled: bool,
+}
+
+impl_response_constructor!(FeeEnabledChannelResponse, fee_enabled: bool);

packages/std/src/testing/mock.rs

@@ -1,4 +1,5 @@
 use crate::prelude::*;
+use crate::query::FeeEnabledChannelResponse;
 use crate::HashFunction;
 use crate::{Addr, CanonicalAddr, Timestamp};
 use alloc::collections::BTreeMap;
@@ -903,6 +904,11 @@ impl IbcQuerier {
                 };
                 to_json_binary(&res).into()
             }
+            #[cfg(feature = "cosmwasm_2_2")]
+            IbcQuery::FeeEnabledChannel { .. } => {
+                // for now, we always return true
+                to_json_binary(&FeeEnabledChannelResponse::new(true)).into()
+            }
         };
         // system result is always ok in the mock implementation
         SystemResult::Ok(contract_result)