api!: rename path to merkle path for contract api json msgs (backport #…

…6962) (#7207) * api!: rename path to merkle path for contract api json msgs (#6962) * api!: rename path to merkle path for contract api json msgs * fix --------- Co-authored-by: DimitrisJim <[email protected]> (cherry picked from commit 5a6b4ae) # Conflicts: # modules/light-clients/08-wasm/CHANGELOG.md * fix conflict --------- Co-authored-by: Carlos Rodriguez <[email protected]>
cosmos · Aug 26, 2024 · f516e48 · f516e48
1 parent bb420a9
commit f516e48
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/modules/light-clients/08-wasm/CHANGELOG.md b/modules/light-clients/08-wasm/CHANGELOG.md
@@ -44,7 +44,6 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 ### API Breaking
 
-* [\#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. 
 * [\#6937](https://github.com/cosmos/ibc-go/pull/6937) Remove `WasmConsensusHost` implementation of the `ConsensusHost` interface.
 
 ### 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
@@ -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.