Skip to content

Commit 86fd486

Browse files
committed
bump solana
1 parent fe4f23d commit 86fd486

24 files changed

Lines changed: 106 additions & 22 deletions

File tree

core/config/docs/chains-solana.toml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,15 @@ LogPollerSlotsBatchSize = 100 # Default
6666
[Solana.Workflow]
6767
# AcceptanceTimeout is the default timeout for a tranmission to be accepted on chain
6868
AcceptanceTimeout = '45s' # Default
69+
# ForwarderAddress is the keystone forwarder program address on chain.
70+
# Deprecated: ignored at runtime; use capability config. Kept for TOML compatibility.
71+
ForwarderAddress = '14grJpemFaf88c8tiVb77W7TYg2W3ir6pfkKz3YjhhZ5' # Example
72+
# ForwarderState is the keystone forwarder program state account on chain.
73+
# Deprecated: ignored at runtime; use capability config. Kept for TOML compatibility.
74+
ForwarderState = '14grJpemFaf88c8tiVb77W7TYg2W3ir6pfkKz3YjhhZ5' # Example
75+
# FromAddress is Address of the transmitter key to use for workflow writes.
76+
# Deprecated: ignored at runtime; use capability / transmitter config. Kept for TOML compatibility.
77+
FromAddress = '4BJXYkfvg37zEmBbsacZjeQDpTNx91KppxFJxRqrz48e' # Example
6978
# GasLimitDefault is the default gas limit for workflow transactions.
7079
GasLimitDefault = 300_000 # Default
7180
# Local defines if relayer runs against local devnet

core/scripts/cre/environment/configs/capability_defaults.toml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,10 @@
123123
PollPeriod = "2s"
124124
AcceptanceTimeout = "30s"
125125

126+
# Runtime values below are typically filled at runtime, but may be overridden
127+
# FromAddress = "0x0000000000000000000000000000000000000000"
128+
# ForwarderAddress = "0x0000000000000000000000000000000000000000"
129+
126130
[capability_configs.write-solana.values]
127131
# Solana Workflow configuration for write capabilities
128132
TxAcceptanceState = 3
@@ -131,6 +135,9 @@
131135
PollPeriod = "2s"
132136
SkipPreflight = true
133137
Local = true
138+
# Runtime values below are typically filled at runtime, but may be overridden
139+
# FromAddress = "0x0000000000000000000000000000000000000000"
140+
# ForwarderAddress = "0x0000000000000000000000000000000000000000"
134141

135142
# Aptos chain capability plugin (View + WriteReport). Runtime values are injected per chain.
136143
[capability_configs.aptos]

core/scripts/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,7 @@ require (
514514
github.com/smartcontractkit/chainlink-protos/storage-service v0.3.0 // indirect
515515
github.com/smartcontractkit/chainlink-protos/svr v1.1.1-0.20260203131522-bb8bc5c423b3 // indirect
516516
github.com/smartcontractkit/chainlink-protos/workflows/go v0.0.0-20260323124644-faea187e6997 // indirect
517-
github.com/smartcontractkit/chainlink-solana v1.1.2-0.20260427183309-13341c01b05d // indirect
517+
github.com/smartcontractkit/chainlink-solana v1.1.2-0.20260427222330-7065b206514d // indirect
518518
github.com/smartcontractkit/chainlink-solana/contracts v0.0.0-20260421131224-c46cbfe7bc6c // indirect
519519
github.com/smartcontractkit/chainlink-sui v0.0.0-20260420191233-429504ae18dc // indirect
520520
github.com/smartcontractkit/chainlink-sui/deployment v0.0.0-20260409184948-5b16fae57fe0 // indirect

core/scripts/go.sum

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/services/chainlink/config_test.go

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99
"testing"
1010
"time"
1111

12+
"github.com/gagliardetto/solana-go"
1213
"github.com/kylelemons/godebug/diff"
1314
"github.com/shopspring/decimal"
1415
"github.com/stretchr/testify/assert"
@@ -937,6 +938,9 @@ func TestConfig_Marshal(t *testing.T) {
937938
},
938939
Workflow: solcfg.WorkflowConfig{
939940
AcceptanceTimeout: commoncfg.MustNewDuration(time.Second * 45),
941+
FromAddress: ptr(solana.MustPublicKeyFromBase58("4BJXYkfvg37zEmBbsacZjeQDpTNx91KppxFJxRqrz48e")),
942+
ForwarderAddress: ptr(solana.MustPublicKeyFromBase58("14grJpemFaf88c8tiVb77W7TYg2W3ir6pfkKz3YjhhZ5")),
943+
ForwarderState: ptr(solana.MustPublicKeyFromBase58("14grJpemFaf88c8tiVb77W7TYg2W3ir6pfkKz3YjhhZ5")),
940944
TxAcceptanceState: ptr(commontypes.Finalized),
941945
PollPeriod: commoncfg.MustNewDuration(time.Second * 3),
942946
Local: ptr(true),
@@ -1431,6 +1435,9 @@ LogPollerSlotsBatchSize = 100
14311435
14321436
[Solana.Workflow]
14331437
AcceptanceTimeout = '45s'
1438+
ForwarderAddress = '14grJpemFaf88c8tiVb77W7TYg2W3ir6pfkKz3YjhhZ5'
1439+
ForwarderState = '14grJpemFaf88c8tiVb77W7TYg2W3ir6pfkKz3YjhhZ5'
1440+
FromAddress = '4BJXYkfvg37zEmBbsacZjeQDpTNx91KppxFJxRqrz48e'
14341441
GasLimitDefault = 0
14351442
Local = true
14361443
PollPeriod = '3s'
@@ -1587,6 +1594,19 @@ func TestConfig_full(t *testing.T) {
15871594
}
15881595

15891596
for c := range got.Solana {
1597+
// Deprecated Solana workflow keys: align with full TOML fixtures for nil checks only (not used at runtime).
1598+
if got.Solana[c].Workflow.ForwarderAddress == nil {
1599+
pk := solana.MustPublicKeyFromBase58("14grJpemFaf88c8tiVb77W7TYg2W3ir6pfkKz3YjhhZ5")
1600+
got.Solana[c].Workflow.ForwarderAddress = &pk
1601+
}
1602+
if got.Solana[c].Workflow.ForwarderState == nil {
1603+
pk := solana.MustPublicKeyFromBase58("14grJpemFaf88c8tiVb77W7TYg2W3ir6pfkKz3YjhhZ5")
1604+
got.Solana[c].Workflow.ForwarderState = &pk
1605+
}
1606+
if got.Solana[c].Workflow.FromAddress == nil {
1607+
pk := solana.MustPublicKeyFromBase58("4BJXYkfvg37zEmBbsacZjeQDpTNx91KppxFJxRqrz48e")
1608+
got.Solana[c].Workflow.FromAddress = &pk
1609+
}
15901610
for n := range got.Solana[c].Nodes {
15911611
if got.Solana[c].Nodes[n].IsLoadBalancedRPC == nil {
15921612
got.Solana[c].Nodes[n].IsLoadBalancedRPC = ptr(false)

core/services/chainlink/testdata/config-full.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -650,6 +650,9 @@ LogPollerSlotsBatchSize = 100
650650

651651
[Solana.Workflow]
652652
AcceptanceTimeout = '45s'
653+
ForwarderAddress = '14grJpemFaf88c8tiVb77W7TYg2W3ir6pfkKz3YjhhZ5'
654+
ForwarderState = '14grJpemFaf88c8tiVb77W7TYg2W3ir6pfkKz3YjhhZ5'
655+
FromAddress = '4BJXYkfvg37zEmBbsacZjeQDpTNx91KppxFJxRqrz48e'
653656
GasLimitDefault = 0
654657
Local = true
655658
PollPeriod = '3s'

core/services/chainlink/testdata/config-multi-chain-effective.toml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -801,6 +801,9 @@ LogPollerSlotsBatchSize = 1000
801801

802802
[Solana.Workflow]
803803
AcceptanceTimeout = '45s'
804+
ForwarderAddress = '11111111111111111111111111111111'
805+
ForwarderState = '11111111111111111111111111111111'
806+
FromAddress = '11111111111111111111111111111111'
804807
GasLimitDefault = 300000
805808
Local = false
806809
PollPeriod = '3s'
@@ -863,6 +866,9 @@ LogPollerSlotsBatchSize = 1000
863866

864867
[Solana.Workflow]
865868
AcceptanceTimeout = '45s'
869+
ForwarderAddress = '11111111111111111111111111111111'
870+
ForwarderState = '11111111111111111111111111111111'
871+
FromAddress = '11111111111111111111111111111111'
866872
GasLimitDefault = 300000
867873
Local = false
868874
PollPeriod = '3s'

core/web/chains_controller_test.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,9 @@ Nodes = []
280280
281281
[Workflow]
282282
AcceptanceTimeout = '45s'
283+
ForwarderAddress = '14grJpemFaf88c8tiVb77W7TYg2W3ir6pfkKz3YjhhZ5'
284+
ForwarderState = '14grJpemFaf88c8tiVb77W7TYg2W3ir6pfkKz3YjhhZ5'
285+
FromAddress = '4BJXYkfvg37zEmBbsacZjeQDpTNx91KppxFJxRqrz48e'
283286
GasLimitDefault = 300000
284287
Local = false
285288
PollPeriod = '3s'

core/web/resolver/testdata/config-full.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -625,6 +625,9 @@ LogPollerSlotsBatchSize = 100
625625

626626
[Solana.Workflow]
627627
AcceptanceTimeout = '45s'
628+
ForwarderAddress = '14grJpemFaf88c8tiVb77W7TYg2W3ir6pfkKz3YjhhZ5'
629+
ForwarderState = '14grJpemFaf88c8tiVb77W7TYg2W3ir6pfkKz3YjhhZ5'
630+
FromAddress = '4BJXYkfvg37zEmBbsacZjeQDpTNx91KppxFJxRqrz48e'
628631
GasLimitDefault = 0
629632
Local = true
630633
PollPeriod = '3s'

core/web/resolver/testdata/config-multi-chain-effective.toml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -801,6 +801,9 @@ LogPollerSlotsBatchSize = 1000
801801

802802
[Solana.Workflow]
803803
AcceptanceTimeout = '45s'
804+
ForwarderAddress = '11111111111111111111111111111111'
805+
ForwarderState = '11111111111111111111111111111111'
806+
FromAddress = '11111111111111111111111111111111'
804807
GasLimitDefault = 300000
805808
Local = false
806809
PollPeriod = '3s'
@@ -862,6 +865,9 @@ LogPollerSlotsBatchSize = 2000
862865

863866
[Solana.Workflow]
864867
AcceptanceTimeout = '45s'
868+
ForwarderAddress = '11111111111111111111111111111111'
869+
ForwarderState = '11111111111111111111111111111111'
870+
FromAddress = '11111111111111111111111111111111'
865871
GasLimitDefault = 300000
866872
Local = false
867873
PollPeriod = '3s'

0 commit comments

Comments
 (0)