Skip to content

Commit 8774dfe

Browse files
committed
pkg/solana/config: config enhancements
1 parent e212e55 commit 8774dfe

File tree

18 files changed

+1004
-222
lines changed

18 files changed

+1004
-222
lines changed

.github/workflows/relay.yml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ jobs:
2323
with:
2424
go-version-file: "go.mod"
2525
check-latest: true
26-
- name: Install gotestloghelper
27-
run: go install github.com/smartcontractkit/chainlink-testing-framework/tools/gotestloghelper@latest
2826
- name: Check go mod tidy
2927
run: |
3028
make gomodtidy
@@ -38,10 +36,8 @@ jobs:
3836
git diff --stat --exit-code
3937
- name: Install Solana CLI
4038
run: ./scripts/install-solana-ci.sh
41-
- name: Compilation check
42-
run: go test -run=xxx ./... # check compilation across tests + relayer / monitoring go code without running
4339
- name: Build
44-
run: go build -v ./pkg/...
40+
run: go build ./pkg/...
4541
- name: Get core ref
4642
id: get-ref
4743
uses: ./.github/actions/get-core-ref
@@ -55,17 +51,18 @@ jobs:
5551
CL_DATABASE_URL: ${{ steps.setup-testdb.outputs.cl-db-url }}
5652
run: |
5753
set -o pipefail
58-
go test ./pkg/... -json -tags integration -covermode=atomic -coverpkg=./... -coverprofile=integration_coverage.txt 2>&1 | tee /tmp/gotest.log | gotestloghelper -ci
54+
go test ./pkg/... -tags integration -covermode=atomic -coverpkg=./... -coverprofile=integration_coverage.txt 2>&1 | tee /tmp/gotest.log
5955
- name: Test with the race detector enabled
6056
env:
6157
CL_DATABASE_URL: ${{ steps.setup-testdb.outputs.cl-db-url }}
62-
run: go test ./pkg/... -v -race -count=10 -timeout=15m -covermode=atomic -coverpkg=./... -coverprofile=race_coverage.txt
58+
run: GORACE="log_path=$PWD/race" go test ./pkg/... -race -count=5 -timeout=15m -covermode=atomic -coverpkg=./... -coverprofile=race_coverage.txt
6359
- name: Upload Go test results
6460
if: always()
6561
uses: actions/upload-artifact@v4
6662
with:
6763
name: go-relay-test-results
6864
path: |
6965
/tmp/gotest.log
70-
./race_coverage.txt
7166
./integration_coverage.txt
67+
./race.*
68+
./race_coverage.txt

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ require (
2323
github.com/smartcontractkit/chainlink-ccip v0.0.0-20250627133416-1d85eec09097
2424
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250707132450-d1f5f0be212a
2525
github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20250804184440-c0506474fc44
26-
github.com/smartcontractkit/chainlink-common v0.9.1-0.20250819154659-73aa8dc9bf8c
26+
github.com/smartcontractkit/chainlink-common v0.9.4-0.20250822114026-4186ff61208b
2727
github.com/smartcontractkit/chainlink-common/pkg/monitoring v0.0.0-20250415235644-8703639403c7
2828
github.com/smartcontractkit/chainlink-framework/capabilities v0.0.0-20250818175541-3389ac08a563
2929
github.com/smartcontractkit/chainlink-framework/metrics v0.0.0-20250717121125-2350c82883e2

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -410,8 +410,8 @@ github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250707132450-d
410410
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250707132450-d1f5f0be212a/go.mod h1:XEtEV52YIISL1Xp2l9XqyXFonKF9WxuGQQJu/lMozl8=
411411
github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20250804184440-c0506474fc44 h1:S00lus9RPu5JuxKRtGEET+aIUfASahHpTRV5RgPARSI=
412412
github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20250804184440-c0506474fc44/go.mod h1:xtZNi6pOKdC3sLvokDvXOhgHzT+cyBqH/gWwvxTxqrg=
413-
github.com/smartcontractkit/chainlink-common v0.9.1-0.20250819154659-73aa8dc9bf8c h1:YXFwFoclQBL+B9C3xG07v5GNc31fUcib7hu+MzneFWI=
414-
github.com/smartcontractkit/chainlink-common v0.9.1-0.20250819154659-73aa8dc9bf8c/go.mod h1:0OMQFyxibohHOzskRmEz4wr+w0SdAFsU6CjW/VhRf34=
413+
github.com/smartcontractkit/chainlink-common v0.9.4-0.20250822114026-4186ff61208b h1:SOTBUmlyMVlKPeNAuxB4ZGkhQRXOEWRGbV6PQ+bs5Nw=
414+
github.com/smartcontractkit/chainlink-common v0.9.4-0.20250822114026-4186ff61208b/go.mod h1:0OMQFyxibohHOzskRmEz4wr+w0SdAFsU6CjW/VhRf34=
415415
github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.1 h1:ca2z5OXgnbBPQRxpwXwBLJsUA1+cAp5ncfW4Ssvd6eY=
416416
github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.1/go.mod h1:NZv/qKYGFRnkjOYBouajnDfFoZ+WDa6H2KNmSf1dnKc=
417417
github.com/smartcontractkit/chainlink-common/pkg/monitoring v0.0.0-20250415235644-8703639403c7 h1:9wh1G+WbXwPVqf0cfSRSgwIcaXTQgvYezylEAfwmrbw=

integration-tests/go.mod

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ require (
1616
github.com/pelletier/go-toml/v2 v2.2.4
1717
github.com/rs/zerolog v1.33.0
1818
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250805210128-7f8a0f403c3a
19-
github.com/smartcontractkit/chainlink-common v0.9.1-0.20250819154659-73aa8dc9bf8c
19+
github.com/smartcontractkit/chainlink-common v0.9.4-0.20250822114026-4186ff61208b
2020
github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20250819150450-95ef563f6e6d
21-
github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250820135304-632bebc0e802
21+
github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250822114658-478d76fce6b9
2222
github.com/smartcontractkit/chainlink-testing-framework/lib v1.54.4
2323
github.com/smartcontractkit/chainlink-testing-framework/parrot v0.6.2
2424
github.com/smartcontractkit/chainlink-testing-framework/seth v1.51.2
25-
github.com/smartcontractkit/chainlink/deployment v0.0.0-20250821121906-52f5372c5da8
26-
github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20250821121906-52f5372c5da8
27-
github.com/smartcontractkit/chainlink/v2 v2.26.0-debug-tracing.0.20250821121906-52f5372c5da8
25+
github.com/smartcontractkit/chainlink/deployment v0.0.0-20250822122521-7924eae1304f
26+
github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20250822122521-7924eae1304f
27+
github.com/smartcontractkit/chainlink/v2 v2.26.0-debug-tracing.0.20250822122521-7924eae1304f
2828
github.com/smartcontractkit/libocr v0.0.0-20250707144819-babe0ec4e358
2929
github.com/stretchr/testify v1.10.0
3030
github.com/testcontainers/testcontainers-go v0.37.0
@@ -273,6 +273,7 @@ require (
273273
github.com/klauspost/cpuid/v2 v2.2.10 // indirect
274274
github.com/kr/pretty v0.3.1 // indirect
275275
github.com/kr/text v0.2.0 // indirect
276+
github.com/kylelemons/godebug v1.1.0 // indirect
276277
github.com/leanovate/gopter v0.2.11 // indirect
277278
github.com/leodido/go-urn v1.4.0 // indirect
278279
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect

integration-tests/go.sum

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1253,8 +1253,8 @@ github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250805210128-7
12531253
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250805210128-7f8a0f403c3a/go.mod h1:Ve1xD71bl193YIZQEoJMmBqLGQJdNs29bwbuObwvbhQ=
12541254
github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20250805210128-7f8a0f403c3a h1:38dAlTPRUQHZus5dCnBnQyf/V4oYn0p2svWlbPgHDQ4=
12551255
github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20250805210128-7f8a0f403c3a/go.mod h1:xtZNi6pOKdC3sLvokDvXOhgHzT+cyBqH/gWwvxTxqrg=
1256-
github.com/smartcontractkit/chainlink-common v0.9.1-0.20250819154659-73aa8dc9bf8c h1:YXFwFoclQBL+B9C3xG07v5GNc31fUcib7hu+MzneFWI=
1257-
github.com/smartcontractkit/chainlink-common v0.9.1-0.20250819154659-73aa8dc9bf8c/go.mod h1:0OMQFyxibohHOzskRmEz4wr+w0SdAFsU6CjW/VhRf34=
1256+
github.com/smartcontractkit/chainlink-common v0.9.4-0.20250822114026-4186ff61208b h1:SOTBUmlyMVlKPeNAuxB4ZGkhQRXOEWRGbV6PQ+bs5Nw=
1257+
github.com/smartcontractkit/chainlink-common v0.9.4-0.20250822114026-4186ff61208b/go.mod h1:0OMQFyxibohHOzskRmEz4wr+w0SdAFsU6CjW/VhRf34=
12581258
github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.1 h1:ca2z5OXgnbBPQRxpwXwBLJsUA1+cAp5ncfW4Ssvd6eY=
12591259
github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.1/go.mod h1:NZv/qKYGFRnkjOYBouajnDfFoZ+WDa6H2KNmSf1dnKc=
12601260
github.com/smartcontractkit/chainlink-common/pkg/monitoring v0.0.0-20250415235644-8703639403c7 h1:9wh1G+WbXwPVqf0cfSRSgwIcaXTQgvYezylEAfwmrbw=
@@ -1305,12 +1305,12 @@ github.com/smartcontractkit/chainlink-tron/relayer v0.0.11-0.20250815105909-7549
13051305
github.com/smartcontractkit/chainlink-tron/relayer v0.0.11-0.20250815105909-75499abc4335/go.mod h1:ccjEgNeqOO+bjPddnL4lUrNLzyCvGCxgBjJdhFX3wa8=
13061306
github.com/smartcontractkit/chainlink-tron/relayer/gotron-sdk v0.0.5-0.20250422175525-b7575d96bd4d h1:qLmSOOtB/Ogn79eIDkuujOu8M5Jd747V1H7Brk/nTvo=
13071307
github.com/smartcontractkit/chainlink-tron/relayer/gotron-sdk v0.0.5-0.20250422175525-b7575d96bd4d/go.mod h1:4WhGgCA0smBbBud5mK+jnDb2wwndMvoqaWBJ3OV/7Bw=
1308-
github.com/smartcontractkit/chainlink/deployment v0.0.0-20250821121906-52f5372c5da8 h1:79o/WUYI136MqwGLGmABUoeyFJ/TJpTatIX65qbyQMg=
1309-
github.com/smartcontractkit/chainlink/deployment v0.0.0-20250821121906-52f5372c5da8/go.mod h1:zjv6COe1k/n1cvsAIFFxJbkqKdB5GbMCBiL8Yy6U4l8=
1310-
github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20250821121906-52f5372c5da8 h1:LysiZIrcwhsFcnJavuOzwjqHPKondAr9zgRbf3rhIfA=
1311-
github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20250821121906-52f5372c5da8/go.mod h1:z+6wW9tJ9fqIKoDpZ5KiqRQYIKHOxCYvXXz/ej8ipW8=
1312-
github.com/smartcontractkit/chainlink/v2 v2.26.0-debug-tracing.0.20250821121906-52f5372c5da8 h1:3MxyN53l61mbG5Y6eyK5mamFnQujm0cMjcAlUJmS3co=
1313-
github.com/smartcontractkit/chainlink/v2 v2.26.0-debug-tracing.0.20250821121906-52f5372c5da8/go.mod h1:/KP0hw3OuSYybp9IWgfr6gjWhAFr0um5cggj+v6ODyA=
1308+
github.com/smartcontractkit/chainlink/deployment v0.0.0-20250822122521-7924eae1304f h1:v6V7rbwxnKQDkV1+bXNySC5+eRDgq5i/Zhilj1Dkg3c=
1309+
github.com/smartcontractkit/chainlink/deployment v0.0.0-20250822122521-7924eae1304f/go.mod h1:hOBwMZV5wGR5U6LKTNH2agxDqiM5yJl0i/d0qsIeGek=
1310+
github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20250822122521-7924eae1304f h1:Tp/3Op3n08gbzCZaLFUDtS3Pg1477BW8A3/n00ncDwc=
1311+
github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20250822122521-7924eae1304f/go.mod h1:EZnjwYZToUpLw1VsFYU64fV2OhbnJFvjsick1804DJA=
1312+
github.com/smartcontractkit/chainlink/v2 v2.26.0-debug-tracing.0.20250822122521-7924eae1304f h1:VuA3mpTiqwo9UaCPESYJeS+ONtPdiqZIqa4I30d8QDQ=
1313+
github.com/smartcontractkit/chainlink/v2 v2.26.0-debug-tracing.0.20250822122521-7924eae1304f/go.mod h1:FsbzpAb719eV79qc2ixb3BHEW7YCNEVpIU1Q0yajHGo=
13141314
github.com/smartcontractkit/cre-sdk-go v0.5.1-0.20250818135829-9ea58491207f h1:pgupmqPyAqfl2xgqHaRwfI/Kd6HtGbB8WeMt9XPM5L0=
13151315
github.com/smartcontractkit/cre-sdk-go v0.5.1-0.20250818135829-9ea58491207f/go.mod h1:C1KXVcxUy89lFVqJ335pEPeeC/wJy0jCF0ZztwWdCmU=
13161316
github.com/smartcontractkit/freeport v0.1.3-0.20250716200817-cb5dfd0e369e h1:Hv9Mww35LrufCdM9wtS9yVi/rEWGI1UnjHbcKKU0nVY=

integration-tests/testconfig/testconfig.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,6 @@ func (c *TestConfig) GetNodeConfigTOML() (string, error) {
281281
// Increase timeout for TransactionSender
282282
TxTimeout: config.MustNewDuration(2 * time.Minute),
283283
}
284-
chainCfg.SetDefaults()
285284

286285
solConfig := solcfg.TOMLConfig{
287286
Enabled: ptr.Ptr(true),

0 commit comments

Comments
 (0)