diff --git a/core/config/docs/chains-solana.toml b/core/config/docs/chains-solana.toml index 1b413fb3aab..4fb46338449 100644 --- a/core/config/docs/chains-solana.toml +++ b/core/config/docs/chains-solana.toml @@ -64,14 +64,8 @@ LogPollerCPIEventsEnabled = true # Default LogPollerSlotsBatchSize = 100 # Default [Solana.Workflow] -# AcceptanceTimeout is the default timeout for a tranmission to be accepted on chain +# AcceptanceTimeout is the default timeout for a transmission to be accepted on chain AcceptanceTimeout = '45s' # Default -# ForwarderAddress is the keystone forwarder program address on chain. -ForwarderAddress = '14grJpemFaf88c8tiVb77W7TYg2W3ir6pfkKz3YjhhZ5' # Example -# ForwarderState is the keystone forwarder program state account on chain. -ForwarderState = '14grJpemFaf88c8tiVb77W7TYg2W3ir6pfkKz3YjhhZ5' # Example -# FromAddress is Address of the transmitter key to use for workflow writes. -FromAddress = '4BJXYkfvg37zEmBbsacZjeQDpTNx91KppxFJxRqrz48e' # Example # GasLimitDefault is the default gas limit for workflow transactions. GasLimitDefault = 300_000 # Default # Local defines if relayer runs against local devnet diff --git a/core/scripts/cre/environment/configs/capability_defaults.toml b/core/scripts/cre/environment/configs/capability_defaults.toml index f04783f936c..593ec3880c3 100644 --- a/core/scripts/cre/environment/configs/capability_defaults.toml +++ b/core/scripts/cre/environment/configs/capability_defaults.toml @@ -122,9 +122,6 @@ TxAcceptanceState = 2 PollPeriod = "2s" AcceptanceTimeout = "30s" - # Runtime values below are typically filled at runtime, but may be overridden - # FromAddress = "0x0000000000000000000000000000000000000000" - # ForwarderAddress = "0x0000000000000000000000000000000000000000" [capability_configs.write-solana.values] # Solana Workflow configuration for write capabilities @@ -134,9 +131,6 @@ PollPeriod = "2s" SkipPreflight = true Local = true - # Runtime values below are typically filled at runtime, but may be overridden - # FromAddress = "0x0000000000000000000000000000000000000000" - # ForwarderAddress = "0x0000000000000000000000000000000000000000" # Aptos chain capability plugin (View + WriteReport). Runtime values are injected per chain. [capability_configs.aptos] diff --git a/core/scripts/go.mod b/core/scripts/go.mod index 024dcdd64dc..2d23d163074 100644 --- a/core/scripts/go.mod +++ b/core/scripts/go.mod @@ -514,7 +514,7 @@ require ( github.com/smartcontractkit/chainlink-protos/storage-service v0.3.0 // indirect github.com/smartcontractkit/chainlink-protos/svr v1.1.1-0.20260203131522-bb8bc5c423b3 // indirect github.com/smartcontractkit/chainlink-protos/workflows/go v0.0.0-20260323124644-faea187e6997 // indirect - github.com/smartcontractkit/chainlink-solana v1.1.2-0.20260421131224-c46cbfe7bc6c // indirect + github.com/smartcontractkit/chainlink-solana v1.1.2-0.20260427183309-13341c01b05d // indirect github.com/smartcontractkit/chainlink-solana/contracts v0.0.0-20260421131224-c46cbfe7bc6c // indirect github.com/smartcontractkit/chainlink-sui v0.0.0-20260420191233-429504ae18dc // indirect github.com/smartcontractkit/chainlink-sui/deployment v0.0.0-20260409184948-5b16fae57fe0 // indirect diff --git a/core/scripts/go.sum b/core/scripts/go.sum index 0359a597ff4..13f68da7a40 100644 --- a/core/scripts/go.sum +++ b/core/scripts/go.sum @@ -1712,8 +1712,8 @@ github.com/smartcontractkit/chainlink-protos/svr v1.1.1-0.20260203131522-bb8bc5c github.com/smartcontractkit/chainlink-protos/svr v1.1.1-0.20260203131522-bb8bc5c423b3/go.mod h1:TcOliTQU6r59DwG4lo3U+mFM9WWyBHGuFkkxQpvSujo= github.com/smartcontractkit/chainlink-protos/workflows/go v0.0.0-20260323124644-faea187e6997 h1:W0HKHO8eE8BckTRnhSdqjHKbJcnk068nEWYnWRu6tJY= github.com/smartcontractkit/chainlink-protos/workflows/go v0.0.0-20260323124644-faea187e6997/go.mod h1:GTpDgyK0OObf7jpch6p8N281KxN92wbB8serZhU9yRc= -github.com/smartcontractkit/chainlink-solana v1.1.2-0.20260421131224-c46cbfe7bc6c h1:2ZdBZCZWKUMOWLtReaBBHkmDtXc0WtwcqIROHAcm3j4= -github.com/smartcontractkit/chainlink-solana v1.1.2-0.20260421131224-c46cbfe7bc6c/go.mod h1:sUsEwLtVPBlz0wPcysaolS+HVj9cOAt4jYhwE6J8dXg= +github.com/smartcontractkit/chainlink-solana v1.1.2-0.20260427183309-13341c01b05d h1:kYgreJn/CJgjyN8tM1K+AVO1AbYzY6zILEjV5NMlyEw= +github.com/smartcontractkit/chainlink-solana v1.1.2-0.20260427183309-13341c01b05d/go.mod h1:sUsEwLtVPBlz0wPcysaolS+HVj9cOAt4jYhwE6J8dXg= github.com/smartcontractkit/chainlink-solana/contracts v0.0.0-20260421131224-c46cbfe7bc6c h1:Hn/80PyYFrQhRlNSaq9HY4cjc/7AuP9zyWLle22t34A= github.com/smartcontractkit/chainlink-solana/contracts v0.0.0-20260421131224-c46cbfe7bc6c/go.mod h1:C5pZsbYX3qkhZTYWr1aYJi9QMfonFAun+Jl1npQ7UJA= github.com/smartcontractkit/chainlink-sui v0.0.0-20260420191233-429504ae18dc h1:BfUgvQ9PzvCPfFyNOrFMN7F7ljpPA7p+RbGZPB2+kLw= diff --git a/core/services/chainlink/config_test.go b/core/services/chainlink/config_test.go index 87ef592f7c2..6e049017477 100644 --- a/core/services/chainlink/config_test.go +++ b/core/services/chainlink/config_test.go @@ -9,7 +9,6 @@ import ( "testing" "time" - "github.com/gagliardetto/solana-go" "github.com/kylelemons/godebug/diff" "github.com/shopspring/decimal" "github.com/stretchr/testify/assert" @@ -938,9 +937,6 @@ func TestConfig_Marshal(t *testing.T) { }, Workflow: solcfg.WorkflowConfig{ AcceptanceTimeout: commoncfg.MustNewDuration(time.Second * 45), - FromAddress: ptr(solana.MustPublicKeyFromBase58("4BJXYkfvg37zEmBbsacZjeQDpTNx91KppxFJxRqrz48e")), - ForwarderAddress: ptr(solana.MustPublicKeyFromBase58("14grJpemFaf88c8tiVb77W7TYg2W3ir6pfkKz3YjhhZ5")), - ForwarderState: ptr(solana.MustPublicKeyFromBase58("14grJpemFaf88c8tiVb77W7TYg2W3ir6pfkKz3YjhhZ5")), TxAcceptanceState: ptr(commontypes.Finalized), PollPeriod: commoncfg.MustNewDuration(time.Second * 3), Local: ptr(true), @@ -1435,9 +1431,6 @@ LogPollerSlotsBatchSize = 100 [Solana.Workflow] AcceptanceTimeout = '45s' -ForwarderAddress = '14grJpemFaf88c8tiVb77W7TYg2W3ir6pfkKz3YjhhZ5' -ForwarderState = '14grJpemFaf88c8tiVb77W7TYg2W3ir6pfkKz3YjhhZ5' -FromAddress = '4BJXYkfvg37zEmBbsacZjeQDpTNx91KppxFJxRqrz48e' GasLimitDefault = 0 Local = true PollPeriod = '3s' diff --git a/core/services/chainlink/relayer_factory.go b/core/services/chainlink/relayer_factory.go index bd781717854..2b391e52556 100644 --- a/core/services/chainlink/relayer_factory.go +++ b/core/services/chainlink/relayer_factory.go @@ -199,7 +199,7 @@ func (r *RelayerFactory) NewSolana(ks, ksCSA coretypes.Keystore, config SolanaFa if err != nil { return nil, err } - solanaRelayers[relayID] = relay.NewServerAdapter(solana.NewRelayer(lggr, chain, r.CapabilitiesRegistry)) + solanaRelayers[relayID] = relay.NewServerAdapter(solana.NewRelayer(lggr, chain, r.CapabilitiesRegistry, ks)) } } return solanaRelayers, nil diff --git a/core/services/chainlink/testdata/config-full.toml b/core/services/chainlink/testdata/config-full.toml index a784f98a591..6f9aff63d4a 100644 --- a/core/services/chainlink/testdata/config-full.toml +++ b/core/services/chainlink/testdata/config-full.toml @@ -650,9 +650,6 @@ LogPollerSlotsBatchSize = 100 [Solana.Workflow] AcceptanceTimeout = '45s' -ForwarderAddress = '14grJpemFaf88c8tiVb77W7TYg2W3ir6pfkKz3YjhhZ5' -ForwarderState = '14grJpemFaf88c8tiVb77W7TYg2W3ir6pfkKz3YjhhZ5' -FromAddress = '4BJXYkfvg37zEmBbsacZjeQDpTNx91KppxFJxRqrz48e' GasLimitDefault = 0 Local = true PollPeriod = '3s' diff --git a/core/services/chainlink/testdata/config-multi-chain-effective.toml b/core/services/chainlink/testdata/config-multi-chain-effective.toml index ee3c20150eb..34be5c4aeb5 100644 --- a/core/services/chainlink/testdata/config-multi-chain-effective.toml +++ b/core/services/chainlink/testdata/config-multi-chain-effective.toml @@ -801,9 +801,6 @@ LogPollerSlotsBatchSize = 1000 [Solana.Workflow] AcceptanceTimeout = '45s' -ForwarderAddress = '11111111111111111111111111111111' -ForwarderState = '11111111111111111111111111111111' -FromAddress = '11111111111111111111111111111111' GasLimitDefault = 300000 Local = false PollPeriod = '3s' @@ -866,9 +863,6 @@ LogPollerSlotsBatchSize = 1000 [Solana.Workflow] AcceptanceTimeout = '45s' -ForwarderAddress = '11111111111111111111111111111111' -ForwarderState = '11111111111111111111111111111111' -FromAddress = '11111111111111111111111111111111' GasLimitDefault = 300000 Local = false PollPeriod = '3s' diff --git a/core/web/chains_controller_test.go b/core/web/chains_controller_test.go index 04399e70f73..2b8c1c12974 100644 --- a/core/web/chains_controller_test.go +++ b/core/web/chains_controller_test.go @@ -280,9 +280,6 @@ Nodes = [] [Workflow] AcceptanceTimeout = '45s' -ForwarderAddress = '11111111111111111111111111111111' -ForwarderState = '11111111111111111111111111111111' -FromAddress = '11111111111111111111111111111111' GasLimitDefault = 300000 Local = false PollPeriod = '3s' diff --git a/core/web/resolver/testdata/config-full.toml b/core/web/resolver/testdata/config-full.toml index 5543f86326f..c8e7d1f69d3 100644 --- a/core/web/resolver/testdata/config-full.toml +++ b/core/web/resolver/testdata/config-full.toml @@ -625,9 +625,6 @@ LogPollerSlotsBatchSize = 100 [Solana.Workflow] AcceptanceTimeout = '45s' -ForwarderAddress = '14grJpemFaf88c8tiVb77W7TYg2W3ir6pfkKz3YjhhZ5' -ForwarderState = '14grJpemFaf88c8tiVb77W7TYg2W3ir6pfkKz3YjhhZ5' -FromAddress = '4BJXYkfvg37zEmBbsacZjeQDpTNx91KppxFJxRqrz48e' GasLimitDefault = 0 Local = true PollPeriod = '3s' diff --git a/core/web/resolver/testdata/config-multi-chain-effective.toml b/core/web/resolver/testdata/config-multi-chain-effective.toml index 6d4542a1092..328392a7ea5 100644 --- a/core/web/resolver/testdata/config-multi-chain-effective.toml +++ b/core/web/resolver/testdata/config-multi-chain-effective.toml @@ -801,9 +801,6 @@ LogPollerSlotsBatchSize = 1000 [Solana.Workflow] AcceptanceTimeout = '45s' -ForwarderAddress = '11111111111111111111111111111111' -ForwarderState = '11111111111111111111111111111111' -FromAddress = '11111111111111111111111111111111' GasLimitDefault = 300000 Local = false PollPeriod = '3s' @@ -865,9 +862,6 @@ LogPollerSlotsBatchSize = 2000 [Solana.Workflow] AcceptanceTimeout = '45s' -ForwarderAddress = '11111111111111111111111111111111' -ForwarderState = '11111111111111111111111111111111' -FromAddress = '11111111111111111111111111111111' GasLimitDefault = 300000 Local = false PollPeriod = '3s' diff --git a/deployment/go.mod b/deployment/go.mod index afe257dad5c..ea2e77d7c31 100644 --- a/deployment/go.mod +++ b/deployment/go.mod @@ -52,7 +52,7 @@ require ( github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20260420204255-a3f3bdd56877 github.com/smartcontractkit/chainlink-protos/job-distributor v0.18.0 github.com/smartcontractkit/chainlink-protos/orchestrator v0.10.0 - github.com/smartcontractkit/chainlink-solana v1.1.2-0.20260421131224-c46cbfe7bc6c + github.com/smartcontractkit/chainlink-solana v1.1.2-0.20260427183309-13341c01b05d github.com/smartcontractkit/chainlink-solana/contracts v0.0.0-20260421131224-c46cbfe7bc6c github.com/smartcontractkit/chainlink-sui v0.0.0-20260420191233-429504ae18dc github.com/smartcontractkit/chainlink-sui/deployment v0.0.0-20260409184948-5b16fae57fe0 diff --git a/deployment/go.sum b/deployment/go.sum index de265950030..0bd3c692afd 100644 --- a/deployment/go.sum +++ b/deployment/go.sum @@ -1456,8 +1456,8 @@ github.com/smartcontractkit/chainlink-protos/svr v1.1.1-0.20260203131522-bb8bc5c github.com/smartcontractkit/chainlink-protos/svr v1.1.1-0.20260203131522-bb8bc5c423b3/go.mod h1:TcOliTQU6r59DwG4lo3U+mFM9WWyBHGuFkkxQpvSujo= github.com/smartcontractkit/chainlink-protos/workflows/go v0.0.0-20260323124644-faea187e6997 h1:W0HKHO8eE8BckTRnhSdqjHKbJcnk068nEWYnWRu6tJY= github.com/smartcontractkit/chainlink-protos/workflows/go v0.0.0-20260323124644-faea187e6997/go.mod h1:GTpDgyK0OObf7jpch6p8N281KxN92wbB8serZhU9yRc= -github.com/smartcontractkit/chainlink-solana v1.1.2-0.20260421131224-c46cbfe7bc6c h1:2ZdBZCZWKUMOWLtReaBBHkmDtXc0WtwcqIROHAcm3j4= -github.com/smartcontractkit/chainlink-solana v1.1.2-0.20260421131224-c46cbfe7bc6c/go.mod h1:sUsEwLtVPBlz0wPcysaolS+HVj9cOAt4jYhwE6J8dXg= +github.com/smartcontractkit/chainlink-solana v1.1.2-0.20260427183309-13341c01b05d h1:kYgreJn/CJgjyN8tM1K+AVO1AbYzY6zILEjV5NMlyEw= +github.com/smartcontractkit/chainlink-solana v1.1.2-0.20260427183309-13341c01b05d/go.mod h1:sUsEwLtVPBlz0wPcysaolS+HVj9cOAt4jYhwE6J8dXg= github.com/smartcontractkit/chainlink-solana/contracts v0.0.0-20260421131224-c46cbfe7bc6c h1:Hn/80PyYFrQhRlNSaq9HY4cjc/7AuP9zyWLle22t34A= github.com/smartcontractkit/chainlink-solana/contracts v0.0.0-20260421131224-c46cbfe7bc6c/go.mod h1:C5pZsbYX3qkhZTYWr1aYJi9QMfonFAun+Jl1npQ7UJA= github.com/smartcontractkit/chainlink-sui v0.0.0-20260420191233-429504ae18dc h1:BfUgvQ9PzvCPfFyNOrFMN7F7ljpPA7p+RbGZPB2+kLw= diff --git a/docs/CONFIG.md b/docs/CONFIG.md index d0487cd90bb..e464121bcf8 100644 --- a/docs/CONFIG.md +++ b/docs/CONFIG.md @@ -18842,9 +18842,6 @@ LogPollerSlotsBatchSize is the number of slots to process in a batch when pollin ```toml [Solana.Workflow] AcceptanceTimeout = '45s' # Default -ForwarderAddress = '14grJpemFaf88c8tiVb77W7TYg2W3ir6pfkKz3YjhhZ5' # Example -ForwarderState = '14grJpemFaf88c8tiVb77W7TYg2W3ir6pfkKz3YjhhZ5' # Example -FromAddress = '4BJXYkfvg37zEmBbsacZjeQDpTNx91KppxFJxRqrz48e' # Example GasLimitDefault = 300_000 # Default Local = false # Default PollPeriod = '3s' # Default @@ -18856,25 +18853,7 @@ TxAcceptanceState = 3 # Default ```toml AcceptanceTimeout = '45s' # Default ``` -AcceptanceTimeout is the default timeout for a tranmission to be accepted on chain - -### ForwarderAddress -```toml -ForwarderAddress = '14grJpemFaf88c8tiVb77W7TYg2W3ir6pfkKz3YjhhZ5' # Example -``` -ForwarderAddress is the keystone forwarder program address on chain. - -### ForwarderState -```toml -ForwarderState = '14grJpemFaf88c8tiVb77W7TYg2W3ir6pfkKz3YjhhZ5' # Example -``` -ForwarderState is the keystone forwarder program state account on chain. - -### FromAddress -```toml -FromAddress = '4BJXYkfvg37zEmBbsacZjeQDpTNx91KppxFJxRqrz48e' # Example -``` -FromAddress is Address of the transmitter key to use for workflow writes. +AcceptanceTimeout is the default timeout for a transmission to be accepted on chain ### GasLimitDefault ```toml diff --git a/go.mod b/go.mod index 8e6996fbccf..5f6919f4452 100644 --- a/go.mod +++ b/go.mod @@ -103,7 +103,7 @@ require ( github.com/smartcontractkit/chainlink-protos/ring/go v0.0.0-20260331131315-f08a616d8dcd github.com/smartcontractkit/chainlink-protos/storage-service v0.3.0 github.com/smartcontractkit/chainlink-protos/workflows/go v0.0.0-20260323124644-faea187e6997 - github.com/smartcontractkit/chainlink-solana v1.1.2-0.20260421131224-c46cbfe7bc6c + github.com/smartcontractkit/chainlink-solana v1.1.2-0.20260427183309-13341c01b05d github.com/smartcontractkit/chainlink-sui v0.0.0-20260420191233-429504ae18dc github.com/smartcontractkit/chainlink-ton v0.0.0-20260415120434-cecc380f8d87 github.com/smartcontractkit/cre-sdk-go v1.5.0 diff --git a/go.sum b/go.sum index cc48b7bd28e..443cc8d540c 100644 --- a/go.sum +++ b/go.sum @@ -1298,8 +1298,8 @@ github.com/smartcontractkit/chainlink-protos/svr v1.1.1-0.20260203131522-bb8bc5c github.com/smartcontractkit/chainlink-protos/svr v1.1.1-0.20260203131522-bb8bc5c423b3/go.mod h1:TcOliTQU6r59DwG4lo3U+mFM9WWyBHGuFkkxQpvSujo= github.com/smartcontractkit/chainlink-protos/workflows/go v0.0.0-20260323124644-faea187e6997 h1:W0HKHO8eE8BckTRnhSdqjHKbJcnk068nEWYnWRu6tJY= github.com/smartcontractkit/chainlink-protos/workflows/go v0.0.0-20260323124644-faea187e6997/go.mod h1:GTpDgyK0OObf7jpch6p8N281KxN92wbB8serZhU9yRc= -github.com/smartcontractkit/chainlink-solana v1.1.2-0.20260421131224-c46cbfe7bc6c h1:2ZdBZCZWKUMOWLtReaBBHkmDtXc0WtwcqIROHAcm3j4= -github.com/smartcontractkit/chainlink-solana v1.1.2-0.20260421131224-c46cbfe7bc6c/go.mod h1:sUsEwLtVPBlz0wPcysaolS+HVj9cOAt4jYhwE6J8dXg= +github.com/smartcontractkit/chainlink-solana v1.1.2-0.20260427183309-13341c01b05d h1:kYgreJn/CJgjyN8tM1K+AVO1AbYzY6zILEjV5NMlyEw= +github.com/smartcontractkit/chainlink-solana v1.1.2-0.20260427183309-13341c01b05d/go.mod h1:sUsEwLtVPBlz0wPcysaolS+HVj9cOAt4jYhwE6J8dXg= github.com/smartcontractkit/chainlink-sui v0.0.0-20260420191233-429504ae18dc h1:BfUgvQ9PzvCPfFyNOrFMN7F7ljpPA7p+RbGZPB2+kLw= github.com/smartcontractkit/chainlink-sui v0.0.0-20260420191233-429504ae18dc/go.mod h1:wfcTy4b7gblAAuJ2HiBRc0OH/D9lztBmUZBVrqOIA1s= github.com/smartcontractkit/chainlink-ton v0.0.0-20260415120434-cecc380f8d87 h1:NgA2+Q0wfHicP/QeY1hgULQ1ZBk1sgBpOJi3GpxfjE8= diff --git a/integration-tests/go.mod b/integration-tests/go.mod index b0262691278..7fac9533108 100644 --- a/integration-tests/go.mod +++ b/integration-tests/go.mod @@ -428,7 +428,7 @@ require ( github.com/smartcontractkit/chainlink-protos/storage-service v0.3.0 // indirect github.com/smartcontractkit/chainlink-protos/svr v1.1.1-0.20260203131522-bb8bc5c423b3 // indirect github.com/smartcontractkit/chainlink-protos/workflows/go v0.0.0-20260323124644-faea187e6997 // indirect - github.com/smartcontractkit/chainlink-solana v1.1.2-0.20260421131224-c46cbfe7bc6c // indirect + github.com/smartcontractkit/chainlink-solana v1.1.2-0.20260427183309-13341c01b05d // indirect github.com/smartcontractkit/chainlink-testing-framework/framework v0.15.16 // indirect github.com/smartcontractkit/chainlink-tron/relayer v0.0.11-0.20260408092456-3c6369888d4a // indirect github.com/smartcontractkit/freeport v0.1.3-0.20250828155247-add56fa28aad // indirect diff --git a/integration-tests/go.sum b/integration-tests/go.sum index d7ea502e549..08bf6430612 100644 --- a/integration-tests/go.sum +++ b/integration-tests/go.sum @@ -1441,8 +1441,8 @@ github.com/smartcontractkit/chainlink-protos/svr v1.1.1-0.20260203131522-bb8bc5c github.com/smartcontractkit/chainlink-protos/svr v1.1.1-0.20260203131522-bb8bc5c423b3/go.mod h1:TcOliTQU6r59DwG4lo3U+mFM9WWyBHGuFkkxQpvSujo= github.com/smartcontractkit/chainlink-protos/workflows/go v0.0.0-20260323124644-faea187e6997 h1:W0HKHO8eE8BckTRnhSdqjHKbJcnk068nEWYnWRu6tJY= github.com/smartcontractkit/chainlink-protos/workflows/go v0.0.0-20260323124644-faea187e6997/go.mod h1:GTpDgyK0OObf7jpch6p8N281KxN92wbB8serZhU9yRc= -github.com/smartcontractkit/chainlink-solana v1.1.2-0.20260421131224-c46cbfe7bc6c h1:2ZdBZCZWKUMOWLtReaBBHkmDtXc0WtwcqIROHAcm3j4= -github.com/smartcontractkit/chainlink-solana v1.1.2-0.20260421131224-c46cbfe7bc6c/go.mod h1:sUsEwLtVPBlz0wPcysaolS+HVj9cOAt4jYhwE6J8dXg= +github.com/smartcontractkit/chainlink-solana v1.1.2-0.20260427183309-13341c01b05d h1:kYgreJn/CJgjyN8tM1K+AVO1AbYzY6zILEjV5NMlyEw= +github.com/smartcontractkit/chainlink-solana v1.1.2-0.20260427183309-13341c01b05d/go.mod h1:sUsEwLtVPBlz0wPcysaolS+HVj9cOAt4jYhwE6J8dXg= github.com/smartcontractkit/chainlink-sui v0.0.0-20260420191233-429504ae18dc h1:BfUgvQ9PzvCPfFyNOrFMN7F7ljpPA7p+RbGZPB2+kLw= github.com/smartcontractkit/chainlink-sui v0.0.0-20260420191233-429504ae18dc/go.mod h1:wfcTy4b7gblAAuJ2HiBRc0OH/D9lztBmUZBVrqOIA1s= github.com/smartcontractkit/chainlink-sui/deployment v0.0.0-20260420191233-429504ae18dc h1:4zH20ZvNJ4gUrQQBOKfV2/XPFlvEj4a0fiRRdADNzkA= diff --git a/integration-tests/load/go.mod b/integration-tests/load/go.mod index b317f1a5688..59e296994c9 100644 --- a/integration-tests/load/go.mod +++ b/integration-tests/load/go.mod @@ -507,7 +507,7 @@ require ( github.com/smartcontractkit/chainlink-protos/storage-service v0.3.0 // indirect github.com/smartcontractkit/chainlink-protos/svr v1.1.1-0.20260203131522-bb8bc5c423b3 // indirect github.com/smartcontractkit/chainlink-protos/workflows/go v0.0.0-20260323124644-faea187e6997 // indirect - github.com/smartcontractkit/chainlink-solana v1.1.2-0.20260421131224-c46cbfe7bc6c // indirect + github.com/smartcontractkit/chainlink-solana v1.1.2-0.20260427183309-13341c01b05d // indirect github.com/smartcontractkit/chainlink-sui v0.0.0-20260420191233-429504ae18dc // indirect github.com/smartcontractkit/chainlink-sui/deployment v0.0.0-20260420191233-429504ae18dc // indirect github.com/smartcontractkit/chainlink-testing-framework/lib v1.54.7 // indirect diff --git a/integration-tests/load/go.sum b/integration-tests/load/go.sum index 6f2865428ce..b28fb513121 100644 --- a/integration-tests/load/go.sum +++ b/integration-tests/load/go.sum @@ -1709,8 +1709,8 @@ github.com/smartcontractkit/chainlink-protos/svr v1.1.1-0.20260203131522-bb8bc5c github.com/smartcontractkit/chainlink-protos/svr v1.1.1-0.20260203131522-bb8bc5c423b3/go.mod h1:TcOliTQU6r59DwG4lo3U+mFM9WWyBHGuFkkxQpvSujo= github.com/smartcontractkit/chainlink-protos/workflows/go v0.0.0-20260323124644-faea187e6997 h1:W0HKHO8eE8BckTRnhSdqjHKbJcnk068nEWYnWRu6tJY= github.com/smartcontractkit/chainlink-protos/workflows/go v0.0.0-20260323124644-faea187e6997/go.mod h1:GTpDgyK0OObf7jpch6p8N281KxN92wbB8serZhU9yRc= -github.com/smartcontractkit/chainlink-solana v1.1.2-0.20260421131224-c46cbfe7bc6c h1:2ZdBZCZWKUMOWLtReaBBHkmDtXc0WtwcqIROHAcm3j4= -github.com/smartcontractkit/chainlink-solana v1.1.2-0.20260421131224-c46cbfe7bc6c/go.mod h1:sUsEwLtVPBlz0wPcysaolS+HVj9cOAt4jYhwE6J8dXg= +github.com/smartcontractkit/chainlink-solana v1.1.2-0.20260427183309-13341c01b05d h1:kYgreJn/CJgjyN8tM1K+AVO1AbYzY6zILEjV5NMlyEw= +github.com/smartcontractkit/chainlink-solana v1.1.2-0.20260427183309-13341c01b05d/go.mod h1:sUsEwLtVPBlz0wPcysaolS+HVj9cOAt4jYhwE6J8dXg= github.com/smartcontractkit/chainlink-sui v0.0.0-20260420191233-429504ae18dc h1:BfUgvQ9PzvCPfFyNOrFMN7F7ljpPA7p+RbGZPB2+kLw= github.com/smartcontractkit/chainlink-sui v0.0.0-20260420191233-429504ae18dc/go.mod h1:wfcTy4b7gblAAuJ2HiBRc0OH/D9lztBmUZBVrqOIA1s= github.com/smartcontractkit/chainlink-sui/deployment v0.0.0-20260420191233-429504ae18dc h1:4zH20ZvNJ4gUrQQBOKfV2/XPFlvEj4a0fiRRdADNzkA= diff --git a/plugins/plugins.public.yaml b/plugins/plugins.public.yaml index 95b4fb2b3e6..514e6e61400 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.20260421131224-c46cbfe7bc6c" + gitRef: "v1.1.2-0.20260427183309-13341c01b05d" installPath: "./pkg/solana/cmd/chainlink-solana" starknet: diff --git a/system-tests/lib/cre/features/solana/v2/solana.go b/system-tests/lib/cre/features/solana/v2/solana.go index 443d28ca61a..3f2ac3ead36 100644 --- a/system-tests/lib/cre/features/solana/v2/solana.go +++ b/system-tests/lib/cre/features/solana/v2/solana.go @@ -11,7 +11,6 @@ import ( "time" "dario.cat/mergo" - solanago "github.com/gagliardetto/solana-go" "github.com/pelletier/go-toml/v2" "github.com/pkg/errors" "github.com/rs/zerolog" @@ -81,15 +80,11 @@ func (s *Solana) PreEnvStartup( ) (*cre.PreEnvStartupOutput, error) { // 1. Deploy forwarders to solana blockchains solChain := extractSolanaFromEnv(creEnv) - programID, state, fErr := deployForwarder(testLogger, creEnv, solChain) - if fErr != nil { + if _, _, fErr := deployForwarder(testLogger, creEnv, solChain); fErr != nil { return nil, errors.Wrapf(fErr, "failed to deploy forwarder for solana") } - input := input{ - ForwarderAddress: *programID, - ForwarderState: *state, - } - // 2. Patch nodes TOML config to include workflow From Address + input := input{} + // 2. Patch nodes TOML config to include Solana workflow settings cfgErr := patchNodeTOML(creEnv, don, input, solChain.ChainSelector()) if cfgErr != nil { return nil, errors.Wrapf(cfgErr, "failed to update node configs for solana") @@ -429,17 +424,10 @@ func deployForwarder(testLogger zerolog.Logger, creEnv *cre.Environment, solChai } func updateNodeConfig(workerNode *cre.NodeMetadata, chainID string, data input, currentConfig string, capabilityConfig cre.CapabilityConfig) (*string, error) { - key, ok := workerNode.Keys.Solana[chainID] - if !ok { + if _, ok := workerNode.Keys.Solana[chainID]; !ok { return nil, errors.Errorf("missing Solana key for chainID %s on node index %d", chainID, workerNode.Index) } - data.FromAddress = key.PublicAddress - - runtimeValues := map[string]any{ - "FromAddress": data.FromAddress.String(), - "ForwarderAddress": data.ForwarderAddress, - "ForwarderState": data.ForwarderState, - } + runtimeValues := map[string]any{} var mErr error data.WorkflowConfig, mErr = credon.ApplyRuntimeValues(capabilityConfig.Values, runtimeValues) @@ -495,18 +483,11 @@ func updateNodeConfig(workerNode *cre.NodeMetadata, chainID string, data input, } type input struct { - ChainSelector uint64 - FromAddress solanago.PublicKey - ForwarderAddress string - ForwarderState string - HasWrite bool - WorkflowConfig map[string]any // Configuration for Solana.Workflow section + HasWrite bool + WorkflowConfig map[string]any // Configuration for Solana.Workflow section } const solWorkflowConfigTemplate = ` - ForwarderAddress = '{{.ForwarderAddress}}' - FromAddress = '{{.FromAddress}}' - ForwarderState = '{{.ForwarderState}}' PollPeriod = '{{.PollPeriod}}' AcceptanceTimeout = '{{.AcceptanceTimeout}}' TxAcceptanceState = {{printf "%d" .TxAcceptanceState}} diff --git a/system-tests/lib/go.mod b/system-tests/lib/go.mod index ce013d03e53..843b1314095 100644 --- a/system-tests/lib/go.mod +++ b/system-tests/lib/go.mod @@ -42,7 +42,7 @@ require ( github.com/smartcontractkit/chainlink-protos/job-distributor v0.18.0 github.com/smartcontractkit/chainlink-protos/linking-service/go v0.0.0-20251002192024-d2ad9222409b github.com/smartcontractkit/chainlink-protos/workflows/go v0.0.0-20260323124644-faea187e6997 - github.com/smartcontractkit/chainlink-solana v1.1.2-0.20260421131224-c46cbfe7bc6c + github.com/smartcontractkit/chainlink-solana v1.1.2-0.20260427183309-13341c01b05d github.com/smartcontractkit/chainlink-testing-framework/framework v0.15.17 github.com/smartcontractkit/chainlink-testing-framework/framework/components/chiprouter v1.0.2 github.com/smartcontractkit/chainlink-testing-framework/framework/components/dockercompose v0.1.15 diff --git a/system-tests/lib/go.sum b/system-tests/lib/go.sum index ec1c7e40f4b..d7bc881fdbe 100644 --- a/system-tests/lib/go.sum +++ b/system-tests/lib/go.sum @@ -1677,8 +1677,8 @@ github.com/smartcontractkit/chainlink-protos/svr v1.1.1-0.20260203131522-bb8bc5c github.com/smartcontractkit/chainlink-protos/svr v1.1.1-0.20260203131522-bb8bc5c423b3/go.mod h1:TcOliTQU6r59DwG4lo3U+mFM9WWyBHGuFkkxQpvSujo= github.com/smartcontractkit/chainlink-protos/workflows/go v0.0.0-20260323124644-faea187e6997 h1:W0HKHO8eE8BckTRnhSdqjHKbJcnk068nEWYnWRu6tJY= github.com/smartcontractkit/chainlink-protos/workflows/go v0.0.0-20260323124644-faea187e6997/go.mod h1:GTpDgyK0OObf7jpch6p8N281KxN92wbB8serZhU9yRc= -github.com/smartcontractkit/chainlink-solana v1.1.2-0.20260421131224-c46cbfe7bc6c h1:2ZdBZCZWKUMOWLtReaBBHkmDtXc0WtwcqIROHAcm3j4= -github.com/smartcontractkit/chainlink-solana v1.1.2-0.20260421131224-c46cbfe7bc6c/go.mod h1:sUsEwLtVPBlz0wPcysaolS+HVj9cOAt4jYhwE6J8dXg= +github.com/smartcontractkit/chainlink-solana v1.1.2-0.20260427183309-13341c01b05d h1:kYgreJn/CJgjyN8tM1K+AVO1AbYzY6zILEjV5NMlyEw= +github.com/smartcontractkit/chainlink-solana v1.1.2-0.20260427183309-13341c01b05d/go.mod h1:sUsEwLtVPBlz0wPcysaolS+HVj9cOAt4jYhwE6J8dXg= github.com/smartcontractkit/chainlink-solana/contracts v0.0.0-20260421131224-c46cbfe7bc6c h1:Hn/80PyYFrQhRlNSaq9HY4cjc/7AuP9zyWLle22t34A= github.com/smartcontractkit/chainlink-solana/contracts v0.0.0-20260421131224-c46cbfe7bc6c/go.mod h1:C5pZsbYX3qkhZTYWr1aYJi9QMfonFAun+Jl1npQ7UJA= github.com/smartcontractkit/chainlink-sui v0.0.0-20260420191233-429504ae18dc h1:BfUgvQ9PzvCPfFyNOrFMN7F7ljpPA7p+RbGZPB2+kLw= diff --git a/system-tests/tests/go.mod b/system-tests/tests/go.mod index a4d40d8d283..a394c754329 100644 --- a/system-tests/tests/go.mod +++ b/system-tests/tests/go.mod @@ -157,7 +157,7 @@ require ( github.com/smartcontractkit/chainlink-protos/chainlink-ccv/message-discovery v0.0.0-20251211142334-5c3421fe2c8d // indirect github.com/smartcontractkit/chainlink-protos/chainlink-ccv/verifier v0.0.0-20251211142334-5c3421fe2c8d // indirect github.com/smartcontractkit/chainlink-protos/node-platform v0.0.0-20260319180422-b5808c964785 // indirect - github.com/smartcontractkit/chainlink-solana v1.1.2-0.20260421131224-c46cbfe7bc6c // indirect + github.com/smartcontractkit/chainlink-solana v1.1.2-0.20260427183309-13341c01b05d // indirect github.com/smartcontractkit/chainlink-solana/contracts v0.0.0-20260421131224-c46cbfe7bc6c // indirect github.com/smartcontractkit/chainlink-sui/deployment v0.0.0-20260409184948-5b16fae57fe0 // indirect github.com/stellar/go-stellar-sdk v0.1.0 // indirect diff --git a/system-tests/tests/go.sum b/system-tests/tests/go.sum index ca1d6d96b66..c47fd759877 100644 --- a/system-tests/tests/go.sum +++ b/system-tests/tests/go.sum @@ -1892,8 +1892,8 @@ github.com/smartcontractkit/chainlink-protos/svr v1.1.1-0.20260203131522-bb8bc5c github.com/smartcontractkit/chainlink-protos/svr v1.1.1-0.20260203131522-bb8bc5c423b3/go.mod h1:TcOliTQU6r59DwG4lo3U+mFM9WWyBHGuFkkxQpvSujo= github.com/smartcontractkit/chainlink-protos/workflows/go v0.0.0-20260323124644-faea187e6997 h1:W0HKHO8eE8BckTRnhSdqjHKbJcnk068nEWYnWRu6tJY= github.com/smartcontractkit/chainlink-protos/workflows/go v0.0.0-20260323124644-faea187e6997/go.mod h1:GTpDgyK0OObf7jpch6p8N281KxN92wbB8serZhU9yRc= -github.com/smartcontractkit/chainlink-solana v1.1.2-0.20260421131224-c46cbfe7bc6c h1:2ZdBZCZWKUMOWLtReaBBHkmDtXc0WtwcqIROHAcm3j4= -github.com/smartcontractkit/chainlink-solana v1.1.2-0.20260421131224-c46cbfe7bc6c/go.mod h1:sUsEwLtVPBlz0wPcysaolS+HVj9cOAt4jYhwE6J8dXg= +github.com/smartcontractkit/chainlink-solana v1.1.2-0.20260427183309-13341c01b05d h1:kYgreJn/CJgjyN8tM1K+AVO1AbYzY6zILEjV5NMlyEw= +github.com/smartcontractkit/chainlink-solana v1.1.2-0.20260427183309-13341c01b05d/go.mod h1:sUsEwLtVPBlz0wPcysaolS+HVj9cOAt4jYhwE6J8dXg= github.com/smartcontractkit/chainlink-solana/contracts v0.0.0-20260421131224-c46cbfe7bc6c h1:Hn/80PyYFrQhRlNSaq9HY4cjc/7AuP9zyWLle22t34A= github.com/smartcontractkit/chainlink-solana/contracts v0.0.0-20260421131224-c46cbfe7bc6c/go.mod h1:C5pZsbYX3qkhZTYWr1aYJi9QMfonFAun+Jl1npQ7UJA= github.com/smartcontractkit/chainlink-sui v0.0.0-20260420191233-429504ae18dc h1:BfUgvQ9PzvCPfFyNOrFMN7F7ljpPA7p+RbGZPB2+kLw=