Skip to content

Commit 09d9d14

Browse files
chore: Deprecate FeeEnabledChannel and FeeEnabledChannelResponse (#2481)
* chore: Deprecate FeeEnabledChannel and FeeEnabledChannelResponse * [autofix.ci] apply automated fixes * chore: Update and fix CHANGELOG --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
1 parent a17d3b9 commit 09d9d14

File tree

6 files changed

+22
-7
lines changed

6 files changed

+22
-7
lines changed

CHANGELOG.md

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,15 @@ and this project adheres to
1111
## Fixed
1212

1313
- cosmwasm-std: Fix deserialization of `DenomMetadata`. ([#2417])
14+
- cosmwasm-std: Deprecate `PayPacketFee`, `PayPacketFeeAsync`, `IbcFee`. IBC
15+
fees have been removed from ibc-go in version 10. The mentioned struct and
16+
enum fields are deprecated and will be removed in cosmwasm `3.0` ([#2431])
17+
- cosmwasm-std: Deprecate `FeeEnabledChannel` and `FeeEnabledChannelResponse`
18+
([#2481])
1419

1520
[#2417]: https://github.com/CosmWasm/cosmwasm/pull/2417
21+
[#2431]: https://github.com/CosmWasm/cosmwasm/pull/2431
22+
[#2481]: https://github.com/CosmWasm/cosmwasm/pull/2481
1623

1724
## [2.2.2] - 2025-03-05
1825

@@ -65,15 +72,11 @@ and this project adheres to
6572
- cosmwasm-derive: Add support for migrate method with
6673
`migrate_info: MigrateInfo` argument. ([#2212])
6774
- cosmwasm-vm: Add `Cache::store_code`
68-
- cosmwasm-vm: Deprecate `PayPacketFee`, `PayPacketFeeAsync`, `IbcFee`. IBC fees
69-
have been removed from ibc-go in version 10. The mentioned struct and enum
70-
fields are deprecated and will be removed in cosmwasm `3.0` ([#2431])
7175

7276
[#2118]: https://github.com/CosmWasm/cosmwasm/pull/2118
7377
[#2196]: https://github.com/CosmWasm/cosmwasm/pull/2196
7478
[#2220]: https://github.com/CosmWasm/cosmwasm/pull/2220
7579
[#2212]: https://github.com/CosmWasm/cosmwasm/pull/2212
76-
[#2431]: https://github.com/CosmWasm/cosmwasm/pull/2431
7780

7881
### Changed
7982

contracts/reflect/schema/raw/query.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -427,6 +427,7 @@
427427
},
428428
{
429429
"description": "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)\n\nReturns a `FeeEnabledChannelResponse`.",
430+
"deprecated": true,
430431
"type": "object",
431432
"required": [
432433
"fee_enabled_channel"

contracts/reflect/schema/reflect.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1690,6 +1690,7 @@
16901690
},
16911691
{
16921692
"description": "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)\n\nReturns a `FeeEnabledChannelResponse`.",
1693+
"deprecated": true,
16931694
"type": "object",
16941695
"required": [
16951696
"fee_enabled_channel"

packages/std/src/lib.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,15 +88,16 @@ pub use crate::metadata::{DenomMetadata, DenomUnit};
8888
pub use crate::msgpack::{from_msgpack, to_msgpack_binary, to_msgpack_vec};
8989
pub use crate::never::Never;
9090
pub use crate::pagination::PageRequest;
91+
#[allow(deprecated)]
92+
pub use crate::query::FeeEnabledChannelResponse;
9193
pub use crate::query::{
9294
AllBalanceResponse, AllDelegationsResponse, AllDenomMetadataResponse, AllValidatorsResponse,
9395
BalanceResponse, BankQuery, BondedDenomResponse, ChannelResponse, CodeInfoResponse,
9496
ContractInfoResponse, CustomQuery, DecCoin, Delegation, DelegationResponse,
9597
DelegationRewardsResponse, DelegationTotalRewardsResponse, DelegatorReward,
9698
DelegatorValidatorsResponse, DelegatorWithdrawAddressResponse, DenomMetadataResponse,
97-
DistributionQuery, FeeEnabledChannelResponse, FullDelegation, GrpcQuery, IbcQuery,
98-
ListChannelsResponse, PortIdResponse, QueryRequest, StakingQuery, SupplyResponse, Validator,
99-
ValidatorResponse, WasmQuery,
99+
DistributionQuery, FullDelegation, GrpcQuery, IbcQuery, ListChannelsResponse, PortIdResponse,
100+
QueryRequest, StakingQuery, SupplyResponse, Validator, ValidatorResponse, WasmQuery,
100101
};
101102
#[cfg(all(feature = "stargate", feature = "cosmwasm_1_2"))]
102103
pub use crate::results::WeightedVoteOption;

packages/std/src/query/ibc.rs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@ pub enum IbcQuery {
3636
///
3737
/// Returns a `FeeEnabledChannelResponse`.
3838
#[cfg(feature = "cosmwasm_2_2")]
39+
#[deprecated(
40+
since = "2.2.3",
41+
note = "IBC fees have been removed from ibc-go `v10`, which is used in wasmd `v0.55.0`."
42+
)]
3943
FeeEnabledChannel {
4044
port_id: Option<String>,
4145
channel_id: String,
@@ -68,6 +72,10 @@ impl_response_constructor!(ChannelResponse, channel: Option<IbcChannel>);
6872

6973
#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
7074
#[non_exhaustive]
75+
#[deprecated(
76+
since = "2.2.3",
77+
note = "IBC fees have been removed from ibc-go `v10`, which is used in wasmd `v0.55.0`."
78+
)]
7179
pub struct FeeEnabledChannelResponse {
7280
pub fee_enabled: bool,
7381
}

packages/std/src/testing/mock.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -958,6 +958,7 @@ impl IbcQuerier {
958958
to_json_binary(&res).into()
959959
}
960960
#[cfg(feature = "cosmwasm_2_2")]
961+
#[allow(deprecated)]
961962
IbcQuery::FeeEnabledChannel { .. } => {
962963
use crate::query::FeeEnabledChannelResponse;
963964
// for now, we always return true

0 commit comments

Comments
 (0)