Skip to content

alias CR/CW types to pkg/types/solana #1279

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

Draft
wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

alias CR/CW types to pkg/types/solana #1279

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: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ require (
github.com/gagliardetto/gofuzz v1.2.2
github.com/gagliardetto/solana-go v1.13.0
github.com/gagliardetto/treeout v0.1.4
github.com/gagliardetto/utilz v0.1.1
github.com/go-viper/mapstructure/v2 v2.4.0
github.com/google/uuid v1.6.0
github.com/hashicorp/go-plugin v1.6.3
Expand All @@ -23,7 +22,7 @@ require (
github.com/smartcontractkit/chainlink-ccip v0.0.0-20250627133416-1d85eec09097
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250707132450-d1f5f0be212a
github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20250804184440-c0506474fc44
github.com/smartcontractkit/chainlink-common v0.9.4-0.20250822114026-4186ff61208b
github.com/smartcontractkit/chainlink-common v0.9.4-0.20250822210039-df24f468593d
github.com/smartcontractkit/chainlink-common/pkg/monitoring v0.0.0-20250415235644-8703639403c7
github.com/smartcontractkit/chainlink-framework/capabilities v0.0.0-20250818175541-3389ac08a563
github.com/smartcontractkit/chainlink-framework/metrics v0.0.0-20250717121125-2350c82883e2
Expand Down Expand Up @@ -60,6 +59,7 @@ require (
github.com/fatih/color v1.18.0 // indirect
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
github.com/gabriel-vasile/mimetype v1.4.8 // indirect
github.com/gagliardetto/utilz v0.1.3 // indirect
github.com/go-json-experiment/json v0.0.0-20250223041408-d3c622f1b874 // indirect
github.com/go-kit/log v0.2.1 // indirect
github.com/go-logfmt/logfmt v0.6.0 // indirect
Expand Down
8 changes: 4 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,8 @@ github.com/gagliardetto/solana-go v1.13.0 h1:uNzhjwdAdbq9xMaX2DF0MwXNMw6f8zdZ7JP
github.com/gagliardetto/solana-go v1.13.0/go.mod h1:l/qqqIN6qJJPtxW/G1PF4JtcE3Zg2vD2EliZrr9Gn5k=
github.com/gagliardetto/treeout v0.1.4 h1:ozeYerrLCmCubo1TcIjFiOWTTGteOOHND1twdFpgwaw=
github.com/gagliardetto/treeout v0.1.4/go.mod h1:loUefvXTrlRG5rYmJmExNryyBRh8f89VZhmMOyCyqok=
github.com/gagliardetto/utilz v0.1.1 h1:/etW4hl607emKg6R6Lj9jRJ9d6ue2AQOyjhuAwjzs1U=
github.com/gagliardetto/utilz v0.1.1/go.mod h1:b+rGFkRHz3HWJD0RYMzat47JyvbTtpE0iEcYTRJTLLA=
github.com/gagliardetto/utilz v0.1.3 h1:A+asc+6/3a9qNBrgticApj3yW5F7y4TaJd8Ijg+o0zM=
github.com/gagliardetto/utilz v0.1.3/go.mod h1:b+rGFkRHz3HWJD0RYMzat47JyvbTtpE0iEcYTRJTLLA=
github.com/go-json-experiment/json v0.0.0-20250223041408-d3c622f1b874 h1:F8d1AJ6M9UQCavhwmO6ZsrYLfG8zVFWfEfMS2MXPkSY=
github.com/go-json-experiment/json v0.0.0-20250223041408-d3c622f1b874/go.mod h1:TiCD2a1pcmjd7YnhGH0f/zKNcCD06B029pHhzV23c2M=
github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
Expand Down Expand Up @@ -410,8 +410,8 @@ github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250707132450-d
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250707132450-d1f5f0be212a/go.mod h1:XEtEV52YIISL1Xp2l9XqyXFonKF9WxuGQQJu/lMozl8=
github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20250804184440-c0506474fc44 h1:S00lus9RPu5JuxKRtGEET+aIUfASahHpTRV5RgPARSI=
github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20250804184440-c0506474fc44/go.mod h1:xtZNi6pOKdC3sLvokDvXOhgHzT+cyBqH/gWwvxTxqrg=
github.com/smartcontractkit/chainlink-common v0.9.4-0.20250822114026-4186ff61208b h1:SOTBUmlyMVlKPeNAuxB4ZGkhQRXOEWRGbV6PQ+bs5Nw=
github.com/smartcontractkit/chainlink-common v0.9.4-0.20250822114026-4186ff61208b/go.mod h1:0OMQFyxibohHOzskRmEz4wr+w0SdAFsU6CjW/VhRf34=
github.com/smartcontractkit/chainlink-common v0.9.4-0.20250822210039-df24f468593d h1:z1DOZ+CrXqyS2OFPnUTqJCRH+QOpti8kpNS8uZ4KkbQ=
github.com/smartcontractkit/chainlink-common v0.9.4-0.20250822210039-df24f468593d/go.mod h1:Kp54d3kbM4eGPEmJW7fcRWYUk6emXy+F5TEu5czFcH8=
github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.1 h1:ca2z5OXgnbBPQRxpwXwBLJsUA1+cAp5ncfW4Ssvd6eY=
github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.1/go.mod h1:NZv/qKYGFRnkjOYBouajnDfFoZ+WDa6H2KNmSf1dnKc=
github.com/smartcontractkit/chainlink-common/pkg/monitoring v0.0.0-20250415235644-8703639403c7 h1:9wh1G+WbXwPVqf0cfSRSgwIcaXTQgvYezylEAfwmrbw=
Expand Down
12 changes: 6 additions & 6 deletions integration-tests/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ require (
github.com/pelletier/go-toml/v2 v2.2.4
github.com/rs/zerolog v1.33.0
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250805210128-7f8a0f403c3a
github.com/smartcontractkit/chainlink-common v0.9.4-0.20250822114026-4186ff61208b
github.com/smartcontractkit/chainlink-common v0.9.4-0.20250822210039-df24f468593d
github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20250819150450-95ef563f6e6d
github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250822114658-478d76fce6b9
github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250825220915-aa665a71ecd0
github.com/smartcontractkit/chainlink-testing-framework/lib v1.54.4
github.com/smartcontractkit/chainlink-testing-framework/parrot v0.6.2
github.com/smartcontractkit/chainlink-testing-framework/seth v1.51.2
github.com/smartcontractkit/chainlink/deployment v0.0.0-20250822122521-7924eae1304f
github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20250822122521-7924eae1304f
github.com/smartcontractkit/chainlink/v2 v2.26.0-debug-tracing.0.20250822122521-7924eae1304f
github.com/smartcontractkit/chainlink/deployment v0.0.0-20250825221423-6ed54fd5fc70
github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20250825221423-6ed54fd5fc70
github.com/smartcontractkit/chainlink/v2 v2.26.0-debug-tracing.0.20250825221423-6ed54fd5fc70
github.com/smartcontractkit/libocr v0.0.0-20250707144819-babe0ec4e358
github.com/stretchr/testify v1.10.0
github.com/testcontainers/testcontainers-go v0.37.0
Expand Down Expand Up @@ -172,7 +172,7 @@ require (
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
github.com/gabriel-vasile/mimetype v1.4.8 // indirect
github.com/gagliardetto/treeout v0.1.4 // indirect
github.com/gagliardetto/utilz v0.1.1 // indirect
github.com/gagliardetto/utilz v0.1.3 // indirect
github.com/getsentry/sentry-go v0.27.0 // indirect
github.com/gibson042/canonicaljson-go v1.0.3 // indirect
github.com/gin-contrib/sessions v0.0.5 // indirect
Expand Down
20 changes: 10 additions & 10 deletions integration-tests/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,8 +464,8 @@ github.com/gagliardetto/solana-go v1.13.0 h1:uNzhjwdAdbq9xMaX2DF0MwXNMw6f8zdZ7JP
github.com/gagliardetto/solana-go v1.13.0/go.mod h1:l/qqqIN6qJJPtxW/G1PF4JtcE3Zg2vD2EliZrr9Gn5k=
github.com/gagliardetto/treeout v0.1.4 h1:ozeYerrLCmCubo1TcIjFiOWTTGteOOHND1twdFpgwaw=
github.com/gagliardetto/treeout v0.1.4/go.mod h1:loUefvXTrlRG5rYmJmExNryyBRh8f89VZhmMOyCyqok=
github.com/gagliardetto/utilz v0.1.1 h1:/etW4hl607emKg6R6Lj9jRJ9d6ue2AQOyjhuAwjzs1U=
github.com/gagliardetto/utilz v0.1.1/go.mod h1:b+rGFkRHz3HWJD0RYMzat47JyvbTtpE0iEcYTRJTLLA=
github.com/gagliardetto/utilz v0.1.3 h1:A+asc+6/3a9qNBrgticApj3yW5F7y4TaJd8Ijg+o0zM=
github.com/gagliardetto/utilz v0.1.3/go.mod h1:b+rGFkRHz3HWJD0RYMzat47JyvbTtpE0iEcYTRJTLLA=
github.com/gballet/go-libpcsclite v0.0.0-20191108122812-4678299bea08 h1:f6D9Hr8xV8uYKlyuj8XIruxlh9WjVjdh1gIicAS7ays=
github.com/gballet/go-libpcsclite v0.0.0-20191108122812-4678299bea08/go.mod h1:x7DCsMOv1taUwEWCzT4cmDeAkigA5/QCwUodaVOe8Ww=
github.com/gedex/inflector v0.0.0-20170307190818-16278e9db813 h1:Uc+IZ7gYqAf/rSGFplbWBSHaGolEQlNLgMgSE3ccnIQ=
Expand Down Expand Up @@ -1253,8 +1253,8 @@ github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250805210128-7
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250805210128-7f8a0f403c3a/go.mod h1:Ve1xD71bl193YIZQEoJMmBqLGQJdNs29bwbuObwvbhQ=
github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20250805210128-7f8a0f403c3a h1:38dAlTPRUQHZus5dCnBnQyf/V4oYn0p2svWlbPgHDQ4=
github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20250805210128-7f8a0f403c3a/go.mod h1:xtZNi6pOKdC3sLvokDvXOhgHzT+cyBqH/gWwvxTxqrg=
github.com/smartcontractkit/chainlink-common v0.9.4-0.20250822114026-4186ff61208b h1:SOTBUmlyMVlKPeNAuxB4ZGkhQRXOEWRGbV6PQ+bs5Nw=
github.com/smartcontractkit/chainlink-common v0.9.4-0.20250822114026-4186ff61208b/go.mod h1:0OMQFyxibohHOzskRmEz4wr+w0SdAFsU6CjW/VhRf34=
github.com/smartcontractkit/chainlink-common v0.9.4-0.20250822210039-df24f468593d h1:z1DOZ+CrXqyS2OFPnUTqJCRH+QOpti8kpNS8uZ4KkbQ=
github.com/smartcontractkit/chainlink-common v0.9.4-0.20250822210039-df24f468593d/go.mod h1:Kp54d3kbM4eGPEmJW7fcRWYUk6emXy+F5TEu5czFcH8=
github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.1 h1:ca2z5OXgnbBPQRxpwXwBLJsUA1+cAp5ncfW4Ssvd6eY=
github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.1/go.mod h1:NZv/qKYGFRnkjOYBouajnDfFoZ+WDa6H2KNmSf1dnKc=
github.com/smartcontractkit/chainlink-common/pkg/monitoring v0.0.0-20250415235644-8703639403c7 h1:9wh1G+WbXwPVqf0cfSRSgwIcaXTQgvYezylEAfwmrbw=
Expand Down Expand Up @@ -1305,12 +1305,12 @@ github.com/smartcontractkit/chainlink-tron/relayer v0.0.11-0.20250815105909-7549
github.com/smartcontractkit/chainlink-tron/relayer v0.0.11-0.20250815105909-75499abc4335/go.mod h1:ccjEgNeqOO+bjPddnL4lUrNLzyCvGCxgBjJdhFX3wa8=
github.com/smartcontractkit/chainlink-tron/relayer/gotron-sdk v0.0.5-0.20250422175525-b7575d96bd4d h1:qLmSOOtB/Ogn79eIDkuujOu8M5Jd747V1H7Brk/nTvo=
github.com/smartcontractkit/chainlink-tron/relayer/gotron-sdk v0.0.5-0.20250422175525-b7575d96bd4d/go.mod h1:4WhGgCA0smBbBud5mK+jnDb2wwndMvoqaWBJ3OV/7Bw=
github.com/smartcontractkit/chainlink/deployment v0.0.0-20250822122521-7924eae1304f h1:v6V7rbwxnKQDkV1+bXNySC5+eRDgq5i/Zhilj1Dkg3c=
github.com/smartcontractkit/chainlink/deployment v0.0.0-20250822122521-7924eae1304f/go.mod h1:hOBwMZV5wGR5U6LKTNH2agxDqiM5yJl0i/d0qsIeGek=
github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20250822122521-7924eae1304f h1:Tp/3Op3n08gbzCZaLFUDtS3Pg1477BW8A3/n00ncDwc=
github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20250822122521-7924eae1304f/go.mod h1:EZnjwYZToUpLw1VsFYU64fV2OhbnJFvjsick1804DJA=
github.com/smartcontractkit/chainlink/v2 v2.26.0-debug-tracing.0.20250822122521-7924eae1304f h1:VuA3mpTiqwo9UaCPESYJeS+ONtPdiqZIqa4I30d8QDQ=
github.com/smartcontractkit/chainlink/v2 v2.26.0-debug-tracing.0.20250822122521-7924eae1304f/go.mod h1:FsbzpAb719eV79qc2ixb3BHEW7YCNEVpIU1Q0yajHGo=
github.com/smartcontractkit/chainlink/deployment v0.0.0-20250825221423-6ed54fd5fc70 h1:sHr+O1v7wBNtpO1ymj5R+UH+uPc3zdj12GDa0d8fpKs=
github.com/smartcontractkit/chainlink/deployment v0.0.0-20250825221423-6ed54fd5fc70/go.mod h1:VojWOERGFaR0/vc0TDrppuksJ3gYzNNYWd7eZkjrV/I=
github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20250825221423-6ed54fd5fc70 h1:HuxvHvfD1kYAfn38Fv/bWuq/gxYvFyF2tF/7chsh5vk=
github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20250825221423-6ed54fd5fc70/go.mod h1:N7YNnckw4beJYxtkKDP8mCH0kueES7c+fr985A3rkHg=
github.com/smartcontractkit/chainlink/v2 v2.26.0-debug-tracing.0.20250825221423-6ed54fd5fc70 h1:0EfDhrjlsA8ZZmsy9LexU/yVUk1O4/3UPnFDPERnMvo=
github.com/smartcontractkit/chainlink/v2 v2.26.0-debug-tracing.0.20250825221423-6ed54fd5fc70/go.mod h1:3/VehDaq2C74UoUn7I4cxEG0oFrGVurtqOYFPQjEc9Y=
github.com/smartcontractkit/cre-sdk-go v0.5.1-0.20250818135829-9ea58491207f h1:pgupmqPyAqfl2xgqHaRwfI/Kd6HtGbB8WeMt9XPM5L0=
github.com/smartcontractkit/cre-sdk-go v0.5.1-0.20250818135829-9ea58491207f/go.mod h1:C1KXVcxUy89lFVqJ335pEPeeC/wJy0jCF0ZztwWdCmU=
github.com/smartcontractkit/freeport v0.1.3-0.20250716200817-cb5dfd0e369e h1:Hv9Mww35LrufCdM9wtS9yVi/rEWGI1UnjHbcKKU0nVY=
Expand Down
15 changes: 8 additions & 7 deletions integration-tests/relayinterface/buffer_payload_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import (
"github.com/smartcontractkit/chainlink-common/pkg/logger"
"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
"github.com/smartcontractkit/chainlink-common/pkg/types"
soltypes "github.com/smartcontractkit/chainlink-common/pkg/types/solana"

"github.com/smartcontractkit/chainlink-solana/contracts/generated/buffer_payload"
"github.com/smartcontractkit/chainlink-solana/integration-tests/utils"
Expand Down Expand Up @@ -76,25 +77,25 @@ func Test_BufferPayload(t *testing.T) {
contractName := "buffer"
methodName := "execute"

cwConfig := chainwriter.ChainWriterConfig{
Programs: map[string]chainwriter.ProgramConfig{
cwConfig := soltypes.ContractWriterConfig{
Programs: map[string]soltypes.ProgramConfig{
contractName: {
Methods: map[string]chainwriter.MethodConfig{
Methods: map[string]soltypes.MethodConfig{
methodName: {
FromAddress: sender.PublicKey().String(),
ChainSpecificName: "execute",
ComputeUnitLimitOverhead: 150_000,
BufferPayloadMethod: "CCIPExecutionReportBuffer",
Accounts: []chainwriter.Lookup{
Accounts: []soltypes.Lookup{
{
AccountConstant: &chainwriter.AccountConstant{
AccountConstant: &soltypes.AccountConstant{
Address: sender.PublicKey().String(),
IsSigner: true,
IsWritable: true,
},
},
{
AccountConstant: &chainwriter.AccountConstant{
AccountConstant: &soltypes.AccountConstant{
Address: solana.SystemProgramID.String(),
IsSigner: false,
IsWritable: false,
Expand Down Expand Up @@ -176,7 +177,7 @@ func Test_BufferPayload(t *testing.T) {
})
}

func initializeAndRunCW(t *testing.T, lggr logger.Logger, multiClient client.MultiClient, txm *txm.Txm, config chainwriter.ChainWriterConfig) *chainwriter.SolanaChainWriterService {
func initializeAndRunCW(t *testing.T, lggr logger.Logger, multiClient client.MultiClient, txm *txm.Txm, config soltypes.ContractWriterConfig) *chainwriter.SolanaChainWriterService {
cw, err := chainwriter.NewSolanaChainWriterService(lggr, multiClient, txm, nil, config)
require.NoError(t, err)
servicetest.Run(t, cw)
Expand Down
Loading
Loading