Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bumps dependencies #503

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Bumps dependencies #503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
21 changes: 11 additions & 10 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,11 @@ require (
github.com/gagliardetto/treeout v0.1.4
github.com/google/uuid v1.3.0
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.14.0
github.com/prometheus/client_golang v1.15.0
github.com/smartcontractkit/chainlink-relay v0.1.7-0.20230525161650-dce1bc58b504
github.com/smartcontractkit/chainlink-relay v0.1.7-0.20230531175356-03a8f54e3528
github.com/smartcontractkit/libocr v0.0.0-20230525150148-a75f6e244bb3
github.com/smartcontractkit/libocr v0.0.0-20230531174957-6e75d6e613d1
github.com/stretchr/testify v1.8.2
go.uber.org/multierr v1.8.0
go.uber.org/zap v1.24.0
Expand All @@ -34,18 +36,16 @@ require (
github.com/dfuse-io/logging v0.0.0-20210109005628-b97a57253f70 // indirect
github.com/fatih/color v1.13.0 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/jpillora/backoff v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/compress v1.15.11 // indirect
github.com/klauspost/compress v1.15.15 // indirect
github.com/linkedin/goavro/v2 v2.12.0 // indirect
github.com/logrusorgru/aurora v2.0.3+incompatible // indirect
github.com/magiconair/properties v1.8.6 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.16 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
Expand All @@ -54,9 +54,10 @@ require (
github.com/onsi/gomega v1.24.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/common v0.37.0 // indirect
github.com/prometheus/procfs v0.8.0 // indirect
github.com/prometheus/common v0.42.0 // indirect
github.com/prometheus/procfs v0.9.0 // indirect
github.com/riferrei/srclient v0.5.4 // indirect
github.com/rogpeppe/go-internal v1.9.0 // indirect
github.com/santhosh-tekuri/jsonschema/v5 v5.1.1 // indirect
github.com/stretchr/objx v0.5.0 // indirect
github.com/teris-io/shortid v0.0.0-20201117134242-e59966efd125 // indirect
Expand All @@ -67,8 +68,8 @@ require (
go.uber.org/atomic v1.9.0 // indirect
go.uber.org/ratelimit v0.2.0 // indirect
golang.org/x/crypto v0.5.0 // indirect
golang.org/x/sys v0.5.0 // indirect
golang.org/x/sys v0.6.0 // indirect
golang.org/x/term v0.4.0 // indirect
google.golang.org/protobuf v1.28.1 // indirect
google.golang.org/protobuf v1.30.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
159 changes: 39 additions & 120 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions integration-tests/common/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ import (
mockservercfg "github.com/smartcontractkit/chainlink-env/pkg/helm/mockserver-cfg"
"github.com/smartcontractkit/chainlink-env/pkg/helm/sol"

"github.com/smartcontractkit/libocr/offchainreporting2/confighelper"
"github.com/smartcontractkit/libocr/offchainreporting2/reportingplugin/median"
"github.com/smartcontractkit/libocr/offchainreporting2/types"
"github.com/smartcontractkit/libocr/offchainreporting2plus/confighelper"
"github.com/smartcontractkit/libocr/offchainreporting2plus/reportingplugin/median"
"github.com/smartcontractkit/libocr/offchainreporting2plus/types"

ctfClient "github.com/smartcontractkit/chainlink-testing-framework/client"
"github.com/smartcontractkit/chainlink/integration-tests/client"
Expand Down
6 changes: 6 additions & 0 deletions integration-tests/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,6 +395,12 @@ replace (
// K8s imports are weird
k8s.io/api => k8s.io/api v0.25.4
k8s.io/client-go => k8s.io/client-go v0.25.4

// TODO: replace this with the installation of the libocr final version supporting block ranges for mercury
github.com/smartcontractkit/libocr => github.com/smartcontractkit/libocr v0.0.0-20230428143950-b8c4d1923d16

github.com/smartcontractkit/chainlink/v2 => github.com/smartcontractkit/chainlink/v2 v2.0.0-20230424160613-84de6834a2e7
github.com/smartcontractkit/chainlink/integration-tests => github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20230424160613-84de6834a2e7
)

exclude k8s.io/client-go v12.0.0+incompatible
11 changes: 11 additions & 0 deletions integration-tests/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1331,6 +1331,7 @@ github.com/smartcontractkit/chainlink-testing-framework v1.11.5 h1:gYSnOQhLxgE0m
github.com/smartcontractkit/chainlink-testing-framework v1.11.5/go.mod h1:0ktPcDE5fFSvNewsaHuC4tGVaiCMQsl5RN/cWO5k0rg=
github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20230418232145-9b83bdc20e8a h1:P4SBSDeAaBqWBoOiYLberqn68/ziF8lSubfySCTjEZI=
github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20230418232145-9b83bdc20e8a/go.mod h1:yEBKMo/0B2q2U7peHWTUiAVYU0swpgrBGP87ZUBcsvg=
<<<<<<< HEAD
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unresolved conflicts

github.com/smartcontractkit/chainlink/v2 v2.2.0-mercury-20230527.0.20230531021143-790758f0bd08 h1:WgEteBcWB+t+Na8K1GReIM6SS1CPxyO6/sST5L9NSsQ=
github.com/smartcontractkit/chainlink/v2 v2.2.0-mercury-20230527.0.20230531021143-790758f0bd08/go.mod h1:euMZJQMObJPBsmMD8Klvy/xvXg/hOzbU2D4eal8phiM=
github.com/smartcontractkit/libocr v0.0.0-20230525150148-a75f6e244bb3 h1:/Gel/U5eIZ/BGGr25OrHaXiVDTAJ5DYX5+UlXp3q7Gg=
Expand All @@ -1339,6 +1340,16 @@ github.com/smartcontractkit/ocr2keepers v0.6.15 h1:dFhg+qT+tc6b3G8N4qnAHuHe8N0m8
github.com/smartcontractkit/ocr2keepers v0.6.15/go.mod h1:gqIksJFzdXFsHfGdCWm1uTxbwvAltgcwcaqIgAStC1A=
github.com/smartcontractkit/ocr2vrf v0.0.0-20230510102715-c58be582bf19 h1:RxaC+V34UEP2u/riXfcvWPZEglri4UsfQi5joUObZ08=
github.com/smartcontractkit/ocr2vrf v0.0.0-20230510102715-c58be582bf19/go.mod h1:AZbOisIoA3cOUku8suZ+KWBnzbRiafmhi7UKiXoezrk=
=======
github.com/smartcontractkit/chainlink/v2 v2.0.0-20230418232145-9b83bdc20e8a h1:euA3VRgcEXw8RtsYD9srEsGkl08O19JhYcWUggmi1Zs=
github.com/smartcontractkit/chainlink/v2 v2.0.0-20230418232145-9b83bdc20e8a/go.mod h1:s4z5oq5g5J+ezpO8DGUcS1FnlnXzgmnLty+4F2FowEE=
github.com/smartcontractkit/libocr v0.0.0-20230413082317-9561d14087cc h1:aSCDAai0Dmbhp/KHTtJnC/EJcaEz4CAO80SKRzRZiQA=
github.com/smartcontractkit/libocr v0.0.0-20230413082317-9561d14087cc/go.mod h1:7Pd28puvezPJXB+xRJlcsx5CfzzkFJbMXydaAEsL4E8=
github.com/smartcontractkit/ocr2keepers v0.6.14 h1:Rg+SYd8PCyd4CcCetwnRKjVEQsHVsV6QOaWcLhi+6sg=
github.com/smartcontractkit/ocr2keepers v0.6.14/go.mod h1:gqIksJFzdXFsHfGdCWm1uTxbwvAltgcwcaqIgAStC1A=
github.com/smartcontractkit/ocr2vrf v0.0.0-20230313164535-dce9b4be73a3 h1:YqC6hCZpYPafWIYNcWDWCG/pbrvc6vhfnIKhbp6GBQ8=
github.com/smartcontractkit/ocr2vrf v0.0.0-20230313164535-dce9b4be73a3/go.mod h1:NKkp8yf3trq+hJe/gn2Q1dd4abZvcYavUKPzYJCgVew=
>>>>>>> 38cedf8 (Bumps dependencies)
github.com/smartcontractkit/sqlx v1.3.5-0.20210805004948-4be295aacbeb h1:OMaBUb4X9IFPLbGbCHsMU+kw/BPCrewaVwWGIBc0I4A=
github.com/smartcontractkit/sqlx v1.3.5-0.20210805004948-4be295aacbeb/go.mod h1:HNUu4cJekUdsJbwRBCiOybtkPJEfGRELQPe2tkoDEyk=
github.com/smartcontractkit/wsrpc v0.7.2 h1:iBXzMeg7vc5YoezIQBq896y25BARw7OKbhrb6vPbtRQ=
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/solclient/ocr2.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/gagliardetto/solana-go/rpc"
"github.com/rs/zerolog/log"
"github.com/smartcontractkit/chainlink/integration-tests/contracts"
"github.com/smartcontractkit/libocr/offchainreporting2/confighelper"
"github.com/smartcontractkit/libocr/offchainreporting2plus/confighelper"

ocr_2 "github.com/smartcontractkit/chainlink-solana/contracts/generated/ocr2"
"github.com/smartcontractkit/chainlink-solana/integration-tests/utils"
Expand Down
6 changes: 5 additions & 1 deletion ops/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,4 +218,8 @@ require (
sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0 // indirect
)

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

github.com/smartcontractkit/chainlink-relay => github.com/smartcontractkit/chainlink-relay v0.1.7-0.20230420161409-bc9a3111e34e
)
2 changes: 1 addition & 1 deletion pkg/monitoring/node_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"io"

relayMonitoring "github.com/smartcontractkit/chainlink-relay/pkg/monitoring"
"github.com/smartcontractkit/libocr/offchainreporting2/types"
"github.com/smartcontractkit/libocr/offchainreporting2plus/types"
)

type SolanaNodeConfig struct {
Expand Down
5 changes: 3 additions & 2 deletions pkg/monitoring/source_envelope.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,11 @@ import (
"github.com/gagliardetto/solana-go"
"github.com/gagliardetto/solana-go/rpc"
relayMonitoring "github.com/smartcontractkit/chainlink-relay/pkg/monitoring"
"github.com/smartcontractkit/libocr/offchainreporting2plus/types"
"go.uber.org/multierr"

"github.com/smartcontractkit/chainlink-solana/pkg/monitoring/event"
pkgSolana "github.com/smartcontractkit/chainlink-solana/pkg/solana"
"github.com/smartcontractkit/libocr/offchainreporting2/types"
"go.uber.org/multierr"
)

func NewEnvelopeSourceFactory(
Expand Down
7 changes: 4 additions & 3 deletions pkg/monitoring/source_envelope_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,12 @@ import (
"github.com/gagliardetto/solana-go"
"github.com/gagliardetto/solana-go/rpc"
relayMonitoring "github.com/smartcontractkit/chainlink-relay/pkg/monitoring"
"github.com/smartcontractkit/chainlink-solana/pkg/monitoring/mocks"
pkgSolana "github.com/smartcontractkit/chainlink-solana/pkg/solana"
"github.com/smartcontractkit/libocr/offchainreporting2/types"
"github.com/smartcontractkit/libocr/offchainreporting2plus/types"
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"

"github.com/smartcontractkit/chainlink-solana/pkg/monitoring/mocks"
pkgSolana "github.com/smartcontractkit/chainlink-solana/pkg/solana"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion pkg/solana/config_digester.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/pkg/errors"

"github.com/gagliardetto/solana-go"
"github.com/smartcontractkit/libocr/offchainreporting2/types"
"github.com/smartcontractkit/libocr/offchainreporting2plus/types"
)

var _ types.OffchainConfigDigester = (*OffchainConfigDigester)(nil)
Expand Down
4 changes: 2 additions & 2 deletions pkg/solana/config_tracker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package solana
import (
"context"

"github.com/smartcontractkit/libocr/offchainreporting2/reportingplugin/median"
"github.com/smartcontractkit/libocr/offchainreporting2/types"
"github.com/smartcontractkit/libocr/offchainreporting2plus/reportingplugin/median"
"github.com/smartcontractkit/libocr/offchainreporting2plus/types"

"github.com/smartcontractkit/chainlink-solana/pkg/solana/client"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/solana/median_contract.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"math/big"
"time"

"github.com/smartcontractkit/libocr/offchainreporting2/types"
"github.com/smartcontractkit/libocr/offchainreporting2plus/types"
)

type MedianContract struct {
Expand Down
4 changes: 2 additions & 2 deletions pkg/solana/relay.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
relaylogger "github.com/smartcontractkit/chainlink-relay/pkg/logger"
relaytypes "github.com/smartcontractkit/chainlink-relay/pkg/types"
"github.com/smartcontractkit/chainlink-relay/pkg/utils"
"github.com/smartcontractkit/libocr/offchainreporting2/reportingplugin/median"
"github.com/smartcontractkit/libocr/offchainreporting2/types"
"github.com/smartcontractkit/libocr/offchainreporting2plus/reportingplugin/median"
"github.com/smartcontractkit/libocr/offchainreporting2plus/types"

"github.com/smartcontractkit/chainlink-solana/pkg/solana/client"
"github.com/smartcontractkit/chainlink-solana/pkg/solana/logger"
Expand Down
4 changes: 2 additions & 2 deletions pkg/solana/report.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"sort"

"github.com/smartcontractkit/libocr/bigbigendian"
"github.com/smartcontractkit/libocr/offchainreporting2/reportingplugin/median"
"github.com/smartcontractkit/libocr/offchainreporting2/types"
"github.com/smartcontractkit/libocr/offchainreporting2plus/reportingplugin/median"
"github.com/smartcontractkit/libocr/offchainreporting2plus/types"
)

var _ median.ReportCodec = (*ReportCodec)(nil)
Expand Down
2 changes: 1 addition & 1 deletion pkg/solana/report_fuzz_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (

"github.com/stretchr/testify/require"

"github.com/smartcontractkit/libocr/offchainreporting2/reportingplugin/median"
"github.com/smartcontractkit/libocr/offchainreporting2plus/reportingplugin/median"
)

// Ensure your env is using go 1.18 then in pkg/solana:
Expand Down
4 changes: 2 additions & 2 deletions pkg/solana/report_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
bin "github.com/gagliardetto/binary"
"github.com/smartcontractkit/chainlink-relay/pkg/utils"
"github.com/smartcontractkit/libocr/commontypes"
"github.com/smartcontractkit/libocr/offchainreporting2/reportingplugin/median"
"github.com/smartcontractkit/libocr/offchainreporting2/types"
"github.com/smartcontractkit/libocr/offchainreporting2plus/reportingplugin/median"
"github.com/smartcontractkit/libocr/offchainreporting2plus/types"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/solana/transmitter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/gagliardetto/solana-go"
"github.com/pkg/errors"
"github.com/smartcontractkit/chainlink-relay/pkg/utils"
"github.com/smartcontractkit/libocr/offchainreporting2/types"
"github.com/smartcontractkit/libocr/offchainreporting2plus/types"

"github.com/smartcontractkit/chainlink-solana/pkg/solana/client"
"github.com/smartcontractkit/chainlink-solana/pkg/solana/logger"
Expand Down