diff --git a/modules/light-clients/08-wasm/CHANGELOG.md b/modules/light-clients/08-wasm/CHANGELOG.md index 5a9da678180..39c7cab55a9 100644 --- a/modules/light-clients/08-wasm/CHANGELOG.md +++ b/modules/light-clients/08-wasm/CHANGELOG.md @@ -43,7 +43,11 @@ Ref: https://keepachangelog.com/en/1.0.0/ ### API Breaking +<<<<<<< HEAD * [\#6644](https://github.com/cosmos/ibc-go/pull/6644) api!: add `v2.MerklePath` for contract api `VerifyMembershipMsg` and `VerifyNonMembershipMsg` structs. Note, this requires a migration for existing client contracts to correctly handle deserialization of `MerklePath.KeyPath` which has changed from `repeated string` to `repeated bytes`. In JSON message structures this change is reflected as the `KeyPath` being a marshalled as a list of base64 encoded byte strings. +======= + * [\#6923](https://github.com/cosmos/ibc-go/pull/6923) The JSON msg API for `VerifyMembershipMsg` and `VerifyNonMembershipMsg` payloads for client contract `SudoMsg` has been updated. The field `path` has been changed to `merkle_path`. This change requires updates to 08-wasm client contracts for integration. +>>>>>>> 5a6b4ae0 (api!: rename path to merkle path for contract api json msgs (#6962)) ### State Machine Breaking diff --git a/modules/light-clients/08-wasm/types/contract_api.go b/modules/light-clients/08-wasm/types/contract_api.go index 7bc9f58b226..5e987738b9e 100644 --- a/modules/light-clients/08-wasm/types/contract_api.go +++ b/modules/light-clients/08-wasm/types/contract_api.go @@ -70,7 +70,7 @@ type VerifyMembershipMsg struct { DelayTimePeriod uint64 `json:"delay_time_period"` DelayBlockPeriod uint64 `json:"delay_block_period"` Proof []byte `json:"proof"` - Path commitmenttypesv2.MerklePath `json:"path"` + Path commitmenttypesv2.MerklePath `json:"merkle_path"` Value []byte `json:"value"` } @@ -80,7 +80,7 @@ type VerifyNonMembershipMsg struct { DelayTimePeriod uint64 `json:"delay_time_period"` DelayBlockPeriod uint64 `json:"delay_block_period"` Proof []byte `json:"proof"` - Path commitmenttypesv2.MerklePath `json:"path"` + Path commitmenttypesv2.MerklePath `json:"merkle_path"` } // VerifyUpgradeAndUpdateStateMsg is a sudoMsg sent to the contract to verify an upgrade and update its state.