Skip to content

Commit 5cdb2e3

Browse files
authored
Merge branch 'main' into rtinianov_test_race_fix
2 parents 5a39b16 + e5cda5f commit 5cdb2e3

File tree

365 files changed

+9746
-1821
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

365 files changed

+9746
-1821
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
/pkg/beholder/ @smartcontractkit/data-tooling
1010
/pkg/capabilities/v2/chain-capabilities @smartcontractkit/keystone @smartcontractkit/capabilities-team @smartcontractkit/bix-framework
1111
/pkg/chains/evm @smartcontractkit/bix-framework
12+
/pkg/chipingress/ @smartcontractkit/data-tooling
1213
/pkg/codec/ @smartcontractkit/bix-framework @smartcontractkit/foundations
1314
/pkg/loop/cmd/loopinstall @smartcontractkit/devex-cicd
1415
/pkg/loop/internal/relayer @smartcontractkit/bix-framework @smartcontractkit/foundations

.github/workflows/api-diff.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
name: Analyze API Changes
2-
description: Runs apidiff-go action to check for breaking changes to modules' public APIs
32

43
on:
54
pull_request:
@@ -23,7 +22,7 @@ jobs:
2322
go-version-file: "go.mod"
2423
cache: false
2524

26-
- uses: smartcontractkit/.github/actions/apidiff-go@apidiff-go/0.1.0
25+
- uses: smartcontractkit/.github/actions/apidiff-go@apidiff-go/v1
2726
env:
2827
GITHUB_TOKEN: ${{ github.token }}
2928
with:

.github/workflows/keystore.yml

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
name: Keystore Checks
2+
permissions:
3+
contents: read
4+
5+
on:
6+
push:
7+
paths:
8+
- "keystore/**"
9+
10+
jobs:
11+
run-tests:
12+
defaults:
13+
run:
14+
working-directory: keystore
15+
runs-on: ubuntu-latest
16+
steps:
17+
- name: Checkout
18+
uses: actions/checkout@v4
19+
20+
- name: Set up Go
21+
uses: ./.github/actions/setup-go
22+
with:
23+
go-version-file: "go.mod"
24+
restore-build-cache-only: "false"
25+
26+
- name: Build
27+
run: go build -v ./...
28+
29+
- name: Unit Tests
30+
run: go test ./... -coverpkg=./... -coverprofile=coverage.txt
31+
32+
build-race-tests:
33+
runs-on: ubuntu-latest
34+
steps:
35+
- name: Checkout
36+
uses: actions/checkout@v4
37+
38+
- name: Set up Go
39+
uses: ./.github/actions/setup-go
40+
with:
41+
go-version-file: "go.mod"
42+
43+
- name: Build
44+
run: go build -v ./...
45+
46+
- name: Race Tests
47+
run: GORACE="log_path=$PWD/race" go test -race ./...
48+
49+
- name: Print Races
50+
if: failure()
51+
id: print-races
52+
run: |
53+
find race.* | xargs cat > race.txt
54+
if [[ -s race.txt ]]; then
55+
cat race.txt
56+
fi
57+
58+
- name: Upload Go test results
59+
if: always()
60+
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
61+
with:
62+
name: go-race-results
63+
path: |
64+
./race.*

.tool-versions

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
golang 1.24.5
1+
golang 1.25.3
22
protoc 29.3
33
protoc-gen-go-grpc 1.3.0
4-
golangci-lint 2.2.2
4+
golangci-lint 2.4.0
55
mockery 2.53.3

Makefile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@ gomodtidy: gomods
88

99
.PHONY: docs
1010
docs:
11-
go install golang.org/x/pkgsite/cmd/pkgsite@latest
12-
# http://localhost:8080/pkg/github.com/smartcontractkit/chainlink-common/pkg/
13-
pkgsite
11+
go doc -http
1412

1513
.PHONY: install-protoc
1614
install-protoc:
@@ -35,7 +33,7 @@ rm-builders:
3533

3634
.PHONY: generate
3735
generate: mockery install-protoc gomods cre-protoc modgraph
38-
export PATH="$(HOME)/.local/bin:$(PATH)"; gomods -s proto_vendor -go generate -x ./...
36+
export PATH="$(HOME)/.local/bin:$(HOME)/go/bin:$(PATH)"; gomods -s proto_vendor -go generate -x ./...
3937
find . -type f -name .mockery.yaml -execdir mockery \; ## Execute mockery for all .mockery.yaml files. If this fails, you might have a local mockery installed. Uninstall or update it.
4038

4139
.PHONY: cre-protoc

go.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ flowchart LR
99
chainlink-common --> chainlink-common/pkg/values
1010
chainlink-common --> chainlink-protos/billing/go
1111
chainlink-common --> chainlink-protos/cre/go
12+
chainlink-common --> chainlink-protos/linking-service/go
1213
chainlink-common --> chainlink-protos/storage-service
1314
chainlink-common --> freeport
1415
chainlink-common --> grpc-proxy
@@ -24,6 +25,8 @@ flowchart LR
2425
click chainlink-protos/billing/go href "https://github.com/smartcontractkit/chainlink-protos"
2526
chainlink-protos/cre/go
2627
click chainlink-protos/cre/go href "https://github.com/smartcontractkit/chainlink-protos"
28+
chainlink-protos/linking-service/go
29+
click chainlink-protos/linking-service/go href "https://github.com/smartcontractkit/chainlink-protos"
2730
chainlink-protos/storage-service
2831
click chainlink-protos/storage-service href "https://github.com/smartcontractkit/chainlink-protos"
2932
chainlink-protos/workflows/go
@@ -46,6 +49,7 @@ flowchart LR
4649
subgraph chainlink-protos-repo[chainlink-protos]
4750
chainlink-protos/billing/go
4851
chainlink-protos/cre/go
52+
chainlink-protos/linking-service/go
4953
chainlink-protos/storage-service
5054
chainlink-protos/workflows/go
5155
end

go.mod

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/smartcontractkit/chainlink-common
22

3-
go 1.24.5
3+
go 1.25.3
44

55
require (
66
github.com/Masterminds/semver/v3 v3.4.0
@@ -37,16 +37,18 @@ require (
3737
github.com/scylladb/go-reflectx v1.0.1
3838
github.com/shopspring/decimal v1.4.0
3939
github.com/smartcontractkit/chain-selectors v1.0.67
40-
github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.4
41-
github.com/smartcontractkit/chainlink-protos/billing/go v0.0.0-20250722225531-876fd6b94976
42-
github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20250911124514-5874cc6d62b2
40+
github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.9-0.20251020164035-ab562b473fe2
41+
github.com/smartcontractkit/chainlink-protos/billing/go v0.0.0-20251024234028-0988426d98f4
42+
github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20251021010742-3f8d3dba17d8
43+
github.com/smartcontractkit/chainlink-protos/linking-service/go v0.0.0-20251002192024-d2ad9222409b
4344
github.com/smartcontractkit/chainlink-protos/storage-service v0.3.0
45+
github.com/smartcontractkit/chainlink-protos/workflows/go v0.0.0-20251020004840-4638e4262066
4446
github.com/smartcontractkit/freeport v0.1.3-0.20250716200817-cb5dfd0e369e
4547
github.com/smartcontractkit/grpc-proxy v0.0.0-20240830132753-a7e17fec5ab7
46-
github.com/smartcontractkit/libocr v0.0.0-20250707144819-babe0ec4e358
47-
github.com/stretchr/testify v1.10.0
48-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0
49-
go.opentelemetry.io/otel v1.37.0
48+
github.com/smartcontractkit/libocr v0.0.0-20250912173940-f3ab0246e23d
49+
github.com/stretchr/testify v1.11.1
50+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0
51+
go.opentelemetry.io/otel v1.38.0
5052
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.12.2
5153
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.12.2
5254
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.36.0
@@ -57,21 +59,21 @@ require (
5759
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.36.0
5860
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.36.0
5961
go.opentelemetry.io/otel/log v0.13.0
60-
go.opentelemetry.io/otel/metric v1.37.0
61-
go.opentelemetry.io/otel/sdk v1.37.0
62+
go.opentelemetry.io/otel/metric v1.38.0
63+
go.opentelemetry.io/otel/sdk v1.38.0
6264
go.opentelemetry.io/otel/sdk/log v0.13.0
63-
go.opentelemetry.io/otel/sdk/metric v1.37.0
64-
go.opentelemetry.io/otel/trace v1.37.0
65+
go.opentelemetry.io/otel/sdk/metric v1.38.0
66+
go.opentelemetry.io/otel/trace v1.38.0
6567
go.uber.org/zap v1.27.0
66-
golang.org/x/crypto v0.40.0
68+
golang.org/x/crypto v0.41.0
6769
golang.org/x/exp v0.0.0-20250711185948-6ae5c78190dc
6870
golang.org/x/sync v0.16.0
6971
golang.org/x/time v0.12.0
7072
golang.org/x/tools v0.35.0
7173
gonum.org/v1/gonum v0.16.0
72-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822
73-
google.golang.org/grpc v1.74.2
74-
google.golang.org/protobuf v1.36.7
74+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250825161204-c5933d9347a5
75+
google.golang.org/grpc v1.75.0
76+
google.golang.org/protobuf v1.36.8
7577
gopkg.in/yaml.v3 v3.0.1
7678
sigs.k8s.io/yaml v1.4.0
7779
)
@@ -137,7 +139,6 @@ require (
137139
github.com/rogpeppe/go-internal v1.13.1 // indirect
138140
github.com/ryanuber/go-glob v1.0.0 // indirect
139141
github.com/sanity-io/litter v1.5.5 // indirect
140-
github.com/smartcontractkit/chainlink-protos/workflows/go v0.0.0-20250822025801-598d3d86f873 // indirect
141142
github.com/stretchr/objx v0.5.2 // indirect
142143
github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect
143144
github.com/x448/float16 v0.8.4 // indirect
@@ -147,11 +148,11 @@ require (
147148
go.opentelemetry.io/proto/otlp v1.6.0 // indirect
148149
go.uber.org/multierr v1.11.0 // indirect
149150
golang.org/x/mod v0.26.0 // indirect
150-
golang.org/x/net v0.42.0 // indirect
151-
golang.org/x/sys v0.34.0 // indirect
152-
golang.org/x/term v0.33.0 // indirect
153-
golang.org/x/text v0.27.0 // indirect
151+
golang.org/x/net v0.43.0 // indirect
152+
golang.org/x/sys v0.35.0 // indirect
153+
golang.org/x/term v0.34.0 // indirect
154+
golang.org/x/text v0.28.0 // indirect
154155
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect
155-
google.golang.org/genproto/googleapis/api v0.0.0-20250528174236-200df99c418a // indirect
156+
google.golang.org/genproto/googleapis/api v0.0.0-20250707201910-8d1bb00bc6a7 // indirect
156157
gopkg.in/yaml.v2 v2.4.0 // indirect
157158
)

0 commit comments

Comments
 (0)