Skip to content

transfer: Disallow a forwarding object specified with zero hops and a memo #6599

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DimitrisJim merged 3 commits into from
Jun 14, 2024
Merged

transfer: Disallow a forwarding object specified with zero hops and a memo #6599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2d2820b
transfer: Disallow a forwarding object specified with zero hops and a…
DimitrisJim Jun 14, 2024
6ae3497
Apply suggestions from code review
DimitrisJim Jun 14, 2024
d7ee9ee
Merge branch 'feat/ics20-v2-path-forwarding' into jim/forbid-empty-ho…
gjermundgaraba Jun 14, 2024
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
12 changes: 8 additions & 4 deletions modules/apps/transfer/types/forwarding.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,14 @@ func (fi Forwarding) Validate() error {
return errorsmod.Wrapf(ErrInvalidForwarding, "number of hops in forwarding path cannot exceed %d", MaximumNumberOfForwardingHops)
}

if len(fi.Memo) > MaximumMemoLength {
return errorsmod.Wrapf(ErrInvalidMemo, "memo length cannot exceed %d", MaximumMemoLength)
}

if len(fi.Hops) == 0 && fi.Memo != "" {
return errorsmod.Wrap(ErrInvalidForwarding, "memo specified when forwarding hops is empty")
}

for _, hop := range fi.Hops {
if err := host.PortIdentifierValidator(hop.PortId); err != nil {
return errorsmod.Wrapf(err, "invalid source port ID %s", hop.PortId)
Expand All @@ -31,9 +39,5 @@ func (fi Forwarding) Validate() error {
}
}

if len(fi.Memo) > MaximumMemoLength {
return errorsmod.Wrapf(ErrInvalidMemo, "memo length cannot exceed %d", MaximumMemoLength)
}

return nil
}
5 changes: 5 additions & 0 deletions modules/apps/transfer/types/forwarding_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,11 @@ func TestForwarding_Validate(t *testing.T) {
types.NewForwarding(ibctesting.GenerateString(types.MaximumMemoLength+1), validHop),
types.ErrInvalidMemo,
},
{
"invalid forwarding with empty hops and specified memo",
types.NewForwarding("memo"),
types.ErrInvalidForwarding,
},
{
"invalid forwarding with too short hop port ID",
types.NewForwarding(
Expand Down