Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@

- Bump Cosmos SDK dependencies to v0.53. ([\#2594](https://github.com/cosmos/interchain-security/pull/2594))

### BUG FIXES

- `[x/ccv]` Return an error when the transfer memo is missing the provider reward memo. ([\#2626](https://github.com/cosmos/interchain-security/pull/2626))

## v6.4.1

*February 25, 2025*
Expand Down
2 changes: 1 addition & 1 deletion x/ccv/types/wire.go
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ func GetRewardMemoFromTransferMemo(memo string) (RewardMemo, error) {

providerMemo, ok := memoData["provider"]
if !ok {
return RewardMemo{}, err
return RewardMemo{}, errors.New("missing provider reward memo")
}

rewardMemo := RewardMemo{}
Expand Down
55 changes: 55 additions & 0 deletions x/ccv/types/wire_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -237,3 +237,58 @@ func TestCreateTransferMemo(t *testing.T) {
require.Equal(t, chainId, rewardMemo.ChainId)
require.Equal(t, "ICS rewards", rewardMemo.Memo)
}

func TestGetRewardMemoFromTransferMemo(t *testing.T) {
testCases := []struct {
name string
memo string
expectErr bool
want types.RewardMemo
}{
{
name: "missing provider key",
memo: `{"foo":"bar"}`,
expectErr: true,
},
{
name: "invalid JSON",
memo: `{not-json}`,
expectErr: true,
},
{
name: "provider present but wrong type",
memo: `{"provider":"not-an-object"}`,
expectErr: true,
},
{
name: "provider present but missing fields",
memo: `{"provider":{"memo":"ICS rewards"}}`,
expectErr: false,
want: types.RewardMemo{Memo: "ICS rewards"},
},
{
name: "provider present and decodes",
memo: `{"provider":{"consumerId":"13","chainId":"chain-13","memo":"memo"}}`,
expectErr: false,
want: types.RewardMemo{ConsumerId: "13", ChainId: "chain-13", Memo: "memo"},
},
{
name: "valid ICS rewards memo",
memo: `{"provider":{"consumerId":"13","chainId":"chain-13","memo":"ICS rewards"}}`,
expectErr: false,
want: types.RewardMemo{ConsumerId: "13", ChainId: "chain-13", Memo: "ICS rewards"},
},
}

for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
rewardMemo, err := types.GetRewardMemoFromTransferMemo(tc.memo)
if tc.expectErr {
require.Error(t, err)
return
}
require.NoError(t, err)
require.Equal(t, tc.want, rewardMemo)
})
}
}