Skip to content

Commit

Permalink
move chain and config from core
Browse files Browse the repository at this point in the history
bump go version on nix + nixpkgs

bump golangci-lint

make golangci-lint build use go1.21
  • Loading branch information
jmank88 committed Oct 23, 2023
1 parent 3dc6bc4 commit c51f611
Show file tree
Hide file tree
Showing 19 changed files with 2,614 additions and 485 deletions.
4 changes: 2 additions & 2 deletions .tool-versions
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# Languages
nodejs 18.6.0
yarn 1.22.19
golang 1.20.1
golang 1.21.3
python 3.9.13

# Tools
mockery 2.22.1
golangci-lint 1.51.2
golangci-lint 1.55.0
actionlint 1.6.12
shellcheck 0.8.0

Expand Down
6 changes: 3 additions & 3 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

236 changes: 172 additions & 64 deletions integration-tests/go.mod

Large diffs are not rendered by default.

1,660 changes: 1,541 additions & 119 deletions integration-tests/go.sum

Large diffs are not rendered by default.

10 changes: 6 additions & 4 deletions integration-tests/smoke/ocr2_test.go
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
package smoke_test

// revive:disable:dot-imports
import (
"flag"
"fmt"
"github.com/smartcontractkit/chainlink/integration-tests/actions"
"go.uber.org/zap/zapcore"
"testing"

"go.uber.org/zap/zapcore"

"github.com/stretchr/testify/require"

"github.com/smartcontractkit/chainlink-starknet/integration-tests/common"
"github.com/smartcontractkit/chainlink-starknet/ops/gauntlet"
"github.com/smartcontractkit/chainlink-starknet/ops/utils"
"github.com/stretchr/testify/require"

"github.com/smartcontractkit/chainlink/integration-tests/actions"
)

var (
Expand Down
7 changes: 4 additions & 3 deletions integration-tests/soak/ocr2_test.go
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
package soak_test

// revive:disable:dot-imports
import (
"flag"
"fmt"
"testing"

"github.com/stretchr/testify/require"
"go.uber.org/zap/zapcore"

"github.com/smartcontractkit/chainlink-starknet/integration-tests/common"
"github.com/smartcontractkit/chainlink-starknet/ops/gauntlet"
"github.com/smartcontractkit/chainlink-starknet/ops/utils"

"github.com/smartcontractkit/chainlink/integration-tests/actions"
"github.com/stretchr/testify/require"
"go.uber.org/zap/zapcore"
)

var (
Expand Down
67 changes: 39 additions & 28 deletions monitoring/go.mod
Original file line number Diff line number Diff line change
@@ -1,21 +1,24 @@
module github.com/smartcontractkit/chainlink-starknet/monitoring

go 1.20
go 1.21

toolchain go1.21.1

require (
github.com/prometheus/client_golang v1.15.0
github.com/prometheus/client_golang v1.17.0
github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704
github.com/smartcontractkit/chainlink-relay v0.1.7-0.20230808141159-4e20b0757f3a
github.com/smartcontractkit/chainlink-relay v0.1.7-0.20231020230319-2ede955d1dc9
github.com/smartcontractkit/chainlink-starknet/relayer v0.0.0-20230508053614-9f2fd5fd4ff1
github.com/smartcontractkit/libocr v0.0.0-20230802221916-2271752fa829
github.com/smartcontractkit/libocr v0.0.0-20230925165524-ffa38fe11ef8
github.com/stretchr/testify v1.8.4
go.uber.org/multierr v1.11.0
)

require (
github.com/benbjohnson/clock v1.3.0 // indirect
cloud.google.com/go/compute/metadata v0.2.3 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/btcsuite/btcd/btcec/v2 v2.2.1 // indirect
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/confluentinc/confluent-kafka-go v1.9.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
Expand All @@ -31,12 +34,13 @@ require (
github.com/golang/protobuf v1.5.3 // indirect
github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect
github.com/google/go-querystring v1.1.0 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/google/uuid v1.3.1 // indirect
github.com/gorilla/websocket v1.5.0 // indirect
github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.0-rc.0 // indirect
github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.0 // indirect
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.0-rc.3 // indirect
github.com/hashicorp/go-hclog v0.14.1 // indirect
github.com/hashicorp/go-plugin v1.4.10 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
github.com/hashicorp/go-hclog v1.5.0 // indirect
github.com/hashicorp/go-plugin v1.5.2 // indirect
github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb // indirect
github.com/holiman/uint256 v1.2.2-0.20230321075855-87b91420868c // indirect
github.com/jpillora/backoff v1.0.0 // indirect
Expand All @@ -50,32 +54,36 @@ require (
github.com/oklog/run v1.0.0 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/common v0.42.0 // indirect
github.com/prometheus/procfs v0.9.0 // indirect
github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16 // indirect
github.com/prometheus/common v0.44.0 // indirect
github.com/prometheus/procfs v0.11.1 // indirect
github.com/riferrei/srclient v0.5.4 // indirect
github.com/santhosh-tekuri/jsonschema/v5 v5.1.1 // indirect
github.com/shirou/gopsutil v3.21.11+incompatible // indirect
github.com/shopspring/decimal v1.3.1 // indirect
github.com/stretchr/objx v0.5.0 // indirect
github.com/tklauser/go-sysconf v0.3.10 // indirect
github.com/tklauser/numcpus v0.5.0 // indirect
github.com/yusufpapurcu/wmi v1.2.2 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0 // indirect
go.opentelemetry.io/otel v1.16.0 // indirect
go.opentelemetry.io/otel/metric v1.16.0 // indirect
go.opentelemetry.io/otel/sdk v1.16.0 // indirect
go.opentelemetry.io/otel/trace v1.16.0 // indirect
go.uber.org/atomic v1.10.0 // indirect
go.uber.org/zap v1.24.0 // indirect
golang.org/x/crypto v0.9.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.45.0 // indirect
go.opentelemetry.io/otel v1.19.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.18.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.18.0 // indirect
go.opentelemetry.io/otel/metric v1.19.0 // indirect
go.opentelemetry.io/otel/sdk v1.19.0 // indirect
go.opentelemetry.io/otel/trace v1.19.0 // indirect
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
go.uber.org/zap v1.26.0 // indirect
golang.org/x/crypto v0.13.0 // indirect
golang.org/x/exp v0.0.0-20230425010034-47ecfdc1ba53 // indirect
golang.org/x/net v0.10.0 // indirect
golang.org/x/sync v0.1.0 // indirect
golang.org/x/sys v0.8.0 // indirect
golang.org/x/text v0.9.0 // indirect
google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 // indirect
google.golang.org/grpc v1.55.0 // indirect
google.golang.org/protobuf v1.30.0 // indirect
golang.org/x/net v0.15.0 // indirect
golang.org/x/sync v0.3.0 // indirect
golang.org/x/sys v0.12.0 // indirect
golang.org/x/text v0.13.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
google.golang.org/grpc v1.58.3 // indirect
google.golang.org/protobuf v1.31.0 // indirect
gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Expand All @@ -87,8 +95,11 @@ replace (

github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1

// until merged upstream: https://github.com/hashicorp/go-plugin/pull/257
github.com/hashicorp/go-plugin => github.com/smartcontractkit/go-plugin v0.0.0-20231003134350-e49dad63b306

// until merged upstream: https://github.com/mwitkow/grpc-proxy/pull/69
github.com/mwitkow/grpc-proxy => github.com/jmank88/grpc-proxy v0.0.0-20230731114312-86ed94c93231
github.com/mwitkow/grpc-proxy => github.com/smartcontractkit/grpc-proxy v0.0.0-20230731113816-f1be6620749f

github.com/smartcontractkit/chainlink-starknet/relayer => ../relayer
)
Loading

0 comments on commit c51f611

Please sign in to comment.