Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 1 addition & 7 deletions core/config/docs/chains-solana.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion core/scripts/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions core/scripts/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 0 additions & 7 deletions core/services/chainlink/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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),
Expand Down Expand Up @@ -1435,9 +1431,6 @@ LogPollerSlotsBatchSize = 100

[Solana.Workflow]
AcceptanceTimeout = '45s'
ForwarderAddress = '14grJpemFaf88c8tiVb77W7TYg2W3ir6pfkKz3YjhhZ5'
ForwarderState = '14grJpemFaf88c8tiVb77W7TYg2W3ir6pfkKz3YjhhZ5'
FromAddress = '4BJXYkfvg37zEmBbsacZjeQDpTNx91KppxFJxRqrz48e'
GasLimitDefault = 0
Local = true
PollPeriod = '3s'
Expand Down
2 changes: 1 addition & 1 deletion core/services/chainlink/relayer_factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions core/services/chainlink/testdata/config-full.toml
Original file line number Diff line number Diff line change
Expand Up @@ -650,9 +650,6 @@ LogPollerSlotsBatchSize = 100

[Solana.Workflow]
AcceptanceTimeout = '45s'
ForwarderAddress = '14grJpemFaf88c8tiVb77W7TYg2W3ir6pfkKz3YjhhZ5'
ForwarderState = '14grJpemFaf88c8tiVb77W7TYg2W3ir6pfkKz3YjhhZ5'
FromAddress = '4BJXYkfvg37zEmBbsacZjeQDpTNx91KppxFJxRqrz48e'
GasLimitDefault = 0
Local = true
PollPeriod = '3s'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -801,9 +801,6 @@ LogPollerSlotsBatchSize = 1000

[Solana.Workflow]
AcceptanceTimeout = '45s'
ForwarderAddress = '11111111111111111111111111111111'
ForwarderState = '11111111111111111111111111111111'
FromAddress = '11111111111111111111111111111111'
GasLimitDefault = 300000
Local = false
PollPeriod = '3s'
Expand Down Expand Up @@ -866,9 +863,6 @@ LogPollerSlotsBatchSize = 1000

[Solana.Workflow]
AcceptanceTimeout = '45s'
ForwarderAddress = '11111111111111111111111111111111'
ForwarderState = '11111111111111111111111111111111'
FromAddress = '11111111111111111111111111111111'
GasLimitDefault = 300000
Local = false
PollPeriod = '3s'
Expand Down
3 changes: 0 additions & 3 deletions core/web/chains_controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -280,9 +280,6 @@ Nodes = []
[Workflow]
AcceptanceTimeout = '45s'
ForwarderAddress = '11111111111111111111111111111111'
ForwarderState = '11111111111111111111111111111111'
FromAddress = '11111111111111111111111111111111'
GasLimitDefault = 300000
Local = false
PollPeriod = '3s'
Expand Down
3 changes: 0 additions & 3 deletions core/web/resolver/testdata/config-full.toml
Original file line number Diff line number Diff line change
Expand Up @@ -625,9 +625,6 @@ LogPollerSlotsBatchSize = 100

[Solana.Workflow]
AcceptanceTimeout = '45s'
ForwarderAddress = '14grJpemFaf88c8tiVb77W7TYg2W3ir6pfkKz3YjhhZ5'
ForwarderState = '14grJpemFaf88c8tiVb77W7TYg2W3ir6pfkKz3YjhhZ5'
FromAddress = '4BJXYkfvg37zEmBbsacZjeQDpTNx91KppxFJxRqrz48e'
GasLimitDefault = 0
Local = true
PollPeriod = '3s'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -801,9 +801,6 @@ LogPollerSlotsBatchSize = 1000

[Solana.Workflow]
AcceptanceTimeout = '45s'
ForwarderAddress = '11111111111111111111111111111111'
ForwarderState = '11111111111111111111111111111111'
FromAddress = '11111111111111111111111111111111'
GasLimitDefault = 300000
Local = false
PollPeriod = '3s'
Expand Down Expand Up @@ -865,9 +862,6 @@ LogPollerSlotsBatchSize = 2000

[Solana.Workflow]
AcceptanceTimeout = '45s'
ForwarderAddress = '11111111111111111111111111111111'
ForwarderState = '11111111111111111111111111111111'
FromAddress = '11111111111111111111111111111111'
GasLimitDefault = 300000
Local = false
PollPeriod = '3s'
Expand Down
2 changes: 1 addition & 1 deletion deployment/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions deployment/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 1 addition & 22 deletions docs/CONFIG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion integration-tests/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions integration-tests/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion integration-tests/load/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions integration-tests/load/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion plugins/plugins.public.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Loading
Loading