Skip to content

Commit 8d0d322

Browse files
Add Replay to Relayer + Go v1.24 Update (#601)
* Add Replay to Relayer * Add Relayer Replay * Bump nix version for linter * Bump common * Nix Go version * Bump core * Revert install-nix-action version * Bump common * Bump core * Update golangci commands * Update golangci-lint commands * Bump Core * Update shell.nix * Update shell.nix * Tidy * Bump common * Update shell.nix * Update shell.nix * Use t.Context * Update Makefile * Bump mockery * Update Makefile * Update Makefile * Update Makefile * Update Makefile * integration-tests: rm cometbft replace; swap TOMLConfig for RawConfig --------- Co-authored-by: Jordan Krage <[email protected]>
1 parent 2ea4d99 commit 8d0d322

File tree

25 files changed

+1251
-825
lines changed

25 files changed

+1251
-825
lines changed

.tool-versions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ golang 1.23.3
55
python 3.9.13
66

77
# Tools
8-
mockery 2.22.1
8+
mockery 2.53.0
99
golangci-lint 1.62.2
1010
actionlint 1.6.12
1111
shellcheck 0.8.0

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ gomodtidy: gomods
140140

141141
.PHONY: mockery
142142
mockery: $(mockery) ## Install mockery.
143-
go install github.com/vektra/mockery/v2@v2.43.2
143+
go install github.com/vektra/mockery/v2@v2.53.0
144144

145145
.PHONY: rm-mocked
146146
rm-mocked:
@@ -170,15 +170,15 @@ format-ts-check:
170170

171171
.PHONY: lint-go-ops
172172
lint-go-ops:
173-
cd ./ops && golangci-lint --config ../.golangci.yml --color=always --out-format checkstyle:golangci-lint-ops-report.xml run
173+
cd ./ops && golangci-lint --config ../.golangci.yml --color=always --out-format checkstyle run > golangci-lint-ops-report.xml
174174

175175
.PHONY: lint-go-relayer
176176
lint-go-relayer:
177-
cd ./relayer && golangci-lint --config ../.golangci.yml --color=always --out-format checkstyle:golangci-lint-relayer-report.xml run
177+
cd ./relayer && golangci-lint --config ../.golangci.yml --color=always --out-format checkstyle run > golangci-lint-relayer-report.xml
178178

179179
.PHONY: lint-go-test
180180
lint-go-test:
181-
cd ./integration-tests && golangci-lint --config ../.golangci.yml --color=always --exclude=dot-imports --out-format checkstyle:golangci-lint-integration-tests-report.xml run
181+
cd ./integration-tests && golangci-lint --config ../.golangci.yml --color=always --out-format checkstyle run > golangci-lint-integration-tests-report.xml
182182

183183
.PHONY: test-go
184184
test-go: test-unit-go test-unit-go-race test-integration-go

flake.lock

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

integration-tests/.tool-versions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
golang 1.23.3
1+
golang 1.24.1

integration-tests/go.mod

Lines changed: 174 additions & 174 deletions
Large diffs are not rendered by default.

integration-tests/go.sum

Lines changed: 426 additions & 420 deletions
Large diffs are not rendered by default.

integration-tests/testconfig/testconfig.go

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import (
1818
"golang.org/x/text/language"
1919

2020
"github.com/smartcontractkit/chainlink/integration-tests/types/config/node"
21+
"github.com/smartcontractkit/chainlink/v2/core/services/chainlink"
2122

2223
common_cfg "github.com/smartcontractkit/chainlink-common/pkg/config"
2324

@@ -29,7 +30,6 @@ import (
2930
"github.com/smartcontractkit/chainlink-testing-framework/seth"
3031

3132
ocr2_config "github.com/smartcontractkit/chainlink-starknet/integration-tests/testconfig/ocr2"
32-
"github.com/smartcontractkit/chainlink-starknet/relayer/pkg/chainlink/config"
3333
)
3434

3535
type TestConfig struct {
@@ -134,21 +134,21 @@ func (c TestConfig) GetNodeConfigTOML() (string, error) {
134134
RPCL2InternalAPIKey = c.GetRPCL2InternalAPIKey()
135135
}
136136

137-
starkConfig := config.TOMLConfig{
138-
Enabled: ptr.Ptr(true),
139-
ChainID: ptr.Ptr(chainID),
140-
FeederURL: common_cfg.MustParseURL(feederURL),
141-
Nodes: []*config.Node{
137+
starkConfig := chainlink.RawConfig{
138+
"Enabled": true,
139+
"ChainID": chainID,
140+
"FeederURL": feederURL,
141+
"Nodes": []map[string]any{
142142
{
143-
Name: ptr.Ptr("primary"),
144-
URL: common_cfg.MustParseURL(RPCL2Internal),
145-
APIKey: ptr.Ptr(RPCL2InternalAPIKey),
143+
"Name": "primary",
144+
"URL": RPCL2Internal,
145+
"APIKey": RPCL2InternalAPIKey,
146146
},
147147
},
148148
}
149149
baseConfig := node.NewBaseConfig()
150-
baseConfig.Starknet = config.TOMLConfigs{
151-
&starkConfig,
150+
baseConfig.Starknet = chainlink.RawConfigs{
151+
starkConfig,
152152
}
153153
baseConfig.OCR2.Enabled = ptr.Ptr(true)
154154
baseConfig.P2P.V2.Enabled = ptr.Ptr(true)

monitoring/go.mod

Lines changed: 38 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,54 @@
11
module github.com/smartcontractkit/chainlink-starknet/monitoring
22

3-
go 1.23.3
3+
go 1.24
4+
5+
toolchain go1.24.1
46

57
require (
68
github.com/NethermindEth/juno v0.3.1
79
github.com/NethermindEth/starknet.go v0.7.1-0.20240401080518-34a506f3cfdb
810
github.com/prometheus/client_golang v1.20.0
9-
github.com/smartcontractkit/chainlink-common v0.4.2-0.20250116214855-f49c5c27db51
11+
github.com/smartcontractkit/chainlink-common v0.6.0
1012
github.com/smartcontractkit/chainlink-starknet/relayer v0.0.0-20230508053614-9f2fd5fd4ff1
11-
github.com/smartcontractkit/libocr v0.0.0-20241007185508-adbe57025f12
13+
github.com/smartcontractkit/libocr v0.0.0-20250220133800-f3b940c4f298
1214
github.com/stretchr/testify v1.9.0
1315
go.uber.org/multierr v1.11.0
1416
)
1517

1618
require (
1719
github.com/DataDog/zstd v1.5.2 // indirect
1820
github.com/Microsoft/go-winio v0.6.2 // indirect
21+
github.com/XSAM/otelsql v0.29.0 // indirect
1922
github.com/bahlo/generic-list-go v0.2.0 // indirect
2023
github.com/beorn7/perks v1.0.1 // indirect
21-
github.com/bits-and-blooms/bitset v1.10.0 // indirect
22-
github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect
24+
github.com/bits-and-blooms/bitset v1.15.0 // indirect
25+
github.com/btcsuite/btcd/btcec/v2 v2.3.4 // indirect
2326
github.com/btcsuite/btcd/chaincfg/chainhash v1.0.3 // indirect
2427
github.com/buger/jsonparser v1.1.1 // indirect
2528
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
2629
github.com/cespare/xxhash/v2 v2.3.0 // indirect
27-
github.com/cockroachdb/errors v1.10.0 // indirect
30+
github.com/cockroachdb/errors v1.11.3 // indirect
31+
github.com/cockroachdb/fifo v0.0.0-20240606204812-0bbfbd93a7ce // indirect
2832
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
29-
github.com/cockroachdb/pebble v0.0.0-20230928194634-aa077af62593 // indirect
33+
github.com/cockroachdb/pebble v1.1.2 // indirect
3034
github.com/cockroachdb/redact v1.1.5 // indirect
3135
github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect
3236
github.com/confluentinc/confluent-kafka-go/v2 v2.3.0 // indirect
33-
github.com/consensys/bavard v0.1.13 // indirect
34-
github.com/consensys/gnark-crypto v0.12.1 // indirect
35-
github.com/crate-crypto/go-kzg-4844 v0.7.0 // indirect
37+
github.com/consensys/bavard v0.1.22 // indirect
38+
github.com/consensys/gnark-crypto v0.13.0 // indirect
39+
github.com/crate-crypto/go-ipa v0.0.0-20240724233137-53bbb0ceb27a // indirect
40+
github.com/crate-crypto/go-kzg-4844 v1.1.0 // indirect
3641
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
3742
github.com/deckarep/golang-set/v2 v2.6.0 // indirect
38-
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
39-
github.com/ethereum/c-kzg-4844 v0.4.0 // indirect
40-
github.com/ethereum/go-ethereum v1.13.8 // indirect
43+
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect
44+
github.com/ethereum/c-kzg-4844 v1.0.3 // indirect
45+
github.com/ethereum/go-ethereum v1.14.11 // indirect
46+
github.com/ethereum/go-verkle v0.2.2 // indirect
4147
github.com/fatih/color v1.17.0 // indirect
4248
github.com/fsnotify/fsnotify v1.7.0 // indirect
4349
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
4450
github.com/gabriel-vasile/mimetype v1.4.3 // indirect
45-
github.com/getsentry/sentry-go v0.23.0 // indirect
51+
github.com/getsentry/sentry-go v0.27.0 // indirect
4652
github.com/go-json-experiment/json v0.0.0-20231102232822-2e55bd4e08b0 // indirect
4753
github.com/go-logr/logr v1.4.2 // indirect
4854
github.com/go-logr/stdr v1.2.2 // indirect
@@ -63,13 +69,23 @@ require (
6369
github.com/hashicorp/go-hclog v1.5.0 // indirect
6470
github.com/hashicorp/go-plugin v1.6.2 // indirect
6571
github.com/hashicorp/yamux v0.1.1 // indirect
66-
github.com/holiman/uint256 v1.2.4 // indirect
72+
github.com/holiman/uint256 v1.3.1 // indirect
6773
github.com/invopop/jsonschema v0.12.0 // indirect
74+
github.com/jackc/chunkreader/v2 v2.0.1 // indirect
75+
github.com/jackc/pgconn v1.14.3 // indirect
76+
github.com/jackc/pgio v1.0.0 // indirect
77+
github.com/jackc/pgpassfile v1.0.0 // indirect
78+
github.com/jackc/pgproto3/v2 v2.3.3 // indirect
79+
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
80+
github.com/jackc/pgtype v1.14.0 // indirect
81+
github.com/jackc/pgx/v4 v4.18.3 // indirect
82+
github.com/jmoiron/sqlx v1.4.0 // indirect
6883
github.com/jpillora/backoff v1.0.0 // indirect
6984
github.com/klauspost/compress v1.17.11 // indirect
7085
github.com/kr/pretty v0.3.1 // indirect
7186
github.com/kr/text v0.2.0 // indirect
7287
github.com/leodido/go-urn v1.4.0 // indirect
88+
github.com/lib/pq v1.10.9 // indirect
7389
github.com/linkedin/goavro/v2 v2.12.0 // indirect
7490
github.com/mailru/easyjson v0.7.7 // indirect
7591
github.com/mattn/go-colorable v0.1.13 // indirect
@@ -87,12 +103,13 @@ require (
87103
github.com/riferrei/srclient v0.5.4 // indirect
88104
github.com/rogpeppe/go-internal v1.12.0 // indirect
89105
github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect
106+
github.com/scylladb/go-reflectx v1.0.1 // indirect
90107
github.com/shirou/gopsutil v3.21.11+incompatible // indirect
91108
github.com/shopspring/decimal v1.4.0 // indirect
92109
github.com/smartcontractkit/grpc-proxy v0.0.0-20240830132753-a7e17fec5ab7 // indirect
93110
github.com/spf13/pflag v1.0.5 // indirect
94111
github.com/stretchr/objx v0.5.2 // indirect
95-
github.com/supranational/blst v0.3.11 // indirect
112+
github.com/supranational/blst v0.3.13 // indirect
96113
github.com/test-go/testify v1.1.4 // indirect
97114
github.com/tklauser/go-sysconf v0.3.12 // indirect
98115
github.com/tklauser/numcpus v0.6.1 // indirect
@@ -119,16 +136,16 @@ require (
119136
go.opentelemetry.io/otel/trace v1.30.0 // indirect
120137
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
121138
go.uber.org/zap v1.27.0 // indirect
122-
golang.org/x/crypto v0.28.0 // indirect
139+
golang.org/x/crypto v0.29.0 // indirect
123140
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
124141
golang.org/x/net v0.30.0 // indirect
125-
golang.org/x/sync v0.8.0 // indirect
126-
golang.org/x/sys v0.26.0 // indirect
127-
golang.org/x/text v0.19.0 // indirect
142+
golang.org/x/sync v0.9.0 // indirect
143+
golang.org/x/sys v0.27.0 // indirect
144+
golang.org/x/text v0.20.0 // indirect
128145
google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 // indirect
129146
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
130147
google.golang.org/grpc v1.67.1 // indirect
131-
google.golang.org/protobuf v1.35.1 // indirect
148+
google.golang.org/protobuf v1.36.6 // indirect
132149
gopkg.in/yaml.v3 v3.0.1 // indirect
133150
rsc.io/tmplfunc v0.0.3 // indirect
134151
)

0 commit comments

Comments
 (0)