Skip to content

Commit 1024f2b

Browse files
cedric-cordeniercedric-cordenier
authored
Merge pull request #426 from smartcontractkit/KS-186-AddOCR3CapabilityProviderStub
[KS-186] Add OCR3 Capability Provider Stub
2 parents 50c7a33 + 2bdbef0 commit 1024f2b

File tree

10 files changed

+196
-151
lines changed

10 files changed

+196
-151
lines changed

‎integration-tests/common/common.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ import (
2727
"gopkg.in/guregu/null.v4"
2828

2929
common_cfg "github.com/smartcontractkit/chainlink-common/pkg/config"
30+
"github.com/smartcontractkit/chainlink-common/pkg/types"
3031
"github.com/smartcontractkit/chainlink-testing-framework/k8s/environment"
3132
"github.com/smartcontractkit/chainlink/integration-tests/client"
3233
"github.com/smartcontractkit/chainlink/integration-tests/types/config/node"
3334
cl "github.com/smartcontractkit/chainlink/v2/core/services/chainlink"
3435
"github.com/smartcontractkit/chainlink/v2/core/services/job"
35-
"github.com/smartcontractkit/chainlink/v2/core/services/relay"
3636
)
3737

3838
type Common struct {
@@ -274,7 +274,7 @@ func (c *Common) CreateJobsForContract(cc *ChainlinkClient, observationSource st
274274

275275
oracleSpec := job.OCR2OracleSpec{
276276
ContractID: ocrControllerAddress,
277-
Relay: relay.StarkNet,
277+
Relay: types.NetworkStarkNet,
278278
RelayConfig: bootstrapRelayConfig,
279279
ContractConfigConfirmations: 1, // don't wait for confirmation on devnet
280280
}
@@ -317,7 +317,7 @@ func (c *Common) CreateJobsForContract(cc *ChainlinkClient, observationSource st
317317

318318
oracleSpec = job.OCR2OracleSpec{
319319
ContractID: ocrControllerAddress,
320-
Relay: relay.StarkNet,
320+
Relay: types.NetworkStarkNet,
321321
RelayConfig: relayConfig,
322322
PluginType: "median",
323323
OCRKeyBundleID: null.StringFrom(cc.NKeys[nIdx].OCR2Key.Data.ID),

‎integration-tests/common/test_common.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ func (m *OCRv2TestState) DeployCluster() {
150150
} else { // Otherwise use docker
151151
env, err := test_env.NewTestEnv()
152152
require.NoError(m.TestConfig.T, err)
153-
stark := test_env_starknet.NewStarknet([]string{env.Network.Name}, *m.Common.TestConfig.Common.DevnetImage)
153+
stark := test_env_starknet.NewStarknet([]string{env.DockerNetwork.Name}, *m.Common.TestConfig.Common.DevnetImage)
154154
err = stark.StartContainer()
155155
require.NoError(m.TestConfig.T, err)
156156

‎integration-tests/go.mod

Lines changed: 48 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/smartcontractkit/chainlink-starknet/integration-tests
22

3-
go 1.21.4
3+
go 1.21.7
44

55
require (
66
github.com/NethermindEth/juno v0.3.1
@@ -12,12 +12,13 @@ require (
1212
github.com/pelletier/go-toml/v2 v2.1.1
1313
github.com/pkg/errors v0.9.1
1414
github.com/rs/zerolog v1.30.0
15-
github.com/smartcontractkit/chainlink-common v0.1.7-0.20240213113935-001c2f4befd4
15+
github.com/smartcontractkit/chainlink-common v0.1.7-0.20240508083542-17d8e2bbc336
1616
github.com/smartcontractkit/chainlink-starknet/ops v0.0.0-20231205180940-ea2e3e916725
17-
github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20240213121419-1272736c2ac0
18-
github.com/smartcontractkit/chainlink-testing-framework v1.27.0
19-
github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20240215151806-009c99876c4c
20-
github.com/smartcontractkit/chainlink/v2 v2.9.0-beta0.0.20240215151806-009c99876c4c
17+
github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20240325075535-0f7eb05ee595
18+
github.com/smartcontractkit/chainlink-testing-framework v1.28.8
19+
github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20240506164029-09f8c7fcd63b
20+
github.com/smartcontractkit/chainlink/v2 v2.10.0-beta0.0.20240508135056-c90f6d5bdcfb
21+
github.com/smartcontractkit/seth v0.1.6-0.20240429143720-cacb8160ecec
2122
github.com/stretchr/testify v1.9.0
2223
github.com/testcontainers/testcontainers-go v0.28.0
2324
go.uber.org/zap v1.26.0
@@ -55,6 +56,7 @@ require (
5556
github.com/Microsoft/go-winio v0.6.1 // indirect
5657
github.com/Microsoft/hcsshim v0.11.4 // indirect
5758
github.com/VictoriaMetrics/fastcache v1.12.1 // indirect
59+
github.com/XSAM/otelsql v0.27.0 // indirect
5860
github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect
5961
github.com/armon/go-metrics v0.4.1 // indirect
6062
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
@@ -63,7 +65,7 @@ require (
6365
github.com/aws/aws-sdk-go v1.45.25 // indirect
6466
github.com/aws/constructs-go/constructs/v10 v10.1.255 // indirect
6567
github.com/aws/jsii-runtime-go v1.75.0 // indirect
66-
github.com/aybabtme/rgbterm v0.0.0-20170906152045-cc83f3b3ce59 // indirect
68+
github.com/bahlo/generic-list-go v0.2.0 // indirect
6769
github.com/benbjohnson/clock v1.3.5 // indirect
6870
github.com/beorn7/perks v1.0.1 // indirect
6971
github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816 // indirect
@@ -125,8 +127,9 @@ require (
125127
github.com/docker/docker v25.0.2+incompatible // indirect
126128
github.com/docker/go-connections v0.5.0 // indirect
127129
github.com/docker/go-units v0.5.0 // indirect
130+
github.com/dominikbraun/graph v0.23.0 // indirect
128131
github.com/dustin/go-humanize v1.0.1 // indirect
129-
github.com/dvsekhvalnov/jose2go v1.5.0 // indirect
132+
github.com/dvsekhvalnov/jose2go v1.7.0 // indirect
130133
github.com/edsrzf/mmap-go v1.1.0 // indirect
131134
github.com/emicklei/go-restful/v3 v3.10.2 // indirect
132135
github.com/esote/minmaxheap v1.0.0 // indirect
@@ -143,8 +146,8 @@ require (
143146
github.com/fvbommel/sortorder v1.0.2 // indirect
144147
github.com/fxamacker/cbor/v2 v2.5.0 // indirect
145148
github.com/gabriel-vasile/mimetype v1.4.2 // indirect
146-
github.com/gagliardetto/binary v0.7.1 // indirect
147-
github.com/gagliardetto/solana-go v1.4.1-0.20220428092759-5250b4abbb27 // indirect
149+
github.com/gagliardetto/binary v0.7.7 // indirect
150+
github.com/gagliardetto/solana-go v1.8.4 // indirect
148151
github.com/gagliardetto/treeout v0.1.4 // indirect
149152
github.com/gballet/go-libpcsclite v0.0.0-20191108122812-4678299bea08 // indirect
150153
github.com/gballet/go-verkle v0.1.1-0.20231031103413-a67434b50f46 // indirect
@@ -159,7 +162,7 @@ require (
159162
github.com/go-kit/log v0.2.1 // indirect
160163
github.com/go-ldap/ldap/v3 v3.4.6 // indirect
161164
github.com/go-logfmt/logfmt v0.6.0 // indirect
162-
github.com/go-logr/logr v1.3.0 // indirect
165+
github.com/go-logr/logr v1.4.1 // indirect
163166
github.com/go-logr/stdr v1.2.2 // indirect
164167
github.com/go-ole/go-ole v1.2.6 // indirect
165168
github.com/go-openapi/analysis v0.21.4 // indirect
@@ -175,7 +178,6 @@ require (
175178
github.com/go-playground/universal-translator v0.18.1 // indirect
176179
github.com/go-playground/validator/v10 v10.15.5 // indirect
177180
github.com/go-redis/redis/v8 v8.11.5 // indirect
178-
github.com/go-sql-driver/mysql v1.7.1 // indirect
179181
github.com/go-webauthn/webauthn v0.9.4 // indirect
180182
github.com/go-webauthn/x v0.1.5 // indirect
181183
github.com/goccy/go-json v0.10.2 // indirect
@@ -187,7 +189,7 @@ require (
187189
github.com/golang-jwt/jwt/v5 v5.2.0 // indirect
188190
github.com/golang/glog v1.1.2 // indirect
189191
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
190-
github.com/golang/protobuf v1.5.3 // indirect
192+
github.com/golang/protobuf v1.5.4 // indirect
191193
github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect
192194
github.com/google/btree v1.1.2 // indirect
193195
github.com/google/gnostic v0.6.9 // indirect
@@ -209,8 +211,8 @@ require (
209211
github.com/grafana/gomemcache v0.0.0-20231023152154-6947259a0586 // indirect
210212
github.com/grafana/loki v1.6.2-0.20231215164305-b51b7d7b5503 // indirect
211213
github.com/grafana/loki/pkg/push v0.0.0-20231201111602-11ef833ed3e4 // indirect
212-
github.com/grafana/pyroscope-go v1.0.4 // indirect
213-
github.com/grafana/pyroscope-go/godeltaprof v0.1.4 // indirect
214+
github.com/grafana/pyroscope-go v1.1.1 // indirect
215+
github.com/grafana/pyroscope-go/godeltaprof v0.1.6 // indirect
214216
github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd // indirect
215217
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
216218
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
@@ -231,6 +233,7 @@ require (
231233
github.com/hashicorp/go-msgpack v0.5.5 // indirect
232234
github.com/hashicorp/go-multierror v1.1.1 // indirect
233235
github.com/hashicorp/go-plugin v1.6.0 // indirect
236+
github.com/hashicorp/go-retryablehttp v0.7.5 // indirect
234237
github.com/hashicorp/go-rootcerts v1.0.2 // indirect
235238
github.com/hashicorp/go-sockaddr v1.0.2 // indirect
236239
github.com/hashicorp/golang-lru v0.6.0 // indirect
@@ -246,14 +249,15 @@ require (
246249
github.com/huin/goupnp v1.3.0 // indirect
247250
github.com/imdario/mergo v0.3.16 // indirect
248251
github.com/inconshreveable/mousetrap v1.1.0 // indirect
252+
github.com/invopop/jsonschema v0.12.0 // indirect
249253
github.com/jackc/chunkreader/v2 v2.0.1 // indirect
250-
github.com/jackc/pgconn v1.14.1 // indirect
254+
github.com/jackc/pgconn v1.14.3 // indirect
251255
github.com/jackc/pgio v1.0.0 // indirect
252256
github.com/jackc/pgpassfile v1.0.0 // indirect
253-
github.com/jackc/pgproto3/v2 v2.3.2 // indirect
257+
github.com/jackc/pgproto3/v2 v2.3.3 // indirect
254258
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
255259
github.com/jackc/pgtype v1.14.0 // indirect
256-
github.com/jackc/pgx/v4 v4.18.1 // indirect
260+
github.com/jackc/pgx/v4 v4.18.2 // indirect
257261
github.com/jackpal/go-nat-pmp v1.0.2 // indirect
258262
github.com/jmespath/go-jmespath v0.4.0 // indirect
259263
github.com/jmhodges/levigo v1.0.0 // indirect
@@ -264,7 +268,7 @@ require (
264268
github.com/json-iterator/go v1.1.12 // indirect
265269
github.com/julienschmidt/httprouter v1.3.0 // indirect
266270
github.com/kelseyhightower/envconfig v1.4.0 // indirect
267-
github.com/klauspost/compress v1.17.2 // indirect
271+
github.com/klauspost/compress v1.17.3 // indirect
268272
github.com/klauspost/cpuid/v2 v2.2.5 // indirect
269273
github.com/kr/pretty v0.3.1 // indirect
270274
github.com/kr/text v0.2.0 // indirect
@@ -299,6 +303,7 @@ require (
299303
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
300304
github.com/modern-go/reflect2 v1.0.2 // indirect
301305
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
306+
github.com/montanaflynn/stats v0.7.1 // indirect
302307
github.com/morikuni/aec v1.0.0 // indirect
303308
github.com/mostynb/zstdpool-freelist v0.0.0-20201229113212-927304c0c3b1 // indirect
304309
github.com/mr-tron/base58 v1.2.0 // indirect
@@ -337,29 +342,30 @@ require (
337342
github.com/robfig/cron/v3 v3.0.1 // indirect
338343
github.com/rogpeppe/go-internal v1.11.0 // indirect
339344
github.com/russross/blackfriday v1.6.0 // indirect
345+
github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect
340346
github.com/sasha-s/go-deadlock v0.3.1 // indirect
341347
github.com/scylladb/go-reflectx v1.0.1 // indirect
342348
github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 // indirect
343349
github.com/segmentio/ksuid v1.0.4 // indirect
344350
github.com/sercand/kuberesolver/v5 v5.1.1 // indirect
345351
github.com/shirou/gopsutil v3.21.11+incompatible // indirect
346-
github.com/shirou/gopsutil/v3 v3.23.12 // indirect
352+
github.com/shirou/gopsutil/v3 v3.24.3 // indirect
347353
github.com/shoenig/go-m1cpu v0.1.6 // indirect
348354
github.com/shopspring/decimal v1.3.1 // indirect
349355
github.com/sirupsen/logrus v1.9.3 // indirect
350356
github.com/slack-go/slack v0.12.2 // indirect
351-
github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 // indirect
352-
github.com/smartcontractkit/chainlink-automation v1.0.2-0.20240118014648-1ab6a88c9429 // indirect
353-
github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20240213120401-01a23955f9f8 // indirect
354-
github.com/smartcontractkit/chainlink-data-streams v0.0.0-20240214203158-47dae5de1336 // indirect
355-
github.com/smartcontractkit/chainlink-feeds v0.0.0-20240119021347-3c541a78cdb8 // indirect
356-
github.com/smartcontractkit/chainlink-solana v1.0.3-0.20240213161921-c4d342b761b0 // indirect
357+
github.com/smartcontractkit/chain-selectors v1.0.10 // indirect
358+
github.com/smartcontractkit/chainlink-automation v1.0.3 // indirect
359+
github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20240508101745-af1ed7bc8a69 // indirect
360+
github.com/smartcontractkit/chainlink-data-streams v0.0.0-20240220203239-09be0ea34540 // indirect
361+
github.com/smartcontractkit/chainlink-feeds v0.0.0-20240422130241-13c17a91b2ab // indirect
362+
github.com/smartcontractkit/chainlink-solana v1.0.3-0.20240508123714-3a7c0d9d22e3 // indirect
357363
github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868 // indirect
358-
github.com/smartcontractkit/libocr v0.0.0-20240326191951-2bbe9382d052 // indirect
364+
github.com/smartcontractkit/libocr v0.0.0-20240419185742-fd3cab206b2c // indirect
359365
github.com/smartcontractkit/tdh2/go/ocr2/decryptionplugin v0.0.0-20230906073235-9e478e5e19f1 // indirect
360366
github.com/smartcontractkit/tdh2/go/tdh2 v0.0.0-20230906073235-9e478e5e19f1 // indirect
361-
github.com/smartcontractkit/wasp v0.4.2 // indirect
362-
github.com/smartcontractkit/wsrpc v0.7.2 // indirect
367+
github.com/smartcontractkit/wasp v0.4.5 // indirect
368+
github.com/smartcontractkit/wsrpc v0.8.1 // indirect
363369
github.com/soheilhy/cmux v0.1.5 // indirect
364370
github.com/sony/gobreaker v0.5.0 // indirect
365371
github.com/spf13/afero v1.9.5 // indirect
@@ -369,6 +375,7 @@ require (
369375
github.com/spf13/pflag v1.0.5 // indirect
370376
github.com/spf13/viper v1.16.0 // indirect
371377
github.com/status-im/keycard-go v0.2.0 // indirect
378+
github.com/streamingfast/logging v0.0.0-20220405224725-2755dab2ce75 // indirect
372379
github.com/stretchr/objx v0.5.2 // indirect
373380
github.com/subosito/gotenv v1.4.2 // indirect
374381
github.com/supranational/blst v0.3.11 // indirect
@@ -391,9 +398,10 @@ require (
391398
github.com/umbracle/ethgo v0.1.3 // indirect
392399
github.com/umbracle/fastrlp v0.0.0-20220527094140-59d5dd30e722 // indirect
393400
github.com/valyala/fastjson v1.4.1 // indirect
401+
github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect
394402
github.com/x448/float16 v0.8.4 // indirect
395403
github.com/xlab/treeprint v1.1.0 // indirect
396-
github.com/yusufpapurcu/wmi v1.2.3 // indirect
404+
github.com/yusufpapurcu/wmi v1.2.4 // indirect
397405
github.com/zondax/hid v0.9.1 // indirect
398406
github.com/zondax/ledger-go v0.14.1 // indirect
399407
go.dedis.ch/fixbuf v1.0.3 // indirect
@@ -402,18 +410,18 @@ require (
402410
go.etcd.io/etcd/api/v3 v3.5.9 // indirect
403411
go.etcd.io/etcd/client/pkg/v3 v3.5.9 // indirect
404412
go.etcd.io/etcd/client/v3 v3.5.9 // indirect
405-
go.mongodb.org/mongo-driver v1.12.0 // indirect
413+
go.mongodb.org/mongo-driver v1.15.0 // indirect
406414
go.opencensus.io v0.24.0 // indirect
407415
go.opentelemetry.io/collector/pdata v1.0.0-rcv0016 // indirect
408416
go.opentelemetry.io/collector/semconv v0.87.0 // indirect
409417
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 // indirect
410418
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 // indirect
411-
go.opentelemetry.io/otel v1.21.0 // indirect
419+
go.opentelemetry.io/otel v1.24.0 // indirect
412420
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0 // indirect
413421
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0 // indirect
414-
go.opentelemetry.io/otel/metric v1.21.0 // indirect
422+
go.opentelemetry.io/otel/metric v1.24.0 // indirect
415423
go.opentelemetry.io/otel/sdk v1.21.0 // indirect
416-
go.opentelemetry.io/otel/trace v1.21.0 // indirect
424+
go.opentelemetry.io/otel/trace v1.24.0 // indirect
417425
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
418426
go.starlark.net v0.0.0-20220817180228-f738f5508c12 // indirect
419427
go.uber.org/atomic v1.11.0 // indirect
@@ -422,14 +430,14 @@ require (
422430
go.uber.org/ratelimit v0.3.0 // indirect
423431
go4.org/netipx v0.0.0-20230125063823-8449b0a6169f // indirect
424432
golang.org/x/arch v0.7.0 // indirect
425-
golang.org/x/crypto v0.19.0 // indirect
433+
golang.org/x/crypto v0.22.0 // indirect
426434
golang.org/x/exp v0.0.0-20240213143201-ec583247a57a // indirect
427435
golang.org/x/mod v0.15.0 // indirect
428-
golang.org/x/net v0.21.0 // indirect
436+
golang.org/x/net v0.24.0 // indirect
429437
golang.org/x/oauth2 v0.17.0 // indirect
430438
golang.org/x/sync v0.6.0 // indirect
431-
golang.org/x/sys v0.17.0 // indirect
432-
golang.org/x/term v0.17.0 // indirect
439+
golang.org/x/sys v0.19.0 // indirect
440+
golang.org/x/term v0.19.0 // indirect
433441
golang.org/x/time v0.5.0 // indirect
434442
golang.org/x/tools v0.18.0 // indirect
435443
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
@@ -439,8 +447,7 @@ require (
439447
google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b // indirect
440448
google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 // indirect
441449
google.golang.org/grpc v1.59.0 // indirect
442-
google.golang.org/protobuf v1.32.0 // indirect
443-
gopkg.in/guregu/null.v2 v2.1.2 // indirect
450+
google.golang.org/protobuf v1.33.0 // indirect
444451
gopkg.in/inf.v0 v0.9.1 // indirect
445452
gopkg.in/ini.v1 v1.67.0 // indirect
446453
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
@@ -464,7 +471,7 @@ require (
464471
sigs.k8s.io/kustomize/api v0.12.1 // indirect
465472
sigs.k8s.io/kustomize/kyaml v0.13.9 // indirect
466473
sigs.k8s.io/structured-merge-diff/v4 v4.3.0 // indirect
467-
sigs.k8s.io/yaml v1.3.0 // indirect
474+
sigs.k8s.io/yaml v1.4.0 // indirect
468475
)
469476

470477
replace (

0 commit comments

Comments
 (0)