From 26aa3698a9fe68c1c77af2ac00247ddbc5711f2d Mon Sep 17 00:00:00 2001 From: Jordan Krage Date: Sat, 28 Jun 2025 09:21:28 -0500 Subject: [PATCH] use common instead of chainlink-solana --- .../ccip/ccipsolana/crcwconfig.go | 4 +- .../ccip/configs/solana/contract_reader.go | 337 +++++++++--------- .../configs/solana/contract_reader_test.go | 4 +- core/scripts/go.mod | 4 +- core/scripts/go.sum | 8 +- deployment/go.mod | 4 +- deployment/go.sum | 8 +- go.mod | 4 +- go.sum | 8 +- integration-tests/go.mod | 4 +- integration-tests/go.sum | 8 +- integration-tests/load/go.mod | 4 +- integration-tests/load/go.sum | 8 +- plugins/plugins.public.yaml | 2 +- system-tests/lib/go.mod | 4 +- system-tests/lib/go.sum | 8 +- system-tests/tests/go.mod | 4 +- system-tests/tests/go.sum | 8 +- 18 files changed, 215 insertions(+), 216 deletions(-) diff --git a/core/capabilities/ccip/ccipsolana/crcwconfig.go b/core/capabilities/ccip/ccipsolana/crcwconfig.go index 5d81b1cd73c..c65e2198a4b 100644 --- a/core/capabilities/ccip/ccipsolana/crcwconfig.go +++ b/core/capabilities/ccip/ccipsolana/crcwconfig.go @@ -8,8 +8,8 @@ import ( "github.com/gagliardetto/solana-go" "github.com/smartcontractkit/chainlink-common/pkg/types" + soltypes "github.com/smartcontractkit/chainlink-common/pkg/types/solana" solanaconfig "github.com/smartcontractkit/chainlink-solana/pkg/solana/ccip/config" - "github.com/smartcontractkit/chainlink-solana/pkg/solana/config" ccipcommon "github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/common" ccipconfig "github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/configs/solana" ) @@ -47,7 +47,7 @@ func (g ChainRWProvider) GetChainWriter(ctx context.Context, pararms ccipcommon. // GetChainReader returns a new ContractReader for Solana chains. func (g ChainRWProvider) GetChainReader(ctx context.Context, params ccipcommon.ChainReaderProviderOpts) (types.ContractReader, error) { var err error - var cfg config.ContractReader + var cfg soltypes.ContractReader if params.ChainID == params.DestChainID && params.ChainFamily == params.DestChainFamily { cfg, err = ccipconfig.DestContractReaderConfig() if err != nil { diff --git a/core/capabilities/ccip/configs/solana/contract_reader.go b/core/capabilities/ccip/configs/solana/contract_reader.go index 77bb3dc3755..d637707cc47 100644 --- a/core/capabilities/ccip/configs/solana/contract_reader.go +++ b/core/capabilities/ccip/configs/solana/contract_reader.go @@ -10,8 +10,7 @@ import ( idl "github.com/smartcontractkit/chainlink-ccip/chains/solana" "github.com/smartcontractkit/chainlink-ccip/pkg/consts" "github.com/smartcontractkit/chainlink-common/pkg/codec" - solanacodec "github.com/smartcontractkit/chainlink-solana/pkg/solana/codec" - "github.com/smartcontractkit/chainlink-solana/pkg/solana/config" + types "github.com/smartcontractkit/chainlink-common/pkg/types/solana" ) var ( @@ -32,36 +31,36 @@ var ( defaultCCIPLogsRetention = 30 * 24 * time.Hour // 30 days ) -func DestContractReaderConfig() (config.ContractReader, error) { - var offRampIDL solanacodec.IDL +func DestContractReaderConfig() (types.ContractReader, error) { + var offRampIDL types.IDL if err := json.Unmarshal([]byte(ccipOffRampIDL), &offRampIDL); err != nil { - return config.ContractReader{}, fmt.Errorf("unexpected error: invalid CCIP OffRamp IDL, error: %w", err) + return types.ContractReader{}, fmt.Errorf("unexpected error: invalid CCIP OffRamp IDL, error: %w", err) } - var feeQuoterIDL solanacodec.IDL + var feeQuoterIDL types.IDL if err := json.Unmarshal([]byte(ccipFeeQuoterIDL), &feeQuoterIDL); err != nil { - return config.ContractReader{}, fmt.Errorf("unexpected error: invalid CCIP Fee Quoter IDL, error: %w", err) + return types.ContractReader{}, fmt.Errorf("unexpected error: invalid CCIP Fee Quoter IDL, error: %w", err) } - var rmnRemoteIDL solanacodec.IDL + var rmnRemoteIDL types.IDL if err := json.Unmarshal([]byte(ccipRmnRemoteIDL), &rmnRemoteIDL); err != nil { - return config.ContractReader{}, fmt.Errorf("unexpected error: invalid CCIP RMN Remote IDL, error: %w", err) + return types.ContractReader{}, fmt.Errorf("unexpected error: invalid CCIP RMN Remote IDL, error: %w", err) } - var cctpTokenPoolIDL solanacodec.IDL + var cctpTokenPoolIDL types.IDL if err := json.Unmarshal([]byte(ccipCCTPTokenPoolIDL), &cctpTokenPoolIDL); err != nil { - return config.ContractReader{}, fmt.Errorf("unexpected error: invalid CCIP CCTP Token Pool IDL, error: %w", err) + return types.ContractReader{}, fmt.Errorf("unexpected error: invalid CCIP CCTP Token Pool IDL, error: %w", err) } - feeQuoterIDL.Accounts = append(feeQuoterIDL.Accounts, solanacodec.IdlTypeDef{ + feeQuoterIDL.Accounts = append(feeQuoterIDL.Accounts, types.IdlTypeDef{ Name: "USDPerToken", - Type: solanacodec.IdlTypeDefTy{ - Kind: solanacodec.IdlTypeDefTyKindStruct, - Fields: &solanacodec.IdlTypeDefStruct{ + Type: types.IdlTypeDefTy{ + Kind: types.IdlTypeDefTyKindStruct, + Fields: &types.IdlTypeDefStruct{ { Name: "tokenPrices", - Type: solanacodec.IdlType{ - AsIdlTypeVec: &solanacodec.IdlTypeVec{Vec: solanacodec.IdlType{AsIdlTypeDefined: &solanacodec.IdlTypeDefined{Defined: "TimestampedPackedU224"}}}, + Type: types.IdlType{ + AsIdlTypeVec: &types.IdlTypeVec{Vec: types.IdlType{AsIdlTypeDefined: &types.IdlTypeDefined{Defined: "TimestampedPackedU224"}}}, }, }, }, @@ -69,45 +68,45 @@ func DestContractReaderConfig() (config.ContractReader, error) { }) // Prepend custom type so it takes priority over the IDL - offRampIDL.Types = append([]solanacodec.IdlTypeDef{{ + offRampIDL.Types = append([]types.IdlTypeDef{{ Name: "OnRampAddress", - Type: solanacodec.IdlTypeDefTy{ - Kind: solanacodec.IdlTypeDefTyKindCustom, + Type: types.IdlTypeDefTy{ + Kind: types.IdlTypeDefTyKindCustom, Codec: "onramp_address", }, }}, offRampIDL.Types...) - var routerIDL solanacodec.IDL + var routerIDL types.IDL if err := json.Unmarshal([]byte(ccipRouterIDL), &routerIDL); err != nil { - return config.ContractReader{}, fmt.Errorf("unexpected error: invalid CCIP Router IDL, error: %w", err) + return types.ContractReader{}, fmt.Errorf("unexpected error: invalid CCIP Router IDL, error: %w", err) } trueVal := true locationFirst := codec.ElementExtractorLocationFirst - return config.ContractReader{ + return types.ContractReader{ AddressShareGroups: [][]string{{consts.ContractNameRouter, consts.ContractNameNonceManager}, {consts.ContractNameRMNRemote, consts.ContractNameRMNProxy}}, - Namespaces: map[string]config.ChainContractReader{ + Namespaces: map[string]types.ChainContractReader{ consts.ContractNameOffRamp: { IDL: offRampIDL, - Reads: map[string]config.ReadDefinition{ + Reads: map[string]types.ReadDefinition{ consts.EventNameExecutionStateChanged: { ChainSpecificName: consts.EventNameExecutionStateChanged, - ReadType: config.Event, - EventDefinitions: &config.EventDefinitions{ - PollingFilter: &config.PollingFilter{ + ReadType: types.Event, + EventDefinitions: &types.EventDefinitions{ + PollingFilter: &types.PollingFilter{ Retention: &defaultCCIPLogsRetention, IncludeReverted: &trueVal, }, - IndexedField0: &config.IndexedField{ + IndexedField0: &types.IndexedField{ OffChainPath: consts.EventAttributeSourceChain, OnChainPath: "SourceChainSelector", }, - IndexedField1: &config.IndexedField{ + IndexedField1: &types.IndexedField{ OffChainPath: consts.EventAttributeSequenceNumber, OnChainPath: consts.EventAttributeSequenceNumber, }, - IndexedField2: &config.IndexedField{ + IndexedField2: &types.IndexedField{ OffChainPath: consts.EventAttributeState, OnChainPath: consts.EventAttributeState, }, @@ -115,9 +114,9 @@ func DestContractReaderConfig() (config.ContractReader, error) { }, consts.EventNameCommitReportAccepted: { ChainSpecificName: "CommitReportAccepted", - ReadType: config.Event, - EventDefinitions: &config.EventDefinitions{ - PollingFilter: &config.PollingFilter{ + ReadType: types.Event, + EventDefinitions: &types.EventDefinitions{ + PollingFilter: &types.PollingFilter{ Retention: &defaultCCIPLogsRetention, }, }, @@ -128,8 +127,8 @@ func DestContractReaderConfig() (config.ContractReader, error) { }, consts.MethodNameOffRampLatestConfigDetails: { ChainSpecificName: "Config", - ReadType: config.Account, - PDADefinition: solanacodec.PDATypeDef{Prefix: []byte("config")}, + ReadType: types.Account, + PDADefinition: types.PDATypeDef{Prefix: []byte("config")}, // TODO: OutputModifications are currently disabled and a special workaround is built into chainlink-solana for now // OutputModifications: codec.ModifiersConfig{ // &codec.WrapperModifierConfig{ @@ -137,13 +136,13 @@ func DestContractReaderConfig() (config.ContractReader, error) { // }, // &codec.PropertyExtractorConfig{FieldName: "Ocr3"}, // &codec.ElementExtractorFromOnchainModifierConfig{Extractions: map[string]*codec.ElementExtractorLocation{"OcrConfig": &locationFirst}}, - // &codec.ByteToBooleanModifierConfig{Fields: []string{"OcrConfig.ConfigInfo.IsSignatureVerificationEnabled"}}, + // &codec.ByteToBooleanModifierConfig{Fields: []string{"Ocrtypes.ConfigInfo.IsSignatureVerificationEnabled"}}, // }, }, consts.MethodNameGetLatestPriceSequenceNumber: { ChainSpecificName: "GlobalState", - ReadType: config.Account, - PDADefinition: solanacodec.PDATypeDef{Prefix: []byte("state")}, + ReadType: types.Account, + PDADefinition: types.PDATypeDef{Prefix: []byte("state")}, OutputModifications: codec.ModifiersConfig{ &codec.PropertyExtractorConfig{ FieldName: "LatestPriceSequenceNumber", @@ -152,8 +151,8 @@ func DestContractReaderConfig() (config.ContractReader, error) { }, consts.MethodNameOffRampGetStaticConfig: { ChainSpecificName: "Config", - ReadType: config.Account, - PDADefinition: solanacodec.PDATypeDef{ + ReadType: types.Account, + PDADefinition: types.PDATypeDef{ Prefix: []byte("config"), }, OutputModifications: codec.ModifiersConfig{ @@ -163,13 +162,13 @@ func DestContractReaderConfig() (config.ContractReader, error) { }, }, }, - MultiReader: &config.MultiReader{ - Reads: []config.ReadDefinition{ + MultiReader: &types.MultiReader{ + Reads: []types.ReadDefinition{ // CCIP expects a NonceManager address, in our case that's the Router { ChainSpecificName: "ReferenceAddresses", - ReadType: config.Account, - PDADefinition: solanacodec.PDATypeDef{ + ReadType: types.Account, + PDADefinition: types.PDATypeDef{ Prefix: []byte("reference_addresses"), }, OutputModifications: codec.ModifiersConfig{ @@ -181,8 +180,8 @@ func DestContractReaderConfig() (config.ContractReader, error) { }, consts.MethodNameOffRampGetDynamicConfig: { ChainSpecificName: "Config", - ReadType: config.Account, - PDADefinition: solanacodec.PDATypeDef{ + ReadType: types.Account, + PDADefinition: types.PDATypeDef{ Prefix: []byte("config"), }, OutputModifications: codec.ModifiersConfig{ @@ -192,12 +191,12 @@ func DestContractReaderConfig() (config.ContractReader, error) { // TODO: figure out how this will be properly configured, if it has to be added to SVM state &codec.HardCodeModifierConfig{OffChainValues: map[string]any{"IsRMNVerificationDisabled": true}}, }, - MultiReader: &config.MultiReader{ - Reads: []config.ReadDefinition{ + MultiReader: &types.MultiReader{ + Reads: []types.ReadDefinition{ { ChainSpecificName: "ReferenceAddresses", - ReadType: config.Account, - PDADefinition: solanacodec.PDATypeDef{ + ReadType: types.Account, + PDADefinition: types.PDATypeDef{ Prefix: []byte("reference_addresses"), }, }, @@ -206,10 +205,10 @@ func DestContractReaderConfig() (config.ContractReader, error) { }, consts.MethodNameGetSourceChainConfig: { ChainSpecificName: "SourceChain", - ReadType: config.Account, - PDADefinition: solanacodec.PDATypeDef{ + ReadType: types.Account, + PDADefinition: types.PDATypeDef{ Prefix: []byte("source_chain_state"), - Seeds: []solanacodec.PDASeed{{Name: "NewChainSelector", Type: solanacodec.IdlType{AsString: solanacodec.IdlTypeU64}}}, + Seeds: []types.PDASeed{{Name: "NewChainSelector", Type: types.IdlType{AsString: types.IdlTypeU64}}}, }, InputModifications: codec.ModifiersConfig{&codec.RenameModifierConfig{Fields: map[string]string{"NewChainSelector": "SourceChainSelector"}}}, OutputModifications: codec.ModifiersConfig{ @@ -217,23 +216,23 @@ func DestContractReaderConfig() (config.ContractReader, error) { // TODO: figure out how this will be properly configured, if it has to be added to SVM state &codec.HardCodeModifierConfig{OffChainValues: map[string]any{"IsRMNVerificationDisabled": true}}, }, - MultiReader: &config.MultiReader{ + MultiReader: &types.MultiReader{ ReuseParams: true, - Reads: []config.ReadDefinition{ + Reads: []types.ReadDefinition{ { ChainSpecificName: "ReferenceAddresses", - ReadType: config.Account, - PDADefinition: solanacodec.PDATypeDef{ + ReadType: types.Account, + PDADefinition: types.PDATypeDef{ Prefix: []byte("reference_addresses"), }, }, { // this seems like a hack to extract both State and Config fields? ChainSpecificName: "SourceChain", - ReadType: config.Account, - PDADefinition: solanacodec.PDATypeDef{ + ReadType: types.Account, + PDADefinition: types.PDATypeDef{ Prefix: []byte("source_chain_state"), - Seeds: []solanacodec.PDASeed{{Name: "NewChainSelector", Type: solanacodec.IdlType{AsString: solanacodec.IdlTypeU64}}}, + Seeds: []types.PDASeed{{Name: "NewChainSelector", Type: types.IdlType{AsString: types.IdlTypeU64}}}, }, InputModifications: codec.ModifiersConfig{&codec.RenameModifierConfig{Fields: map[string]string{"NewChainSelector": "SourceChainSelector"}}}, OutputModifications: codec.ModifiersConfig{ @@ -247,11 +246,11 @@ func DestContractReaderConfig() (config.ContractReader, error) { }, consts.ContractNameFeeQuoter: { IDL: feeQuoterIDL, - Reads: map[string]config.ReadDefinition{ + Reads: map[string]types.ReadDefinition{ consts.MethodNameFeeQuoterGetStaticConfig: { ChainSpecificName: "Config", - ReadType: config.Account, - PDADefinition: solanacodec.PDATypeDef{ + ReadType: types.Account, + PDADefinition: types.PDATypeDef{ Prefix: []byte("config"), }, OutputModifications: codec.ModifiersConfig{ @@ -266,15 +265,15 @@ func DestContractReaderConfig() (config.ContractReader, error) { // This one is hacky, but works - [NONEVM-1320] consts.MethodNameFeeQuoterGetTokenPrices: { ChainSpecificName: "USDPerToken", - ReadType: config.Account, - PDADefinition: solanacodec.PDATypeDef{ + ReadType: types.Account, + PDADefinition: types.PDATypeDef{ Prefix: []byte("fee_billing_token_config"), - Seeds: []solanacodec.PDASeed{ + Seeds: []types.PDASeed{ { Name: "Tokens", - Type: solanacodec.IdlType{ - AsIdlTypeVec: &solanacodec.IdlTypeVec{ - Vec: solanacodec.IdlType{AsString: solanacodec.IdlTypePublicKey}, + Type: types.IdlType{ + AsIdlTypeVec: &types.IdlTypeVec{ + Vec: types.IdlType{AsString: types.IdlTypePublicKey}, }, }, }, @@ -286,30 +285,30 @@ func DestContractReaderConfig() (config.ContractReader, error) { }, consts.MethodNameFeeQuoterGetTokenPrice: { ChainSpecificName: "BillingTokenConfigWrapper", - PDADefinition: solanacodec.PDATypeDef{ + PDADefinition: types.PDATypeDef{ Prefix: []byte("fee_billing_token_config"), - Seeds: []solanacodec.PDASeed{{ + Seeds: []types.PDASeed{{ Name: "Token", - Type: solanacodec.IdlType{AsString: solanacodec.IdlTypePublicKey}, + Type: types.IdlType{AsString: types.IdlTypePublicKey}, }}}, OutputModifications: codec.ModifiersConfig{ - &codec.PropertyExtractorConfig{FieldName: "Config.UsdPerToken"}, + &codec.PropertyExtractorConfig{FieldName: "types.UsdPerToken"}, }, }, consts.MethodNameGetFeePriceUpdate: { ChainSpecificName: "DestChain", - PDADefinition: solanacodec.PDATypeDef{ + PDADefinition: types.PDATypeDef{ Prefix: []byte("dest_chain"), - Seeds: []solanacodec.PDASeed{{Name: "DestinationChainSelector", Type: solanacodec.IdlType{AsString: solanacodec.IdlTypeU64}}}, + Seeds: []types.PDASeed{{Name: "DestinationChainSelector", Type: types.IdlType{AsString: types.IdlTypeU64}}}, }, InputModifications: codec.ModifiersConfig{&codec.RenameModifierConfig{Fields: map[string]string{"DestinationChainSelector": "DestChainSelector"}}}, OutputModifications: codec.ModifiersConfig{&codec.PropertyExtractorConfig{FieldName: "State.UsdPerUnitGas"}}, }, consts.MethodNameGetDestChainConfig: { ChainSpecificName: "DestChain", - PDADefinition: solanacodec.PDATypeDef{ + PDADefinition: types.PDATypeDef{ Prefix: []byte("dest_chain"), - Seeds: []solanacodec.PDASeed{{Name: "DestinationChainSelector", Type: solanacodec.IdlType{AsString: solanacodec.IdlTypeU64}}}, + Seeds: []types.PDASeed{{Name: "DestinationChainSelector", Type: types.IdlType{AsString: types.IdlTypeU64}}}, }, InputModifications: codec.ModifiersConfig{&codec.RenameModifierConfig{Fields: map[string]string{"DestinationChainSelector": "DestChainSelector"}}}, OutputModifications: codec.ModifiersConfig{ @@ -321,15 +320,15 @@ func DestContractReaderConfig() (config.ContractReader, error) { }, }, }, - MultiReader: &config.MultiReader{ + MultiReader: &types.MultiReader{ ReuseParams: true, - Reads: []config.ReadDefinition{ + Reads: []types.ReadDefinition{ { // this seems like a hack to extract both State and Config fields? ChainSpecificName: "DestChain", - PDADefinition: solanacodec.PDATypeDef{ + PDADefinition: types.PDATypeDef{ Prefix: []byte("dest_chain"), - Seeds: []solanacodec.PDASeed{{Name: "DestinationChainSelector", Type: solanacodec.IdlType{AsString: solanacodec.IdlTypeU64}}}, + Seeds: []types.PDASeed{{Name: "DestinationChainSelector", Type: types.IdlType{AsString: types.IdlTypeU64}}}, }, InputModifications: codec.ModifiersConfig{&codec.RenameModifierConfig{Fields: map[string]string{"DestinationChainSelector": "DestChainSelector"}}}, OutputModifications: codec.ModifiersConfig{ @@ -343,11 +342,11 @@ func DestContractReaderConfig() (config.ContractReader, error) { }, consts.ContractNameRouter: { IDL: routerIDL, - Reads: map[string]config.ReadDefinition{ + Reads: map[string]types.ReadDefinition{ // TODO: PDA fetching is unnecessary here consts.MethodNameRouterGetWrappedNative: { ChainSpecificName: "Config", - PDADefinition: solanacodec.PDATypeDef{ + PDADefinition: types.PDATypeDef{ Prefix: []byte("config"), }, OutputModifications: codec.ModifiersConfig{ @@ -360,14 +359,14 @@ func DestContractReaderConfig() (config.ContractReader, error) { }, consts.ContractNameNonceManager: { IDL: routerIDL, - Reads: map[string]config.ReadDefinition{ + Reads: map[string]types.ReadDefinition{ consts.MethodNameGetInboundNonce: { ChainSpecificName: "Nonce", - PDADefinition: solanacodec.PDATypeDef{ + PDADefinition: types.PDATypeDef{ Prefix: []byte("nonce"), - Seeds: []solanacodec.PDASeed{ - {Name: "DestinationChainSelector", Type: solanacodec.IdlType{AsString: solanacodec.IdlTypeU64}}, - {Name: "Authority", Type: solanacodec.IdlType{AsString: solanacodec.IdlTypePublicKey}}, + Seeds: []types.PDASeed{ + {Name: "DestinationChainSelector", Type: types.IdlType{AsString: types.IdlTypeU64}}, + {Name: "Authority", Type: types.IdlType{AsString: types.IdlTypePublicKey}}, }, }, InputModifications: codec.ModifiersConfig{ @@ -380,12 +379,12 @@ func DestContractReaderConfig() (config.ContractReader, error) { }, consts.ContractNameRMNProxy: { IDL: rmnRemoteIDL, - Reads: map[string]config.ReadDefinition{ + Reads: map[string]types.ReadDefinition{ consts.MethodNameGetARM: { // TODO: need to have definition or it'll complain ChainSpecificName: "Config", - ReadType: config.Account, - PDADefinition: solanacodec.PDATypeDef{ + ReadType: types.Account, + PDADefinition: types.PDATypeDef{ Prefix: []byte("config"), }, OutputModifications: codec.ModifiersConfig{ @@ -406,11 +405,11 @@ func DestContractReaderConfig() (config.ContractReader, error) { }, consts.ContractNameRMNRemote: { IDL: rmnRemoteIDL, - Reads: map[string]config.ReadDefinition{ + Reads: map[string]types.ReadDefinition{ consts.MethodNameGetVersionedConfig: { ChainSpecificName: "Config", - ReadType: config.Account, - PDADefinition: solanacodec.PDATypeDef{ + ReadType: types.Account, + PDADefinition: types.PDATypeDef{ Prefix: []byte("config"), }, OutputModifications: codec.ModifiersConfig{ @@ -422,15 +421,15 @@ func DestContractReaderConfig() (config.ContractReader, error) { }, consts.MethodNameGetReportDigestHeader: { ChainSpecificName: "Config", - ReadType: config.Account, - PDADefinition: solanacodec.PDATypeDef{ + ReadType: types.Account, + PDADefinition: types.PDATypeDef{ Prefix: []byte("config"), }, }, consts.MethodNameGetCursedSubjects: { ChainSpecificName: "Curses", - ReadType: config.Account, - PDADefinition: solanacodec.PDATypeDef{ + ReadType: types.Account, + PDADefinition: types.PDATypeDef{ Prefix: []byte("curses"), }, OutputModifications: codec.ModifiersConfig{ @@ -446,19 +445,19 @@ func DestContractReaderConfig() (config.ContractReader, error) { }, consts.ContractNameUSDCTokenPool: { IDL: cctpTokenPoolIDL, - Reads: map[string]config.ReadDefinition{ + Reads: map[string]types.ReadDefinition{ consts.EventNameCCTPMessageSent: { ChainSpecificName: "CcipCctpMessageSentEvent", - ReadType: config.Event, - EventDefinitions: &config.EventDefinitions{ - PollingFilter: &config.PollingFilter{ + ReadType: types.Event, + EventDefinitions: &types.EventDefinitions{ + PollingFilter: &types.PollingFilter{ Retention: &defaultCCIPLogsRetention, }, - IndexedField0: &config.IndexedField{ + IndexedField0: &types.IndexedField{ OffChainPath: consts.EventAttributeCCTPNonce, OnChainPath: "CctpNonce", }, - IndexedField1: &config.IndexedField{ + IndexedField1: &types.IndexedField{ OffChainPath: consts.EventAttributeSourceDomain, OnChainPath: "SourceDomain", }, @@ -470,31 +469,31 @@ func DestContractReaderConfig() (config.ContractReader, error) { }, nil } -func SourceContractReaderConfig() (config.ContractReader, error) { - var routerIDL solanacodec.IDL +func SourceContractReaderConfig() (types.ContractReader, error) { + var routerIDL types.IDL if err := json.Unmarshal([]byte(ccipRouterIDL), &routerIDL); err != nil { - return config.ContractReader{}, fmt.Errorf("unexpected error: invalid CCIP Router IDL, error: %w", err) + return types.ContractReader{}, fmt.Errorf("unexpected error: invalid CCIP Router IDL, error: %w", err) } - var feeQuoterIDL solanacodec.IDL + var feeQuoterIDL types.IDL if err := json.Unmarshal([]byte(ccipFeeQuoterIDL), &feeQuoterIDL); err != nil { - return config.ContractReader{}, fmt.Errorf("unexpected error: invalid CCIP Fee Quoter IDL, error: %w", err) + return types.ContractReader{}, fmt.Errorf("unexpected error: invalid CCIP Fee Quoter IDL, error: %w", err) } - var cctpTokenPoolIDL solanacodec.IDL + var cctpTokenPoolIDL types.IDL if err := json.Unmarshal([]byte(ccipCCTPTokenPoolIDL), &cctpTokenPoolIDL); err != nil { - return config.ContractReader{}, fmt.Errorf("unexpected error: invalid CCIP CCTP Token Pool IDL, error: %w", err) + return types.ContractReader{}, fmt.Errorf("unexpected error: invalid CCIP CCTP Token Pool IDL, error: %w", err) } - feeQuoterIDL.Accounts = append(feeQuoterIDL.Accounts, solanacodec.IdlTypeDef{ + feeQuoterIDL.Accounts = append(feeQuoterIDL.Accounts, types.IdlTypeDef{ Name: "USDPerToken", - Type: solanacodec.IdlTypeDefTy{ - Kind: solanacodec.IdlTypeDefTyKindStruct, - Fields: &solanacodec.IdlTypeDefStruct{ + Type: types.IdlTypeDefTy{ + Kind: types.IdlTypeDefTyKindStruct, + Fields: &types.IdlTypeDefStruct{ { Name: "tokenPrices", - Type: solanacodec.IdlType{ - AsIdlTypeVec: &solanacodec.IdlTypeVec{Vec: solanacodec.IdlType{AsIdlTypeDefined: &solanacodec.IdlTypeDefined{Defined: "TimestampedPackedU224"}}}, + Type: types.IdlType{ + AsIdlTypeVec: &types.IdlTypeVec{Vec: types.IdlType{AsIdlTypeDefined: &types.IdlTypeDefined{Defined: "TimestampedPackedU224"}}}, }, }, }, @@ -502,26 +501,26 @@ func SourceContractReaderConfig() (config.ContractReader, error) { }) // Prepend custom type so it takes priority over the IDL - routerIDL.Types = append([]solanacodec.IdlTypeDef{{ + routerIDL.Types = append([]types.IdlTypeDef{{ Name: "CrossChainAmount", - Type: solanacodec.IdlTypeDefTy{ - Kind: solanacodec.IdlTypeDefTyKindCustom, + Type: types.IdlTypeDefTy{ + Kind: types.IdlTypeDefTyKindCustom, Codec: "cross_chain_amount", }, }}, routerIDL.Types...) - return config.ContractReader{ + return types.ContractReader{ AddressShareGroups: [][]string{{consts.ContractNameRouter, consts.ContractNameOnRamp}}, - Namespaces: map[string]config.ChainContractReader{ + Namespaces: map[string]types.ChainContractReader{ consts.ContractNameOnRamp: { IDL: routerIDL, - Reads: map[string]config.ReadDefinition{ + Reads: map[string]types.ReadDefinition{ consts.MethodNameGetExpectedNextSequenceNumber: { ChainSpecificName: "DestChain", - ReadType: config.Account, - PDADefinition: solanacodec.PDATypeDef{ + ReadType: types.Account, + PDADefinition: types.PDATypeDef{ Prefix: []byte("dest_chain_state"), - Seeds: []solanacodec.PDASeed{{Name: "NewChainSelector", Type: solanacodec.IdlType{AsString: solanacodec.IdlTypeU64}}}, + Seeds: []types.PDASeed{{Name: "NewChainSelector", Type: types.IdlType{AsString: types.IdlTypeU64}}}, }, InputModifications: codec.ModifiersConfig{&codec.RenameModifierConfig{Fields: map[string]string{"NewChainSelector": "DestChainSelector"}}}, OutputModifications: codec.ModifiersConfig{ @@ -532,20 +531,20 @@ func SourceContractReaderConfig() (config.ContractReader, error) { }, consts.EventNameCCIPMessageSent: { ChainSpecificName: "CCIPMessageSent", - ReadType: config.Event, - EventDefinitions: &config.EventDefinitions{ - PollingFilter: &config.PollingFilter{ + ReadType: types.Event, + EventDefinitions: &types.EventDefinitions{ + PollingFilter: &types.PollingFilter{ Retention: &defaultCCIPLogsRetention, }, - IndexedField0: &config.IndexedField{ + IndexedField0: &types.IndexedField{ OffChainPath: consts.EventAttributeSourceChain, OnChainPath: "Message.Header.SourceChainSelector", }, - IndexedField1: &config.IndexedField{ + IndexedField1: &types.IndexedField{ OffChainPath: consts.EventAttributeDestChain, OnChainPath: "Message.Header.DestChainSelector", }, - IndexedField2: &config.IndexedField{ + IndexedField2: &types.IndexedField{ OffChainPath: consts.EventAttributeSequenceNumber, OnChainPath: "Message.Header.SequenceNumber", }, @@ -553,10 +552,10 @@ func SourceContractReaderConfig() (config.ContractReader, error) { }, consts.MethodNameOnRampGetDestChainConfig: { ChainSpecificName: "DestChain", - ReadType: config.Account, - PDADefinition: solanacodec.PDATypeDef{ + ReadType: types.Account, + PDADefinition: types.PDATypeDef{ Prefix: []byte("dest_chain_state"), - Seeds: []solanacodec.PDASeed{{Name: "NewChainSelector", Type: solanacodec.IdlType{AsString: solanacodec.IdlTypeU64}}}, + Seeds: []types.PDASeed{{Name: "NewChainSelector", Type: types.IdlType{AsString: types.IdlTypeU64}}}, }, // response Router field will be populated with the bound address of the onramp ResponseAddressHardCoder: &codec.HardCodeModifierConfig{ @@ -570,16 +569,16 @@ func SourceContractReaderConfig() (config.ContractReader, error) { Fields: map[string]string{"SequenceNumber": "ExpectedNextSequenceNumber"}, }, }, - MultiReader: &config.MultiReader{ + MultiReader: &types.MultiReader{ ReuseParams: true, - Reads: []config.ReadDefinition{ + Reads: []types.ReadDefinition{ // this seems like a hack to extract both State and Config fields? { ChainSpecificName: "DestChain", - ReadType: config.Account, - PDADefinition: solanacodec.PDATypeDef{ + ReadType: types.Account, + PDADefinition: types.PDATypeDef{ Prefix: []byte("dest_chain_state"), - Seeds: []solanacodec.PDASeed{{Name: "NewChainSelector", Type: solanacodec.IdlType{AsString: solanacodec.IdlTypeU64}}}, + Seeds: []types.PDASeed{{Name: "NewChainSelector", Type: types.IdlType{AsString: types.IdlTypeU64}}}, }, InputModifications: codec.ModifiersConfig{&codec.RenameModifierConfig{Fields: map[string]string{"NewChainSelector": "DestChainSelector"}}}, OutputModifications: codec.ModifiersConfig{&codec.PropertyExtractorConfig{FieldName: "Config"}}, @@ -589,8 +588,8 @@ func SourceContractReaderConfig() (config.ContractReader, error) { }, consts.MethodNameOnRampGetDynamicConfig: { ChainSpecificName: "Config", - ReadType: config.Account, - PDADefinition: solanacodec.PDATypeDef{Prefix: []byte("config")}, + ReadType: types.Account, + PDADefinition: types.PDATypeDef{Prefix: []byte("config")}, OutputModifications: codec.ModifiersConfig{ &codec.RenameModifierConfig{ Fields: map[string]string{"Owner": "AllowListAdmin"}, @@ -605,11 +604,11 @@ func SourceContractReaderConfig() (config.ContractReader, error) { }, consts.ContractNameFeeQuoter: { IDL: feeQuoterIDL, - Reads: map[string]config.ReadDefinition{ + Reads: map[string]types.ReadDefinition{ consts.MethodNameFeeQuoterGetStaticConfig: { ChainSpecificName: "Config", - ReadType: config.Account, - PDADefinition: solanacodec.PDATypeDef{ + ReadType: types.Account, + PDADefinition: types.PDATypeDef{ Prefix: []byte("config"), }, OutputModifications: codec.ModifiersConfig{ @@ -624,15 +623,15 @@ func SourceContractReaderConfig() (config.ContractReader, error) { // this one is hacky, but should work NONEVM-1320 consts.MethodNameFeeQuoterGetTokenPrices: { ChainSpecificName: "USDPerToken", - ReadType: config.Account, - PDADefinition: solanacodec.PDATypeDef{ + ReadType: types.Account, + PDADefinition: types.PDATypeDef{ Prefix: []byte("fee_billing_token_config"), - Seeds: []solanacodec.PDASeed{ + Seeds: []types.PDASeed{ { Name: "Tokens", - Type: solanacodec.IdlType{ - AsIdlTypeVec: &solanacodec.IdlTypeVec{ - Vec: solanacodec.IdlType{AsString: solanacodec.IdlTypePublicKey}, + Type: types.IdlType{ + AsIdlTypeVec: &types.IdlTypeVec{ + Vec: types.IdlType{AsString: types.IdlTypePublicKey}, }, }, }, @@ -644,30 +643,30 @@ func SourceContractReaderConfig() (config.ContractReader, error) { }, consts.MethodNameFeeQuoterGetTokenPrice: { ChainSpecificName: "BillingTokenConfigWrapper", - PDADefinition: solanacodec.PDATypeDef{ + PDADefinition: types.PDATypeDef{ Prefix: []byte("fee_billing_token_config"), - Seeds: []solanacodec.PDASeed{{ + Seeds: []types.PDASeed{{ Name: "Token", - Type: solanacodec.IdlType{AsString: solanacodec.IdlTypePublicKey}, + Type: types.IdlType{AsString: types.IdlTypePublicKey}, }}}, OutputModifications: codec.ModifiersConfig{ - &codec.PropertyExtractorConfig{FieldName: "Config.UsdPerToken"}, + &codec.PropertyExtractorConfig{FieldName: "types.UsdPerToken"}, }, }, consts.MethodNameGetFeePriceUpdate: { ChainSpecificName: "DestChain", - PDADefinition: solanacodec.PDATypeDef{ + PDADefinition: types.PDATypeDef{ Prefix: []byte("dest_chain"), - Seeds: []solanacodec.PDASeed{{Name: "DestinationChainSelector", Type: solanacodec.IdlType{AsString: solanacodec.IdlTypeU64}}}, + Seeds: []types.PDASeed{{Name: "DestinationChainSelector", Type: types.IdlType{AsString: types.IdlTypeU64}}}, }, InputModifications: codec.ModifiersConfig{&codec.RenameModifierConfig{Fields: map[string]string{"DestinationChainSelector": "DestChainSelector"}}}, OutputModifications: codec.ModifiersConfig{&codec.PropertyExtractorConfig{FieldName: "State.UsdPerUnitGas"}}, }, consts.MethodNameGetDestChainConfig: { ChainSpecificName: "DestChain", - PDADefinition: solanacodec.PDATypeDef{ + PDADefinition: types.PDATypeDef{ Prefix: []byte("dest_chain"), - Seeds: []solanacodec.PDASeed{{Name: "DestinationChainSelector", Type: solanacodec.IdlType{AsString: solanacodec.IdlTypeU64}}}, + Seeds: []types.PDASeed{{Name: "DestinationChainSelector", Type: types.IdlType{AsString: types.IdlTypeU64}}}, }, InputModifications: codec.ModifiersConfig{&codec.RenameModifierConfig{Fields: map[string]string{"DestinationChainSelector": "DestChainSelector"}}}, OutputModifications: codec.ModifiersConfig{ @@ -684,12 +683,12 @@ func SourceContractReaderConfig() (config.ContractReader, error) { }, consts.ContractNameRouter: { IDL: routerIDL, - Reads: map[string]config.ReadDefinition{ + Reads: map[string]types.ReadDefinition{ // TODO: PDA fetching is unnecessary here consts.MethodNameRouterGetWrappedNative: { ChainSpecificName: "Config", - ReadType: config.Account, - PDADefinition: solanacodec.PDATypeDef{ + ReadType: types.Account, + PDADefinition: types.PDATypeDef{ Prefix: []byte("config"), }, OutputModifications: codec.ModifiersConfig{ @@ -702,19 +701,19 @@ func SourceContractReaderConfig() (config.ContractReader, error) { }, consts.ContractNameUSDCTokenPool: { IDL: cctpTokenPoolIDL, - Reads: map[string]config.ReadDefinition{ + Reads: map[string]types.ReadDefinition{ consts.EventNameCCTPMessageSent: { ChainSpecificName: "CcipCctpMessageSentEvent", - ReadType: config.Event, - EventDefinitions: &config.EventDefinitions{ - PollingFilter: &config.PollingFilter{ + ReadType: types.Event, + EventDefinitions: &types.EventDefinitions{ + PollingFilter: &types.PollingFilter{ Retention: &defaultCCIPLogsRetention, }, - IndexedField0: &config.IndexedField{ + IndexedField0: &types.IndexedField{ OffChainPath: consts.EventAttributeCCTPNonce, OnChainPath: "CctpNonce", }, - IndexedField1: &config.IndexedField{ + IndexedField1: &types.IndexedField{ OffChainPath: consts.EventAttributeSourceDomain, OnChainPath: "SourceDomain", }, diff --git a/core/capabilities/ccip/configs/solana/contract_reader_test.go b/core/capabilities/ccip/configs/solana/contract_reader_test.go index f4e343f07f4..5148b4ee24f 100644 --- a/core/capabilities/ccip/configs/solana/contract_reader_test.go +++ b/core/capabilities/ccip/configs/solana/contract_reader_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/smartcontractkit/chainlink-solana/pkg/solana/config" + "github.com/smartcontractkit/chainlink-common/pkg/types/solana" ) func TestContractReaderConfigRaw(t *testing.T) { @@ -16,7 +16,7 @@ func TestContractReaderConfigRaw(t *testing.T) { raw, err := json.Marshal(cfg) require.NoError(t, err) - var result config.ContractReader + var result solana.ContractReader require.NoError(t, json.Unmarshal(raw, &result)) require.Equal(t, cfg, result) diff --git a/core/scripts/go.mod b/core/scripts/go.mod index 00011a11ac0..270811dc81d 100644 --- a/core/scripts/go.mod +++ b/core/scripts/go.mod @@ -188,7 +188,7 @@ require ( github.com/cometbft/cometbft-db v1.0.1 // indirect github.com/compose-spec/compose-go/v2 v2.6.0 // indirect github.com/confluentinc/confluent-kafka-go v1.9.2 // indirect - github.com/consensys/gnark-crypto v0.18.1 // indirect + github.com/consensys/gnark-crypto v0.19.2 // indirect github.com/containerd/console v1.0.4 // indirect github.com/containerd/containerd/api v1.8.0 // indirect github.com/containerd/containerd/v2 v2.0.4 // indirect @@ -509,7 +509,7 @@ require ( github.com/smartcontractkit/chainlink-protos/storage-service v0.3.0 // indirect github.com/smartcontractkit/chainlink-protos/svr v1.1.0 // indirect github.com/smartcontractkit/chainlink-protos/workflows/go v0.0.0-20251025021331-aa7746850cc4 // indirect - github.com/smartcontractkit/chainlink-solana v1.1.2-0.20251121223352-370eb61346d6 // indirect + github.com/smartcontractkit/chainlink-solana v1.1.2-0.20251229213155-e8d74ec011ee // indirect github.com/smartcontractkit/chainlink-sui v0.0.0-20251205161630-88314452254c // indirect github.com/smartcontractkit/chainlink-sui/deployment v0.0.0-20251205161630-88314452254c // indirect github.com/smartcontractkit/chainlink-testing-framework/framework/components/fake v0.10.0 // indirect diff --git a/core/scripts/go.sum b/core/scripts/go.sum index 4dbdfbbc7de..9024e6aa8b5 100644 --- a/core/scripts/go.sum +++ b/core/scripts/go.sum @@ -392,8 +392,8 @@ github.com/confluentinc/confluent-kafka-go v1.9.2 h1:gV/GxhMBUb03tFWkN+7kdhg+zf+ github.com/confluentinc/confluent-kafka-go v1.9.2/go.mod h1:ptXNqsuDfYbAE/LBW6pnwWZElUoWxHoV8E43DCrliyo= github.com/confluentinc/confluent-kafka-go/v2 v2.3.0 h1:icCHutJouWlQREayFwCc7lxDAhws08td+W3/gdqgZts= github.com/confluentinc/confluent-kafka-go/v2 v2.3.0/go.mod h1:/VTy8iEpe6mD9pkCH5BhijlUl8ulUXymKv1Qig5Rgb8= -github.com/consensys/gnark-crypto v0.18.1 h1:RyLV6UhPRoYYzaFnPQA4qK3DyuDgkTgskDdoGqFt3fI= -github.com/consensys/gnark-crypto v0.18.1/go.mod h1:L3mXGFTe1ZN+RSJ+CLjUt9x7PNdx8ubaYfDROyp2Z8c= +github.com/consensys/gnark-crypto v0.19.2 h1:qrEAIXq3T4egxqiliFFoNrepkIWVEeIYwt3UL0fvS80= +github.com/consensys/gnark-crypto v0.19.2/go.mod h1:rT23F0XSZqE0mUA0+pRtnL56IbPxs6gp4CeRsBk4XS0= github.com/containerd/cgroups v1.1.0 h1:v8rEWFl6EoqHB+swVNjVoCJE8o3jX7e8nqBGPLaDFBM= github.com/containerd/cgroups/v3 v3.0.5 h1:44na7Ud+VwyE7LIoJ8JTNQOa549a8543BmzaJHo6Bzo= github.com/containerd/cgroups/v3 v3.0.5/go.mod h1:SA5DLYnXO8pTGYiAHXz94qvLQTKfVM5GEVisn4jpins= @@ -1684,8 +1684,8 @@ github.com/smartcontractkit/chainlink-protos/svr v1.1.0 h1:79Z9N9dMbMVRGaLoDPAQ+ github.com/smartcontractkit/chainlink-protos/svr v1.1.0/go.mod h1:TcOliTQU6r59DwG4lo3U+mFM9WWyBHGuFkkxQpvSujo= github.com/smartcontractkit/chainlink-protos/workflows/go v0.0.0-20251025021331-aa7746850cc4 h1:ZISmdiYAU0qXt2kC8/qxdIs4zg2PLRriatNDw6fANpo= github.com/smartcontractkit/chainlink-protos/workflows/go v0.0.0-20251025021331-aa7746850cc4/go.mod h1:HIpGvF6nKCdtZ30xhdkKWGM9+4Z4CVqJH8ZBL1FTEiY= -github.com/smartcontractkit/chainlink-solana v1.1.2-0.20251121223352-370eb61346d6 h1:4cvFf82P3VcNHgqUG0aRBeIMZd+wSX37ha28Gkie9Lk= -github.com/smartcontractkit/chainlink-solana v1.1.2-0.20251121223352-370eb61346d6/go.mod h1:zX8dX6aXjJNkfbpr1AiTzCioma0sHh5CBPZKtqC7plY= +github.com/smartcontractkit/chainlink-solana v1.1.2-0.20251229213155-e8d74ec011ee h1:8cFHFoM4tDb8vRLR1hXYRpqW6CkwMLUKXwuxyZlhjvE= +github.com/smartcontractkit/chainlink-solana v1.1.2-0.20251229213155-e8d74ec011ee/go.mod h1:wjz8OI3ysKyLqp1X/zPwFBAfVPJinzl8SHMlTrLT5zU= github.com/smartcontractkit/chainlink-sui v0.0.0-20251205161630-88314452254c h1:aNA7J31EuOf755BDgNuhxte5+Z6wucBx/ONGihw2OqA= github.com/smartcontractkit/chainlink-sui v0.0.0-20251205161630-88314452254c/go.mod h1:zrtmeh3wHL+qXu/vaaR7lZ5TSh00I4JYbpOqqb9bXp0= github.com/smartcontractkit/chainlink-sui/deployment v0.0.0-20251205161630-88314452254c h1:uV+yJbVYI5RoTNFSh/tDflWDXJtRk8Yrp0m1VgTy6ro= diff --git a/deployment/go.mod b/deployment/go.mod index 0fe5ee536b6..0dfc9171077 100644 --- a/deployment/go.mod +++ b/deployment/go.mod @@ -50,7 +50,7 @@ require ( github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20251124151448-0448aefdaab9 github.com/smartcontractkit/chainlink-protos/job-distributor v0.17.0 github.com/smartcontractkit/chainlink-protos/orchestrator v0.10.0 - github.com/smartcontractkit/chainlink-solana v1.1.2-0.20251121223352-370eb61346d6 + github.com/smartcontractkit/chainlink-solana v1.1.2-0.20251229213155-e8d74ec011ee github.com/smartcontractkit/chainlink-sui v0.0.0-20251205161630-88314452254c github.com/smartcontractkit/chainlink-sui/deployment v0.0.0-20251205161630-88314452254c github.com/smartcontractkit/chainlink-testing-framework/framework v0.12.1 @@ -176,7 +176,7 @@ require ( github.com/coder/websocket v1.8.14 // indirect github.com/cometbft/cometbft v0.38.17 // indirect github.com/cometbft/cometbft-db v1.0.1 // indirect - github.com/consensys/gnark-crypto v0.18.1 // indirect + github.com/consensys/gnark-crypto v0.19.2 // indirect github.com/containerd/errdefs v1.0.0 // indirect github.com/containerd/errdefs/pkg v0.3.0 // indirect github.com/containerd/log v0.1.0 // indirect diff --git a/deployment/go.sum b/deployment/go.sum index 7118e0b3bac..77e5a297eff 100644 --- a/deployment/go.sum +++ b/deployment/go.sum @@ -338,8 +338,8 @@ github.com/cometbft/cometbft-db v1.0.1 h1:SylKuLseMLQKw3+i8y8KozZyJcQSL98qEe2CGM github.com/cometbft/cometbft-db v1.0.1/go.mod h1:EBrFs1GDRiTqrWXYi4v90Awf/gcdD5ExzdPbg4X8+mk= github.com/confluentinc/confluent-kafka-go/v2 v2.3.0 h1:icCHutJouWlQREayFwCc7lxDAhws08td+W3/gdqgZts= github.com/confluentinc/confluent-kafka-go/v2 v2.3.0/go.mod h1:/VTy8iEpe6mD9pkCH5BhijlUl8ulUXymKv1Qig5Rgb8= -github.com/consensys/gnark-crypto v0.18.1 h1:RyLV6UhPRoYYzaFnPQA4qK3DyuDgkTgskDdoGqFt3fI= -github.com/consensys/gnark-crypto v0.18.1/go.mod h1:L3mXGFTe1ZN+RSJ+CLjUt9x7PNdx8ubaYfDROyp2Z8c= +github.com/consensys/gnark-crypto v0.19.2 h1:qrEAIXq3T4egxqiliFFoNrepkIWVEeIYwt3UL0fvS80= +github.com/consensys/gnark-crypto v0.19.2/go.mod h1:rT23F0XSZqE0mUA0+pRtnL56IbPxs6gp4CeRsBk4XS0= github.com/containerd/errdefs v1.0.0 h1:tg5yIfIlQIrxYtu9ajqY42W3lpS19XqdxRQeEwYG8PI= github.com/containerd/errdefs v1.0.0/go.mod h1:+YBYIdtsnF4Iw6nWZhJcqGSg/dwvV7tyJ/kCkyJ2k+M= github.com/containerd/errdefs/pkg v0.3.0 h1:9IKJ06FvyNlexW690DXuQNx2KA2cUJXx151Xdx3ZPPE= @@ -1408,8 +1408,8 @@ github.com/smartcontractkit/chainlink-protos/svr v1.1.0 h1:79Z9N9dMbMVRGaLoDPAQ+ github.com/smartcontractkit/chainlink-protos/svr v1.1.0/go.mod h1:TcOliTQU6r59DwG4lo3U+mFM9WWyBHGuFkkxQpvSujo= github.com/smartcontractkit/chainlink-protos/workflows/go v0.0.0-20251025021331-aa7746850cc4 h1:ZISmdiYAU0qXt2kC8/qxdIs4zg2PLRriatNDw6fANpo= github.com/smartcontractkit/chainlink-protos/workflows/go v0.0.0-20251025021331-aa7746850cc4/go.mod h1:HIpGvF6nKCdtZ30xhdkKWGM9+4Z4CVqJH8ZBL1FTEiY= -github.com/smartcontractkit/chainlink-solana v1.1.2-0.20251121223352-370eb61346d6 h1:4cvFf82P3VcNHgqUG0aRBeIMZd+wSX37ha28Gkie9Lk= -github.com/smartcontractkit/chainlink-solana v1.1.2-0.20251121223352-370eb61346d6/go.mod h1:zX8dX6aXjJNkfbpr1AiTzCioma0sHh5CBPZKtqC7plY= +github.com/smartcontractkit/chainlink-solana v1.1.2-0.20251229213155-e8d74ec011ee h1:8cFHFoM4tDb8vRLR1hXYRpqW6CkwMLUKXwuxyZlhjvE= +github.com/smartcontractkit/chainlink-solana v1.1.2-0.20251229213155-e8d74ec011ee/go.mod h1:wjz8OI3ysKyLqp1X/zPwFBAfVPJinzl8SHMlTrLT5zU= github.com/smartcontractkit/chainlink-sui v0.0.0-20251205161630-88314452254c h1:aNA7J31EuOf755BDgNuhxte5+Z6wucBx/ONGihw2OqA= github.com/smartcontractkit/chainlink-sui v0.0.0-20251205161630-88314452254c/go.mod h1:zrtmeh3wHL+qXu/vaaR7lZ5TSh00I4JYbpOqqb9bXp0= github.com/smartcontractkit/chainlink-sui/deployment v0.0.0-20251205161630-88314452254c h1:uV+yJbVYI5RoTNFSh/tDflWDXJtRk8Yrp0m1VgTy6ro= diff --git a/go.mod b/go.mod index 90d5fe870c8..a41f9f0ae6f 100644 --- a/go.mod +++ b/go.mod @@ -100,7 +100,7 @@ require ( github.com/smartcontractkit/chainlink-protos/orchestrator v0.10.0 github.com/smartcontractkit/chainlink-protos/storage-service v0.3.0 github.com/smartcontractkit/chainlink-protos/workflows/go v0.0.0-20251025021331-aa7746850cc4 - github.com/smartcontractkit/chainlink-solana v1.1.2-0.20251121223352-370eb61346d6 + github.com/smartcontractkit/chainlink-solana v1.1.2-0.20251229213155-e8d74ec011ee github.com/smartcontractkit/chainlink-sui v0.0.0-20251205161630-88314452254c github.com/smartcontractkit/chainlink-ton v0.0.0-20251219221624-54a39a031e62 github.com/smartcontractkit/cre-sdk-go v0.7.1-0.20250919133015-2df149f34a81 @@ -206,7 +206,7 @@ require ( github.com/coder/websocket v1.8.14 // indirect github.com/cometbft/cometbft v0.38.17 // indirect github.com/cometbft/cometbft-db v1.0.1 // indirect - github.com/consensys/gnark-crypto v0.18.1 // indirect + github.com/consensys/gnark-crypto v0.19.2 // indirect github.com/containerd/continuity v0.4.5 // indirect github.com/cosmos/btcutil v1.0.5 // indirect github.com/cosmos/cosmos-db v1.1.1 // indirect diff --git a/go.sum b/go.sum index dac445dfba7..d76bbbfc343 100644 --- a/go.sum +++ b/go.sum @@ -249,8 +249,8 @@ github.com/cometbft/cometbft-db v1.0.1 h1:SylKuLseMLQKw3+i8y8KozZyJcQSL98qEe2CGM github.com/cometbft/cometbft-db v1.0.1/go.mod h1:EBrFs1GDRiTqrWXYi4v90Awf/gcdD5ExzdPbg4X8+mk= github.com/confluentinc/confluent-kafka-go/v2 v2.3.0 h1:icCHutJouWlQREayFwCc7lxDAhws08td+W3/gdqgZts= github.com/confluentinc/confluent-kafka-go/v2 v2.3.0/go.mod h1:/VTy8iEpe6mD9pkCH5BhijlUl8ulUXymKv1Qig5Rgb8= -github.com/consensys/gnark-crypto v0.18.1 h1:RyLV6UhPRoYYzaFnPQA4qK3DyuDgkTgskDdoGqFt3fI= -github.com/consensys/gnark-crypto v0.18.1/go.mod h1:L3mXGFTe1ZN+RSJ+CLjUt9x7PNdx8ubaYfDROyp2Z8c= +github.com/consensys/gnark-crypto v0.19.2 h1:qrEAIXq3T4egxqiliFFoNrepkIWVEeIYwt3UL0fvS80= +github.com/consensys/gnark-crypto v0.19.2/go.mod h1:rT23F0XSZqE0mUA0+pRtnL56IbPxs6gp4CeRsBk4XS0= github.com/containerd/continuity v0.4.5 h1:ZRoN1sXq9u7V6QoHMcVWGhOwDFqZ4B9i5H6un1Wh0x4= github.com/containerd/continuity v0.4.5/go.mod h1:/lNJvtJKUQStBzpVQ1+rasXO1LAWtUQssk28EZvJ3nE= github.com/containerd/errdefs v1.0.0 h1:tg5yIfIlQIrxYtu9ajqY42W3lpS19XqdxRQeEwYG8PI= @@ -1210,8 +1210,8 @@ github.com/smartcontractkit/chainlink-protos/svr v1.1.0 h1:79Z9N9dMbMVRGaLoDPAQ+ github.com/smartcontractkit/chainlink-protos/svr v1.1.0/go.mod h1:TcOliTQU6r59DwG4lo3U+mFM9WWyBHGuFkkxQpvSujo= github.com/smartcontractkit/chainlink-protos/workflows/go v0.0.0-20251025021331-aa7746850cc4 h1:ZISmdiYAU0qXt2kC8/qxdIs4zg2PLRriatNDw6fANpo= github.com/smartcontractkit/chainlink-protos/workflows/go v0.0.0-20251025021331-aa7746850cc4/go.mod h1:HIpGvF6nKCdtZ30xhdkKWGM9+4Z4CVqJH8ZBL1FTEiY= -github.com/smartcontractkit/chainlink-solana v1.1.2-0.20251121223352-370eb61346d6 h1:4cvFf82P3VcNHgqUG0aRBeIMZd+wSX37ha28Gkie9Lk= -github.com/smartcontractkit/chainlink-solana v1.1.2-0.20251121223352-370eb61346d6/go.mod h1:zX8dX6aXjJNkfbpr1AiTzCioma0sHh5CBPZKtqC7plY= +github.com/smartcontractkit/chainlink-solana v1.1.2-0.20251229213155-e8d74ec011ee h1:8cFHFoM4tDb8vRLR1hXYRpqW6CkwMLUKXwuxyZlhjvE= +github.com/smartcontractkit/chainlink-solana v1.1.2-0.20251229213155-e8d74ec011ee/go.mod h1:wjz8OI3ysKyLqp1X/zPwFBAfVPJinzl8SHMlTrLT5zU= github.com/smartcontractkit/chainlink-sui v0.0.0-20251205161630-88314452254c h1:aNA7J31EuOf755BDgNuhxte5+Z6wucBx/ONGihw2OqA= github.com/smartcontractkit/chainlink-sui v0.0.0-20251205161630-88314452254c/go.mod h1:zrtmeh3wHL+qXu/vaaR7lZ5TSh00I4JYbpOqqb9bXp0= github.com/smartcontractkit/chainlink-ton v0.0.0-20251219221624-54a39a031e62 h1:/gnBkA9Ph6+EaWoBuR7FE8UIKfegY7eP3+QhxvVTYxw= diff --git a/integration-tests/go.mod b/integration-tests/go.mod index 3dfdc00b37e..e4992593307 100644 --- a/integration-tests/go.mod +++ b/integration-tests/go.mod @@ -191,7 +191,7 @@ require ( github.com/coder/websocket v1.8.14 // indirect github.com/cometbft/cometbft v0.38.17 // indirect github.com/cometbft/cometbft-db v1.0.1 // indirect - github.com/consensys/gnark-crypto v0.18.1 // indirect + github.com/consensys/gnark-crypto v0.19.2 // indirect github.com/containerd/errdefs v1.0.0 // indirect github.com/containerd/errdefs/pkg v0.3.0 // indirect github.com/containerd/log v0.1.0 // indirect @@ -515,7 +515,7 @@ require ( github.com/smartcontractkit/chainlink-protos/storage-service v0.3.0 // indirect github.com/smartcontractkit/chainlink-protos/svr v1.1.0 // indirect github.com/smartcontractkit/chainlink-protos/workflows/go v0.0.0-20251025021331-aa7746850cc4 // indirect - github.com/smartcontractkit/chainlink-solana v1.1.2-0.20251121223352-370eb61346d6 // indirect + github.com/smartcontractkit/chainlink-solana v1.1.2-0.20251229213155-e8d74ec011ee // indirect github.com/smartcontractkit/chainlink-testing-framework/framework v0.12.1 // indirect github.com/smartcontractkit/chainlink-tron/relayer v0.0.11-0.20251014143056-a0c6328c91e9 // indirect github.com/smartcontractkit/freeport v0.1.3-0.20250716200817-cb5dfd0e369e // indirect diff --git a/integration-tests/go.sum b/integration-tests/go.sum index e56180b32c6..a1ae80cb382 100644 --- a/integration-tests/go.sum +++ b/integration-tests/go.sum @@ -403,8 +403,8 @@ github.com/cometbft/cometbft-db v1.0.1 h1:SylKuLseMLQKw3+i8y8KozZyJcQSL98qEe2CGM github.com/cometbft/cometbft-db v1.0.1/go.mod h1:EBrFs1GDRiTqrWXYi4v90Awf/gcdD5ExzdPbg4X8+mk= github.com/confluentinc/confluent-kafka-go/v2 v2.3.0 h1:icCHutJouWlQREayFwCc7lxDAhws08td+W3/gdqgZts= github.com/confluentinc/confluent-kafka-go/v2 v2.3.0/go.mod h1:/VTy8iEpe6mD9pkCH5BhijlUl8ulUXymKv1Qig5Rgb8= -github.com/consensys/gnark-crypto v0.18.1 h1:RyLV6UhPRoYYzaFnPQA4qK3DyuDgkTgskDdoGqFt3fI= -github.com/consensys/gnark-crypto v0.18.1/go.mod h1:L3mXGFTe1ZN+RSJ+CLjUt9x7PNdx8ubaYfDROyp2Z8c= +github.com/consensys/gnark-crypto v0.19.2 h1:qrEAIXq3T4egxqiliFFoNrepkIWVEeIYwt3UL0fvS80= +github.com/consensys/gnark-crypto v0.19.2/go.mod h1:rT23F0XSZqE0mUA0+pRtnL56IbPxs6gp4CeRsBk4XS0= github.com/containerd/continuity v0.4.5 h1:ZRoN1sXq9u7V6QoHMcVWGhOwDFqZ4B9i5H6un1Wh0x4= github.com/containerd/continuity v0.4.5/go.mod h1:/lNJvtJKUQStBzpVQ1+rasXO1LAWtUQssk28EZvJ3nE= github.com/containerd/errdefs v1.0.0 h1:tg5yIfIlQIrxYtu9ajqY42W3lpS19XqdxRQeEwYG8PI= @@ -1651,8 +1651,8 @@ github.com/smartcontractkit/chainlink-protos/svr v1.1.0 h1:79Z9N9dMbMVRGaLoDPAQ+ github.com/smartcontractkit/chainlink-protos/svr v1.1.0/go.mod h1:TcOliTQU6r59DwG4lo3U+mFM9WWyBHGuFkkxQpvSujo= github.com/smartcontractkit/chainlink-protos/workflows/go v0.0.0-20251025021331-aa7746850cc4 h1:ZISmdiYAU0qXt2kC8/qxdIs4zg2PLRriatNDw6fANpo= github.com/smartcontractkit/chainlink-protos/workflows/go v0.0.0-20251025021331-aa7746850cc4/go.mod h1:HIpGvF6nKCdtZ30xhdkKWGM9+4Z4CVqJH8ZBL1FTEiY= -github.com/smartcontractkit/chainlink-solana v1.1.2-0.20251121223352-370eb61346d6 h1:4cvFf82P3VcNHgqUG0aRBeIMZd+wSX37ha28Gkie9Lk= -github.com/smartcontractkit/chainlink-solana v1.1.2-0.20251121223352-370eb61346d6/go.mod h1:zX8dX6aXjJNkfbpr1AiTzCioma0sHh5CBPZKtqC7plY= +github.com/smartcontractkit/chainlink-solana v1.1.2-0.20251229213155-e8d74ec011ee h1:8cFHFoM4tDb8vRLR1hXYRpqW6CkwMLUKXwuxyZlhjvE= +github.com/smartcontractkit/chainlink-solana v1.1.2-0.20251229213155-e8d74ec011ee/go.mod h1:wjz8OI3ysKyLqp1X/zPwFBAfVPJinzl8SHMlTrLT5zU= github.com/smartcontractkit/chainlink-sui v0.0.0-20251205161630-88314452254c h1:aNA7J31EuOf755BDgNuhxte5+Z6wucBx/ONGihw2OqA= github.com/smartcontractkit/chainlink-sui v0.0.0-20251205161630-88314452254c/go.mod h1:zrtmeh3wHL+qXu/vaaR7lZ5TSh00I4JYbpOqqb9bXp0= github.com/smartcontractkit/chainlink-sui/deployment v0.0.0-20251205161630-88314452254c h1:uV+yJbVYI5RoTNFSh/tDflWDXJtRk8Yrp0m1VgTy6ro= diff --git a/integration-tests/load/go.mod b/integration-tests/load/go.mod index 9327ff5fe3d..5068a78432a 100644 --- a/integration-tests/load/go.mod +++ b/integration-tests/load/go.mod @@ -161,7 +161,7 @@ require ( github.com/coder/websocket v1.8.14 // indirect github.com/cometbft/cometbft v0.38.17 // indirect github.com/cometbft/cometbft-db v1.0.1 // indirect - github.com/consensys/gnark-crypto v0.18.1 // indirect + github.com/consensys/gnark-crypto v0.19.2 // indirect github.com/containerd/errdefs v1.0.0 // indirect github.com/containerd/errdefs/pkg v0.3.0 // indirect github.com/containerd/log v0.1.0 // indirect @@ -501,7 +501,7 @@ require ( github.com/smartcontractkit/chainlink-protos/storage-service v0.3.0 // indirect github.com/smartcontractkit/chainlink-protos/svr v1.1.0 // indirect github.com/smartcontractkit/chainlink-protos/workflows/go v0.0.0-20251025021331-aa7746850cc4 // indirect - github.com/smartcontractkit/chainlink-solana v1.1.2-0.20251121223352-370eb61346d6 // indirect + github.com/smartcontractkit/chainlink-solana v1.1.2-0.20251229213155-e8d74ec011ee // indirect github.com/smartcontractkit/chainlink-sui v0.0.0-20251205161630-88314452254c // indirect github.com/smartcontractkit/chainlink-sui/deployment v0.0.0-20251205161630-88314452254c // indirect github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.51.0 // indirect diff --git a/integration-tests/load/go.sum b/integration-tests/load/go.sum index f41be6e8973..4b54454fe9b 100644 --- a/integration-tests/load/go.sum +++ b/integration-tests/load/go.sum @@ -381,8 +381,8 @@ github.com/cometbft/cometbft-db v1.0.1 h1:SylKuLseMLQKw3+i8y8KozZyJcQSL98qEe2CGM github.com/cometbft/cometbft-db v1.0.1/go.mod h1:EBrFs1GDRiTqrWXYi4v90Awf/gcdD5ExzdPbg4X8+mk= github.com/confluentinc/confluent-kafka-go/v2 v2.3.0 h1:icCHutJouWlQREayFwCc7lxDAhws08td+W3/gdqgZts= github.com/confluentinc/confluent-kafka-go/v2 v2.3.0/go.mod h1:/VTy8iEpe6mD9pkCH5BhijlUl8ulUXymKv1Qig5Rgb8= -github.com/consensys/gnark-crypto v0.18.1 h1:RyLV6UhPRoYYzaFnPQA4qK3DyuDgkTgskDdoGqFt3fI= -github.com/consensys/gnark-crypto v0.18.1/go.mod h1:L3mXGFTe1ZN+RSJ+CLjUt9x7PNdx8ubaYfDROyp2Z8c= +github.com/consensys/gnark-crypto v0.19.2 h1:qrEAIXq3T4egxqiliFFoNrepkIWVEeIYwt3UL0fvS80= +github.com/consensys/gnark-crypto v0.19.2/go.mod h1:rT23F0XSZqE0mUA0+pRtnL56IbPxs6gp4CeRsBk4XS0= github.com/containerd/continuity v0.4.5 h1:ZRoN1sXq9u7V6QoHMcVWGhOwDFqZ4B9i5H6un1Wh0x4= github.com/containerd/continuity v0.4.5/go.mod h1:/lNJvtJKUQStBzpVQ1+rasXO1LAWtUQssk28EZvJ3nE= github.com/containerd/errdefs v1.0.0 h1:tg5yIfIlQIrxYtu9ajqY42W3lpS19XqdxRQeEwYG8PI= @@ -1630,8 +1630,8 @@ github.com/smartcontractkit/chainlink-protos/svr v1.1.0 h1:79Z9N9dMbMVRGaLoDPAQ+ github.com/smartcontractkit/chainlink-protos/svr v1.1.0/go.mod h1:TcOliTQU6r59DwG4lo3U+mFM9WWyBHGuFkkxQpvSujo= github.com/smartcontractkit/chainlink-protos/workflows/go v0.0.0-20251025021331-aa7746850cc4 h1:ZISmdiYAU0qXt2kC8/qxdIs4zg2PLRriatNDw6fANpo= github.com/smartcontractkit/chainlink-protos/workflows/go v0.0.0-20251025021331-aa7746850cc4/go.mod h1:HIpGvF6nKCdtZ30xhdkKWGM9+4Z4CVqJH8ZBL1FTEiY= -github.com/smartcontractkit/chainlink-solana v1.1.2-0.20251121223352-370eb61346d6 h1:4cvFf82P3VcNHgqUG0aRBeIMZd+wSX37ha28Gkie9Lk= -github.com/smartcontractkit/chainlink-solana v1.1.2-0.20251121223352-370eb61346d6/go.mod h1:zX8dX6aXjJNkfbpr1AiTzCioma0sHh5CBPZKtqC7plY= +github.com/smartcontractkit/chainlink-solana v1.1.2-0.20251229213155-e8d74ec011ee h1:8cFHFoM4tDb8vRLR1hXYRpqW6CkwMLUKXwuxyZlhjvE= +github.com/smartcontractkit/chainlink-solana v1.1.2-0.20251229213155-e8d74ec011ee/go.mod h1:wjz8OI3ysKyLqp1X/zPwFBAfVPJinzl8SHMlTrLT5zU= github.com/smartcontractkit/chainlink-sui v0.0.0-20251205161630-88314452254c h1:aNA7J31EuOf755BDgNuhxte5+Z6wucBx/ONGihw2OqA= github.com/smartcontractkit/chainlink-sui v0.0.0-20251205161630-88314452254c/go.mod h1:zrtmeh3wHL+qXu/vaaR7lZ5TSh00I4JYbpOqqb9bXp0= github.com/smartcontractkit/chainlink-sui/deployment v0.0.0-20251205161630-88314452254c h1:uV+yJbVYI5RoTNFSh/tDflWDXJtRk8Yrp0m1VgTy6ro= diff --git a/plugins/plugins.public.yaml b/plugins/plugins.public.yaml index e3bc8112990..d8357168a19 100644 --- a/plugins/plugins.public.yaml +++ b/plugins/plugins.public.yaml @@ -35,7 +35,7 @@ plugins: solana: - moduleURI: "github.com/smartcontractkit/chainlink-solana" - gitRef: "v1.1.2-0.20251121223352-370eb61346d6" + gitRef: "v1.1.2-0.20251229213155-e8d74ec011ee" installPath: "./pkg/solana/cmd/chainlink-solana" starknet: diff --git a/system-tests/lib/go.mod b/system-tests/lib/go.mod index b0bc99245c5..891c900d9f5 100644 --- a/system-tests/lib/go.mod +++ b/system-tests/lib/go.mod @@ -39,7 +39,7 @@ require ( github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20251211123524-f0c4fe7cfc0a github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20251124151448-0448aefdaab9 github.com/smartcontractkit/chainlink-protos/job-distributor v0.17.0 - github.com/smartcontractkit/chainlink-solana v1.1.2-0.20251121223352-370eb61346d6 + github.com/smartcontractkit/chainlink-solana v1.1.2-0.20251229213155-e8d74ec011ee github.com/smartcontractkit/chainlink-testing-framework/framework v0.12.1 github.com/smartcontractkit/chainlink-testing-framework/framework/components/dockercompose v0.1.15 github.com/smartcontractkit/chainlink-testing-framework/framework/components/fake v0.10.0 @@ -166,7 +166,7 @@ require ( github.com/cometbft/cometbft-db v1.0.1 // indirect github.com/compose-spec/compose-go/v2 v2.6.0 // indirect github.com/confluentinc/confluent-kafka-go v1.9.2 // indirect - github.com/consensys/gnark-crypto v0.18.1 // indirect + github.com/consensys/gnark-crypto v0.19.2 // indirect github.com/containerd/console v1.0.4 // indirect github.com/containerd/containerd/api v1.8.0 // indirect github.com/containerd/containerd/v2 v2.0.4 // indirect diff --git a/system-tests/lib/go.sum b/system-tests/lib/go.sum index 0fed8375b2c..1c8620a1082 100644 --- a/system-tests/lib/go.sum +++ b/system-tests/lib/go.sum @@ -385,8 +385,8 @@ github.com/confluentinc/confluent-kafka-go v1.9.2 h1:gV/GxhMBUb03tFWkN+7kdhg+zf+ github.com/confluentinc/confluent-kafka-go v1.9.2/go.mod h1:ptXNqsuDfYbAE/LBW6pnwWZElUoWxHoV8E43DCrliyo= github.com/confluentinc/confluent-kafka-go/v2 v2.3.0 h1:icCHutJouWlQREayFwCc7lxDAhws08td+W3/gdqgZts= github.com/confluentinc/confluent-kafka-go/v2 v2.3.0/go.mod h1:/VTy8iEpe6mD9pkCH5BhijlUl8ulUXymKv1Qig5Rgb8= -github.com/consensys/gnark-crypto v0.18.1 h1:RyLV6UhPRoYYzaFnPQA4qK3DyuDgkTgskDdoGqFt3fI= -github.com/consensys/gnark-crypto v0.18.1/go.mod h1:L3mXGFTe1ZN+RSJ+CLjUt9x7PNdx8ubaYfDROyp2Z8c= +github.com/consensys/gnark-crypto v0.19.2 h1:qrEAIXq3T4egxqiliFFoNrepkIWVEeIYwt3UL0fvS80= +github.com/consensys/gnark-crypto v0.19.2/go.mod h1:rT23F0XSZqE0mUA0+pRtnL56IbPxs6gp4CeRsBk4XS0= github.com/containerd/cgroups v1.1.0 h1:v8rEWFl6EoqHB+swVNjVoCJE8o3jX7e8nqBGPLaDFBM= github.com/containerd/cgroups/v3 v3.0.5 h1:44na7Ud+VwyE7LIoJ8JTNQOa549a8543BmzaJHo6Bzo= github.com/containerd/cgroups/v3 v3.0.5/go.mod h1:SA5DLYnXO8pTGYiAHXz94qvLQTKfVM5GEVisn4jpins= @@ -1652,8 +1652,8 @@ github.com/smartcontractkit/chainlink-protos/svr v1.1.0 h1:79Z9N9dMbMVRGaLoDPAQ+ github.com/smartcontractkit/chainlink-protos/svr v1.1.0/go.mod h1:TcOliTQU6r59DwG4lo3U+mFM9WWyBHGuFkkxQpvSujo= github.com/smartcontractkit/chainlink-protos/workflows/go v0.0.0-20251025021331-aa7746850cc4 h1:ZISmdiYAU0qXt2kC8/qxdIs4zg2PLRriatNDw6fANpo= github.com/smartcontractkit/chainlink-protos/workflows/go v0.0.0-20251025021331-aa7746850cc4/go.mod h1:HIpGvF6nKCdtZ30xhdkKWGM9+4Z4CVqJH8ZBL1FTEiY= -github.com/smartcontractkit/chainlink-solana v1.1.2-0.20251121223352-370eb61346d6 h1:4cvFf82P3VcNHgqUG0aRBeIMZd+wSX37ha28Gkie9Lk= -github.com/smartcontractkit/chainlink-solana v1.1.2-0.20251121223352-370eb61346d6/go.mod h1:zX8dX6aXjJNkfbpr1AiTzCioma0sHh5CBPZKtqC7plY= +github.com/smartcontractkit/chainlink-solana v1.1.2-0.20251229213155-e8d74ec011ee h1:8cFHFoM4tDb8vRLR1hXYRpqW6CkwMLUKXwuxyZlhjvE= +github.com/smartcontractkit/chainlink-solana v1.1.2-0.20251229213155-e8d74ec011ee/go.mod h1:wjz8OI3ysKyLqp1X/zPwFBAfVPJinzl8SHMlTrLT5zU= github.com/smartcontractkit/chainlink-sui v0.0.0-20251205161630-88314452254c h1:aNA7J31EuOf755BDgNuhxte5+Z6wucBx/ONGihw2OqA= github.com/smartcontractkit/chainlink-sui v0.0.0-20251205161630-88314452254c/go.mod h1:zrtmeh3wHL+qXu/vaaR7lZ5TSh00I4JYbpOqqb9bXp0= github.com/smartcontractkit/chainlink-sui/deployment v0.0.0-20251205161630-88314452254c h1:uV+yJbVYI5RoTNFSh/tDflWDXJtRk8Yrp0m1VgTy6ro= diff --git a/system-tests/tests/go.mod b/system-tests/tests/go.mod index 4a33b239aab..3ccaafa0b61 100644 --- a/system-tests/tests/go.mod +++ b/system-tests/tests/go.mod @@ -53,7 +53,7 @@ require ( github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20251124151448-0448aefdaab9 github.com/smartcontractkit/chainlink-protos/job-distributor v0.17.0 github.com/smartcontractkit/chainlink-protos/workflows/go v0.0.0-20251025021331-aa7746850cc4 - github.com/smartcontractkit/chainlink-solana v1.1.2-0.20251121223352-370eb61346d6 + github.com/smartcontractkit/chainlink-solana v1.1.2-0.20251229213155-e8d74ec011ee github.com/smartcontractkit/chainlink-testing-framework/framework v0.12.1 github.com/smartcontractkit/chainlink-testing-framework/framework/components/fake v0.10.0 github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.7 @@ -207,7 +207,7 @@ require ( github.com/cometbft/cometbft v0.38.17 // indirect github.com/cometbft/cometbft-db v1.0.1 // indirect github.com/compose-spec/compose-go/v2 v2.6.0 // indirect - github.com/consensys/gnark-crypto v0.18.1 // indirect + github.com/consensys/gnark-crypto v0.19.2 // indirect github.com/containerd/console v1.0.4 // indirect github.com/containerd/containerd/api v1.8.0 // indirect github.com/containerd/containerd/v2 v2.0.5 // indirect diff --git a/system-tests/tests/go.sum b/system-tests/tests/go.sum index 3bf59cac32c..a41bebcb023 100644 --- a/system-tests/tests/go.sum +++ b/system-tests/tests/go.sum @@ -429,8 +429,8 @@ github.com/confluentinc/confluent-kafka-go v1.9.2 h1:gV/GxhMBUb03tFWkN+7kdhg+zf+ github.com/confluentinc/confluent-kafka-go v1.9.2/go.mod h1:ptXNqsuDfYbAE/LBW6pnwWZElUoWxHoV8E43DCrliyo= github.com/confluentinc/confluent-kafka-go/v2 v2.3.0 h1:icCHutJouWlQREayFwCc7lxDAhws08td+W3/gdqgZts= github.com/confluentinc/confluent-kafka-go/v2 v2.3.0/go.mod h1:/VTy8iEpe6mD9pkCH5BhijlUl8ulUXymKv1Qig5Rgb8= -github.com/consensys/gnark-crypto v0.18.1 h1:RyLV6UhPRoYYzaFnPQA4qK3DyuDgkTgskDdoGqFt3fI= -github.com/consensys/gnark-crypto v0.18.1/go.mod h1:L3mXGFTe1ZN+RSJ+CLjUt9x7PNdx8ubaYfDROyp2Z8c= +github.com/consensys/gnark-crypto v0.19.2 h1:qrEAIXq3T4egxqiliFFoNrepkIWVEeIYwt3UL0fvS80= +github.com/consensys/gnark-crypto v0.19.2/go.mod h1:rT23F0XSZqE0mUA0+pRtnL56IbPxs6gp4CeRsBk4XS0= github.com/containerd/cgroups v1.1.0 h1:v8rEWFl6EoqHB+swVNjVoCJE8o3jX7e8nqBGPLaDFBM= github.com/containerd/cgroups/v3 v3.0.5 h1:44na7Ud+VwyE7LIoJ8JTNQOa549a8543BmzaJHo6Bzo= github.com/containerd/cgroups/v3 v3.0.5/go.mod h1:SA5DLYnXO8pTGYiAHXz94qvLQTKfVM5GEVisn4jpins= @@ -1849,8 +1849,8 @@ github.com/smartcontractkit/chainlink-protos/svr v1.1.0 h1:79Z9N9dMbMVRGaLoDPAQ+ github.com/smartcontractkit/chainlink-protos/svr v1.1.0/go.mod h1:TcOliTQU6r59DwG4lo3U+mFM9WWyBHGuFkkxQpvSujo= github.com/smartcontractkit/chainlink-protos/workflows/go v0.0.0-20251025021331-aa7746850cc4 h1:ZISmdiYAU0qXt2kC8/qxdIs4zg2PLRriatNDw6fANpo= github.com/smartcontractkit/chainlink-protos/workflows/go v0.0.0-20251025021331-aa7746850cc4/go.mod h1:HIpGvF6nKCdtZ30xhdkKWGM9+4Z4CVqJH8ZBL1FTEiY= -github.com/smartcontractkit/chainlink-solana v1.1.2-0.20251121223352-370eb61346d6 h1:4cvFf82P3VcNHgqUG0aRBeIMZd+wSX37ha28Gkie9Lk= -github.com/smartcontractkit/chainlink-solana v1.1.2-0.20251121223352-370eb61346d6/go.mod h1:zX8dX6aXjJNkfbpr1AiTzCioma0sHh5CBPZKtqC7plY= +github.com/smartcontractkit/chainlink-solana v1.1.2-0.20251229213155-e8d74ec011ee h1:8cFHFoM4tDb8vRLR1hXYRpqW6CkwMLUKXwuxyZlhjvE= +github.com/smartcontractkit/chainlink-solana v1.1.2-0.20251229213155-e8d74ec011ee/go.mod h1:wjz8OI3ysKyLqp1X/zPwFBAfVPJinzl8SHMlTrLT5zU= github.com/smartcontractkit/chainlink-sui v0.0.0-20251205161630-88314452254c h1:aNA7J31EuOf755BDgNuhxte5+Z6wucBx/ONGihw2OqA= github.com/smartcontractkit/chainlink-sui v0.0.0-20251205161630-88314452254c/go.mod h1:zrtmeh3wHL+qXu/vaaR7lZ5TSh00I4JYbpOqqb9bXp0= github.com/smartcontractkit/chainlink-sui/deployment v0.0.0-20251205161630-88314452254c h1:uV+yJbVYI5RoTNFSh/tDflWDXJtRk8Yrp0m1VgTy6ro=