Skip to content

Safe decode dest exec data #1609

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
yashnevatia merged 1 commit into from
Aug 26, 2026
Merged

Safe decode dest exec data #1609

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 pkg/solana/ccip/codec/extradatacodec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,10 @@ func (d ExtraDataDecoder) DecodeExtraArgsToMap(extraArgs ccipocr3.Bytes) (map[st

// DecodeDestExecDataToMap is a helper function for converting dest exec data bytes into map[string]any
func (d ExtraDataDecoder) DecodeDestExecDataToMap(destExecData ccipocr3.Bytes) (map[string]any, error) {
if len(destExecData) < 4 {
return nil, fmt.Errorf("dest exec data too short: %d, should be at least 4 bytes", len(destExecData))
}

return map[string]any{
svmDestExecDataKey: binary.BigEndian.Uint32(destExecData),
}, nil
Expand Down
7 changes: 7 additions & 0 deletions pkg/solana/ccip/codec/extradatacodec_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,13 @@ func Test_decodeExtraArgs(t *testing.T) {
require.Equal(t, destGasAmount, decoded)
})

t.Run("decode dest exec data errors on short input", func(t *testing.T) {
for _, encoded := range [][]byte{nil, {}, {0x1}, {0x1, 0x2, 0x3}} {
_, err := extraDataDecoder.DecodeDestExecDataToMap(encoded)
require.Error(t, err)
}
})

t.Run("decode extra args into map svm", func(t *testing.T) {
destGasAmount := uint32(10000)
bitmap := uint64(0)
Expand Down
Loading