Skip to content

Commit 4b85608

Browse files
authored
bump solana (#22194)
* bump solana * bump solana from develop * bump solana * revert cfg * bump solana * chore: empty commit to retrigger CI
1 parent 4a9038d commit 4b85608

21 files changed

Lines changed: 48 additions & 108 deletions

File tree

core/config/docs/chains-solana.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,13 @@ LogPollerSlotsBatchSize = 100 # Default
6767
# AcceptanceTimeout is the default timeout for a tranmission to be accepted on chain
6868
AcceptanceTimeout = '45s' # Default
6969
# ForwarderAddress is the keystone forwarder program address on chain.
70+
# Deprecated: ignored at runtime; use capability config. Kept for TOML compatibility.
7071
ForwarderAddress = '14grJpemFaf88c8tiVb77W7TYg2W3ir6pfkKz3YjhhZ5' # Example
7172
# ForwarderState is the keystone forwarder program state account on chain.
73+
# Deprecated: ignored at runtime; use capability config. Kept for TOML compatibility.
7274
ForwarderState = '14grJpemFaf88c8tiVb77W7TYg2W3ir6pfkKz3YjhhZ5' # Example
7375
# 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.
7477
FromAddress = '4BJXYkfvg37zEmBbsacZjeQDpTNx91KppxFJxRqrz48e' # Example
7578
# GasLimitDefault is the default gas limit for workflow transactions.
7679
GasLimitDefault = 300_000 # Default

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@
122122
TxAcceptanceState = 2
123123
PollPeriod = "2s"
124124
AcceptanceTimeout = "30s"
125+
125126
# Runtime values below are typically filled at runtime, but may be overridden
126127
# FromAddress = "0x0000000000000000000000000000000000000000"
127128
# ForwarderAddress = "0x0000000000000000000000000000000000000000"

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.20260421131224-c46cbfe7bc6c // indirect
517+
github.com/smartcontractkit/chainlink-solana v1.1.2-0.20260428015924-9456bb6d8932 // indirect
518518
github.com/smartcontractkit/chainlink-solana/contracts v0.0.0-20260421131224-c46cbfe7bc6c // indirect
519519
github.com/smartcontractkit/chainlink-sui v0.0.0-20260427132612-76b9f754a556 // indirect
520520
github.com/smartcontractkit/chainlink-sui/deployment v0.0.0-20260427132612-76b9f754a556 // 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/relayer_factory.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ func (r *RelayerFactory) NewSolana(ks, ksCSA coretypes.Keystore, config SolanaFa
199199
if err != nil {
200200
return nil, err
201201
}
202-
solanaRelayers[relayID] = relay.NewServerAdapter(solana.NewRelayer(lggr, chain, r.CapabilitiesRegistry))
202+
solanaRelayers[relayID] = relay.NewServerAdapter(solana.NewRelayer(lggr, chain, r.CapabilitiesRegistry, ks))
203203
}
204204
}
205205
return solanaRelayers, nil

core/web/chains_controller_test.go

Lines changed: 11 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -245,68 +245,20 @@ func Test_SolanaChainsController_Show(t *testing.T) {
245245
inputID: validID,
246246
name: "success",
247247
want: func(t *testing.T, app *cltest.TestApplication) *commonTypes.ChainStatus {
248+
wc := &config.TOMLConfig{
249+
ChainID: ptr(validID),
250+
Chain: config.Chain{
251+
SkipPreflight: ptr(false),
252+
TxTimeout: commoncfg.MustNewDuration(time.Hour),
253+
},
254+
}
255+
wc.SetDefaults()
256+
cfgStr, err := wc.TOMLString()
257+
require.NoError(t, err)
248258
return &commonTypes.ChainStatus{
249259
ID: validID,
250260
Enabled: true,
251-
Config: `ChainID = 'Chainlink-12'
252-
Enabled = true
253-
BlockTime = '500ms'
254-
BalancePollPeriod = '5s'
255-
ConfirmPollPeriod = '500ms'
256-
OCR2CachePollPeriod = '1s'
257-
OCR2CacheTTL = '1m0s'
258-
TxTimeout = '1h0m0s'
259-
TxRetryTimeout = '10s'
260-
TxConfirmTimeout = '30s'
261-
TxExpirationRebroadcast = false
262-
TxRetentionTimeout = '0s'
263-
SkipPreflight = false
264-
Commitment = 'confirmed'
265-
MaxRetries = 0
266-
FeeEstimatorMode = 'fixed'
267-
ComputeUnitPriceMax = 1000
268-
ComputeUnitPriceMin = 0
269-
ComputeUnitPriceDefault = 0
270-
FeeBumpPeriod = '3s'
271-
BlockHistoryPollPeriod = '5s'
272-
BlockHistorySize = 1
273-
BlockHistoryBatchLoadSize = 20
274-
ComputeUnitLimitDefault = 200000
275-
EstimateComputeUnitLimit = false
276-
LogPollerStartingLookback = '24h0m0s'
277-
LogPollerCPIEventsEnabled = true
278-
LogPollerSlotsBatchSize = 1000
279-
Nodes = []
280-
281-
[Workflow]
282-
AcceptanceTimeout = '45s'
283-
ForwarderAddress = '11111111111111111111111111111111'
284-
ForwarderState = '11111111111111111111111111111111'
285-
FromAddress = '11111111111111111111111111111111'
286-
GasLimitDefault = 300000
287-
Local = false
288-
PollPeriod = '3s'
289-
TxAcceptanceState = 3
290-
291-
[MultiNode]
292-
Enabled = false
293-
PollFailureThreshold = 5
294-
PollInterval = '15s'
295-
SelectionMode = 'PriorityLevel'
296-
SyncThreshold = 10
297-
NodeIsSyncingEnabled = false
298-
LeaseDuration = '1m0s'
299-
NewHeadsPollInterval = '5s'
300-
FinalizedBlockPollInterval = '5s'
301-
EnforceRepeatableRead = true
302-
DeathDeclarationDelay = '20s'
303-
VerifyChainID = true
304-
NodeNoNewHeadsThreshold = '20s'
305-
NoNewFinalizedHeadsThreshold = '20s'
306-
FinalityDepth = 0
307-
FinalityTagEnabled = true
308-
FinalizedBlockOffset = 50
309-
`,
261+
Config: cfgStr,
310262
}
311263
},
312264
wantStatusCode: http.StatusOK,

deployment/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ require (
5252
github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20260420204255-a3f3bdd56877
5353
github.com/smartcontractkit/chainlink-protos/job-distributor v0.18.0
5454
github.com/smartcontractkit/chainlink-protos/orchestrator v0.10.0
55-
github.com/smartcontractkit/chainlink-solana v1.1.2-0.20260421131224-c46cbfe7bc6c
55+
github.com/smartcontractkit/chainlink-solana v1.1.2-0.20260428015924-9456bb6d8932
5656
github.com/smartcontractkit/chainlink-solana/contracts v0.0.0-20260421131224-c46cbfe7bc6c
5757
github.com/smartcontractkit/chainlink-sui v0.0.0-20260427132612-76b9f754a556
5858
github.com/smartcontractkit/chainlink-sui/deployment v0.0.0-20260427132612-76b9f754a556

deployment/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.

docs/CONFIG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18863,18 +18863,21 @@ AcceptanceTimeout is the default timeout for a tranmission to be accepted on cha
1886318863
ForwarderAddress = '14grJpemFaf88c8tiVb77W7TYg2W3ir6pfkKz3YjhhZ5' # Example
1886418864
```
1886518865
ForwarderAddress is the keystone forwarder program address on chain.
18866+
Deprecated: ignored at runtime; use capability config. Kept for TOML compatibility.
1886618867

1886718868
### ForwarderState
1886818869
```toml
1886918870
ForwarderState = '14grJpemFaf88c8tiVb77W7TYg2W3ir6pfkKz3YjhhZ5' # Example
1887018871
```
1887118872
ForwarderState is the keystone forwarder program state account on chain.
18873+
Deprecated: ignored at runtime; use capability config. Kept for TOML compatibility.
1887218874

1887318875
### FromAddress
1887418876
```toml
1887518877
FromAddress = '4BJXYkfvg37zEmBbsacZjeQDpTNx91KppxFJxRqrz48e' # Example
1887618878
```
1887718879
FromAddress is Address of the transmitter key to use for workflow writes.
18880+
Deprecated: ignored at runtime; use capability / transmitter config. Kept for TOML compatibility.
1887818881

1887918882
### GasLimitDefault
1888018883
```toml

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ require (
103103
github.com/smartcontractkit/chainlink-protos/ring/go v0.0.0-20260331131315-f08a616d8dcd
104104
github.com/smartcontractkit/chainlink-protos/storage-service v0.3.0
105105
github.com/smartcontractkit/chainlink-protos/workflows/go v0.0.0-20260323124644-faea187e6997
106-
github.com/smartcontractkit/chainlink-solana v1.1.2-0.20260421131224-c46cbfe7bc6c
106+
github.com/smartcontractkit/chainlink-solana v1.1.2-0.20260428015924-9456bb6d8932
107107
github.com/smartcontractkit/chainlink-sui v0.0.0-20260427132612-76b9f754a556
108108
github.com/smartcontractkit/chainlink-ton v0.0.0-20260423161209-5ce1dba9785e
109109
github.com/smartcontractkit/cre-sdk-go v1.5.0

0 commit comments

Comments
 (0)