Skip to content
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

Implement extra args codec #16016

Open
wants to merge 20 commits into
base: solana-offchain-plugin
Choose a base branch
from
Open

Implement extra args codec #16016

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
a757a6e
Use SVM ABI, needs to check test
huangzhen1997 Jan 21, 2025
7253bba
goimport
huangzhen1997 Jan 21, 2025
0ec8119
update
huangzhen1997 Jan 21, 2025
82a162f
rename
huangzhen1997 Jan 21, 2025
2c7bd05
Merge branch 'solana-offchain-plugin' into NONEVM-1163/implement-extr…
huangzhen1997 Jan 21, 2025
e8bbe9a
tidy
huangzhen1997 Jan 21, 2025
36a5ad1
refactor
huangzhen1997 Jan 21, 2025
3fa671b
fix lint
huangzhen1997 Jan 22, 2025
af29932
fix
huangzhen1997 Jan 22, 2025
2597b48
update
huangzhen1997 Jan 22, 2025
a99bdcc
update
huangzhen1997 Jan 22, 2025
5fe01d2
address Makram comments
huangzhen1997 Jan 23, 2025
c49c04b
lint
huangzhen1997 Jan 23, 2025
7204973
Merge branch 'solana-offchain-plugin' into NONEVM-1163/implement-extr…
huangzhen1997 Jan 23, 2025
a903310
mod tidy
huangzhen1997 Jan 23, 2025
80b3e3b
gomd
huangzhen1997 Jan 23, 2025
afcd808
fix import
huangzhen1997 Jan 24, 2025
6bc6b29
fix broken integration test
huangzhen1997 Jan 24, 2025
a5f84ac
update
huangzhen1997 Jan 24, 2025
d6af37b
fix test
huangzhen1997 Jan 27, 2025
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
2 changes: 1 addition & 1 deletion core/capabilities/ccip/ccipsolana/helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (

func DecodeExtraArgsToMap(extraArgs []byte) (map[string]any, error) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good rule of thumb to add a docstring to exported methods

outputMap := make(map[string]any)
var args ccip_router.SVMExtraArgs
var args ccip_router.AnyExtraArgs
decoder := agbinary.NewBorshDecoder(extraArgs)
err := args.UnmarshalWithDecoder(decoder)
if err != nil {
Expand Down
19 changes: 9 additions & 10 deletions core/capabilities/ccip/ccipsolana/helpers_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,22 @@
"testing"

agbinary "github.com/gagliardetto/binary"
"github.com/gagliardetto/solana-go"
"github.com/stretchr/testify/require"

"github.com/smartcontractkit/chainlink-ccip/chains/solana/contracts/tests/config"
"github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings/ccip_router"
)

func Test_decodeExtraArgs(t *testing.T) {
t.Run("decode extra args into map svm", func(t *testing.T) {
extraArgs := ccip_router.SVMExtraArgs{
ComputeUnits: 1000,
IsWritableBitmap: 2,
Accounts: []solana.PublicKey{
config.ReceiverExternalExecutionConfigPDA,
config.ReceiverTargetAccountPDA,
solana.SystemProgramID,
},
extraArgs := ccip_router.AnyExtraArgs{
// TODO wait for onchain team fix this AnyExtraArgs
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since the source chain here is SVM, we won't need these SVM specific fields here, since you will not go from SVM -> SVM.
Atleast not until CCIP supports another SVM chain apart from Solana.

For testing right now, we should be good with just EVM specific fields in this struct.

//ComputeUnits: 1000,
//IsWritableBitmap: 2,
//Accounts: []solana.PublicKey{
// config.ReceiverExternalExecutionConfigPDA,
// config.ReceiverTargetAccountPDA,
// solana.SystemProgramID,
//},

Check failure on line 23 in core/capabilities/ccip/ccipsolana/helpers_test.go

View workflow job for this annotation

GitHub Actions / GolangCI Lint (.) 

commentFormatting: put a space between `//` and comment text (gocritic)
}

var buf bytes.Buffer
Expand Down
Loading