diff --git a/.github/workflows/dutytracer-bench.yml b/.github/workflows/dutytracer-bench.yml index 3f301cbde5..6fb959d1ce 100644 --- a/.github/workflows/dutytracer-bench.yml +++ b/.github/workflows/dutytracer-bench.yml @@ -26,11 +26,11 @@ jobs: - name: Run benchmark id: bench run: | - go test -benchmem -run=^$ -bench ^BenchmarkTracer$ github.com/ssvlabs/ssv/operator/dutytracer -v + go test -benchmem -run=^$ -bench ^BenchmarkTracer$ github.com/ssvlabs/ssv/v2/operator/dutytracer -v - name: Run eviction test id: eviction run: | - go test -tags lfs -timeout 5s -run ^TestEviction$ github.com/ssvlabs/ssv/operator/dutytracer -v + go test -tags lfs -timeout 5s -run ^TestEviction$ github.com/ssvlabs/ssv/v2/operator/dutytracer -v - run: echo "🍏 This job's status is ${{ job.status }}." diff --git a/README.md b/README.md index 51ce284b79..ec6dc99cd7 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ # SSV Node -[![API Reference](https://img.shields.io/badge/API%20Reference-blue)](https://pkg.go.dev/github.com/ssvlabs/ssv) +[![API Reference](https://img.shields.io/badge/API%20Reference-blue)](https://pkg.go.dev/github.com/ssvlabs/ssv/v2) [![Github Actions](https://github.com/ssvlabs/ssv/actions/workflows/unit-test.yml/badge.svg?branch=main)](https://github.com/ssvlabs/ssv/actions/workflows/unit-test.yml) [![Github Actions](https://github.com/ssvlabs/ssv/actions/workflows/lint.yml/badge.svg?branch=main)](https://github.com/ssvlabs/ssv/actions/workflows/lint.yml) [![Coverage Status](https://codecov.io/gh/ssvlabs/ssv/branch/main/graph/badge.svg)](https://codecov.io/gh/ssvlabs/ssv/tree/main) diff --git a/api/handlers/exporter/committee_http.go b/api/handlers/exporter/committee_http.go index 5ac2f97a5c..3956b96e25 100644 --- a/api/handlers/exporter/committee_http.go +++ b/api/handlers/exporter/committee_http.go @@ -5,7 +5,7 @@ import ( "fmt" "net/http" - "github.com/ssvlabs/ssv/api" + "github.com/ssvlabs/ssv/v2/api" ) // CommitteeTraces godoc diff --git a/api/handlers/exporter/committee_model.go b/api/handlers/exporter/committee_model.go index 5e7cb143b3..35e3903d98 100644 --- a/api/handlers/exporter/committee_model.go +++ b/api/handlers/exporter/committee_model.go @@ -7,9 +7,9 @@ import ( "github.com/hashicorp/go-multierror" spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/api" - "github.com/ssvlabs/ssv/exporter" - exporter2 "github.com/ssvlabs/ssv/exporter2" + "github.com/ssvlabs/ssv/v2/api" + "github.com/ssvlabs/ssv/v2/exporter" + exporter2 "github.com/ssvlabs/ssv/v2/exporter2" ) type CommitteeIDLengthError struct { diff --git a/api/handlers/exporter/common_model.go b/api/handlers/exporter/common_model.go index 280f187e2b..2cdb300350 100644 --- a/api/handlers/exporter/common_model.go +++ b/api/handlers/exporter/common_model.go @@ -8,8 +8,8 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/api" - "github.com/ssvlabs/ssv/exporter" + "github.com/ssvlabs/ssv/v2/api" + "github.com/ssvlabs/ssv/v2/exporter" ) // Decided represents a decided message within a duty trace. diff --git a/api/handlers/exporter/decided_http.go b/api/handlers/exporter/decided_http.go index b675f2fe84..54c282e9db 100644 --- a/api/handlers/exporter/decided_http.go +++ b/api/handlers/exporter/decided_http.go @@ -5,7 +5,7 @@ import ( "fmt" "net/http" - "github.com/ssvlabs/ssv/api" + "github.com/ssvlabs/ssv/v2/api" ) // TraceDecideds godoc diff --git a/api/handlers/exporter/decided_model.go b/api/handlers/exporter/decided_model.go index 79fde647ee..98689f35bf 100644 --- a/api/handlers/exporter/decided_model.go +++ b/api/handlers/exporter/decided_model.go @@ -6,9 +6,9 @@ import ( "github.com/hashicorp/go-multierror" spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/api" - exporter2 "github.com/ssvlabs/ssv/exporter2" - "github.com/ssvlabs/ssv/ibft/storage" + "github.com/ssvlabs/ssv/v2/api" + exporter2 "github.com/ssvlabs/ssv/v2/exporter2" + "github.com/ssvlabs/ssv/v2/ibft/storage" ) type PubKeyLengthError struct { diff --git a/api/handlers/exporter/decided_v1_http.go b/api/handlers/exporter/decided_v1_http.go index db371e8657..ad10b3d700 100644 --- a/api/handlers/exporter/decided_v1_http.go +++ b/api/handlers/exporter/decided_v1_http.go @@ -3,7 +3,7 @@ package exporter import ( "net/http" - "github.com/ssvlabs/ssv/api" + "github.com/ssvlabs/ssv/v2/api" ) // Decideds is the backward-compatible handler for exporter-v1 "decideds" endpoint. diff --git a/api/handlers/exporter/exporter.go b/api/handlers/exporter/exporter.go index 12e813340c..9e46fbd2b1 100644 --- a/api/handlers/exporter/exporter.go +++ b/api/handlers/exporter/exporter.go @@ -9,14 +9,14 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" "go.uber.org/zap" - "github.com/ssvlabs/ssv/api" - "github.com/ssvlabs/ssv/exporter" - "github.com/ssvlabs/ssv/exporter/rolemask" - exporter2 "github.com/ssvlabs/ssv/exporter2" - ibftstorage "github.com/ssvlabs/ssv/ibft/storage" - registrystorage "github.com/ssvlabs/ssv/registry/storage" + "github.com/ssvlabs/ssv/v2/api" + "github.com/ssvlabs/ssv/v2/exporter" + "github.com/ssvlabs/ssv/v2/exporter/rolemask" + exporter2 "github.com/ssvlabs/ssv/v2/exporter2" + ibftstorage "github.com/ssvlabs/ssv/v2/ibft/storage" + registrystorage "github.com/ssvlabs/ssv/v2/registry/storage" - dutytracer "github.com/ssvlabs/ssv/operator/dutytracer" + dutytracer "github.com/ssvlabs/ssv/v2/operator/dutytracer" ) type Exporter struct { diff --git a/api/handlers/exporter/exporter_test.go b/api/handlers/exporter/exporter_test.go index aa0a07ba0c..ae6983a27a 100644 --- a/api/handlers/exporter/exporter_test.go +++ b/api/handlers/exporter/exporter_test.go @@ -20,15 +20,15 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/zap" - "github.com/ssvlabs/ssv/api" - "github.com/ssvlabs/ssv/exporter" - "github.com/ssvlabs/ssv/exporter/rolemask" - estore "github.com/ssvlabs/ssv/exporter/store" - ibftstorage "github.com/ssvlabs/ssv/ibft/storage" - dutytracer "github.com/ssvlabs/ssv/operator/dutytracer" - "github.com/ssvlabs/ssv/operator/slotticker" - ssvtypes "github.com/ssvlabs/ssv/protocol/v2/types" - "github.com/ssvlabs/ssv/registry/storage" + "github.com/ssvlabs/ssv/v2/api" + "github.com/ssvlabs/ssv/v2/exporter" + "github.com/ssvlabs/ssv/v2/exporter/rolemask" + estore "github.com/ssvlabs/ssv/v2/exporter/store" + ibftstorage "github.com/ssvlabs/ssv/v2/ibft/storage" + dutytracer "github.com/ssvlabs/ssv/v2/operator/dutytracer" + "github.com/ssvlabs/ssv/v2/operator/slotticker" + ssvtypes "github.com/ssvlabs/ssv/v2/protocol/v2/types" + "github.com/ssvlabs/ssv/v2/registry/storage" ) // mockParticipantStore is a basic mock for ibftstorage.ParticipantStore. diff --git a/api/handlers/exporter/helpers.go b/api/handlers/exporter/helpers.go index ec4876a36e..1241ce09a3 100644 --- a/api/handlers/exporter/helpers.go +++ b/api/handlers/exporter/helpers.go @@ -3,7 +3,7 @@ package exporter import ( "errors" - "github.com/ssvlabs/ssv/exporter2" + "github.com/ssvlabs/ssv/v2/exporter2" ) func isValidationError(err error) bool { diff --git a/api/handlers/exporter/validator_http.go b/api/handlers/exporter/validator_http.go index 000d76aeab..4607a5f807 100644 --- a/api/handlers/exporter/validator_http.go +++ b/api/handlers/exporter/validator_http.go @@ -3,7 +3,7 @@ package exporter import ( "net/http" - "github.com/ssvlabs/ssv/api" + "github.com/ssvlabs/ssv/v2/api" ) // ValidatorTraces godoc diff --git a/api/handlers/exporter/validator_model.go b/api/handlers/exporter/validator_model.go index e810c3fcab..a37eefd520 100644 --- a/api/handlers/exporter/validator_model.go +++ b/api/handlers/exporter/validator_model.go @@ -9,9 +9,9 @@ import ( "github.com/hashicorp/go-multierror" - "github.com/ssvlabs/ssv/api" - "github.com/ssvlabs/ssv/exporter" - exporter2 "github.com/ssvlabs/ssv/exporter2" + "github.com/ssvlabs/ssv/v2/api" + "github.com/ssvlabs/ssv/v2/exporter" + exporter2 "github.com/ssvlabs/ssv/v2/exporter2" ) // ValidatorTracesRequest represents the filter parameters accepted by the diff --git a/api/handlers/node/mock_test.go b/api/handlers/node/mock_test.go index 092d7d6b07..e390a9b01e 100644 --- a/api/handlers/node/mock_test.go +++ b/api/handlers/node/mock_test.go @@ -11,8 +11,8 @@ import ( "github.com/libp2p/go-libp2p/core/protocol" ma "github.com/multiformats/go-multiaddr" - "github.com/ssvlabs/ssv/network/commons" - "github.com/ssvlabs/ssv/network/records" + "github.com/ssvlabs/ssv/v2/network/commons" + "github.com/ssvlabs/ssv/v2/network/records" ) // MockP2PNetwork is a simple value-based mock implementation of p2pNetwork. diff --git a/api/handlers/node/node.go b/api/handlers/node/node.go index 3060b0da90..51dd64d759 100644 --- a/api/handlers/node/node.go +++ b/api/handlers/node/node.go @@ -9,10 +9,10 @@ import ( "github.com/libp2p/go-libp2p/core/peerstore" ma "github.com/multiformats/go-multiaddr" - "github.com/ssvlabs/ssv/api" - "github.com/ssvlabs/ssv/hprobe" - "github.com/ssvlabs/ssv/network/commons" - "github.com/ssvlabs/ssv/network/records" + "github.com/ssvlabs/ssv/v2/api" + "github.com/ssvlabs/ssv/v2/hprobe" + "github.com/ssvlabs/ssv/v2/network/commons" + "github.com/ssvlabs/ssv/v2/network/records" ) type Node struct { diff --git a/api/handlers/node/node_test.go b/api/handlers/node/node_test.go index 8dff70766a..bc56ddd03d 100644 --- a/api/handlers/node/node_test.go +++ b/api/handlers/node/node_test.go @@ -17,10 +17,10 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/zap" - "github.com/ssvlabs/ssv/api" - "github.com/ssvlabs/ssv/hprobe" - "github.com/ssvlabs/ssv/network/commons" - "github.com/ssvlabs/ssv/network/records" + "github.com/ssvlabs/ssv/v2/api" + "github.com/ssvlabs/ssv/v2/hprobe" + "github.com/ssvlabs/ssv/v2/network/commons" + "github.com/ssvlabs/ssv/v2/network/records" ) // CreateTestNode builds a test Node using a local network. diff --git a/api/handlers/validators/model.go b/api/handlers/validators/model.go index d7c9d1067b..3843daed93 100644 --- a/api/handlers/validators/model.go +++ b/api/handlers/validators/model.go @@ -7,8 +7,8 @@ import ( "github.com/attestantio/go-eth2-client/spec/phase0" spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/api" - "github.com/ssvlabs/ssv/protocol/v2/types" + "github.com/ssvlabs/ssv/v2/api" + "github.com/ssvlabs/ssv/v2/protocol/v2/types" ) // Clusters represents clusters of operator IDs. diff --git a/api/handlers/validators/validators.go b/api/handlers/validators/validators.go index 9720ff1a63..fb05a3b0db 100644 --- a/api/handlers/validators/validators.go +++ b/api/handlers/validators/validators.go @@ -10,9 +10,9 @@ import ( "github.com/attestantio/go-eth2-client/spec/phase0" - "github.com/ssvlabs/ssv/api" - "github.com/ssvlabs/ssv/protocol/v2/types" - registrystorage "github.com/ssvlabs/ssv/registry/storage" + "github.com/ssvlabs/ssv/v2/api" + "github.com/ssvlabs/ssv/v2/protocol/v2/types" + registrystorage "github.com/ssvlabs/ssv/v2/registry/storage" ) type Validators struct { diff --git a/api/handlers/validators/validators_test.go b/api/handlers/validators/validators_test.go index 505570fc1a..4a821bd94a 100644 --- a/api/handlers/validators/validators_test.go +++ b/api/handlers/validators/validators_test.go @@ -17,11 +17,11 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/api" - "github.com/ssvlabs/ssv/protocol/v2/blockchain/beacon" - "github.com/ssvlabs/ssv/protocol/v2/types" - "github.com/ssvlabs/ssv/registry/storage" - "github.com/ssvlabs/ssv/storage/basedb" + "github.com/ssvlabs/ssv/v2/api" + "github.com/ssvlabs/ssv/v2/protocol/v2/blockchain/beacon" + "github.com/ssvlabs/ssv/v2/protocol/v2/types" + "github.com/ssvlabs/ssv/v2/registry/storage" + "github.com/ssvlabs/ssv/v2/storage/basedb" ) // mockShare creates a SSVShare with the specified operator IDs. diff --git a/api/server/server.go b/api/server/server.go index a236bc112c..9490a5c599 100644 --- a/api/server/server.go +++ b/api/server/server.go @@ -9,11 +9,11 @@ import ( "github.com/go-chi/chi/v5/middleware" "go.uber.org/zap" - "github.com/ssvlabs/ssv/api" - exporterHandlers "github.com/ssvlabs/ssv/api/handlers/exporter" - nodeHandlers "github.com/ssvlabs/ssv/api/handlers/node" - validatorsHandlers "github.com/ssvlabs/ssv/api/handlers/validators" - "github.com/ssvlabs/ssv/utils/commons" + "github.com/ssvlabs/ssv/v2/api" + exporterHandlers "github.com/ssvlabs/ssv/v2/api/handlers/exporter" + nodeHandlers "github.com/ssvlabs/ssv/v2/api/handlers/node" + validatorsHandlers "github.com/ssvlabs/ssv/v2/api/handlers/validators" + "github.com/ssvlabs/ssv/v2/utils/commons" ) // Server represents the HTTP API server for SSV. diff --git a/api/server/server_test.go b/api/server/server_test.go index 0a8ca4c044..486667c0c6 100644 --- a/api/server/server_test.go +++ b/api/server/server_test.go @@ -18,11 +18,11 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/zap/zaptest" - "github.com/ssvlabs/ssv/api" - hexporter "github.com/ssvlabs/ssv/api/handlers/exporter" - hnode "github.com/ssvlabs/ssv/api/handlers/node" - hvalidators "github.com/ssvlabs/ssv/api/handlers/validators" - "github.com/ssvlabs/ssv/utils/commons" + "github.com/ssvlabs/ssv/v2/api" + hexporter "github.com/ssvlabs/ssv/v2/api/handlers/exporter" + hnode "github.com/ssvlabs/ssv/v2/api/handlers/node" + hvalidators "github.com/ssvlabs/ssv/v2/api/handlers/validators" + "github.com/ssvlabs/ssv/v2/utils/commons" ) // setupTestServer creates and configures a test HTTP server with mock handlers. diff --git a/api/types.go b/api/types.go index 2f767a8c8e..2f500bb4a1 100644 --- a/api/types.go +++ b/api/types.go @@ -9,7 +9,7 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/protocol/v2/message" + "github.com/ssvlabs/ssv/v2/protocol/v2/message" ) type Hex []byte diff --git a/beacon/goclient/aggregator_test.go b/beacon/goclient/aggregator_test.go index ffc7785ff4..7925baa9bd 100644 --- a/beacon/goclient/aggregator_test.go +++ b/beacon/goclient/aggregator_test.go @@ -16,7 +16,7 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/zap" - "github.com/ssvlabs/ssv/networkconfig" + "github.com/ssvlabs/ssv/v2/networkconfig" ) type aggregatorClientMock struct { diff --git a/beacon/goclient/attest.go b/beacon/goclient/attest.go index a4da46e9f9..4142d1086d 100644 --- a/beacon/goclient/attest.go +++ b/beacon/goclient/attest.go @@ -16,7 +16,7 @@ import ( "github.com/sourcegraph/conc/pool" "go.uber.org/zap" - "github.com/ssvlabs/ssv/observability/log/fields" + "github.com/ssvlabs/ssv/v2/observability/log/fields" ) const ( diff --git a/beacon/goclient/attest_test.go b/beacon/goclient/attest_test.go index d230c13d75..45850bcb24 100644 --- a/beacon/goclient/attest_test.go +++ b/beacon/goclient/attest_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/zap" - "github.com/ssvlabs/ssv/utils/hashmap" + "github.com/ssvlabs/ssv/v2/utils/hashmap" ) var ( diff --git a/beacon/goclient/committees_test.go b/beacon/goclient/committees_test.go index a987d81ff9..a8efd435f8 100644 --- a/beacon/goclient/committees_test.go +++ b/beacon/goclient/committees_test.go @@ -15,7 +15,7 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/zap" - "github.com/ssvlabs/ssv/networkconfig" + "github.com/ssvlabs/ssv/v2/networkconfig" ) // committeeClientMock overrides BeaconCommittees to simplify instrumentation in tests. diff --git a/beacon/goclient/error_paths_test.go b/beacon/goclient/error_paths_test.go index d38079a567..ffc3498719 100644 --- a/beacon/goclient/error_paths_test.go +++ b/beacon/goclient/error_paths_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/zap" - "github.com/ssvlabs/ssv/beacon/goclient/mocks" + "github.com/ssvlabs/ssv/v2/beacon/goclient/mocks" ) func Test_specForClient_errorPaths(t *testing.T) { diff --git a/beacon/goclient/events.go b/beacon/goclient/events.go index e7269b6b38..b6ca6d7f7b 100644 --- a/beacon/goclient/events.go +++ b/beacon/goclient/events.go @@ -16,7 +16,7 @@ import ( "github.com/jellydator/ttlcache/v3" "go.uber.org/zap" - "github.com/ssvlabs/ssv/observability/log/fields" + "github.com/ssvlabs/ssv/v2/observability/log/fields" ) type eventTopic string diff --git a/beacon/goclient/events_test.go b/beacon/goclient/events_test.go index 05b3aa6b9c..e2ab005169 100644 --- a/beacon/goclient/events_test.go +++ b/beacon/goclient/events_test.go @@ -15,7 +15,7 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/zap" - "github.com/ssvlabs/ssv/beacon/goclient/mocks" + "github.com/ssvlabs/ssv/v2/beacon/goclient/mocks" ) func TestSubscribeToHeadEvents(t *testing.T) { diff --git a/beacon/goclient/genesis_test.go b/beacon/goclient/genesis_test.go index 37cb7b8077..c0334df119 100644 --- a/beacon/goclient/genesis_test.go +++ b/beacon/goclient/genesis_test.go @@ -8,9 +8,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/ssvlabs/ssv/beacon/goclient/mocks" - "github.com/ssvlabs/ssv/networkconfig" - "github.com/ssvlabs/ssv/observability/log" + "github.com/ssvlabs/ssv/v2/beacon/goclient/mocks" + "github.com/ssvlabs/ssv/v2/networkconfig" + "github.com/ssvlabs/ssv/v2/observability/log" ) const ( diff --git a/beacon/goclient/goclient.go b/beacon/goclient/goclient.go index bb1f2a3e08..c91e8dca01 100644 --- a/beacon/goclient/goclient.go +++ b/beacon/goclient/goclient.go @@ -23,10 +23,10 @@ import ( "go.uber.org/zap" "tailscale.com/util/singleflight" - "github.com/ssvlabs/ssv/networkconfig" - "github.com/ssvlabs/ssv/observability/log" - "github.com/ssvlabs/ssv/observability/log/fields" - "github.com/ssvlabs/ssv/utils/hashmap" + "github.com/ssvlabs/ssv/v2/networkconfig" + "github.com/ssvlabs/ssv/v2/observability/log" + "github.com/ssvlabs/ssv/v2/observability/log/fields" + "github.com/ssvlabs/ssv/v2/utils/hashmap" ) const ( diff --git a/beacon/goclient/goclient_test.go b/beacon/goclient/goclient_test.go index 1d65c09511..7c6605a262 100644 --- a/beacon/goclient/goclient_test.go +++ b/beacon/goclient/goclient_test.go @@ -15,7 +15,7 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/zap" - "github.com/ssvlabs/ssv/beacon/goclient/mocks" + "github.com/ssvlabs/ssv/v2/beacon/goclient/mocks" ) func TestHealthy(t *testing.T) { diff --git a/beacon/goclient/observability.go b/beacon/goclient/observability.go index b81ab95e79..a01c6ac08e 100644 --- a/beacon/goclient/observability.go +++ b/beacon/goclient/observability.go @@ -14,15 +14,15 @@ import ( semconv "go.opentelemetry.io/otel/semconv/v1.37.0" "go.uber.org/zap" - "github.com/ssvlabs/ssv/observability" - "github.com/ssvlabs/ssv/observability/log/fields" - "github.com/ssvlabs/ssv/observability/metrics" + "github.com/ssvlabs/ssv/v2/observability" + "github.com/ssvlabs/ssv/v2/observability/log/fields" + "github.com/ssvlabs/ssv/v2/observability/metrics" ) type beaconNodeStatus string const ( - observabilityName = "github.com/ssvlabs/ssv/beacon/goclient" + observabilityName = "github.com/ssvlabs/ssv/v2/beacon/goclient" observabilityNamespace = "ssv.cl" statusUnknown beaconNodeStatus = "unknown" diff --git a/beacon/goclient/options.go b/beacon/goclient/options.go index fae1208e58..d9445dfd01 100644 --- a/beacon/goclient/options.go +++ b/beacon/goclient/options.go @@ -3,7 +3,7 @@ package goclient import ( "time" - "github.com/ssvlabs/ssv/networkconfig" + "github.com/ssvlabs/ssv/v2/networkconfig" ) // Various Client timeouts are defined below. diff --git a/beacon/goclient/proposer.go b/beacon/goclient/proposer.go index a072c476f0..2cf4807ebe 100644 --- a/beacon/goclient/proposer.go +++ b/beacon/goclient/proposer.go @@ -24,8 +24,8 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" "go.uber.org/zap" - "github.com/ssvlabs/ssv/observability/log/fields" - "github.com/ssvlabs/ssv/observability/traces" + "github.com/ssvlabs/ssv/v2/observability/log/fields" + "github.com/ssvlabs/ssv/v2/observability/traces" ) // ProposerDuties returns proposer duties for the given epoch. diff --git a/beacon/goclient/proposer_test.go b/beacon/goclient/proposer_test.go index adf02efb16..a9309317a8 100644 --- a/beacon/goclient/proposer_test.go +++ b/beacon/goclient/proposer_test.go @@ -20,8 +20,8 @@ import ( spectestingutils "github.com/ssvlabs/ssv-spec/types/testingutils" "github.com/stretchr/testify/require" - "github.com/ssvlabs/ssv/observability/log" - "github.com/ssvlabs/ssv/utils/hashmap" + "github.com/ssvlabs/ssv/v2/observability/log" + "github.com/ssvlabs/ssv/v2/utils/hashmap" ) const ( diff --git a/beacon/goclient/signing_test.go b/beacon/goclient/signing_test.go index 64a168985f..976fcf19c7 100644 --- a/beacon/goclient/signing_test.go +++ b/beacon/goclient/signing_test.go @@ -13,8 +13,8 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/zap" - "github.com/ssvlabs/ssv/beacon/goclient/mocks" - "github.com/ssvlabs/ssv/networkconfig" + "github.com/ssvlabs/ssv/v2/beacon/goclient/mocks" + "github.com/ssvlabs/ssv/v2/networkconfig" ) type countingMultiClient struct { diff --git a/beacon/goclient/spec.go b/beacon/goclient/spec.go index 76fae0ee30..c07d2ec0c3 100644 --- a/beacon/goclient/spec.go +++ b/beacon/goclient/spec.go @@ -13,7 +13,7 @@ import ( "github.com/attestantio/go-eth2-client/spec/phase0" "go.uber.org/zap" - "github.com/ssvlabs/ssv/networkconfig" + "github.com/ssvlabs/ssv/v2/networkconfig" ) const ( diff --git a/beacon/goclient/spec_test.go b/beacon/goclient/spec_test.go index 362c2455ae..3e6ea957fc 100644 --- a/beacon/goclient/spec_test.go +++ b/beacon/goclient/spec_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/zap" - "github.com/ssvlabs/ssv/beacon/goclient/mocks" - "github.com/ssvlabs/ssv/networkconfig" + "github.com/ssvlabs/ssv/v2/beacon/goclient/mocks" + "github.com/ssvlabs/ssv/v2/networkconfig" ) func Test_specForClient(t *testing.T) { diff --git a/beacon/goclient/sync_committee_test.go b/beacon/goclient/sync_committee_test.go index da49a9381a..c7c059f76d 100644 --- a/beacon/goclient/sync_committee_test.go +++ b/beacon/goclient/sync_committee_test.go @@ -18,7 +18,7 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/zap" - "github.com/ssvlabs/ssv/networkconfig" + "github.com/ssvlabs/ssv/v2/networkconfig" ) type syncCommitteeClientMock struct { diff --git a/beacon/goclient/validator.go b/beacon/goclient/validator.go index c8f5873761..a4272a9f6e 100644 --- a/beacon/goclient/validator.go +++ b/beacon/goclient/validator.go @@ -11,7 +11,7 @@ import ( eth2apiv1 "github.com/attestantio/go-eth2-client/api/v1" "github.com/attestantio/go-eth2-client/spec/phase0" - "github.com/ssvlabs/ssv/observability/log/fields" + "github.com/ssvlabs/ssv/v2/observability/log/fields" ) // GetValidatorData returns metadata (balance, index, status, more) for each pubkey from the node diff --git a/cli/bootnode/boot_node.go b/cli/bootnode/boot_node.go index d6187170f2..d0d7405a9c 100644 --- a/cli/bootnode/boot_node.go +++ b/cli/bootnode/boot_node.go @@ -7,11 +7,11 @@ import ( "github.com/spf13/cobra" "go.uber.org/zap" - globalcfg "github.com/ssvlabs/ssv/cli/config" - "github.com/ssvlabs/ssv/networkconfig" - ssvlog "github.com/ssvlabs/ssv/observability/log" - bootnode "github.com/ssvlabs/ssv/utils/boot_node" - "github.com/ssvlabs/ssv/utils/commons" + globalcfg "github.com/ssvlabs/ssv/v2/cli/config" + "github.com/ssvlabs/ssv/v2/networkconfig" + ssvlog "github.com/ssvlabs/ssv/v2/observability/log" + bootnode "github.com/ssvlabs/ssv/v2/utils/boot_node" + "github.com/ssvlabs/ssv/v2/utils/commons" ) type config struct { diff --git a/cli/cli.go b/cli/cli.go index 6303fa88be..84b21be941 100644 --- a/cli/cli.go +++ b/cli/cli.go @@ -6,8 +6,8 @@ import ( "github.com/spf13/cobra" "go.uber.org/zap" - "github.com/ssvlabs/ssv/cli/bootnode" - "github.com/ssvlabs/ssv/cli/operator" + "github.com/ssvlabs/ssv/v2/cli/bootnode" + "github.com/ssvlabs/ssv/v2/cli/operator" ) // RootCmd represents the root command of SSV CLI diff --git a/cli/export_keys_from_mnemonic.go b/cli/export_keys_from_mnemonic.go index 77e51f9e6c..7018d8cab3 100644 --- a/cli/export_keys_from_mnemonic.go +++ b/cli/export_keys_from_mnemonic.go @@ -10,8 +10,8 @@ import ( util "github.com/wealdtech/go-eth2-util" "go.uber.org/zap" - "github.com/ssvlabs/ssv/cli/flags" - ssvlog "github.com/ssvlabs/ssv/observability/log" + "github.com/ssvlabs/ssv/v2/cli/flags" + ssvlog "github.com/ssvlabs/ssv/v2/observability/log" ) // exportKeysCmd is the command to export private/public keys based on given mnemonic diff --git a/cli/flags/export_keys_from_mnemonic.go b/cli/flags/export_keys_from_mnemonic.go index 502c123563..c72a96a9f4 100644 --- a/cli/flags/export_keys_from_mnemonic.go +++ b/cli/flags/export_keys_from_mnemonic.go @@ -3,8 +3,8 @@ package flags import ( "github.com/spf13/cobra" - "github.com/ssvlabs/ssv/networkconfig" - "github.com/ssvlabs/ssv/utils/cliflag" + "github.com/ssvlabs/ssv/v2/networkconfig" + "github.com/ssvlabs/ssv/v2/utils/cliflag" ) // Flag names. diff --git a/cli/flags/threshold.go b/cli/flags/threshold.go index 003d7e16c2..b3a06fe13c 100644 --- a/cli/flags/threshold.go +++ b/cli/flags/threshold.go @@ -3,7 +3,7 @@ package flags import ( "github.com/spf13/cobra" - "github.com/ssvlabs/ssv/utils/cliflag" + "github.com/ssvlabs/ssv/v2/utils/cliflag" ) // Flag names. diff --git a/cli/generate_config.go b/cli/generate_config.go index b806d9bbc7..76d67c71de 100644 --- a/cli/generate_config.go +++ b/cli/generate_config.go @@ -14,7 +14,7 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/networkconfig" + "github.com/ssvlabs/ssv/v2/networkconfig" ) const ( diff --git a/cli/generate_operator_keys.go b/cli/generate_operator_keys.go index 5b98eb5857..eb4e35e5c9 100644 --- a/cli/generate_operator_keys.go +++ b/cli/generate_operator_keys.go @@ -8,7 +8,7 @@ import ( "github.com/ssvlabs/ssv/ssvsigner/keys" "github.com/ssvlabs/ssv/ssvsigner/keystore" - ssvlog "github.com/ssvlabs/ssv/observability/log" + ssvlog "github.com/ssvlabs/ssv/v2/observability/log" "github.com/spf13/cobra" "go.uber.org/zap" diff --git a/cli/operator/node.go b/cli/operator/node.go index c3df393f1f..ea7f021294 100644 --- a/cli/operator/node.go +++ b/cli/operator/node.go @@ -35,55 +35,54 @@ import ( "github.com/ssvlabs/ssv/ssvsigner/keystore" ssvsignertls "github.com/ssvlabs/ssv/ssvsigner/tls" - "github.com/ssvlabs/ssv/ekmadapter" - - hexporter "github.com/ssvlabs/ssv/api/handlers/exporter" - hnode "github.com/ssvlabs/ssv/api/handlers/node" - hvalidators "github.com/ssvlabs/ssv/api/handlers/validators" - apiserver "github.com/ssvlabs/ssv/api/server" - "github.com/ssvlabs/ssv/beacon/goclient" - global_config "github.com/ssvlabs/ssv/cli/config" - "github.com/ssvlabs/ssv/doppelganger" - "github.com/ssvlabs/ssv/eth/eventhandler" - "github.com/ssvlabs/ssv/eth/eventparser" - "github.com/ssvlabs/ssv/eth/eventsyncer" - "github.com/ssvlabs/ssv/eth/executionclient" - "github.com/ssvlabs/ssv/eth/localevents" - "github.com/ssvlabs/ssv/exporter" - exporterapi "github.com/ssvlabs/ssv/exporter/api" - "github.com/ssvlabs/ssv/exporter/api/decided" - dutytracestore "github.com/ssvlabs/ssv/exporter/store" - "github.com/ssvlabs/ssv/exporter2" - "github.com/ssvlabs/ssv/hprobe" - ibftstorage "github.com/ssvlabs/ssv/ibft/storage" - ssv_identity "github.com/ssvlabs/ssv/identity" - "github.com/ssvlabs/ssv/message/signatureverifier" - "github.com/ssvlabs/ssv/message/validation" - "github.com/ssvlabs/ssv/migrations" - "github.com/ssvlabs/ssv/network" - networkcommons "github.com/ssvlabs/ssv/network/commons" - p2pv1 "github.com/ssvlabs/ssv/network/p2p" - "github.com/ssvlabs/ssv/networkconfig" - "github.com/ssvlabs/ssv/observability" - ssvlog "github.com/ssvlabs/ssv/observability/log" - "github.com/ssvlabs/ssv/observability/log/fields" - "github.com/ssvlabs/ssv/observability/metrics" - "github.com/ssvlabs/ssv/operator" - operatordatastore "github.com/ssvlabs/ssv/operator/datastore" - "github.com/ssvlabs/ssv/operator/duties/dutystore" - dutytracer "github.com/ssvlabs/ssv/operator/dutytracer" - "github.com/ssvlabs/ssv/operator/slotticker" - operatorstorage "github.com/ssvlabs/ssv/operator/storage" - "github.com/ssvlabs/ssv/operator/validator" - "github.com/ssvlabs/ssv/operator/validator/metadata" - "github.com/ssvlabs/ssv/operator/validators" - "github.com/ssvlabs/ssv/protocol/v2/ssv/runner" - "github.com/ssvlabs/ssv/protocol/v2/types" - registrystorage "github.com/ssvlabs/ssv/registry/storage" - "github.com/ssvlabs/ssv/storage/badger" - "github.com/ssvlabs/ssv/storage/basedb" - "github.com/ssvlabs/ssv/storage/pebble" - "github.com/ssvlabs/ssv/utils/commons" + hexporter "github.com/ssvlabs/ssv/v2/api/handlers/exporter" + hnode "github.com/ssvlabs/ssv/v2/api/handlers/node" + hvalidators "github.com/ssvlabs/ssv/v2/api/handlers/validators" + apiserver "github.com/ssvlabs/ssv/v2/api/server" + "github.com/ssvlabs/ssv/v2/beacon/goclient" + global_config "github.com/ssvlabs/ssv/v2/cli/config" + "github.com/ssvlabs/ssv/v2/doppelganger" + "github.com/ssvlabs/ssv/v2/ekmadapter" + "github.com/ssvlabs/ssv/v2/eth/eventhandler" + "github.com/ssvlabs/ssv/v2/eth/eventparser" + "github.com/ssvlabs/ssv/v2/eth/eventsyncer" + "github.com/ssvlabs/ssv/v2/eth/executionclient" + "github.com/ssvlabs/ssv/v2/eth/localevents" + "github.com/ssvlabs/ssv/v2/exporter" + exporterapi "github.com/ssvlabs/ssv/v2/exporter/api" + "github.com/ssvlabs/ssv/v2/exporter/api/decided" + dutytracestore "github.com/ssvlabs/ssv/v2/exporter/store" + "github.com/ssvlabs/ssv/v2/exporter2" + "github.com/ssvlabs/ssv/v2/hprobe" + ibftstorage "github.com/ssvlabs/ssv/v2/ibft/storage" + ssv_identity "github.com/ssvlabs/ssv/v2/identity" + "github.com/ssvlabs/ssv/v2/message/signatureverifier" + "github.com/ssvlabs/ssv/v2/message/validation" + "github.com/ssvlabs/ssv/v2/migrations" + "github.com/ssvlabs/ssv/v2/network" + networkcommons "github.com/ssvlabs/ssv/v2/network/commons" + p2pv1 "github.com/ssvlabs/ssv/v2/network/p2p" + "github.com/ssvlabs/ssv/v2/networkconfig" + "github.com/ssvlabs/ssv/v2/observability" + ssvlog "github.com/ssvlabs/ssv/v2/observability/log" + "github.com/ssvlabs/ssv/v2/observability/log/fields" + "github.com/ssvlabs/ssv/v2/observability/metrics" + "github.com/ssvlabs/ssv/v2/operator" + operatordatastore "github.com/ssvlabs/ssv/v2/operator/datastore" + "github.com/ssvlabs/ssv/v2/operator/duties/dutystore" + dutytracer "github.com/ssvlabs/ssv/v2/operator/dutytracer" + "github.com/ssvlabs/ssv/v2/operator/slotticker" + operatorstorage "github.com/ssvlabs/ssv/v2/operator/storage" + "github.com/ssvlabs/ssv/v2/operator/validator" + "github.com/ssvlabs/ssv/v2/operator/validator/metadata" + "github.com/ssvlabs/ssv/v2/operator/validators" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv/runner" + "github.com/ssvlabs/ssv/v2/protocol/v2/types" + registrystorage "github.com/ssvlabs/ssv/v2/registry/storage" + "github.com/ssvlabs/ssv/v2/storage/badger" + "github.com/ssvlabs/ssv/v2/storage/basedb" + "github.com/ssvlabs/ssv/v2/storage/pebble" + "github.com/ssvlabs/ssv/v2/utils/commons" ) type KeyStore struct { diff --git a/cli/operator/node_test.go b/cli/operator/node_test.go index 67ce2eadac..b28851a949 100644 --- a/cli/operator/node_test.go +++ b/cli/operator/node_test.go @@ -16,12 +16,12 @@ import ( "go.uber.org/zap/zapcore" "go.uber.org/zap/zaptest/observer" - "github.com/ssvlabs/ssv/networkconfig" - operatorstorage "github.com/ssvlabs/ssv/operator/storage" "github.com/ssvlabs/ssv/ssvsigner" "github.com/ssvlabs/ssv/ssvsigner/keys" - kv "github.com/ssvlabs/ssv/storage/badger" - "github.com/ssvlabs/ssv/storage/basedb" + "github.com/ssvlabs/ssv/v2/networkconfig" + operatorstorage "github.com/ssvlabs/ssv/v2/operator/storage" + kv "github.com/ssvlabs/ssv/v2/storage/badger" + "github.com/ssvlabs/ssv/v2/storage/basedb" ) func newTestSSVSignerClient(t *testing.T, register func(mux *http.ServeMux)) *ssvsigner.Client { diff --git a/cli/operator/prober.go b/cli/operator/prober.go index f8b5737a22..bfb72c64d7 100644 --- a/cli/operator/prober.go +++ b/cli/operator/prober.go @@ -6,7 +6,7 @@ import ( "go.uber.org/zap" - "github.com/ssvlabs/ssv/hprobe" + "github.com/ssvlabs/ssv/v2/hprobe" ) // List of health-prober components. diff --git a/cli/threshold.go b/cli/threshold.go index fe4f8ac5ee..281c704ccb 100644 --- a/cli/threshold.go +++ b/cli/threshold.go @@ -8,10 +8,10 @@ import ( "github.com/spf13/cobra" "go.uber.org/zap" - "github.com/ssvlabs/ssv/cli/flags" - ssvlog "github.com/ssvlabs/ssv/observability/log" - ssvtypes "github.com/ssvlabs/ssv/protocol/v2/types" - "github.com/ssvlabs/ssv/utils/threshold" + "github.com/ssvlabs/ssv/v2/cli/flags" + ssvlog "github.com/ssvlabs/ssv/v2/observability/log" + ssvtypes "github.com/ssvlabs/ssv/v2/protocol/v2/types" + "github.com/ssvlabs/ssv/v2/utils/threshold" ) // createThreshold is the command to create threshold based on the given private key diff --git a/cmd/ssvnode/main.go b/cmd/ssvnode/main.go index ac3bb5317e..5d0124d868 100644 --- a/cmd/ssvnode/main.go +++ b/cmd/ssvnode/main.go @@ -3,7 +3,7 @@ package main import ( "fmt" - "github.com/ssvlabs/ssv/cli" + "github.com/ssvlabs/ssv/v2/cli" ) // AppName is the application name diff --git a/doppelganger/doppelganger.go b/doppelganger/doppelganger.go index ab3378d4d1..07b06e9d62 100644 --- a/doppelganger/doppelganger.go +++ b/doppelganger/doppelganger.go @@ -11,12 +11,12 @@ import ( "go.opentelemetry.io/otel/metric" "go.uber.org/zap" - "github.com/ssvlabs/ssv/networkconfig" - "github.com/ssvlabs/ssv/observability/log" - "github.com/ssvlabs/ssv/observability/log/fields" - "github.com/ssvlabs/ssv/observability/metrics" - "github.com/ssvlabs/ssv/operator/slotticker" - "github.com/ssvlabs/ssv/protocol/v2/types" + "github.com/ssvlabs/ssv/v2/networkconfig" + "github.com/ssvlabs/ssv/v2/observability/log" + "github.com/ssvlabs/ssv/v2/observability/log/fields" + "github.com/ssvlabs/ssv/v2/observability/metrics" + "github.com/ssvlabs/ssv/v2/operator/slotticker" + "github.com/ssvlabs/ssv/v2/protocol/v2/types" ) //go:generate go tool -modfile=../tool.mod mockgen -package=doppelganger -destination=./mock.go -source=./doppelganger.go diff --git a/doppelganger/doppelganger_test.go b/doppelganger/doppelganger_test.go index 6f5e587ce6..5666abd284 100644 --- a/doppelganger/doppelganger_test.go +++ b/doppelganger/doppelganger_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" - "github.com/ssvlabs/ssv/networkconfig" - "github.com/ssvlabs/ssv/observability/log" + "github.com/ssvlabs/ssv/v2/networkconfig" + "github.com/ssvlabs/ssv/v2/observability/log" ) func newTestDoppelgangerHandler(t *testing.T) *handler { diff --git a/doppelganger/mock.go b/doppelganger/mock.go index f304076623..60e522c251 100644 --- a/doppelganger/mock.go +++ b/doppelganger/mock.go @@ -15,7 +15,7 @@ import ( v1 "github.com/attestantio/go-eth2-client/api/v1" phase0 "github.com/attestantio/go-eth2-client/spec/phase0" - types "github.com/ssvlabs/ssv/protocol/v2/types" + types "github.com/ssvlabs/ssv/v2/protocol/v2/types" gomock "go.uber.org/mock/gomock" ) diff --git a/doppelganger/observability.go b/doppelganger/observability.go index 8c1ed02054..fadbc9ee2d 100644 --- a/doppelganger/observability.go +++ b/doppelganger/observability.go @@ -5,12 +5,12 @@ import ( "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/metric" - "github.com/ssvlabs/ssv/observability" - "github.com/ssvlabs/ssv/observability/metrics" + "github.com/ssvlabs/ssv/v2/observability" + "github.com/ssvlabs/ssv/v2/observability/metrics" ) const ( - observabilityName = "github.com/ssvlabs/ssv/doppelganger" + observabilityName = "github.com/ssvlabs/ssv/v2/doppelganger" observabilityNamespace = "ssv.doppelganger" ) diff --git a/ekmadapter/database.go b/ekmadapter/database.go index 7e85bf0fe5..ee80242859 100644 --- a/ekmadapter/database.go +++ b/ekmadapter/database.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/ssvlabs/ssv/ssvsigner/ekm" - "github.com/ssvlabs/ssv/storage/basedb" + "github.com/ssvlabs/ssv/v2/storage/basedb" ) // NewDatabaseAdapter bridges node's basedb.Database to ekm.Database. diff --git a/eth/ethtest/cluster_liquidated_test.go b/eth/ethtest/cluster_liquidated_test.go index 425869df4c..15d8eb0139 100644 --- a/eth/ethtest/cluster_liquidated_test.go +++ b/eth/ethtest/cluster_liquidated_test.go @@ -7,7 +7,7 @@ import ( ethcommon "github.com/ethereum/go-ethereum/common" "github.com/stretchr/testify/require" - "github.com/ssvlabs/ssv/eth/simulator/simcontract" + "github.com/ssvlabs/ssv/v2/eth/simulator/simcontract" ) type testClusterLiquidatedInput struct { diff --git a/eth/ethtest/cluster_reactivated_test.go b/eth/ethtest/cluster_reactivated_test.go index 6248919204..7195d43c15 100644 --- a/eth/ethtest/cluster_reactivated_test.go +++ b/eth/ethtest/cluster_reactivated_test.go @@ -7,7 +7,7 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/stretchr/testify/require" - "github.com/ssvlabs/ssv/eth/simulator/simcontract" + "github.com/ssvlabs/ssv/v2/eth/simulator/simcontract" ) type testClusterReactivatedInput struct { diff --git a/eth/ethtest/common_test.go b/eth/ethtest/common_test.go index bdd28611e4..3f7be99cc2 100644 --- a/eth/ethtest/common_test.go +++ b/eth/ethtest/common_test.go @@ -15,12 +15,12 @@ import ( "go.uber.org/mock/gomock" "go.uber.org/zap/zaptest" - "github.com/ssvlabs/ssv/eth/eventhandler/mocks" - "github.com/ssvlabs/ssv/eth/eventsyncer" - "github.com/ssvlabs/ssv/eth/executionclient" - "github.com/ssvlabs/ssv/eth/simulator" - "github.com/ssvlabs/ssv/eth/simulator/simcontract" - "github.com/ssvlabs/ssv/operator/storage" + "github.com/ssvlabs/ssv/v2/eth/eventhandler/mocks" + "github.com/ssvlabs/ssv/v2/eth/eventsyncer" + "github.com/ssvlabs/ssv/v2/eth/executionclient" + "github.com/ssvlabs/ssv/v2/eth/simulator" + "github.com/ssvlabs/ssv/v2/eth/simulator/simcontract" + "github.com/ssvlabs/ssv/v2/operator/storage" ) type CommonTestInput struct { diff --git a/eth/ethtest/eth_e2e_test.go b/eth/ethtest/eth_e2e_test.go index 1a784f83dd..ce256e3cbb 100644 --- a/eth/ethtest/eth_e2e_test.go +++ b/eth/ethtest/eth_e2e_test.go @@ -15,9 +15,9 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" - "github.com/ssvlabs/ssv/eth/simulator/simcontract" - ssvtypes "github.com/ssvlabs/ssv/protocol/v2/types" - registrystorage "github.com/ssvlabs/ssv/registry/storage" + "github.com/ssvlabs/ssv/v2/eth/simulator/simcontract" + ssvtypes "github.com/ssvlabs/ssv/v2/protocol/v2/types" + registrystorage "github.com/ssvlabs/ssv/v2/registry/storage" ) var ( diff --git a/eth/ethtest/operator_added_test.go b/eth/ethtest/operator_added_test.go index 9128f60dee..7cc183ef3d 100644 --- a/eth/ethtest/operator_added_test.go +++ b/eth/ethtest/operator_added_test.go @@ -7,7 +7,7 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/stretchr/testify/require" - "github.com/ssvlabs/ssv/eth/eventparser" + "github.com/ssvlabs/ssv/v2/eth/eventparser" ) type testOperatorAddedEventInput struct { diff --git a/eth/ethtest/utils_test.go b/eth/ethtest/utils_test.go index 158c35a710..7fac9eeb4f 100644 --- a/eth/ethtest/utils_test.go +++ b/eth/ethtest/utils_test.go @@ -16,27 +16,27 @@ import ( "go.uber.org/mock/gomock" "go.uber.org/zap" - "github.com/ssvlabs/ssv/ekmadapter" "github.com/ssvlabs/ssv/ssvsigner/ekm" "github.com/ssvlabs/ssv/ssvsigner/keys" - - "github.com/ssvlabs/ssv/doppelganger" - "github.com/ssvlabs/ssv/eth/contract" - "github.com/ssvlabs/ssv/eth/eventhandler" - "github.com/ssvlabs/ssv/eth/eventhandler/mocks" - "github.com/ssvlabs/ssv/eth/eventparser" - "github.com/ssvlabs/ssv/eth/simulator" - "github.com/ssvlabs/ssv/exporter" - ibftstorage "github.com/ssvlabs/ssv/ibft/storage" - "github.com/ssvlabs/ssv/networkconfig" - operatordatastore "github.com/ssvlabs/ssv/operator/datastore" - operatorstorage "github.com/ssvlabs/ssv/operator/storage" - "github.com/ssvlabs/ssv/operator/validator" - registrystorage "github.com/ssvlabs/ssv/registry/storage" - kv "github.com/ssvlabs/ssv/storage/badger" - "github.com/ssvlabs/ssv/storage/basedb" - "github.com/ssvlabs/ssv/utils/blskeygen" - "github.com/ssvlabs/ssv/utils/threshold" + "github.com/ssvlabs/ssv/v2/ekmadapter" + + "github.com/ssvlabs/ssv/v2/doppelganger" + "github.com/ssvlabs/ssv/v2/eth/contract" + "github.com/ssvlabs/ssv/v2/eth/eventhandler" + "github.com/ssvlabs/ssv/v2/eth/eventhandler/mocks" + "github.com/ssvlabs/ssv/v2/eth/eventparser" + "github.com/ssvlabs/ssv/v2/eth/simulator" + "github.com/ssvlabs/ssv/v2/exporter" + ibftstorage "github.com/ssvlabs/ssv/v2/ibft/storage" + "github.com/ssvlabs/ssv/v2/networkconfig" + operatordatastore "github.com/ssvlabs/ssv/v2/operator/datastore" + operatorstorage "github.com/ssvlabs/ssv/v2/operator/storage" + "github.com/ssvlabs/ssv/v2/operator/validator" + registrystorage "github.com/ssvlabs/ssv/v2/registry/storage" + kv "github.com/ssvlabs/ssv/v2/storage/badger" + "github.com/ssvlabs/ssv/v2/storage/basedb" + "github.com/ssvlabs/ssv/v2/utils/blskeygen" + "github.com/ssvlabs/ssv/v2/utils/threshold" ) type testValidatorData struct { diff --git a/eth/ethtest/validator_added_test.go b/eth/ethtest/validator_added_test.go index ee14add727..b84bd9b151 100644 --- a/eth/ethtest/validator_added_test.go +++ b/eth/ethtest/validator_added_test.go @@ -7,8 +7,8 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/stretchr/testify/require" - "github.com/ssvlabs/ssv/eth/simulator/simcontract" - registrystorage "github.com/ssvlabs/ssv/registry/storage" + "github.com/ssvlabs/ssv/v2/eth/simulator/simcontract" + registrystorage "github.com/ssvlabs/ssv/v2/registry/storage" ) type testValidatorRegisteredInput struct { diff --git a/eth/ethtest/validator_exited_test.go b/eth/ethtest/validator_exited_test.go index 494e0b633f..a133e7852f 100644 --- a/eth/ethtest/validator_exited_test.go +++ b/eth/ethtest/validator_exited_test.go @@ -6,7 +6,7 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/stretchr/testify/require" - "github.com/ssvlabs/ssv/eth/simulator/simcontract" + "github.com/ssvlabs/ssv/v2/eth/simulator/simcontract" ) type testValidatorExitedInput struct { diff --git a/eth/ethtest/validator_removed_test.go b/eth/ethtest/validator_removed_test.go index a7fe9fe8c8..f2961c9ced 100644 --- a/eth/ethtest/validator_removed_test.go +++ b/eth/ethtest/validator_removed_test.go @@ -6,7 +6,7 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/stretchr/testify/require" - "github.com/ssvlabs/ssv/eth/simulator/simcontract" + "github.com/ssvlabs/ssv/v2/eth/simulator/simcontract" ) type testValidatorRemovedInput struct { diff --git a/eth/eventhandler/event_handler.go b/eth/eventhandler/event_handler.go index d8d725be3e..88830149fc 100644 --- a/eth/eventhandler/event_handler.go +++ b/eth/eventhandler/event_handler.go @@ -18,17 +18,17 @@ import ( "github.com/ssvlabs/ssv/ssvsigner/ekm" - "github.com/ssvlabs/ssv/eth/contract" - "github.com/ssvlabs/ssv/eth/eventparser" - "github.com/ssvlabs/ssv/eth/executionclient" - "github.com/ssvlabs/ssv/eth/localevents" - "github.com/ssvlabs/ssv/networkconfig" - "github.com/ssvlabs/ssv/observability/log/fields" - "github.com/ssvlabs/ssv/observability/metrics" - operatordatastore "github.com/ssvlabs/ssv/operator/datastore" - nodestorage "github.com/ssvlabs/ssv/operator/storage" - ssvtypes "github.com/ssvlabs/ssv/protocol/v2/types" - "github.com/ssvlabs/ssv/storage/basedb" + "github.com/ssvlabs/ssv/v2/eth/contract" + "github.com/ssvlabs/ssv/v2/eth/eventparser" + "github.com/ssvlabs/ssv/v2/eth/executionclient" + "github.com/ssvlabs/ssv/v2/eth/localevents" + "github.com/ssvlabs/ssv/v2/networkconfig" + "github.com/ssvlabs/ssv/v2/observability/log/fields" + "github.com/ssvlabs/ssv/v2/observability/metrics" + operatordatastore "github.com/ssvlabs/ssv/v2/operator/datastore" + nodestorage "github.com/ssvlabs/ssv/v2/operator/storage" + ssvtypes "github.com/ssvlabs/ssv/v2/protocol/v2/types" + "github.com/ssvlabs/ssv/v2/storage/basedb" ) // Ethereum SSV network contract event names. diff --git a/eth/eventhandler/event_handler_test.go b/eth/eventhandler/event_handler_test.go index cad8f121d4..0aaf0194c3 100644 --- a/eth/eventhandler/event_handler_test.go +++ b/eth/eventhandler/event_handler_test.go @@ -26,30 +26,30 @@ import ( "go.uber.org/mock/gomock" "go.uber.org/zap" - "github.com/ssvlabs/ssv/ekmadapter" "github.com/ssvlabs/ssv/ssvsigner/ekm" "github.com/ssvlabs/ssv/ssvsigner/keys" - - "github.com/ssvlabs/ssv/beacon/goclient" - "github.com/ssvlabs/ssv/doppelganger" - "github.com/ssvlabs/ssv/eth/contract" - "github.com/ssvlabs/ssv/eth/eventhandler/mocks" - "github.com/ssvlabs/ssv/eth/eventparser" - "github.com/ssvlabs/ssv/eth/executionclient" - "github.com/ssvlabs/ssv/eth/simulator" - "github.com/ssvlabs/ssv/eth/simulator/simcontract" - "github.com/ssvlabs/ssv/exporter" - ibftstorage "github.com/ssvlabs/ssv/ibft/storage" - "github.com/ssvlabs/ssv/networkconfig" - operatordatastore "github.com/ssvlabs/ssv/operator/datastore" - operatorstorage "github.com/ssvlabs/ssv/operator/storage" - "github.com/ssvlabs/ssv/operator/validator" - "github.com/ssvlabs/ssv/operator/validators" - registrystorage "github.com/ssvlabs/ssv/registry/storage" - kv "github.com/ssvlabs/ssv/storage/badger" - "github.com/ssvlabs/ssv/storage/basedb" - "github.com/ssvlabs/ssv/utils/blskeygen" - "github.com/ssvlabs/ssv/utils/threshold" + "github.com/ssvlabs/ssv/v2/ekmadapter" + + "github.com/ssvlabs/ssv/v2/beacon/goclient" + "github.com/ssvlabs/ssv/v2/doppelganger" + "github.com/ssvlabs/ssv/v2/eth/contract" + "github.com/ssvlabs/ssv/v2/eth/eventhandler/mocks" + "github.com/ssvlabs/ssv/v2/eth/eventparser" + "github.com/ssvlabs/ssv/v2/eth/executionclient" + "github.com/ssvlabs/ssv/v2/eth/simulator" + "github.com/ssvlabs/ssv/v2/eth/simulator/simcontract" + "github.com/ssvlabs/ssv/v2/exporter" + ibftstorage "github.com/ssvlabs/ssv/v2/ibft/storage" + "github.com/ssvlabs/ssv/v2/networkconfig" + operatordatastore "github.com/ssvlabs/ssv/v2/operator/datastore" + operatorstorage "github.com/ssvlabs/ssv/v2/operator/storage" + "github.com/ssvlabs/ssv/v2/operator/validator" + "github.com/ssvlabs/ssv/v2/operator/validators" + registrystorage "github.com/ssvlabs/ssv/v2/registry/storage" + kv "github.com/ssvlabs/ssv/v2/storage/badger" + "github.com/ssvlabs/ssv/v2/storage/basedb" + "github.com/ssvlabs/ssv/v2/utils/blskeygen" + "github.com/ssvlabs/ssv/v2/utils/threshold" ) var ( diff --git a/eth/eventhandler/handlers.go b/eth/eventhandler/handlers.go index 356cce65fd..bb293c80aa 100644 --- a/eth/eventhandler/handlers.go +++ b/eth/eventhandler/handlers.go @@ -14,12 +14,12 @@ import ( "github.com/ssvlabs/ssv/ssvsigner/ekm" - "github.com/ssvlabs/ssv/eth/contract" - "github.com/ssvlabs/ssv/observability/log/fields" - "github.com/ssvlabs/ssv/operator/duties" - ssvtypes "github.com/ssvlabs/ssv/protocol/v2/types" - registrystorage "github.com/ssvlabs/ssv/registry/storage" - "github.com/ssvlabs/ssv/storage/basedb" + "github.com/ssvlabs/ssv/v2/eth/contract" + "github.com/ssvlabs/ssv/v2/observability/log/fields" + "github.com/ssvlabs/ssv/v2/operator/duties" + ssvtypes "github.com/ssvlabs/ssv/v2/protocol/v2/types" + registrystorage "github.com/ssvlabs/ssv/v2/registry/storage" + "github.com/ssvlabs/ssv/v2/storage/basedb" ) // b64 encrypted key length is 256 diff --git a/eth/eventhandler/local_events_test.go b/eth/eventhandler/local_events_test.go index 4c42164344..b8581edc5e 100644 --- a/eth/eventhandler/local_events_test.go +++ b/eth/eventhandler/local_events_test.go @@ -13,10 +13,10 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/eth/contract" - "github.com/ssvlabs/ssv/eth/localevents" - "github.com/ssvlabs/ssv/networkconfig" - "github.com/ssvlabs/ssv/registry/storage" + "github.com/ssvlabs/ssv/v2/eth/contract" + "github.com/ssvlabs/ssv/v2/eth/localevents" + "github.com/ssvlabs/ssv/v2/networkconfig" + "github.com/ssvlabs/ssv/v2/registry/storage" ) func TestHandleLocalEvent(t *testing.T) { diff --git a/eth/eventhandler/mockgen.go b/eth/eventhandler/mockgen.go index 2284c9ed4f..a6ed86486c 100644 --- a/eth/eventhandler/mockgen.go +++ b/eth/eventhandler/mockgen.go @@ -1,6 +1,6 @@ package eventhandler -//go:generate go tool -modfile=../../tool.mod mockgen -package=mocks -destination=./mocks/task_executor.go github.com/ssvlabs/ssv/eth/eventhandler TaskExecutor +//go:generate go tool -modfile=../../tool.mod mockgen -package=mocks -destination=./mocks/task_executor.go github.com/ssvlabs/ssv/v2/eth/eventhandler TaskExecutor // TaskExecutor adapts package-private interface for mockgen to generate properly capitalized mock-name. // The mockgen.go cannot be a mockgen_test.go for mockgen to work (if we want Golang to ignore mockgen.go file diff --git a/eth/eventhandler/mocks/task_executor.go b/eth/eventhandler/mocks/task_executor.go index 07f31c9314..a6c385c0c2 100644 --- a/eth/eventhandler/mocks/task_executor.go +++ b/eth/eventhandler/mocks/task_executor.go @@ -1,9 +1,9 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/ssvlabs/ssv/eth/eventhandler (interfaces: TaskExecutor) +// Source: github.com/ssvlabs/ssv/v2/eth/eventhandler (interfaces: TaskExecutor) // // Generated by this command: // -// mockgen -package=mocks -destination=./mocks/task_executor.go github.com/ssvlabs/ssv/eth/eventhandler TaskExecutor +// mockgen -package=mocks -destination=./mocks/task_executor.go github.com/ssvlabs/ssv/v2/eth/eventhandler TaskExecutor // // Package mocks is a generated GoMock package. @@ -15,7 +15,7 @@ import ( phase0 "github.com/attestantio/go-eth2-client/spec/phase0" common "github.com/ethereum/go-ethereum/common" types "github.com/ssvlabs/ssv-spec/types" - types0 "github.com/ssvlabs/ssv/protocol/v2/types" + types0 "github.com/ssvlabs/ssv/v2/protocol/v2/types" gomock "go.uber.org/mock/gomock" ) diff --git a/eth/eventhandler/observability.go b/eth/eventhandler/observability.go index a53c240243..25b588c196 100644 --- a/eth/eventhandler/observability.go +++ b/eth/eventhandler/observability.go @@ -7,12 +7,12 @@ import ( "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/metric" - "github.com/ssvlabs/ssv/observability" - "github.com/ssvlabs/ssv/observability/metrics" + "github.com/ssvlabs/ssv/v2/observability" + "github.com/ssvlabs/ssv/v2/observability/metrics" ) const ( - observabilityName = "github.com/ssvlabs/ssv/eth/eventhandler" + observabilityName = "github.com/ssvlabs/ssv/v2/eth/eventhandler" observabilityNamespace = "ssv.event_syncer.handler" ) diff --git a/eth/eventhandler/options.go b/eth/eventhandler/options.go index 6374dcdcd7..1144590bfa 100644 --- a/eth/eventhandler/options.go +++ b/eth/eventhandler/options.go @@ -3,7 +3,7 @@ package eventhandler import ( "go.uber.org/zap" - "github.com/ssvlabs/ssv/observability/log" + "github.com/ssvlabs/ssv/v2/observability/log" ) // Option defines EventHandler configuration option. diff --git a/eth/eventhandler/task.go b/eth/eventhandler/task.go index bdd40f9fe1..a549b47f2d 100644 --- a/eth/eventhandler/task.go +++ b/eth/eventhandler/task.go @@ -5,7 +5,7 @@ import ( ethcommon "github.com/ethereum/go-ethereum/common" spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/protocol/v2/types" + "github.com/ssvlabs/ssv/v2/protocol/v2/types" ) type Task interface { diff --git a/eth/eventhandler/task_executor_test.go b/eth/eventhandler/task_executor_test.go index 1e3da53ce2..87c986dbb9 100644 --- a/eth/eventhandler/task_executor_test.go +++ b/eth/eventhandler/task_executor_test.go @@ -15,10 +15,10 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/eth/executionclient" - "github.com/ssvlabs/ssv/networkconfig" - ssvtypes "github.com/ssvlabs/ssv/protocol/v2/types" - "github.com/ssvlabs/ssv/registry/storage" + "github.com/ssvlabs/ssv/v2/eth/executionclient" + "github.com/ssvlabs/ssv/v2/networkconfig" + ssvtypes "github.com/ssvlabs/ssv/v2/protocol/v2/types" + "github.com/ssvlabs/ssv/v2/registry/storage" ) // const rawOperatorAdded = `{ diff --git a/eth/eventhandler/validation.go b/eth/eventhandler/validation.go index bdfbdb0823..6e8753bc44 100644 --- a/eth/eventhandler/validation.go +++ b/eth/eventhandler/validation.go @@ -7,9 +7,9 @@ import ( "github.com/ethereum/go-ethereum/crypto" "github.com/herumi/bls-eth-go-binary/bls" - ssvtypes "github.com/ssvlabs/ssv/protocol/v2/types" - registrystorage "github.com/ssvlabs/ssv/registry/storage" - "github.com/ssvlabs/ssv/storage/basedb" + ssvtypes "github.com/ssvlabs/ssv/v2/protocol/v2/types" + registrystorage "github.com/ssvlabs/ssv/v2/registry/storage" + "github.com/ssvlabs/ssv/v2/storage/basedb" ) const maxOperators = 13 diff --git a/eth/eventhandler/validation_test.go b/eth/eventhandler/validation_test.go index 23dd80841a..408168ca9a 100644 --- a/eth/eventhandler/validation_test.go +++ b/eth/eventhandler/validation_test.go @@ -9,11 +9,11 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/zap/zaptest" - "github.com/ssvlabs/ssv/networkconfig" - operatorstorage "github.com/ssvlabs/ssv/operator/storage" - "github.com/ssvlabs/ssv/registry/storage" - kv "github.com/ssvlabs/ssv/storage/badger" - "github.com/ssvlabs/ssv/storage/basedb" + "github.com/ssvlabs/ssv/v2/networkconfig" + operatorstorage "github.com/ssvlabs/ssv/v2/operator/storage" + "github.com/ssvlabs/ssv/v2/registry/storage" + kv "github.com/ssvlabs/ssv/v2/storage/badger" + "github.com/ssvlabs/ssv/v2/storage/basedb" ) func Test_validateValidatorAddedEvent(t *testing.T) { diff --git a/eth/eventparser/event_parser.go b/eth/eventparser/event_parser.go index 231e81a561..fb3e201f1f 100644 --- a/eth/eventparser/event_parser.go +++ b/eth/eventparser/event_parser.go @@ -9,7 +9,7 @@ import ( ethcommon "github.com/ethereum/go-ethereum/common" ethtypes "github.com/ethereum/go-ethereum/core/types" - "github.com/ssvlabs/ssv/eth/contract" + "github.com/ssvlabs/ssv/v2/eth/contract" ) type EventParser struct { diff --git a/eth/eventparser/event_parser_test.go b/eth/eventparser/event_parser_test.go index 5bcec4727f..e4b9c81094 100644 --- a/eth/eventparser/event_parser_test.go +++ b/eth/eventparser/event_parser_test.go @@ -10,8 +10,8 @@ import ( "github.com/status-im/keycard-go/hexutils" "github.com/stretchr/testify/require" - "github.com/ssvlabs/ssv/eth/contract" - "github.com/ssvlabs/ssv/eth/eventparser" + "github.com/ssvlabs/ssv/v2/eth/contract" + "github.com/ssvlabs/ssv/v2/eth/eventparser" ) func TestEventParser(t *testing.T) { diff --git a/eth/eventsyncer/event_syncer.go b/eth/eventsyncer/event_syncer.go index 3698e7ef45..2a896780f2 100644 --- a/eth/eventsyncer/event_syncer.go +++ b/eth/eventsyncer/event_syncer.go @@ -12,9 +12,9 @@ import ( "github.com/ethereum/go-ethereum/core/types" "go.uber.org/zap" - "github.com/ssvlabs/ssv/eth/executionclient" - "github.com/ssvlabs/ssv/observability/log/fields" - nodestorage "github.com/ssvlabs/ssv/operator/storage" + "github.com/ssvlabs/ssv/v2/eth/executionclient" + "github.com/ssvlabs/ssv/v2/observability/log/fields" + nodestorage "github.com/ssvlabs/ssv/v2/operator/storage" ) //go:generate go tool -modfile=../../tool.mod mockgen -package=eventsyncer -destination=./event_syncer_mock.go -source=./event_syncer.go diff --git a/eth/eventsyncer/event_syncer_mock.go b/eth/eventsyncer/event_syncer_mock.go index 52674121fe..c8c91e8ed0 100644 --- a/eth/eventsyncer/event_syncer_mock.go +++ b/eth/eventsyncer/event_syncer_mock.go @@ -15,7 +15,7 @@ import ( reflect "reflect" types "github.com/ethereum/go-ethereum/core/types" - executionclient "github.com/ssvlabs/ssv/eth/executionclient" + executionclient "github.com/ssvlabs/ssv/v2/eth/executionclient" gomock "go.uber.org/mock/gomock" ) diff --git a/eth/eventsyncer/event_syncer_test.go b/eth/eventsyncer/event_syncer_test.go index 334c279d3d..0de23ecd78 100644 --- a/eth/eventsyncer/event_syncer_test.go +++ b/eth/eventsyncer/event_syncer_test.go @@ -22,27 +22,27 @@ import ( "go.uber.org/zap" "go.uber.org/zap/zaptest" - "github.com/ssvlabs/ssv/ekmadapter" "github.com/ssvlabs/ssv/ssvsigner/ekm" "github.com/ssvlabs/ssv/ssvsigner/keys" "github.com/ssvlabs/ssv/ssvsigner/keys/rsaencryption" - - "github.com/ssvlabs/ssv/doppelganger" - "github.com/ssvlabs/ssv/eth/contract" - "github.com/ssvlabs/ssv/eth/eventhandler" - "github.com/ssvlabs/ssv/eth/eventparser" - "github.com/ssvlabs/ssv/eth/executionclient" - "github.com/ssvlabs/ssv/eth/simulator" - "github.com/ssvlabs/ssv/eth/simulator/simcontract" - "github.com/ssvlabs/ssv/exporter" - "github.com/ssvlabs/ssv/networkconfig" - operatordatastore "github.com/ssvlabs/ssv/operator/datastore" - operatorstorage "github.com/ssvlabs/ssv/operator/storage" - "github.com/ssvlabs/ssv/operator/validator" - "github.com/ssvlabs/ssv/operator/validators" - registrystorage "github.com/ssvlabs/ssv/registry/storage" - kv "github.com/ssvlabs/ssv/storage/badger" - "github.com/ssvlabs/ssv/storage/basedb" + "github.com/ssvlabs/ssv/v2/ekmadapter" + + "github.com/ssvlabs/ssv/v2/doppelganger" + "github.com/ssvlabs/ssv/v2/eth/contract" + "github.com/ssvlabs/ssv/v2/eth/eventhandler" + "github.com/ssvlabs/ssv/v2/eth/eventparser" + "github.com/ssvlabs/ssv/v2/eth/executionclient" + "github.com/ssvlabs/ssv/v2/eth/simulator" + "github.com/ssvlabs/ssv/v2/eth/simulator/simcontract" + "github.com/ssvlabs/ssv/v2/exporter" + "github.com/ssvlabs/ssv/v2/networkconfig" + operatordatastore "github.com/ssvlabs/ssv/v2/operator/datastore" + operatorstorage "github.com/ssvlabs/ssv/v2/operator/storage" + "github.com/ssvlabs/ssv/v2/operator/validator" + "github.com/ssvlabs/ssv/v2/operator/validators" + registrystorage "github.com/ssvlabs/ssv/v2/registry/storage" + kv "github.com/ssvlabs/ssv/v2/storage/badger" + "github.com/ssvlabs/ssv/v2/storage/basedb" ) var ( diff --git a/eth/eventsyncer/options.go b/eth/eventsyncer/options.go index fb4b1f6ddb..265096dac9 100644 --- a/eth/eventsyncer/options.go +++ b/eth/eventsyncer/options.go @@ -3,7 +3,7 @@ package eventsyncer import ( "go.uber.org/zap" - "github.com/ssvlabs/ssv/observability/log" + "github.com/ssvlabs/ssv/v2/observability/log" ) // Option defines EventSyncer configuration option. diff --git a/eth/executionclient/bloom.go b/eth/executionclient/bloom.go index ceea172cd8..9601e3247d 100644 --- a/eth/executionclient/bloom.go +++ b/eth/executionclient/bloom.go @@ -12,7 +12,7 @@ import ( ethtypes "github.com/ethereum/go-ethereum/core/types" "go.uber.org/zap" - "github.com/ssvlabs/ssv/observability/log/fields" + "github.com/ssvlabs/ssv/v2/observability/log/fields" ) // verifyLogsWithBloom cross-checks the logs returned by FilterLogs against each block's diff --git a/eth/executionclient/execution_client.go b/eth/executionclient/execution_client.go index cedea343a1..b0b50e297b 100644 --- a/eth/executionclient/execution_client.go +++ b/eth/executionclient/execution_client.go @@ -17,9 +17,9 @@ import ( semconv "go.opentelemetry.io/otel/semconv/v1.37.0" "go.uber.org/zap" - "github.com/ssvlabs/ssv/eth/contract" - "github.com/ssvlabs/ssv/observability/log/fields" - "github.com/ssvlabs/ssv/observability/metrics" + "github.com/ssvlabs/ssv/v2/eth/contract" + "github.com/ssvlabs/ssv/v2/observability/log/fields" + "github.com/ssvlabs/ssv/v2/observability/metrics" ) //go:generate go tool -modfile=../../tool.mod mockgen -package=executionclient -destination=./mocks.go -source=./execution_client.go diff --git a/eth/executionclient/execution_client_test.go b/eth/executionclient/execution_client_test.go index 0b5f443af5..e16facd861 100644 --- a/eth/executionclient/execution_client_test.go +++ b/eth/executionclient/execution_client_test.go @@ -28,8 +28,8 @@ import ( "go.uber.org/zap" "go.uber.org/zap/zaptest" - "github.com/ssvlabs/ssv/eth/simulator" - "github.com/ssvlabs/ssv/eth/simulator/simcontract" + "github.com/ssvlabs/ssv/v2/eth/simulator" + "github.com/ssvlabs/ssv/v2/eth/simulator/simcontract" ) var ( diff --git a/eth/executionclient/mocks.go b/eth/executionclient/mocks.go index 68708c0862..c52a8d90a8 100644 --- a/eth/executionclient/mocks.go +++ b/eth/executionclient/mocks.go @@ -16,7 +16,7 @@ import ( ethereum "github.com/ethereum/go-ethereum" types "github.com/ethereum/go-ethereum/core/types" - contract "github.com/ssvlabs/ssv/eth/contract" + contract "github.com/ssvlabs/ssv/v2/eth/contract" gomock "go.uber.org/mock/gomock" ) diff --git a/eth/executionclient/multi_client.go b/eth/executionclient/multi_client.go index 6d1428da52..2986d955f5 100644 --- a/eth/executionclient/multi_client.go +++ b/eth/executionclient/multi_client.go @@ -15,7 +15,7 @@ import ( "github.com/sourcegraph/conc/pool" "go.uber.org/zap" - "github.com/ssvlabs/ssv/eth/contract" + "github.com/ssvlabs/ssv/v2/eth/contract" ) var _ Provider = &MultiClient{} diff --git a/eth/executionclient/multi_client_test.go b/eth/executionclient/multi_client_test.go index 8ae5da66ec..19d16ce7e0 100644 --- a/eth/executionclient/multi_client_test.go +++ b/eth/executionclient/multi_client_test.go @@ -19,7 +19,7 @@ import ( "go.uber.org/mock/gomock" "go.uber.org/zap" - "github.com/ssvlabs/ssv/observability/log" + "github.com/ssvlabs/ssv/v2/observability/log" ) func TestNewMulti(t *testing.T) { diff --git a/eth/executionclient/observability.go b/eth/executionclient/observability.go index 1c7a370c5e..c90e341291 100644 --- a/eth/executionclient/observability.go +++ b/eth/executionclient/observability.go @@ -13,13 +13,13 @@ import ( semconv "go.opentelemetry.io/otel/semconv/v1.37.0" "go.uber.org/zap" - "github.com/ssvlabs/ssv/observability" - "github.com/ssvlabs/ssv/observability/log/fields" - "github.com/ssvlabs/ssv/observability/metrics" + "github.com/ssvlabs/ssv/v2/observability" + "github.com/ssvlabs/ssv/v2/observability/log/fields" + "github.com/ssvlabs/ssv/v2/observability/metrics" ) const ( - observabilityName = "github.com/ssvlabs/ssv/eth/executionclient" + observabilityName = "github.com/ssvlabs/ssv/v2/eth/executionclient" observabilityNamespace = "ssv.el" ) diff --git a/eth/executionclient/options.go b/eth/executionclient/options.go index 3b5afa3d34..5fd2ca81b2 100644 --- a/eth/executionclient/options.go +++ b/eth/executionclient/options.go @@ -5,7 +5,7 @@ import ( "go.uber.org/zap" - "github.com/ssvlabs/ssv/observability/log" + "github.com/ssvlabs/ssv/v2/observability/log" ) // Option defines an ExecutionClient configuration option. diff --git a/eth/localevents/local_events.go b/eth/localevents/local_events.go index d8d5797e94..b3fa738908 100644 --- a/eth/localevents/local_events.go +++ b/eth/localevents/local_events.go @@ -10,7 +10,7 @@ import ( ethcommon "github.com/ethereum/go-ethereum/common" "gopkg.in/yaml.v3" - "github.com/ssvlabs/ssv/eth/contract" + "github.com/ssvlabs/ssv/v2/eth/contract" ) // Event represents an eth1 event log in the system diff --git a/eth/localevents/local_events_test.go b/eth/localevents/local_events_test.go index 8d9decc727..0d16bb81bd 100644 --- a/eth/localevents/local_events_test.go +++ b/eth/localevents/local_events_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/require" "gopkg.in/yaml.v3" - "github.com/ssvlabs/ssv/eth/contract" - "github.com/ssvlabs/ssv/eth/localevents" + "github.com/ssvlabs/ssv/v2/eth/contract" + "github.com/ssvlabs/ssv/v2/eth/localevents" ) func TestLocalEventsUnmarshalYAML(t *testing.T) { diff --git a/exporter/api/decided/stream.go b/exporter/api/decided/stream.go index 2bbd9a1b8c..4bf3d49cca 100644 --- a/exporter/api/decided/stream.go +++ b/exporter/api/decided/stream.go @@ -8,12 +8,12 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" "go.uber.org/zap" - "github.com/ssvlabs/ssv/exporter/api" - qbftstorage "github.com/ssvlabs/ssv/ibft/storage" - "github.com/ssvlabs/ssv/observability/log/fields" - dutytracer "github.com/ssvlabs/ssv/operator/dutytracer" - "github.com/ssvlabs/ssv/protocol/v2/qbft/controller" - registrystorage "github.com/ssvlabs/ssv/registry/storage" + "github.com/ssvlabs/ssv/v2/exporter/api" + qbftstorage "github.com/ssvlabs/ssv/v2/ibft/storage" + "github.com/ssvlabs/ssv/v2/observability/log/fields" + dutytracer "github.com/ssvlabs/ssv/v2/operator/dutytracer" + "github.com/ssvlabs/ssv/v2/protocol/v2/qbft/controller" + registrystorage "github.com/ssvlabs/ssv/v2/registry/storage" ) // NewStreamPublisher handles incoming newly decided messages. diff --git a/exporter/api/msg.go b/exporter/api/msg.go index a5f51c7138..6bb8d91651 100644 --- a/exporter/api/msg.go +++ b/exporter/api/msg.go @@ -9,7 +9,7 @@ import ( specqbft "github.com/ssvlabs/ssv-spec/qbft" spectypes "github.com/ssvlabs/ssv-spec/types" - qbftstorage "github.com/ssvlabs/ssv/ibft/storage" + qbftstorage "github.com/ssvlabs/ssv/v2/ibft/storage" ) // Message represents an exporter message diff --git a/exporter/api/query_handlers.go b/exporter/api/query_handlers.go index 0c46adb2c3..e297833100 100644 --- a/exporter/api/query_handlers.go +++ b/exporter/api/query_handlers.go @@ -8,9 +8,9 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" "go.uber.org/zap" - "github.com/ssvlabs/ssv/ibft/storage" - "github.com/ssvlabs/ssv/observability/log/fields" - "github.com/ssvlabs/ssv/protocol/v2/message" + "github.com/ssvlabs/ssv/v2/ibft/storage" + "github.com/ssvlabs/ssv/v2/observability/log/fields" + "github.com/ssvlabs/ssv/v2/protocol/v2/message" ) const ( diff --git a/exporter/api/query_handlers_test.go b/exporter/api/query_handlers_test.go index 526975a5be..078983c5ee 100644 --- a/exporter/api/query_handlers_test.go +++ b/exporter/api/query_handlers_test.go @@ -16,12 +16,12 @@ import ( "github.com/ssvlabs/ssv/ssvsigner/keys/rsaencryption" - qbftstorage "github.com/ssvlabs/ssv/ibft/storage" - "github.com/ssvlabs/ssv/networkconfig" - "github.com/ssvlabs/ssv/observability/log" - "github.com/ssvlabs/ssv/operator/storage" - kv "github.com/ssvlabs/ssv/storage/badger" - "github.com/ssvlabs/ssv/storage/basedb" + qbftstorage "github.com/ssvlabs/ssv/v2/ibft/storage" + "github.com/ssvlabs/ssv/v2/networkconfig" + "github.com/ssvlabs/ssv/v2/observability/log" + "github.com/ssvlabs/ssv/v2/operator/storage" + kv "github.com/ssvlabs/ssv/v2/storage/badger" + "github.com/ssvlabs/ssv/v2/storage/basedb" ) func TestHandleUnknownQuery(t *testing.T) { diff --git a/exporter/api/server.go b/exporter/api/server.go index 85d7bbd160..154ca47226 100644 --- a/exporter/api/server.go +++ b/exporter/api/server.go @@ -10,9 +10,9 @@ import ( "go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp" "go.uber.org/zap" - "github.com/ssvlabs/ssv/observability/log" - "github.com/ssvlabs/ssv/observability/log/fields" - "github.com/ssvlabs/ssv/utils/tasks" + "github.com/ssvlabs/ssv/v2/observability/log" + "github.com/ssvlabs/ssv/v2/observability/log/fields" + "github.com/ssvlabs/ssv/v2/utils/tasks" ) const ( diff --git a/exporter/api/server_test.go b/exporter/api/server_test.go index 8f3342c280..8058f80002 100644 --- a/exporter/api/server_test.go +++ b/exporter/api/server_test.go @@ -13,7 +13,7 @@ import ( "go.uber.org/zap" "go.uber.org/zap/zaptest" - registrystorage "github.com/ssvlabs/ssv/registry/storage" + registrystorage "github.com/ssvlabs/ssv/v2/registry/storage" ) func TestHandleQuery(t *testing.T) { diff --git a/exporter/api/testutils.go b/exporter/api/testutils.go index b2edce2539..8db67e30e0 100644 --- a/exporter/api/testutils.go +++ b/exporter/api/testutils.go @@ -10,7 +10,7 @@ import ( "github.com/gorilla/websocket" "go.uber.org/zap" - "github.com/ssvlabs/ssv/observability/log/fields" + "github.com/ssvlabs/ssv/v2/observability/log/fields" ) // WSClient represents a client connection to be used in tests diff --git a/exporter/store/store.go b/exporter/store/store.go index a5e7410449..d40dd25b60 100644 --- a/exporter/store/store.go +++ b/exporter/store/store.go @@ -12,9 +12,9 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/exporter" - "github.com/ssvlabs/ssv/exporter/rolemask" - "github.com/ssvlabs/ssv/storage/basedb" + "github.com/ssvlabs/ssv/v2/exporter" + "github.com/ssvlabs/ssv/v2/exporter/rolemask" + "github.com/ssvlabs/ssv/v2/storage/basedb" ) var ErrNotFound = errors.New("duty not found") diff --git a/exporter/store/store_test.go b/exporter/store/store_test.go index abcf5bf11b..e6df277276 100644 --- a/exporter/store/store_test.go +++ b/exporter/store/store_test.go @@ -10,11 +10,11 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/exporter" - "github.com/ssvlabs/ssv/exporter/rolemask" - store "github.com/ssvlabs/ssv/exporter/store" - kv "github.com/ssvlabs/ssv/storage/badger" - "github.com/ssvlabs/ssv/storage/basedb" + "github.com/ssvlabs/ssv/v2/exporter" + "github.com/ssvlabs/ssv/v2/exporter/rolemask" + store "github.com/ssvlabs/ssv/v2/exporter/store" + kv "github.com/ssvlabs/ssv/v2/storage/badger" + "github.com/ssvlabs/ssv/v2/storage/basedb" ) func TestSaveCommitteeDutyLinks(t *testing.T) { diff --git a/exporter2/committee.go b/exporter2/committee.go index 28ab2b0166..916f3b7f96 100644 --- a/exporter2/committee.go +++ b/exporter2/committee.go @@ -9,9 +9,9 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/exporter" - "github.com/ssvlabs/ssv/exporter/rolemask" - "github.com/ssvlabs/ssv/observability/log/fields" + "github.com/ssvlabs/ssv/v2/exporter" + "github.com/ssvlabs/ssv/v2/exporter/rolemask" + "github.com/ssvlabs/ssv/v2/observability/log/fields" ) // CommitteeTracesCore contains the core logic for CommitteeTraces without any HTTP concerns. diff --git a/exporter2/decided.go b/exporter2/decided.go index 4c31417c51..4e2262d62f 100644 --- a/exporter2/decided.go +++ b/exporter2/decided.go @@ -9,8 +9,8 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/ibft/storage" - dutytracer "github.com/ssvlabs/ssv/operator/dutytracer" + "github.com/ssvlabs/ssv/v2/ibft/storage" + dutytracer "github.com/ssvlabs/ssv/v2/operator/dutytracer" ) // TraceDecidedsCore contains the core logic for TraceDecideds without any HTTP concerns. diff --git a/exporter2/exporter.go b/exporter2/exporter.go index ca8f1b1515..6e03e2d0e8 100644 --- a/exporter2/exporter.go +++ b/exporter2/exporter.go @@ -11,12 +11,12 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/exporter" - "github.com/ssvlabs/ssv/exporter/rolemask" - "github.com/ssvlabs/ssv/exporter/store" - ibftstorage "github.com/ssvlabs/ssv/ibft/storage" - dutytracer "github.com/ssvlabs/ssv/operator/dutytracer" - registrystorage "github.com/ssvlabs/ssv/registry/storage" + "github.com/ssvlabs/ssv/v2/exporter" + "github.com/ssvlabs/ssv/v2/exporter/rolemask" + "github.com/ssvlabs/ssv/v2/exporter/store" + ibftstorage "github.com/ssvlabs/ssv/v2/ibft/storage" + dutytracer "github.com/ssvlabs/ssv/v2/operator/dutytracer" + registrystorage "github.com/ssvlabs/ssv/v2/registry/storage" ) type Exporter struct { diff --git a/exporter2/models.go b/exporter2/models.go index 6183614af7..eee9aa438c 100644 --- a/exporter2/models.go +++ b/exporter2/models.go @@ -5,8 +5,8 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/exporter" - "github.com/ssvlabs/ssv/ibft/storage" + "github.com/ssvlabs/ssv/v2/exporter" + "github.com/ssvlabs/ssv/v2/ibft/storage" ) // DecidedsQuery defines the transport-agnostic parameters for decided traces diff --git a/exporter2/validator.go b/exporter2/validator.go index 4312b1fd1b..b4fc349305 100644 --- a/exporter2/validator.go +++ b/exporter2/validator.go @@ -10,9 +10,9 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/exporter" - "github.com/ssvlabs/ssv/exporter/rolemask" - "github.com/ssvlabs/ssv/observability/log/fields" + "github.com/ssvlabs/ssv/v2/exporter" + "github.com/ssvlabs/ssv/v2/exporter/rolemask" + "github.com/ssvlabs/ssv/v2/observability/log/fields" ) // ValidatorTracesCore contains the core logic for ValidatorTraces without any HTTP concerns. diff --git a/go.mod b/go.mod index ed9c367283..e228aa31ec 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/ssvlabs/ssv +module github.com/ssvlabs/ssv/v2 go 1.26 @@ -21,8 +21,10 @@ require ( github.com/google/gofuzz v1.2.0 github.com/google/uuid v1.6.0 github.com/gorilla/websocket v1.5.3 + github.com/hashicorp/go-multierror v1.1.1 github.com/hashicorp/golang-lru/v2 v2.0.7 github.com/herumi/bls-eth-go-binary v1.29.1 + github.com/holiman/uint256 v1.3.2 github.com/ilyakaznacheev/cleanenv v1.4.2 github.com/jellydator/ttlcache/v3 v3.3.0 github.com/libp2p/go-libp2p v0.45.0 @@ -33,6 +35,7 @@ require ( github.com/oleiade/lane/v2 v2.0.0 github.com/patrickmn/go-cache v2.1.0+incompatible github.com/prometheus/client_golang v1.23.2 + github.com/prometheus/common v0.66.1 github.com/prysmaticlabs/go-bitfield v0.0.0-20240618144021-706c95b2dd15 github.com/prysmaticlabs/prysm/v4 v4.0.8 github.com/rs/zerolog v1.32.0 @@ -47,8 +50,13 @@ require ( github.com/wealdtech/go-eth2-types/v2 v2.8.1 github.com/wealdtech/go-eth2-util v1.8.1 go.opentelemetry.io/contrib/exporters/autoexport v0.61.0 + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 + go.opentelemetry.io/otel v1.41.0 + go.opentelemetry.io/otel/exporters/prometheus v0.58.0 + go.opentelemetry.io/otel/metric v1.41.0 go.opentelemetry.io/otel/sdk v1.38.0 go.opentelemetry.io/otel/sdk/metric v1.38.0 + go.opentelemetry.io/otel/trace v1.41.0 go.uber.org/mock v0.5.2 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 @@ -60,50 +68,6 @@ require ( tailscale.com v1.72.0 ) -require ( - github.com/cenkalti/backoff/v5 v5.0.3 // indirect - github.com/crate-crypto/go-eth-kzg v1.4.0 // indirect - github.com/dchest/siphash v1.2.3 // indirect - github.com/emicklei/dot v1.6.4 // indirect - github.com/ethereum/c-kzg-4844/v2 v2.1.3 // indirect - github.com/ethereum/go-bigmodexpfix v0.0.0-20250911101455-f9e208c548ab // indirect - github.com/filecoin-project/go-clock v0.1.0 // indirect - github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2 // indirect - github.com/libp2p/go-yamux/v5 v5.0.1 // indirect - github.com/mschoch/smat v0.2.0 // indirect - github.com/pion/dtls/v3 v3.0.6 // indirect - github.com/pion/ice/v4 v4.0.10 // indirect - github.com/pion/mdns/v2 v2.0.7 // indirect - github.com/pion/srtp/v3 v3.0.6 // indirect - github.com/pion/stun/v2 v2.0.0 // indirect - github.com/pion/stun/v3 v3.0.0 // indirect - github.com/pion/transport/v3 v3.0.7 // indirect - github.com/pion/turn/v4 v4.0.2 // indirect - github.com/pion/webrtc/v4 v4.1.2 // indirect - github.com/pkg/errors v0.9.1 // indirect - github.com/wealdtech/go-eth2-wallet-encryptor-keystorev4 v1.1.3 // indirect - go.opentelemetry.io/auto/sdk v1.2.1 // indirect - go.opentelemetry.io/contrib/bridges/prometheus v0.61.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.12.2 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.12.2 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.36.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.36.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.38.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.38.0 // indirect - go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.12.2 // indirect - go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.36.0 // indirect - go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.38.0 // indirect - go.opentelemetry.io/otel/log v0.12.2 // indirect - go.opentelemetry.io/otel/sdk/log v0.12.2 // indirect - go.opentelemetry.io/proto/otlp v1.7.1 // indirect - go.yaml.in/yaml/v2 v2.4.3 // indirect - golang.org/x/exp v0.0.0-20250911091902-df9299821621 // indirect - golang.org/x/telemetry v0.0.0-20251008203120-078029d740a8 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20250825161204-c5933d9347a5 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20250825161204-c5933d9347a5 // indirect - google.golang.org/grpc v1.75.0 // indirect -) - require ( github.com/BurntSushi/toml v1.5.0 // indirect github.com/DataDog/zstd v1.5.2 // indirect @@ -116,6 +80,7 @@ require ( github.com/beorn7/perks v1.0.1 // indirect github.com/bits-and-blooms/bitset v1.20.0 // indirect github.com/carlmjohnson/requests v0.24.3 // indirect + github.com/cenkalti/backoff/v5 v5.0.3 // indirect github.com/cockroachdb/errors v1.11.3 // indirect github.com/cockroachdb/fifo v0.0.0-20240606204812-0bbfbd93a7ce // indirect github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect @@ -123,16 +88,22 @@ require ( github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect github.com/consensys/gnark-crypto v0.18.0 // indirect github.com/cpuguy83/go-md2man/v2 v2.0.6 // indirect + github.com/crate-crypto/go-eth-kzg v1.4.0 // indirect github.com/crate-crypto/go-ipa v0.0.0-20240724233137-53bbb0ceb27a // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c // indirect + github.com/dchest/siphash v1.2.3 // indirect github.com/deckarep/golang-set/v2 v2.6.0 // indirect github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 // indirect github.com/dustin/go-humanize v1.0.1 // indirect + github.com/emicklei/dot v1.6.4 // indirect + github.com/ethereum/c-kzg-4844/v2 v2.1.3 // indirect + github.com/ethereum/go-bigmodexpfix v0.0.0-20250911101455-f9e208c548ab // indirect github.com/ethereum/go-verkle v0.2.2 // indirect github.com/fasthttp/router v1.5.4 // indirect github.com/fatih/color v1.18.0 // indirect github.com/felixge/httpsnoop v1.0.4 // indirect + github.com/filecoin-project/go-clock v0.1.0 // indirect github.com/flynn/noise v1.1.0 // indirect github.com/francoispqt/gojay v1.2.13 // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect @@ -150,13 +121,12 @@ require ( github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect github.com/google/flatbuffers v1.12.1 // indirect github.com/google/gopacket v1.1.19 // indirect + github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-bexpr v0.1.10 // indirect - github.com/hashicorp/go-multierror v1.1.1 github.com/hashicorp/golang-lru v1.0.2 // indirect github.com/holiman/billy v0.0.0-20250707135307-f2f9b9aae7db // indirect github.com/holiman/bloomfilter/v2 v2.0.3 // indirect - github.com/holiman/uint256 v1.3.2 github.com/huandu/go-clone v1.6.0 // indirect github.com/huin/goupnp v1.3.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect @@ -183,6 +153,7 @@ require ( github.com/libp2p/go-msgio v0.3.0 // indirect github.com/libp2p/go-netroute v0.3.0 // indirect github.com/libp2p/go-reuseport v0.4.0 // indirect + github.com/libp2p/go-yamux/v5 v5.0.1 // indirect github.com/libp2p/zeroconf/v2 v2.2.0 // indirect github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd // indirect github.com/mattn/go-colorable v0.1.14 // indirect @@ -195,6 +166,7 @@ require ( github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/mitchellh/pointerstructure v1.2.0 // indirect github.com/mr-tron/base58 v1.2.0 // indirect + github.com/mschoch/smat v0.2.0 // indirect github.com/multiformats/go-base32 v0.1.0 // indirect github.com/multiformats/go-base36 v0.2.0 // indirect github.com/multiformats/go-multiaddr-dns v0.4.1 // indirect @@ -209,20 +181,29 @@ require ( github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect github.com/pion/datachannel v1.5.10 // indirect github.com/pion/dtls/v2 v2.2.12 // indirect + github.com/pion/dtls/v3 v3.0.6 // indirect + github.com/pion/ice/v4 v4.0.10 // indirect github.com/pion/interceptor v0.1.40 // indirect github.com/pion/logging v0.2.3 // indirect + github.com/pion/mdns/v2 v2.0.7 // indirect github.com/pion/randutil v0.1.0 // indirect github.com/pion/rtcp v1.2.15 // indirect github.com/pion/rtp v1.8.19 // indirect github.com/pion/sctp v1.8.39 // indirect github.com/pion/sdp/v3 v3.0.13 // indirect + github.com/pion/srtp/v3 v3.0.6 // indirect github.com/pion/stun v0.6.1 // indirect + github.com/pion/stun/v2 v2.0.0 // indirect + github.com/pion/stun/v3 v3.0.0 // indirect github.com/pion/transport/v2 v2.2.10 // indirect + github.com/pion/transport/v3 v3.0.7 // indirect + github.com/pion/turn/v4 v4.0.2 // indirect + github.com/pion/webrtc/v4 v4.1.2 // indirect github.com/pk910/dynamic-ssz v0.0.4 // indirect + github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/polydawn/refmt v0.89.0 // indirect github.com/prometheus/client_model v0.6.2 // indirect - github.com/prometheus/common v0.66.1 github.com/prometheus/procfs v0.17.0 // indirect github.com/quic-go/qpack v0.5.1 // indirect github.com/quic-go/quic-go v0.55.0 // indirect @@ -247,27 +228,43 @@ require ( github.com/valyala/bytebufferpool v1.0.0 // indirect github.com/valyala/fasthttp v1.58.0 // indirect github.com/wealdtech/go-bytesutil v1.2.1 // indirect + github.com/wealdtech/go-eth2-wallet-encryptor-keystorev4 v1.1.3 // indirect github.com/whyrusleeping/go-keyspace v0.0.0-20160322163242-5b898ac5add1 // indirect github.com/wlynxg/anet v0.0.5 // indirect github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 - go.opentelemetry.io/otel v1.41.0 + go.opentelemetry.io/auto/sdk v1.2.1 // indirect + go.opentelemetry.io/contrib/bridges/prometheus v0.61.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.12.2 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.12.2 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.36.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.36.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.38.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.38.0 // indirect - go.opentelemetry.io/otel/exporters/prometheus v0.58.0 - go.opentelemetry.io/otel/metric v1.41.0 - go.opentelemetry.io/otel/trace v1.41.0 + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.38.0 // indirect + go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.12.2 // indirect + go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.36.0 // indirect + go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.38.0 // indirect + go.opentelemetry.io/otel/log v0.12.2 // indirect + go.opentelemetry.io/otel/sdk/log v0.12.2 // indirect + go.opentelemetry.io/proto/otlp v1.7.1 // indirect go.uber.org/dig v1.19.0 // indirect go.uber.org/fx v1.24.0 // indirect + go.yaml.in/yaml/v2 v2.4.3 // indirect golang.org/x/crypto v0.45.0 // indirect + golang.org/x/exp v0.0.0-20250911091902-df9299821621 // indirect golang.org/x/net v0.47.0 // indirect golang.org/x/sys v0.38.0 // indirect + golang.org/x/telemetry v0.0.0-20251008203120-078029d740a8 // indirect golang.org/x/term v0.37.0 // indirect golang.org/x/time v0.12.0 // indirect golang.org/x/tools v0.38.0 // indirect golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect gonum.org/v1/gonum v0.16.0 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20250825161204-c5933d9347a5 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20250825161204-c5933d9347a5 // indirect + google.golang.org/grpc v1.75.0 // indirect google.golang.org/protobuf v1.36.9 // indirect gopkg.in/Knetic/govaluate.v3 v3.0.0 // indirect gopkg.in/cenkalti/backoff.v1 v1.1.0 // indirect @@ -276,11 +273,10 @@ require ( olympos.io/encoding/edn v0.0.0-20201019073823-d3554ca0b0a3 // indirect ) -replace github.com/google/flatbuffers => github.com/google/flatbuffers v1.11.0 - -replace github.com/dgraph-io/ristretto => github.com/dgraph-io/ristretto v0.1.1-0.20211108053508-297c39e6640f - -// SSV fork of go-eth2-client based on upstream v0.27.0 (includes Fulu support) with SSV-specific changes. -replace github.com/attestantio/go-eth2-client => github.com/ssvlabs/go-eth2-client v0.6.31-0.20250922150906-26179dd60c9c - -replace github.com/ssvlabs/ssv/ssvsigner => ./ssvsigner +replace ( + // SSV fork of go-eth2-client based on upstream v0.27.0 (includes Fulu support) with SSV-specific changes. + github.com/attestantio/go-eth2-client => github.com/ssvlabs/go-eth2-client v0.6.31-0.20250922150906-26179dd60c9c + github.com/dgraph-io/ristretto => github.com/dgraph-io/ristretto v0.1.1-0.20211108053508-297c39e6640f + github.com/google/flatbuffers => github.com/google/flatbuffers v1.11.0 + github.com/ssvlabs/ssv/ssvsigner => ./ssvsigner +) diff --git a/hprobe/prober.go b/hprobe/prober.go index cfdc35c0a2..37cc19db36 100644 --- a/hprobe/prober.go +++ b/hprobe/prober.go @@ -9,7 +9,7 @@ import ( "go.uber.org/zap" - "github.com/ssvlabs/ssv/utils/hashmap" + "github.com/ssvlabs/ssv/v2/utils/hashmap" ) // component is an interface a component needs to implement for HealthProber to be able to probe it. diff --git a/hprobe/prober_test.go b/hprobe/prober_test.go index a9f47118c6..5d1ef3ba8c 100644 --- a/hprobe/prober_test.go +++ b/hprobe/prober_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/ssvlabs/ssv/observability/log" + "github.com/ssvlabs/ssv/v2/observability/log" ) func TestProber(t *testing.T) { diff --git a/ibft/storage/observability.go b/ibft/storage/observability.go index 7aa8c6ed68..8aac2d55bd 100644 --- a/ibft/storage/observability.go +++ b/ibft/storage/observability.go @@ -8,12 +8,12 @@ import ( "go.opentelemetry.io/otel/metric" semconv "go.opentelemetry.io/otel/semconv/v1.37.0" - "github.com/ssvlabs/ssv/observability" - "github.com/ssvlabs/ssv/observability/metrics" + "github.com/ssvlabs/ssv/v2/observability" + "github.com/ssvlabs/ssv/v2/observability/metrics" ) const ( - observabilityName = "github.com/ssvlabs/ssv/ibft/storage" + observabilityName = "github.com/ssvlabs/ssv/v2/ibft/storage" observabilityNamespace = "ssv.storage" ) diff --git a/ibft/storage/participant_store.go b/ibft/storage/participant_store.go index 9e89876f69..8c6dcc4c76 100644 --- a/ibft/storage/participant_store.go +++ b/ibft/storage/participant_store.go @@ -7,7 +7,7 @@ import ( specqbft "github.com/ssvlabs/ssv-spec/qbft" spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/operator/slotticker" + "github.com/ssvlabs/ssv/v2/operator/slotticker" ) // Participation extends ParticipantsRangeEntry with role and pubkey. diff --git a/ibft/storage/store.go b/ibft/storage/store.go index 311283a688..5a73cbf27e 100644 --- a/ibft/storage/store.go +++ b/ibft/storage/store.go @@ -12,9 +12,9 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" "go.uber.org/zap" - "github.com/ssvlabs/ssv/observability/log/fields" - "github.com/ssvlabs/ssv/operator/slotticker" - "github.com/ssvlabs/ssv/storage/basedb" + "github.com/ssvlabs/ssv/v2/observability/log/fields" + "github.com/ssvlabs/ssv/v2/operator/slotticker" + "github.com/ssvlabs/ssv/v2/storage/basedb" ) const ( diff --git a/ibft/storage/store_test.go b/ibft/storage/store_test.go index 0abeda512a..e4ed1a2f46 100644 --- a/ibft/storage/store_test.go +++ b/ibft/storage/store_test.go @@ -21,10 +21,10 @@ import ( "github.com/ssvlabs/ssv/ssvsigner/keys/rsaencryption" - "github.com/ssvlabs/ssv/operator/slotticker" - mockslotticker "github.com/ssvlabs/ssv/operator/slotticker/mocks" - kv "github.com/ssvlabs/ssv/storage/badger" - "github.com/ssvlabs/ssv/storage/basedb" + "github.com/ssvlabs/ssv/v2/operator/slotticker" + mockslotticker "github.com/ssvlabs/ssv/v2/operator/slotticker/mocks" + kv "github.com/ssvlabs/ssv/v2/storage/badger" + "github.com/ssvlabs/ssv/v2/storage/basedb" ) func TestRemoveSlot(t *testing.T) { diff --git a/ibft/storage/stores.go b/ibft/storage/stores.go index dcc9adc5f7..311290e968 100644 --- a/ibft/storage/stores.go +++ b/ibft/storage/stores.go @@ -3,7 +3,7 @@ package storage import ( spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/utils/hashmap" + "github.com/ssvlabs/ssv/v2/utils/hashmap" ) // ParticipantStores wraps sync map with cast functions to qbft store diff --git a/identity/store.go b/identity/store.go index 4ccbcd9d53..5bd814916d 100644 --- a/identity/store.go +++ b/identity/store.go @@ -10,9 +10,9 @@ import ( gcrypto "github.com/ethereum/go-ethereum/crypto" "go.uber.org/zap" - "github.com/ssvlabs/ssv/observability/log" - "github.com/ssvlabs/ssv/storage/basedb" - "github.com/ssvlabs/ssv/utils" + "github.com/ssvlabs/ssv/v2/observability/log" + "github.com/ssvlabs/ssv/v2/storage/basedb" + "github.com/ssvlabs/ssv/v2/utils" ) var ( diff --git a/identity/store_test.go b/identity/store_test.go index 4f76dd2140..92b0b5cc89 100644 --- a/identity/store_test.go +++ b/identity/store_test.go @@ -15,12 +15,12 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/zap" - "github.com/ssvlabs/ssv/network/commons" - "github.com/ssvlabs/ssv/observability/log" "github.com/ssvlabs/ssv/ssvsigner" "github.com/ssvlabs/ssv/ssvsigner/keys" - kv "github.com/ssvlabs/ssv/storage/badger" - "github.com/ssvlabs/ssv/storage/basedb" + "github.com/ssvlabs/ssv/v2/network/commons" + "github.com/ssvlabs/ssv/v2/observability/log" + kv "github.com/ssvlabs/ssv/v2/storage/badger" + "github.com/ssvlabs/ssv/v2/storage/basedb" ) var ( diff --git a/message/signatureverifier/mock.go b/message/signatureverifier/mock.go index 5a1f174207..085cc22f95 100644 --- a/message/signatureverifier/mock.go +++ b/message/signatureverifier/mock.go @@ -13,8 +13,8 @@ import ( reflect "reflect" types "github.com/ssvlabs/ssv-spec/types" - storage "github.com/ssvlabs/ssv/registry/storage" - basedb "github.com/ssvlabs/ssv/storage/basedb" + storage "github.com/ssvlabs/ssv/v2/registry/storage" + basedb "github.com/ssvlabs/ssv/v2/storage/basedb" gomock "go.uber.org/mock/gomock" ) diff --git a/message/signatureverifier/signature_verifier.go b/message/signatureverifier/signature_verifier.go index 224ceff72a..cece32a32b 100644 --- a/message/signatureverifier/signature_verifier.go +++ b/message/signatureverifier/signature_verifier.go @@ -6,9 +6,9 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" - registrystorage "github.com/ssvlabs/ssv/registry/storage" "github.com/ssvlabs/ssv/ssvsigner/keys" - "github.com/ssvlabs/ssv/storage/basedb" + registrystorage "github.com/ssvlabs/ssv/v2/registry/storage" + "github.com/ssvlabs/ssv/v2/storage/basedb" ) //go:generate go tool -modfile=../../tool.mod mockgen -package=signatureverifier -destination=./mock.go -source=./signature_verifier.go diff --git a/message/validation/consensus_validation.go b/message/validation/consensus_validation.go index 61ed77ecdf..dd08458d2e 100644 --- a/message/validation/consensus_validation.go +++ b/message/validation/consensus_validation.go @@ -16,9 +16,9 @@ import ( specqbft "github.com/ssvlabs/ssv-spec/qbft" spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/protocol/v2/message" - "github.com/ssvlabs/ssv/protocol/v2/qbft/roundtimer" - ssvtypes "github.com/ssvlabs/ssv/protocol/v2/types" + "github.com/ssvlabs/ssv/v2/protocol/v2/message" + "github.com/ssvlabs/ssv/v2/protocol/v2/qbft/roundtimer" + ssvtypes "github.com/ssvlabs/ssv/v2/protocol/v2/types" ) func (mv *messageValidator) validateConsensusMessage( diff --git a/message/validation/consensus_validation_test.go b/message/validation/consensus_validation_test.go index 72fed79e80..6e3f0f554e 100644 --- a/message/validation/consensus_validation_test.go +++ b/message/validation/consensus_validation_test.go @@ -8,8 +8,8 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" "github.com/stretchr/testify/require" - "github.com/ssvlabs/ssv/networkconfig" - "github.com/ssvlabs/ssv/protocol/v2/qbft/roundtimer" + "github.com/ssvlabs/ssv/v2/networkconfig" + "github.com/ssvlabs/ssv/v2/protocol/v2/qbft/roundtimer" ) func TestMessageValidator_currentEstimatedRound(t *testing.T) { diff --git a/message/validation/errors.go b/message/validation/errors.go index 679b6b087f..cfc9ca2c24 100644 --- a/message/validation/errors.go +++ b/message/validation/errors.go @@ -10,8 +10,8 @@ import ( "github.com/libp2p/go-libp2p/core/peer" "go.uber.org/zap" - "github.com/ssvlabs/ssv/observability/log/fields" - "github.com/ssvlabs/ssv/protocol/v2/ssv/queue" + "github.com/ssvlabs/ssv/v2/observability/log/fields" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv/queue" ) type Error struct { diff --git a/message/validation/logger_fields.go b/message/validation/logger_fields.go index b1f0e6af62..06f801dcad 100644 --- a/message/validation/logger_fields.go +++ b/message/validation/logger_fields.go @@ -10,9 +10,9 @@ import ( specqbft "github.com/ssvlabs/ssv-spec/qbft" spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/observability/log/fields" - ssvmessage "github.com/ssvlabs/ssv/protocol/v2/message" - "github.com/ssvlabs/ssv/protocol/v2/ssv/queue" + "github.com/ssvlabs/ssv/v2/observability/log/fields" + ssvmessage "github.com/ssvlabs/ssv/v2/protocol/v2/message" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv/queue" ) // ConsensusFields provides details about the consensus for a message. It's used for logging and metrics. diff --git a/message/validation/logger_fields_test.go b/message/validation/logger_fields_test.go index bcbc24c358..ff4eff4711 100644 --- a/message/validation/logger_fields_test.go +++ b/message/validation/logger_fields_test.go @@ -10,7 +10,7 @@ import ( specqbft "github.com/ssvlabs/ssv-spec/qbft" spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/protocol/v2/ssv/queue" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv/queue" ) func TestBuildLoggerFields(t *testing.T) { diff --git a/message/validation/observability.go b/message/validation/observability.go index 1bc72940e0..f2671801c6 100644 --- a/message/validation/observability.go +++ b/message/validation/observability.go @@ -9,12 +9,12 @@ import ( "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/metric" - "github.com/ssvlabs/ssv/observability" - "github.com/ssvlabs/ssv/observability/metrics" + "github.com/ssvlabs/ssv/v2/observability" + "github.com/ssvlabs/ssv/v2/observability/metrics" ) const ( - observabilityName = "github.com/ssvlabs/ssv/message/validation" + observabilityName = "github.com/ssvlabs/ssv/v2/message/validation" observabilityNamespace = "ssv.p2p.message.validations" ) diff --git a/message/validation/self.go b/message/validation/self.go index a1aaba0b5e..adb6e9a800 100644 --- a/message/validation/self.go +++ b/message/validation/self.go @@ -5,7 +5,7 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" "go.uber.org/zap" - "github.com/ssvlabs/ssv/protocol/v2/ssv/queue" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv/queue" ) func (mv *messageValidator) validateSelf(pMsg *pubsub.Message) pubsub.ValidationResult { diff --git a/message/validation/signed_ssv_message.go b/message/validation/signed_ssv_message.go index 5c6b0b5edd..4f8faabc1b 100644 --- a/message/validation/signed_ssv_message.go +++ b/message/validation/signed_ssv_message.go @@ -10,7 +10,7 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" - ssvmessage "github.com/ssvlabs/ssv/protocol/v2/message" + ssvmessage "github.com/ssvlabs/ssv/v2/protocol/v2/message" ) func (mv *messageValidator) decodeSignedSSVMessage(pMsg *pubsub.Message) (*spectypes.SignedSSVMessage, error) { diff --git a/message/validation/validation.go b/message/validation/validation.go index 10e6c790ac..c0e7b018ad 100644 --- a/message/validation/validation.go +++ b/message/validation/validation.go @@ -20,14 +20,14 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/message/signatureverifier" - "github.com/ssvlabs/ssv/network/commons" - "github.com/ssvlabs/ssv/networkconfig" - "github.com/ssvlabs/ssv/operator/duties/dutystore" - "github.com/ssvlabs/ssv/protocol/v2/ssv/queue" - ssvtypes "github.com/ssvlabs/ssv/protocol/v2/types" - registrystorage "github.com/ssvlabs/ssv/registry/storage" - "github.com/ssvlabs/ssv/storage/basedb" + "github.com/ssvlabs/ssv/v2/message/signatureverifier" + "github.com/ssvlabs/ssv/v2/network/commons" + "github.com/ssvlabs/ssv/v2/networkconfig" + "github.com/ssvlabs/ssv/v2/operator/duties/dutystore" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv/queue" + ssvtypes "github.com/ssvlabs/ssv/v2/protocol/v2/types" + registrystorage "github.com/ssvlabs/ssv/v2/registry/storage" + "github.com/ssvlabs/ssv/v2/storage/basedb" ) // MessageValidator defines methods for validating pubsub messages. diff --git a/message/validation/validation_test.go b/message/validation/validation_test.go index 90a99780fc..e107109b3d 100644 --- a/message/validation/validation_test.go +++ b/message/validation/validation_test.go @@ -31,19 +31,19 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" spectestingutils "github.com/ssvlabs/ssv-spec/types/testingutils" - "github.com/ssvlabs/ssv/beacon/goclient" - "github.com/ssvlabs/ssv/message/signatureverifier" - "github.com/ssvlabs/ssv/network/commons" - "github.com/ssvlabs/ssv/networkconfig" - "github.com/ssvlabs/ssv/operator/duties/dutystore" - "github.com/ssvlabs/ssv/operator/storage" - "github.com/ssvlabs/ssv/protocol/v2/message" - "github.com/ssvlabs/ssv/protocol/v2/qbft/roundtimer" - ssvtypes "github.com/ssvlabs/ssv/protocol/v2/types" - registrystorage "github.com/ssvlabs/ssv/registry/storage" - "github.com/ssvlabs/ssv/registry/storage/mocks" - kv "github.com/ssvlabs/ssv/storage/badger" - "github.com/ssvlabs/ssv/storage/basedb" + "github.com/ssvlabs/ssv/v2/beacon/goclient" + "github.com/ssvlabs/ssv/v2/message/signatureverifier" + "github.com/ssvlabs/ssv/v2/network/commons" + "github.com/ssvlabs/ssv/v2/networkconfig" + "github.com/ssvlabs/ssv/v2/operator/duties/dutystore" + "github.com/ssvlabs/ssv/v2/operator/storage" + "github.com/ssvlabs/ssv/v2/protocol/v2/message" + "github.com/ssvlabs/ssv/v2/protocol/v2/qbft/roundtimer" + ssvtypes "github.com/ssvlabs/ssv/v2/protocol/v2/types" + registrystorage "github.com/ssvlabs/ssv/v2/registry/storage" + "github.com/ssvlabs/ssv/v2/registry/storage/mocks" + kv "github.com/ssvlabs/ssv/v2/storage/badger" + "github.com/ssvlabs/ssv/v2/storage/basedb" ) func PartialMsgTypeToString(mt spectypes.PartialSigMsgType) string { diff --git a/migrations/migration_0_example.go b/migrations/migration_0_example.go index 0cf2bd1676..0cb4dc70cf 100644 --- a/migrations/migration_0_example.go +++ b/migrations/migration_0_example.go @@ -5,7 +5,7 @@ import ( "go.uber.org/zap" - "github.com/ssvlabs/ssv/storage/basedb" + "github.com/ssvlabs/ssv/v2/storage/basedb" ) // This migration is an Example migration diff --git a/migrations/migration_1_example.go b/migrations/migration_1_example.go index 50b360f03d..ba7ccb2db0 100644 --- a/migrations/migration_1_example.go +++ b/migrations/migration_1_example.go @@ -6,7 +6,7 @@ import ( "go.uber.org/zap" - "github.com/ssvlabs/ssv/storage/basedb" + "github.com/ssvlabs/ssv/v2/storage/basedb" ) // This migration is an Example of atomic diff --git a/migrations/migration_2_encrypt_shares.go b/migrations/migration_2_encrypt_shares.go index 7aac9186e7..5ef9d9301a 100644 --- a/migrations/migration_2_encrypt_shares.go +++ b/migrations/migration_2_encrypt_shares.go @@ -10,7 +10,7 @@ import ( "github.com/ssvlabs/ssv/ssvsigner/keys/rsaencryption" - "github.com/ssvlabs/ssv/storage/basedb" + "github.com/ssvlabs/ssv/v2/storage/basedb" ) var migration_2_encrypt_shares = Migration{ diff --git a/migrations/migration_4_configlock_add_alan_fork_to_network_name.go b/migrations/migration_4_configlock_add_alan_fork_to_network_name.go index 03e99cc5f9..362364eac0 100644 --- a/migrations/migration_4_configlock_add_alan_fork_to_network_name.go +++ b/migrations/migration_4_configlock_add_alan_fork_to_network_name.go @@ -6,7 +6,7 @@ import ( "go.uber.org/zap" - "github.com/ssvlabs/ssv/storage/basedb" + "github.com/ssvlabs/ssv/v2/storage/basedb" ) // This migration adds the Alan fork name to the network name diff --git a/migrations/migration_5_gob.go b/migrations/migration_5_gob.go index d9a707359d..99eb7add2b 100644 --- a/migrations/migration_5_gob.go +++ b/migrations/migration_5_gob.go @@ -9,8 +9,8 @@ import ( "github.com/ethereum/go-ethereum/common" spectypes "github.com/ssvlabs/ssv-spec/types" - beaconprotocol "github.com/ssvlabs/ssv/protocol/v2/blockchain/beacon" - "github.com/ssvlabs/ssv/protocol/v2/types" + beaconprotocol "github.com/ssvlabs/ssv/v2/protocol/v2/blockchain/beacon" + "github.com/ssvlabs/ssv/v2/protocol/v2/types" ) var sharesPrefixGOB = []byte("shares/") diff --git a/migrations/migration_5_share_gob_to_ssz.go b/migrations/migration_5_share_gob_to_ssz.go index 9278b874d7..7a8b53a147 100644 --- a/migrations/migration_5_share_gob_to_ssz.go +++ b/migrations/migration_5_share_gob_to_ssz.go @@ -8,9 +8,9 @@ import ( "github.com/sanity-io/litter" "go.uber.org/zap" - opstorage "github.com/ssvlabs/ssv/operator/storage" - "github.com/ssvlabs/ssv/registry/storage" - "github.com/ssvlabs/ssv/storage/basedb" + opstorage "github.com/ssvlabs/ssv/v2/operator/storage" + "github.com/ssvlabs/ssv/v2/registry/storage" + "github.com/ssvlabs/ssv/v2/storage/basedb" ) // This migration changes share format used for storing share in DB from gob to ssz. diff --git a/migrations/migration_5_share_gob_to_ssz_test.go b/migrations/migration_5_share_gob_to_ssz_test.go index f9d5a8928b..410a4d385d 100644 --- a/migrations/migration_5_share_gob_to_ssz_test.go +++ b/migrations/migration_5_share_gob_to_ssz_test.go @@ -8,7 +8,7 @@ import ( "github.com/ssvlabs/ssv-spec/types" "github.com/stretchr/testify/require" - "github.com/ssvlabs/ssv/protocol/v2/blockchain/beacon" + "github.com/ssvlabs/ssv/v2/protocol/v2/blockchain/beacon" ) func TestMigration5_shareGOB_Decode(t *testing.T) { diff --git a/migrations/migration_6_model.go b/migrations/migration_6_model.go index 06f6211dd0..e7ed5b1b2e 100644 --- a/migrations/migration_6_model.go +++ b/migrations/migration_6_model.go @@ -3,7 +3,7 @@ package migrations import ( "fmt" - "github.com/ssvlabs/ssv/protocol/v2/types" + "github.com/ssvlabs/ssv/v2/protocol/v2/types" ) //go:generate go tool -modfile=../tool.mod sszgen -path ./migration_6_model.go --objs migration_6_OldStorageShare diff --git a/migrations/migration_6_share_exit_epoch.go b/migrations/migration_6_share_exit_epoch.go index a3cb68385a..b7480e6f70 100644 --- a/migrations/migration_6_share_exit_epoch.go +++ b/migrations/migration_6_share_exit_epoch.go @@ -9,10 +9,10 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" "go.uber.org/zap" - opstorage "github.com/ssvlabs/ssv/operator/storage" - "github.com/ssvlabs/ssv/protocol/v2/types" - "github.com/ssvlabs/ssv/registry/storage" - "github.com/ssvlabs/ssv/storage/basedb" + opstorage "github.com/ssvlabs/ssv/v2/operator/storage" + "github.com/ssvlabs/ssv/v2/protocol/v2/types" + "github.com/ssvlabs/ssv/v2/registry/storage" + "github.com/ssvlabs/ssv/v2/storage/basedb" ) const migration_6_Name = "migration_6_share_exit_epoch" diff --git a/migrations/migration_6_share_exit_epoch_test.go b/migrations/migration_6_share_exit_epoch_test.go index 5e4543433a..66fe27c867 100644 --- a/migrations/migration_6_share_exit_epoch_test.go +++ b/migrations/migration_6_share_exit_epoch_test.go @@ -10,11 +10,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/ssvlabs/ssv/observability/log" - opstorage "github.com/ssvlabs/ssv/operator/storage" - "github.com/ssvlabs/ssv/protocol/v2/types" - "github.com/ssvlabs/ssv/registry/storage" - "github.com/ssvlabs/ssv/storage/basedb" + "github.com/ssvlabs/ssv/v2/observability/log" + opstorage "github.com/ssvlabs/ssv/v2/operator/storage" + "github.com/ssvlabs/ssv/v2/protocol/v2/types" + "github.com/ssvlabs/ssv/v2/registry/storage" + "github.com/ssvlabs/ssv/v2/storage/basedb" ) func TestMigration6ExitEpochField(t *testing.T) { diff --git a/migrations/migration_7_derive_signer_key_with_hkdf.go b/migrations/migration_7_derive_signer_key_with_hkdf.go index fbdb0f9780..8621b4807b 100644 --- a/migrations/migration_7_derive_signer_key_with_hkdf.go +++ b/migrations/migration_7_derive_signer_key_with_hkdf.go @@ -6,7 +6,7 @@ import ( "go.uber.org/zap" - "github.com/ssvlabs/ssv/storage/basedb" + "github.com/ssvlabs/ssv/v2/storage/basedb" ) var migration_7_derive_signer_key_with_hkdf = Migration{ diff --git a/migrations/migration_7_derive_signer_key_with_hkdf_test.go b/migrations/migration_7_derive_signer_key_with_hkdf_test.go index 247711ab80..1a36950cf1 100644 --- a/migrations/migration_7_derive_signer_key_with_hkdf_test.go +++ b/migrations/migration_7_derive_signer_key_with_hkdf_test.go @@ -12,15 +12,15 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/zap" - "github.com/ssvlabs/ssv/ekmadapter" "github.com/ssvlabs/ssv/ssvsigner/ekm" "github.com/ssvlabs/ssv/ssvsigner/keys" + "github.com/ssvlabs/ssv/v2/ekmadapter" - "github.com/ssvlabs/ssv/networkconfig" - "github.com/ssvlabs/ssv/observability/log" - "github.com/ssvlabs/ssv/operator/storage" - kv "github.com/ssvlabs/ssv/storage/badger" - "github.com/ssvlabs/ssv/storage/basedb" + "github.com/ssvlabs/ssv/v2/networkconfig" + "github.com/ssvlabs/ssv/v2/observability/log" + "github.com/ssvlabs/ssv/v2/operator/storage" + kv "github.com/ssvlabs/ssv/v2/storage/badger" + "github.com/ssvlabs/ssv/v2/storage/basedb" ) func TestMigration7DeriveSignerKeyWithHKDF(t *testing.T) { diff --git a/migrations/migration_8_populate_validator_index_mapping.go b/migrations/migration_8_populate_validator_index_mapping.go index 14736cc321..63450bf7a6 100644 --- a/migrations/migration_8_populate_validator_index_mapping.go +++ b/migrations/migration_8_populate_validator_index_mapping.go @@ -7,9 +7,9 @@ import ( "go.uber.org/zap" - opstorage "github.com/ssvlabs/ssv/operator/storage" - "github.com/ssvlabs/ssv/registry/storage" - "github.com/ssvlabs/ssv/storage/basedb" + opstorage "github.com/ssvlabs/ssv/v2/operator/storage" + "github.com/ssvlabs/ssv/v2/registry/storage" + "github.com/ssvlabs/ssv/v2/storage/basedb" ) // This migration populates the mapping between validator pubkey -> index diff --git a/migrations/migration_8_populate_validator_index_mapping_test.go b/migrations/migration_8_populate_validator_index_mapping_test.go index 790ee788e4..3504514750 100644 --- a/migrations/migration_8_populate_validator_index_mapping_test.go +++ b/migrations/migration_8_populate_validator_index_mapping_test.go @@ -8,9 +8,9 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/zap" - opstorage "github.com/ssvlabs/ssv/operator/storage" - "github.com/ssvlabs/ssv/registry/storage" - "github.com/ssvlabs/ssv/storage/basedb" + opstorage "github.com/ssvlabs/ssv/v2/operator/storage" + "github.com/ssvlabs/ssv/v2/registry/storage" + "github.com/ssvlabs/ssv/v2/storage/basedb" ) func TestMigration8PopulateValidatorIndexMapping(t *testing.T) { diff --git a/migrations/migrations.go b/migrations/migrations.go index 2ac96200d2..0dce14c46f 100644 --- a/migrations/migrations.go +++ b/migrations/migrations.go @@ -8,15 +8,15 @@ import ( "go.uber.org/zap" - "github.com/ssvlabs/ssv/ekmadapter" "github.com/ssvlabs/ssv/ssvsigner/ekm" "github.com/ssvlabs/ssv/ssvsigner/keys" + "github.com/ssvlabs/ssv/v2/ekmadapter" - "github.com/ssvlabs/ssv/networkconfig" - "github.com/ssvlabs/ssv/observability/log" - "github.com/ssvlabs/ssv/observability/log/fields" - operatorstorage "github.com/ssvlabs/ssv/operator/storage" - "github.com/ssvlabs/ssv/storage/basedb" + "github.com/ssvlabs/ssv/v2/networkconfig" + "github.com/ssvlabs/ssv/v2/observability/log" + "github.com/ssvlabs/ssv/v2/observability/log/fields" + operatorstorage "github.com/ssvlabs/ssv/v2/operator/storage" + "github.com/ssvlabs/ssv/v2/storage/basedb" ) var ( diff --git a/migrations/migrations_test.go b/migrations/migrations_test.go index 71ca3a458b..5afa14b764 100644 --- a/migrations/migrations_test.go +++ b/migrations/migrations_test.go @@ -9,9 +9,9 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/zap" - "github.com/ssvlabs/ssv/observability/log" - kv "github.com/ssvlabs/ssv/storage/badger" - "github.com/ssvlabs/ssv/storage/basedb" + "github.com/ssvlabs/ssv/v2/observability/log" + kv "github.com/ssvlabs/ssv/v2/storage/badger" + "github.com/ssvlabs/ssv/v2/storage/basedb" ) func setupOptions(ctx context.Context, t *testing.T) (Options, error) { diff --git a/network/discovery/dv5_filters.go b/network/discovery/dv5_filters.go index 58b0a4b0cd..034b3b6c8c 100644 --- a/network/discovery/dv5_filters.go +++ b/network/discovery/dv5_filters.go @@ -8,7 +8,7 @@ import ( libp2pnetwork "github.com/libp2p/go-libp2p/core/network" "go.uber.org/zap" - "github.com/ssvlabs/ssv/network/records" + "github.com/ssvlabs/ssv/v2/network/records" ) func readSSVNodeFlag(node *enode.Node) (bool, error) { diff --git a/network/discovery/dv5_routing.go b/network/discovery/dv5_routing.go index 801eec4330..46fcd98da6 100644 --- a/network/discovery/dv5_routing.go +++ b/network/discovery/dv5_routing.go @@ -9,8 +9,8 @@ import ( "github.com/libp2p/go-libp2p/core/peer" "go.uber.org/zap" - "github.com/ssvlabs/ssv/observability/log" - "github.com/ssvlabs/ssv/observability/log/fields" + "github.com/ssvlabs/ssv/v2/observability/log" + "github.com/ssvlabs/ssv/v2/observability/log/fields" ) // implementing discovery.Discovery diff --git a/network/discovery/dv5_service.go b/network/discovery/dv5_service.go index b5c98a0faf..2b51670d86 100644 --- a/network/discovery/dv5_service.go +++ b/network/discovery/dv5_service.go @@ -16,13 +16,13 @@ import ( "go.uber.org/zap" "go.uber.org/zap/zapcore" - "github.com/ssvlabs/ssv/network/commons" - "github.com/ssvlabs/ssv/network/peers" - "github.com/ssvlabs/ssv/network/records" - "github.com/ssvlabs/ssv/networkconfig" - "github.com/ssvlabs/ssv/observability/log" - "github.com/ssvlabs/ssv/observability/log/fields" - "github.com/ssvlabs/ssv/utils/ttl" + "github.com/ssvlabs/ssv/v2/network/commons" + "github.com/ssvlabs/ssv/v2/network/peers" + "github.com/ssvlabs/ssv/v2/network/records" + "github.com/ssvlabs/ssv/v2/networkconfig" + "github.com/ssvlabs/ssv/v2/observability/log" + "github.com/ssvlabs/ssv/v2/observability/log/fields" + "github.com/ssvlabs/ssv/v2/utils/ttl" ) const ( diff --git a/network/discovery/dv5_service_test.go b/network/discovery/dv5_service_test.go index 442aef252c..ac6f15145f 100644 --- a/network/discovery/dv5_service_test.go +++ b/network/discovery/dv5_service_test.go @@ -17,13 +17,13 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/network/commons" - "github.com/ssvlabs/ssv/network/peers" - "github.com/ssvlabs/ssv/network/peers/connections/mock" - "github.com/ssvlabs/ssv/network/records" - "github.com/ssvlabs/ssv/networkconfig" - "github.com/ssvlabs/ssv/utils" - "github.com/ssvlabs/ssv/utils/ttl" + "github.com/ssvlabs/ssv/v2/network/commons" + "github.com/ssvlabs/ssv/v2/network/peers" + "github.com/ssvlabs/ssv/v2/network/peers/connections/mock" + "github.com/ssvlabs/ssv/v2/network/records" + "github.com/ssvlabs/ssv/v2/networkconfig" + "github.com/ssvlabs/ssv/v2/utils" + "github.com/ssvlabs/ssv/v2/utils/ttl" ) func TestCheckPeer(t *testing.T) { diff --git a/network/discovery/enode.go b/network/discovery/enode.go index 1f20999172..d69f8b3442 100644 --- a/network/discovery/enode.go +++ b/network/discovery/enode.go @@ -11,7 +11,7 @@ import ( "github.com/libp2p/go-libp2p/core/peer" ma "github.com/multiformats/go-multiaddr" - "github.com/ssvlabs/ssv/network/commons" + "github.com/ssvlabs/ssv/v2/network/commons" ) // createLocalNode create a new enode.LocalNode instance diff --git a/network/discovery/enode_test.go b/network/discovery/enode_test.go index ec1a4207b6..201df005cc 100644 --- a/network/discovery/enode_test.go +++ b/network/discovery/enode_test.go @@ -9,7 +9,7 @@ import ( "github.com/libp2p/go-libp2p/core/crypto" "github.com/stretchr/testify/require" - "github.com/ssvlabs/ssv/network/commons" + "github.com/ssvlabs/ssv/v2/network/commons" ) func Test_ToMultiAddr(t *testing.T) { diff --git a/network/discovery/local_service.go b/network/discovery/local_service.go index a814e4c22d..c4afaa641f 100644 --- a/network/discovery/local_service.go +++ b/network/discovery/local_service.go @@ -15,7 +15,7 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" "go.uber.org/zap" - "github.com/ssvlabs/ssv/observability/log" + "github.com/ssvlabs/ssv/v2/observability/log" ) const ( diff --git a/network/discovery/node_record.go b/network/discovery/node_record.go index 24a8fe519b..c0b62f2547 100644 --- a/network/discovery/node_record.go +++ b/network/discovery/node_record.go @@ -7,8 +7,8 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/network/commons" - "github.com/ssvlabs/ssv/network/records" + "github.com/ssvlabs/ssv/v2/network/commons" + "github.com/ssvlabs/ssv/v2/network/records" ) type NodeRecordDecoration func(*enode.LocalNode) error diff --git a/network/discovery/observability.go b/network/discovery/observability.go index 1ff2725e4f..439329e919 100644 --- a/network/discovery/observability.go +++ b/network/discovery/observability.go @@ -7,12 +7,12 @@ import ( "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/metric" - "github.com/ssvlabs/ssv/observability" - "github.com/ssvlabs/ssv/observability/metrics" + "github.com/ssvlabs/ssv/v2/observability" + "github.com/ssvlabs/ssv/v2/observability/metrics" ) const ( - observabilityName = "github.com/ssvlabs/ssv/network/discovery" + observabilityName = "github.com/ssvlabs/ssv/v2/network/discovery" observabilityNamespace = "ssv.p2p.discovery" ) diff --git a/network/discovery/options.go b/network/discovery/options.go index a925ee2e55..8eb5a7df44 100644 --- a/network/discovery/options.go +++ b/network/discovery/options.go @@ -10,9 +10,9 @@ import ( "github.com/ethereum/go-ethereum/p2p/discover" "go.uber.org/zap" - "github.com/ssvlabs/ssv/network/commons" - compatible_logger "github.com/ssvlabs/ssv/network/discovery/logger" - "github.com/ssvlabs/ssv/observability/log" + "github.com/ssvlabs/ssv/v2/network/commons" + compatible_logger "github.com/ssvlabs/ssv/v2/network/discovery/logger" + "github.com/ssvlabs/ssv/v2/observability/log" ) var DefaultSSVProtocolID = [6]byte{'s', 's', 'v', 'd', 'v', '5'} diff --git a/network/discovery/service.go b/network/discovery/service.go index 0d0768a334..e689147f5b 100644 --- a/network/discovery/service.go +++ b/network/discovery/service.go @@ -12,9 +12,9 @@ import ( "github.com/libp2p/go-libp2p/core/peer" "go.uber.org/zap" - "github.com/ssvlabs/ssv/network/peers" - "github.com/ssvlabs/ssv/networkconfig" - "github.com/ssvlabs/ssv/utils/ttl" + "github.com/ssvlabs/ssv/v2/network/peers" + "github.com/ssvlabs/ssv/v2/networkconfig" + "github.com/ssvlabs/ssv/v2/utils/ttl" ) const ( diff --git a/network/discovery/service_test.go b/network/discovery/service_test.go index f406777951..5064189904 100644 --- a/network/discovery/service_test.go +++ b/network/discovery/service_test.go @@ -17,9 +17,9 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/network/commons" - "github.com/ssvlabs/ssv/network/records" - "github.com/ssvlabs/ssv/networkconfig" + "github.com/ssvlabs/ssv/v2/network/commons" + "github.com/ssvlabs/ssv/v2/network/records" + "github.com/ssvlabs/ssv/v2/networkconfig" ) func CheckBootnodes(t *testing.T, dvs *DiscV5Service, netConfig *networkconfig.Network) { diff --git a/network/discovery/subnets.go b/network/discovery/subnets.go index aea045868c..c538e7b636 100644 --- a/network/discovery/subnets.go +++ b/network/discovery/subnets.go @@ -5,7 +5,7 @@ import ( "regexp" "strconv" - "github.com/ssvlabs/ssv/network/commons" + "github.com/ssvlabs/ssv/v2/network/commons" ) var ( diff --git a/network/discovery/testutils.go b/network/discovery/testutils.go index 7419bfecd9..b4ac119f0e 100644 --- a/network/discovery/testutils.go +++ b/network/discovery/testutils.go @@ -5,10 +5,10 @@ import ( "go.uber.org/zap" - "github.com/ssvlabs/ssv/networkconfig" - "github.com/ssvlabs/ssv/observability/log" - "github.com/ssvlabs/ssv/observability/log/fields" - "github.com/ssvlabs/ssv/utils" + "github.com/ssvlabs/ssv/v2/networkconfig" + "github.com/ssvlabs/ssv/v2/observability/log" + "github.com/ssvlabs/ssv/v2/observability/log/fields" + "github.com/ssvlabs/ssv/v2/utils" ) // BootnodeOptions contains options to create the node diff --git a/network/discovery/util_test.go b/network/discovery/util_test.go index 315e76e940..a5950e65c1 100644 --- a/network/discovery/util_test.go +++ b/network/discovery/util_test.go @@ -24,11 +24,11 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/network/commons" - "github.com/ssvlabs/ssv/network/peers" - "github.com/ssvlabs/ssv/network/records" - "github.com/ssvlabs/ssv/networkconfig" - "github.com/ssvlabs/ssv/utils/ttl" + "github.com/ssvlabs/ssv/v2/network/commons" + "github.com/ssvlabs/ssv/v2/network/peers" + "github.com/ssvlabs/ssv/v2/network/records" + "github.com/ssvlabs/ssv/v2/networkconfig" + "github.com/ssvlabs/ssv/v2/utils/ttl" ) var ( diff --git a/network/network.go b/network/network.go index 7c66b23320..b3e10fc9b6 100644 --- a/network/network.go +++ b/network/network.go @@ -6,8 +6,8 @@ import ( "github.com/libp2p/go-libp2p/core/peer" - "github.com/ssvlabs/ssv/network/commons" - protocolp2p "github.com/ssvlabs/ssv/protocol/v2/p2p" + "github.com/ssvlabs/ssv/v2/network/commons" + protocolp2p "github.com/ssvlabs/ssv/v2/protocol/v2/p2p" ) // DecodedSSVMessage serves as a marker interface for any SSV message types. diff --git a/network/p2p/config.go b/network/p2p/config.go index 01244917c5..818f8bc5fd 100644 --- a/network/p2p/config.go +++ b/network/p2p/config.go @@ -16,13 +16,13 @@ import ( ma "github.com/multiformats/go-multiaddr" "go.uber.org/zap" - "github.com/ssvlabs/ssv/message/validation" - "github.com/ssvlabs/ssv/network" - "github.com/ssvlabs/ssv/network/commons" - "github.com/ssvlabs/ssv/networkconfig" - operatordatastore "github.com/ssvlabs/ssv/operator/datastore" - "github.com/ssvlabs/ssv/operator/storage" - uc "github.com/ssvlabs/ssv/utils/commons" + "github.com/ssvlabs/ssv/v2/message/validation" + "github.com/ssvlabs/ssv/v2/network" + "github.com/ssvlabs/ssv/v2/network/commons" + "github.com/ssvlabs/ssv/v2/networkconfig" + operatordatastore "github.com/ssvlabs/ssv/v2/operator/datastore" + "github.com/ssvlabs/ssv/v2/operator/storage" + uc "github.com/ssvlabs/ssv/v2/utils/commons" ) const ( diff --git a/network/p2p/observability.go b/network/p2p/observability.go index b41329286d..cbb95d0cd2 100644 --- a/network/p2p/observability.go +++ b/network/p2p/observability.go @@ -11,15 +11,15 @@ import ( "go.opentelemetry.io/otel/metric" "go.uber.org/zap" - "github.com/ssvlabs/ssv/network/peers" - "github.com/ssvlabs/ssv/network/topics" - "github.com/ssvlabs/ssv/observability" - "github.com/ssvlabs/ssv/observability/log/fields" - "github.com/ssvlabs/ssv/observability/metrics" + "github.com/ssvlabs/ssv/v2/network/peers" + "github.com/ssvlabs/ssv/v2/network/topics" + "github.com/ssvlabs/ssv/v2/observability" + "github.com/ssvlabs/ssv/v2/observability/log/fields" + "github.com/ssvlabs/ssv/v2/observability/metrics" ) const ( - observabilityName = "github.com/ssvlabs/ssv/network/p2p" + observabilityName = "github.com/ssvlabs/ssv/v2/network/p2p" observabilityNamespace = "ssv.p2p" ) diff --git a/network/p2p/p2p.go b/network/p2p/p2p.go index 7c6d47544f..debebd5c95 100644 --- a/network/p2p/p2p.go +++ b/network/p2p/p2p.go @@ -21,23 +21,23 @@ import ( ma "github.com/multiformats/go-multiaddr" "go.uber.org/zap" - "github.com/ssvlabs/ssv/message/validation" - "github.com/ssvlabs/ssv/network" - "github.com/ssvlabs/ssv/network/commons" - "github.com/ssvlabs/ssv/network/discovery" - "github.com/ssvlabs/ssv/network/peers" - "github.com/ssvlabs/ssv/network/peers/connections" - "github.com/ssvlabs/ssv/network/records" - "github.com/ssvlabs/ssv/network/streams" - "github.com/ssvlabs/ssv/network/topics" - "github.com/ssvlabs/ssv/observability/log" - "github.com/ssvlabs/ssv/observability/log/fields" - operatordatastore "github.com/ssvlabs/ssv/operator/datastore" - operatorstorage "github.com/ssvlabs/ssv/operator/storage" - "github.com/ssvlabs/ssv/utils/async" - "github.com/ssvlabs/ssv/utils/hashmap" - "github.com/ssvlabs/ssv/utils/tasks" - "github.com/ssvlabs/ssv/utils/ttl" + "github.com/ssvlabs/ssv/v2/message/validation" + "github.com/ssvlabs/ssv/v2/network" + "github.com/ssvlabs/ssv/v2/network/commons" + "github.com/ssvlabs/ssv/v2/network/discovery" + "github.com/ssvlabs/ssv/v2/network/peers" + "github.com/ssvlabs/ssv/v2/network/peers/connections" + "github.com/ssvlabs/ssv/v2/network/records" + "github.com/ssvlabs/ssv/v2/network/streams" + "github.com/ssvlabs/ssv/v2/network/topics" + "github.com/ssvlabs/ssv/v2/observability/log" + "github.com/ssvlabs/ssv/v2/observability/log/fields" + operatordatastore "github.com/ssvlabs/ssv/v2/operator/datastore" + operatorstorage "github.com/ssvlabs/ssv/v2/operator/storage" + "github.com/ssvlabs/ssv/v2/utils/async" + "github.com/ssvlabs/ssv/v2/utils/hashmap" + "github.com/ssvlabs/ssv/v2/utils/tasks" + "github.com/ssvlabs/ssv/v2/utils/ttl" ) // network states diff --git a/network/p2p/p2p_discovery.go b/network/p2p/p2p_discovery.go index 31af6caa37..ea9ec7cecd 100644 --- a/network/p2p/p2p_discovery.go +++ b/network/p2p/p2p_discovery.go @@ -9,10 +9,10 @@ import ( "github.com/oleiade/lane/v2" "go.uber.org/zap" - "github.com/ssvlabs/ssv/network/commons" - "github.com/ssvlabs/ssv/network/discovery" - "github.com/ssvlabs/ssv/observability/log/fields" - "github.com/ssvlabs/ssv/utils/async" + "github.com/ssvlabs/ssv/v2/network/commons" + "github.com/ssvlabs/ssv/v2/network/discovery" + "github.com/ssvlabs/ssv/v2/observability/log/fields" + "github.com/ssvlabs/ssv/v2/utils/async" ) type peerSelectionPoolStats struct { diff --git a/network/p2p/p2p_discovery_test.go b/network/p2p/p2p_discovery_test.go index d7ca284fe9..c88dce0e4d 100644 --- a/network/p2p/p2p_discovery_test.go +++ b/network/p2p/p2p_discovery_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/ssvlabs/ssv/network/commons" - "github.com/ssvlabs/ssv/network/discovery" + "github.com/ssvlabs/ssv/v2/network/commons" + "github.com/ssvlabs/ssv/v2/network/discovery" ) // createSubnets creates a commons.Subnets with the specified subnets active diff --git a/network/p2p/p2p_pubsub.go b/network/p2p/p2p_pubsub.go index 0595df338c..ae9dc3e20b 100644 --- a/network/p2p/p2p_pubsub.go +++ b/network/p2p/p2p_pubsub.go @@ -14,11 +14,11 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/network" - "github.com/ssvlabs/ssv/network/commons" - "github.com/ssvlabs/ssv/observability/log/fields" - p2pprotocol "github.com/ssvlabs/ssv/protocol/v2/p2p" - "github.com/ssvlabs/ssv/protocol/v2/ssv/queue" + "github.com/ssvlabs/ssv/v2/network" + "github.com/ssvlabs/ssv/v2/network/commons" + "github.com/ssvlabs/ssv/v2/observability/log/fields" + p2pprotocol "github.com/ssvlabs/ssv/v2/protocol/v2/p2p" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv/queue" ) // committeeSubscriptionStatus reflects the state of committee subscription (whether we are subscribed to the diff --git a/network/p2p/p2p_pubsub_test.go b/network/p2p/p2p_pubsub_test.go index be0a543b04..b40998ee93 100644 --- a/network/p2p/p2p_pubsub_test.go +++ b/network/p2p/p2p_pubsub_test.go @@ -8,8 +8,8 @@ import ( "github.com/libp2p/go-libp2p/core/peer" "github.com/stretchr/testify/require" - "github.com/ssvlabs/ssv/network/commons" - "github.com/ssvlabs/ssv/network/topics" + "github.com/ssvlabs/ssv/v2/network/commons" + "github.com/ssvlabs/ssv/v2/network/topics" ) type subscribeRandomsTopicsController struct { diff --git a/network/p2p/p2p_reporter.go b/network/p2p/p2p_reporter.go index 3c8405c67d..bdd7f57cd5 100644 --- a/network/p2p/p2p_reporter.go +++ b/network/p2p/p2p_reporter.go @@ -6,9 +6,9 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" "go.uber.org/zap" - ssvpeers "github.com/ssvlabs/ssv/network/peers" - "github.com/ssvlabs/ssv/observability/log/fields" - protocolp2p "github.com/ssvlabs/ssv/protocol/v2/p2p" + ssvpeers "github.com/ssvlabs/ssv/v2/network/peers" + "github.com/ssvlabs/ssv/v2/observability/log/fields" + protocolp2p "github.com/ssvlabs/ssv/v2/protocol/v2/p2p" ) // ReportValidation reports the result for the given message diff --git a/network/p2p/p2p_setup.go b/network/p2p/p2p_setup.go index b4ce824fb3..b3873bcf5b 100644 --- a/network/p2p/p2p_setup.go +++ b/network/p2p/p2p_setup.go @@ -22,14 +22,14 @@ import ( "github.com/prysmaticlabs/prysm/v4/async" "go.uber.org/zap" - p2pcommons "github.com/ssvlabs/ssv/network/commons" - "github.com/ssvlabs/ssv/network/discovery" - "github.com/ssvlabs/ssv/network/peers" - "github.com/ssvlabs/ssv/network/peers/connections" - "github.com/ssvlabs/ssv/network/records" - "github.com/ssvlabs/ssv/network/streams" - "github.com/ssvlabs/ssv/network/topics" - "github.com/ssvlabs/ssv/utils/commons" + p2pcommons "github.com/ssvlabs/ssv/v2/network/commons" + "github.com/ssvlabs/ssv/v2/network/discovery" + "github.com/ssvlabs/ssv/v2/network/peers" + "github.com/ssvlabs/ssv/v2/network/peers/connections" + "github.com/ssvlabs/ssv/v2/network/records" + "github.com/ssvlabs/ssv/v2/network/streams" + "github.com/ssvlabs/ssv/v2/network/topics" + "github.com/ssvlabs/ssv/v2/utils/commons" ) const ( diff --git a/network/p2p/p2p_shutdown_test.go b/network/p2p/p2p_shutdown_test.go index beb7881d99..0bcb5fb728 100644 --- a/network/p2p/p2p_shutdown_test.go +++ b/network/p2p/p2p_shutdown_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/zap" - "github.com/ssvlabs/ssv/networkconfig" - "github.com/ssvlabs/ssv/utils/hashmap" + "github.com/ssvlabs/ssv/v2/networkconfig" + "github.com/ssvlabs/ssv/v2/utils/hashmap" ) const timeout = 400 * time.Millisecond diff --git a/network/p2p/p2p_test.go b/network/p2p/p2p_test.go index 6fb2125318..4351bff5fd 100644 --- a/network/p2p/p2p_test.go +++ b/network/p2p/p2p_test.go @@ -20,10 +20,10 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" spectestingutils "github.com/ssvlabs/ssv-spec/types/testingutils" - "github.com/ssvlabs/ssv/network" - "github.com/ssvlabs/ssv/network/commons" - "github.com/ssvlabs/ssv/networkconfig" - ssvtypes "github.com/ssvlabs/ssv/protocol/v2/types" + "github.com/ssvlabs/ssv/v2/network" + "github.com/ssvlabs/ssv/v2/network/commons" + "github.com/ssvlabs/ssv/v2/networkconfig" + ssvtypes "github.com/ssvlabs/ssv/v2/protocol/v2/types" ) func TestGetMaxPeers(t *testing.T) { diff --git a/network/p2p/p2p_trimming_test.go b/network/p2p/p2p_trimming_test.go index 1db9012daf..2243260e81 100644 --- a/network/p2p/p2p_trimming_test.go +++ b/network/p2p/p2p_trimming_test.go @@ -13,10 +13,10 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/zap" - "github.com/ssvlabs/ssv/network/commons" - "github.com/ssvlabs/ssv/network/peers" - "github.com/ssvlabs/ssv/network/topics" - "github.com/ssvlabs/ssv/utils/hashmap" + "github.com/ssvlabs/ssv/v2/network/commons" + "github.com/ssvlabs/ssv/v2/network/peers" + "github.com/ssvlabs/ssv/v2/network/topics" + "github.com/ssvlabs/ssv/v2/utils/hashmap" ) type testTopicsController struct { diff --git a/network/p2p/p2p_validation_test.go b/network/p2p/p2p_validation_test.go index 44fc622cf4..85963184a2 100644 --- a/network/p2p/p2p_validation_test.go +++ b/network/p2p/p2p_validation_test.go @@ -26,9 +26,9 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" spectestingutils "github.com/ssvlabs/ssv-spec/types/testingutils" - "github.com/ssvlabs/ssv/message/validation" - "github.com/ssvlabs/ssv/protocol/v2/ssv/queue" - ssvtypes "github.com/ssvlabs/ssv/protocol/v2/types" + "github.com/ssvlabs/ssv/v2/message/validation" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv/queue" + ssvtypes "github.com/ssvlabs/ssv/v2/protocol/v2/types" ) // TestP2pNetwork_MessageValidation tests p2pNetwork would score peers according diff --git a/network/p2p/testutils.go b/network/p2p/testutils.go index 994293eedd..0233a6fc15 100644 --- a/network/p2p/testutils.go +++ b/network/p2p/testutils.go @@ -14,19 +14,19 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/message/validation" - "github.com/ssvlabs/ssv/network" - p2pcommons "github.com/ssvlabs/ssv/network/commons" - "github.com/ssvlabs/ssv/network/discovery" - "github.com/ssvlabs/ssv/network/testing" - "github.com/ssvlabs/ssv/networkconfig" - operatordatastore "github.com/ssvlabs/ssv/operator/datastore" - "github.com/ssvlabs/ssv/operator/duties/dutystore" - "github.com/ssvlabs/ssv/operator/storage" - ssvtypes "github.com/ssvlabs/ssv/protocol/v2/types" - registrystorage "github.com/ssvlabs/ssv/registry/storage" - kv "github.com/ssvlabs/ssv/storage/badger" - "github.com/ssvlabs/ssv/storage/basedb" + "github.com/ssvlabs/ssv/v2/message/validation" + "github.com/ssvlabs/ssv/v2/network" + p2pcommons "github.com/ssvlabs/ssv/v2/network/commons" + "github.com/ssvlabs/ssv/v2/network/discovery" + "github.com/ssvlabs/ssv/v2/network/testing" + "github.com/ssvlabs/ssv/v2/networkconfig" + operatordatastore "github.com/ssvlabs/ssv/v2/operator/datastore" + "github.com/ssvlabs/ssv/v2/operator/duties/dutystore" + "github.com/ssvlabs/ssv/v2/operator/storage" + ssvtypes "github.com/ssvlabs/ssv/v2/protocol/v2/types" + registrystorage "github.com/ssvlabs/ssv/v2/registry/storage" + kv "github.com/ssvlabs/ssv/v2/storage/badger" + "github.com/ssvlabs/ssv/v2/storage/basedb" ) // TODO: (Alan) might have to rename this file back to test_utils.go if non-test files require it. diff --git a/network/peers/conn_manager.go b/network/peers/conn_manager.go index 57bc5421fb..3422f56eac 100644 --- a/network/peers/conn_manager.go +++ b/network/peers/conn_manager.go @@ -8,8 +8,8 @@ import ( "github.com/libp2p/go-libp2p/core/peer" "go.uber.org/zap" - "github.com/ssvlabs/ssv/network/commons" - "github.com/ssvlabs/ssv/observability/log/fields" + "github.com/ssvlabs/ssv/v2/network/commons" + "github.com/ssvlabs/ssv/v2/observability/log/fields" ) // ConnManager is a wrapper on top of go-libp2p/core/connmgr.ConnManager. diff --git a/network/peers/conn_manager_test.go b/network/peers/conn_manager_test.go index 47b8a585d2..dcc3865f79 100644 --- a/network/peers/conn_manager_test.go +++ b/network/peers/conn_manager_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/zap" - "github.com/ssvlabs/ssv/network/commons" + "github.com/ssvlabs/ssv/v2/network/commons" ) var errTestClosePeer = errors.New("test close peer error") diff --git a/network/peers/connections/conn_gater.go b/network/peers/connections/conn_gater.go index cb4c66daac..6442b4df59 100644 --- a/network/peers/connections/conn_gater.go +++ b/network/peers/connections/conn_gater.go @@ -13,9 +13,9 @@ import ( leakybucket "github.com/prysmaticlabs/prysm/v4/container/leaky-bucket" "go.uber.org/zap" - "github.com/ssvlabs/ssv/observability/log" - "github.com/ssvlabs/ssv/observability/log/fields" - "github.com/ssvlabs/ssv/utils/ttl" + "github.com/ssvlabs/ssv/v2/observability/log" + "github.com/ssvlabs/ssv/v2/observability/log/fields" + "github.com/ssvlabs/ssv/v2/utils/ttl" ) const ( diff --git a/network/peers/connections/conn_gater_test.go b/network/peers/connections/conn_gater_test.go index 0cc4f9c4df..a2473206e7 100644 --- a/network/peers/connections/conn_gater_test.go +++ b/network/peers/connections/conn_gater_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/zap" - "github.com/ssvlabs/ssv/utils/ttl" + "github.com/ssvlabs/ssv/v2/utils/ttl" ) const ( diff --git a/network/peers/connections/conn_handler.go b/network/peers/connections/conn_handler.go index ef5a566969..a255bea6fa 100644 --- a/network/peers/connections/conn_handler.go +++ b/network/peers/connections/conn_handler.go @@ -11,12 +11,12 @@ import ( "github.com/libp2p/go-libp2p/core/peer" "go.uber.org/zap" - "github.com/ssvlabs/ssv/network/commons" - "github.com/ssvlabs/ssv/network/discovery" - "github.com/ssvlabs/ssv/network/peers" - "github.com/ssvlabs/ssv/observability/log" - "github.com/ssvlabs/ssv/observability/log/fields" - "github.com/ssvlabs/ssv/utils/ttl" + "github.com/ssvlabs/ssv/v2/network/commons" + "github.com/ssvlabs/ssv/v2/network/discovery" + "github.com/ssvlabs/ssv/v2/network/peers" + "github.com/ssvlabs/ssv/v2/observability/log" + "github.com/ssvlabs/ssv/v2/observability/log/fields" + "github.com/ssvlabs/ssv/v2/utils/ttl" ) // ConnHandler handles new connections (inbound / outbound) using libp2pnetwork.NotifyBundle diff --git a/network/peers/connections/conn_handler_test.go b/network/peers/connections/conn_handler_test.go index ca3494abcc..8339e24304 100644 --- a/network/peers/connections/conn_handler_test.go +++ b/network/peers/connections/conn_handler_test.go @@ -9,11 +9,11 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/zap" - "github.com/ssvlabs/ssv/network/commons" - "github.com/ssvlabs/ssv/network/discovery" - "github.com/ssvlabs/ssv/network/peers" - "github.com/ssvlabs/ssv/network/peers/connections/mock" - "github.com/ssvlabs/ssv/utils/ttl" + "github.com/ssvlabs/ssv/v2/network/commons" + "github.com/ssvlabs/ssv/v2/network/discovery" + "github.com/ssvlabs/ssv/v2/network/peers" + "github.com/ssvlabs/ssv/v2/network/peers/connections/mock" + "github.com/ssvlabs/ssv/v2/utils/ttl" ) func TestConnHandlerHandleOutboundConnection(t *testing.T) { diff --git a/network/peers/connections/filters.go b/network/peers/connections/filters.go index a5d0825f2f..6986cb8f3b 100644 --- a/network/peers/connections/filters.go +++ b/network/peers/connections/filters.go @@ -6,8 +6,8 @@ import ( "github.com/libp2p/go-libp2p/core/peer" - "github.com/ssvlabs/ssv/network/peers" - "github.com/ssvlabs/ssv/network/records" + "github.com/ssvlabs/ssv/v2/network/peers" + "github.com/ssvlabs/ssv/v2/network/records" ) // NetworkIDFilter determines whether we will connect to the given node by the network ID diff --git a/network/peers/connections/filters_test.go b/network/peers/connections/filters_test.go index a615aa198e..ad8c70498c 100644 --- a/network/peers/connections/filters_test.go +++ b/network/peers/connections/filters_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/ssvlabs/ssv/network/records" + "github.com/ssvlabs/ssv/v2/network/records" ) func TestNetworkIDFilter(t *testing.T) { diff --git a/network/peers/connections/handshaker.go b/network/peers/connections/handshaker.go index bd4709fa2b..89f7e3c49a 100644 --- a/network/peers/connections/handshaker.go +++ b/network/peers/connections/handshaker.go @@ -14,11 +14,11 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/network/commons" - "github.com/ssvlabs/ssv/network/peers" - "github.com/ssvlabs/ssv/network/records" - "github.com/ssvlabs/ssv/network/streams" - "github.com/ssvlabs/ssv/observability/log/fields" + "github.com/ssvlabs/ssv/v2/network/commons" + "github.com/ssvlabs/ssv/v2/network/peers" + "github.com/ssvlabs/ssv/v2/network/records" + "github.com/ssvlabs/ssv/v2/network/streams" + "github.com/ssvlabs/ssv/v2/observability/log/fields" ) // errPeerWasFiltered is thrown when a peer is filtered during handshake diff --git a/network/peers/connections/handshaker_test.go b/network/peers/connections/handshaker_test.go index 6bcc3a29ea..d6f7ec5356 100644 --- a/network/peers/connections/handshaker_test.go +++ b/network/peers/connections/handshaker_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/ssvlabs/ssv/network/peers/connections/mock" - "github.com/ssvlabs/ssv/observability/log" + "github.com/ssvlabs/ssv/v2/network/peers/connections/mock" + "github.com/ssvlabs/ssv/v2/observability/log" ) // TestHandshakeTestData is a test for testing data and mocks diff --git a/network/peers/connections/helpers_test.go b/network/peers/connections/helpers_test.go index 9b81e5ff76..77994d9658 100644 --- a/network/peers/connections/helpers_test.go +++ b/network/peers/connections/helpers_test.go @@ -14,12 +14,12 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/zap" - "github.com/ssvlabs/ssv/network/commons" - "github.com/ssvlabs/ssv/network/peers" - "github.com/ssvlabs/ssv/network/peers/connections/mock" - "github.com/ssvlabs/ssv/network/records" - "github.com/ssvlabs/ssv/networkconfig" "github.com/ssvlabs/ssv/ssvsigner/keys" + "github.com/ssvlabs/ssv/v2/network/commons" + "github.com/ssvlabs/ssv/v2/network/peers" + "github.com/ssvlabs/ssv/v2/network/peers/connections/mock" + "github.com/ssvlabs/ssv/v2/network/records" + "github.com/ssvlabs/ssv/v2/networkconfig" ) var errTestHandshake = errors.New("test handshake error") diff --git a/network/peers/connections/mock/mock_node_info_idx.go b/network/peers/connections/mock/mock_node_info_idx.go index ff676847d4..690d447dc9 100644 --- a/network/peers/connections/mock/mock_node_info_idx.go +++ b/network/peers/connections/mock/mock_node_info_idx.go @@ -5,8 +5,8 @@ import ( "github.com/libp2p/go-libp2p/core/peer" - "github.com/ssvlabs/ssv/network/peers" - "github.com/ssvlabs/ssv/network/records" + "github.com/ssvlabs/ssv/v2/network/peers" + "github.com/ssvlabs/ssv/v2/network/records" ) var _ peers.NodeInfoIndex = NodeInfoIndex{} diff --git a/network/peers/connections/mock/mock_stream_controller.go b/network/peers/connections/mock/mock_stream_controller.go index 8c374ea206..a61c167689 100644 --- a/network/peers/connections/mock/mock_stream_controller.go +++ b/network/peers/connections/mock/mock_stream_controller.go @@ -8,7 +8,7 @@ import ( "github.com/libp2p/go-libp2p/core/protocol" "go.uber.org/zap" - "github.com/ssvlabs/ssv/network/streams" + "github.com/ssvlabs/ssv/v2/network/streams" ) var _ streams.StreamController = StreamController{} diff --git a/network/peers/connections/observability.go b/network/peers/connections/observability.go index af7ce85cba..9e5c422434 100644 --- a/network/peers/connections/observability.go +++ b/network/peers/connections/observability.go @@ -7,12 +7,12 @@ import ( "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/metric" - "github.com/ssvlabs/ssv/observability" - "github.com/ssvlabs/ssv/observability/metrics" + "github.com/ssvlabs/ssv/v2/observability" + "github.com/ssvlabs/ssv/v2/observability/metrics" ) const ( - observabilityComponentName = "github.com/ssvlabs/ssv/network/peers/connections" + observabilityComponentName = "github.com/ssvlabs/ssv/v2/network/peers/connections" observabilityNamespace = "ssv.p2p.connections" ) diff --git a/network/peers/gossipsub_score_index.go b/network/peers/gossipsub_score_index.go index 3ca48e8b67..e07d9deeba 100644 --- a/network/peers/gossipsub_score_index.go +++ b/network/peers/gossipsub_score_index.go @@ -6,7 +6,7 @@ import ( "github.com/libp2p/go-libp2p/core/peer" - "github.com/ssvlabs/ssv/network/topics/params" + "github.com/ssvlabs/ssv/v2/network/topics/params" ) // Implements GossipScoreIndex diff --git a/network/peers/index.go b/network/peers/index.go index 95cb5892f5..2e2afbd702 100644 --- a/network/peers/index.go +++ b/network/peers/index.go @@ -8,8 +8,8 @@ import ( "github.com/libp2p/go-libp2p/core/peer" ma "github.com/multiformats/go-multiaddr" - "github.com/ssvlabs/ssv/network/commons" - "github.com/ssvlabs/ssv/network/records" + "github.com/ssvlabs/ssv/v2/network/commons" + "github.com/ssvlabs/ssv/v2/network/records" ) const ( diff --git a/network/peers/peer_info.go b/network/peers/peer_info.go index b5ab609cd5..ede49378a8 100644 --- a/network/peers/peer_info.go +++ b/network/peers/peer_info.go @@ -8,7 +8,7 @@ import ( "github.com/libp2p/go-libp2p/core/peer" ma "github.com/multiformats/go-multiaddr" - "github.com/ssvlabs/ssv/network/records" + "github.com/ssvlabs/ssv/v2/network/records" ) type PeerInfo struct { diff --git a/network/peers/peers_index.go b/network/peers/peers_index.go index 667cb4a721..1f064dbebe 100644 --- a/network/peers/peers_index.go +++ b/network/peers/peers_index.go @@ -9,7 +9,7 @@ import ( "github.com/libp2p/go-libp2p/core/peer" "go.uber.org/zap" - "github.com/ssvlabs/ssv/network/records" + "github.com/ssvlabs/ssv/v2/network/records" ) // MaxPeersProvider returns the max peers for the given topic. diff --git a/network/peers/scores_test.go b/network/peers/scores_test.go index fb5da8ed56..6bd74055c9 100644 --- a/network/peers/scores_test.go +++ b/network/peers/scores_test.go @@ -6,8 +6,8 @@ import ( "github.com/libp2p/go-libp2p/core/peer" "github.com/stretchr/testify/require" - "github.com/ssvlabs/ssv/network/commons" - nettesting "github.com/ssvlabs/ssv/network/testing" + "github.com/ssvlabs/ssv/v2/network/commons" + nettesting "github.com/ssvlabs/ssv/v2/network/testing" ) func TestScoresIndex(t *testing.T) { diff --git a/network/peers/subnets.go b/network/peers/subnets.go index 2b6fae2947..3306048e76 100644 --- a/network/peers/subnets.go +++ b/network/peers/subnets.go @@ -5,7 +5,7 @@ import ( "github.com/libp2p/go-libp2p/core/peer" - "github.com/ssvlabs/ssv/network/commons" + "github.com/ssvlabs/ssv/v2/network/commons" ) // subnetsIndex implements SubnetsIndex diff --git a/network/peers/subnets_test.go b/network/peers/subnets_test.go index d8f02cae84..04700484c3 100644 --- a/network/peers/subnets_test.go +++ b/network/peers/subnets_test.go @@ -7,8 +7,8 @@ import ( "github.com/libp2p/go-libp2p/core/peer" "github.com/stretchr/testify/require" - "github.com/ssvlabs/ssv/network/commons" - nettesting "github.com/ssvlabs/ssv/network/testing" + "github.com/ssvlabs/ssv/v2/network/commons" + nettesting "github.com/ssvlabs/ssv/v2/network/testing" ) func TestSubnetsIndex(t *testing.T) { diff --git a/network/records/entries.go b/network/records/entries.go index 96846c3c1c..d16b0bd7c2 100644 --- a/network/records/entries.go +++ b/network/records/entries.go @@ -11,7 +11,7 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/network/commons" + "github.com/ssvlabs/ssv/v2/network/commons" ) type ENRKey string diff --git a/network/records/metadata.go b/network/records/metadata.go index 027c18b7b1..551b95c6a9 100644 --- a/network/records/metadata.go +++ b/network/records/metadata.go @@ -4,7 +4,7 @@ import ( "encoding/json" "fmt" - "github.com/ssvlabs/ssv/network/commons" + "github.com/ssvlabs/ssv/v2/network/commons" ) const subnetsLength = int(commons.SubnetsCount) / 4 // each char in the string encodes status of 4 subnets diff --git a/network/records/node_info_test.go b/network/records/node_info_test.go index 16a6311dea..b1748f6e56 100644 --- a/network/records/node_info_test.go +++ b/network/records/node_info_test.go @@ -8,7 +8,7 @@ import ( "github.com/libp2p/go-libp2p/core/crypto" "github.com/stretchr/testify/require" - "github.com/ssvlabs/ssv/network/commons" + "github.com/ssvlabs/ssv/v2/network/commons" ) func TestNodeInfo_Seal_Consume(t *testing.T) { diff --git a/network/records/subnets.go b/network/records/subnets.go index c6d2afedfa..a84e68c0d7 100644 --- a/network/records/subnets.go +++ b/network/records/subnets.go @@ -6,7 +6,7 @@ import ( "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ssvlabs/ssv/network/commons" + "github.com/ssvlabs/ssv/v2/network/commons" ) // UpdateSubnets updates subnets entry according to the given changes. diff --git a/network/records/subnets_test.go b/network/records/subnets_test.go index dfa0323a63..f6f8d84f22 100644 --- a/network/records/subnets_test.go +++ b/network/records/subnets_test.go @@ -7,7 +7,7 @@ import ( "github.com/libp2p/go-libp2p/core/crypto" "github.com/stretchr/testify/require" - "github.com/ssvlabs/ssv/network/commons" + "github.com/ssvlabs/ssv/v2/network/commons" ) func Test_SubnetsEntry(t *testing.T) { diff --git a/network/streams/controller.go b/network/streams/controller.go index 1aa3b2aa12..74a4daf2ad 100644 --- a/network/streams/controller.go +++ b/network/streams/controller.go @@ -14,7 +14,7 @@ import ( "go.opentelemetry.io/otel/metric" "go.uber.org/zap" - "github.com/ssvlabs/ssv/observability/log/fields" + "github.com/ssvlabs/ssv/v2/observability/log/fields" ) // StreamResponder abstracts the stream access with a simpler interface that accepts only the data to send diff --git a/network/streams/controller_test.go b/network/streams/controller_test.go index 0884f4f25a..a214ad7121 100644 --- a/network/streams/controller_test.go +++ b/network/streams/controller_test.go @@ -15,7 +15,7 @@ import ( "go.uber.org/zap/zapcore" "go.uber.org/zap/zaptest/observer" - "github.com/ssvlabs/ssv/observability/log/fields" + "github.com/ssvlabs/ssv/v2/observability/log/fields" ) func TestStreamCtrl(t *testing.T) { diff --git a/network/streams/observability.go b/network/streams/observability.go index 892390980b..1b82823797 100644 --- a/network/streams/observability.go +++ b/network/streams/observability.go @@ -6,12 +6,12 @@ import ( "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/metric" - "github.com/ssvlabs/ssv/observability" - "github.com/ssvlabs/ssv/observability/metrics" + "github.com/ssvlabs/ssv/v2/observability" + "github.com/ssvlabs/ssv/v2/observability/metrics" ) const ( - observabilityName = "github.com/ssvlabs/ssv/network/streams" + observabilityName = "github.com/ssvlabs/ssv/v2/network/streams" observabilityNamespace = "ssv.p2p.stream" ) diff --git a/network/testing/keys.go b/network/testing/keys.go index 29802ce9e3..a13cc110e3 100644 --- a/network/testing/keys.go +++ b/network/testing/keys.go @@ -6,8 +6,8 @@ import ( crand "crypto/rand" - "github.com/ssvlabs/ssv/network/commons" "github.com/ssvlabs/ssv/ssvsigner/keys" + "github.com/ssvlabs/ssv/v2/network/commons" "github.com/libp2p/go-libp2p/core/crypto" ) diff --git a/network/testing/local.go b/network/testing/local.go index ae1ed9acf9..8f078d795f 100644 --- a/network/testing/local.go +++ b/network/testing/local.go @@ -3,7 +3,7 @@ package testing import ( "context" - "github.com/ssvlabs/ssv/network" + "github.com/ssvlabs/ssv/v2/network" ) // NetworkFactory is a generic factory for network instances diff --git a/network/topics/controller.go b/network/topics/controller.go index be69588a57..03980e814f 100644 --- a/network/topics/controller.go +++ b/network/topics/controller.go @@ -12,8 +12,8 @@ import ( "go.opentelemetry.io/otel/metric" "go.uber.org/zap" - "github.com/ssvlabs/ssv/network/commons" - "github.com/ssvlabs/ssv/protocol/v2/ssv/queue" + "github.com/ssvlabs/ssv/v2/network/commons" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv/queue" ) // Controller is an interface for managing pubsub topics diff --git a/network/topics/controller_test.go b/network/topics/controller_test.go index 53d41fb2f9..acbc503b1f 100644 --- a/network/topics/controller_test.go +++ b/network/topics/controller_test.go @@ -26,18 +26,18 @@ import ( specqbft "github.com/ssvlabs/ssv-spec/qbft" spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/message/signatureverifier" - "github.com/ssvlabs/ssv/message/validation" - "github.com/ssvlabs/ssv/network/commons" - "github.com/ssvlabs/ssv/network/discovery" - "github.com/ssvlabs/ssv/network/topics" - "github.com/ssvlabs/ssv/networkconfig" - "github.com/ssvlabs/ssv/observability/log" - "github.com/ssvlabs/ssv/operator/duties/dutystore" - registrystorage "github.com/ssvlabs/ssv/registry/storage" - "github.com/ssvlabs/ssv/registry/storage/mocks" - kv "github.com/ssvlabs/ssv/storage/badger" - "github.com/ssvlabs/ssv/storage/basedb" + "github.com/ssvlabs/ssv/v2/message/signatureverifier" + "github.com/ssvlabs/ssv/v2/message/validation" + "github.com/ssvlabs/ssv/v2/network/commons" + "github.com/ssvlabs/ssv/v2/network/discovery" + "github.com/ssvlabs/ssv/v2/network/topics" + "github.com/ssvlabs/ssv/v2/networkconfig" + "github.com/ssvlabs/ssv/v2/observability/log" + "github.com/ssvlabs/ssv/v2/operator/duties/dutystore" + registrystorage "github.com/ssvlabs/ssv/v2/registry/storage" + "github.com/ssvlabs/ssv/v2/registry/storage/mocks" + kv "github.com/ssvlabs/ssv/v2/storage/badger" + "github.com/ssvlabs/ssv/v2/storage/basedb" ) // TODO: fix this test to run post-fork diff --git a/network/topics/msg_id.go b/network/topics/msg_id.go index 648395a6be..d54e2c18f8 100644 --- a/network/topics/msg_id.go +++ b/network/topics/msg_id.go @@ -12,7 +12,7 @@ import ( "github.com/libp2p/go-libp2p/core/peer" "go.uber.org/zap" - "github.com/ssvlabs/ssv/observability/log/fields" + "github.com/ssvlabs/ssv/v2/observability/log/fields" ) const ( diff --git a/network/topics/msg_validator_test.go b/network/topics/msg_validator_test.go index 5e7b10d014..4a4ce032f2 100644 --- a/network/topics/msg_validator_test.go +++ b/network/topics/msg_validator_test.go @@ -17,16 +17,16 @@ import ( "github.com/ssvlabs/ssv/ssvsigner/keys/rsaencryption" - "github.com/ssvlabs/ssv/message/signatureverifier" - "github.com/ssvlabs/ssv/message/validation" - "github.com/ssvlabs/ssv/network/commons" - "github.com/ssvlabs/ssv/networkconfig" - "github.com/ssvlabs/ssv/operator/duties/dutystore" - operatorstorage "github.com/ssvlabs/ssv/operator/storage" - ssvtypes "github.com/ssvlabs/ssv/protocol/v2/types" - "github.com/ssvlabs/ssv/registry/storage" - kv "github.com/ssvlabs/ssv/storage/badger" - "github.com/ssvlabs/ssv/storage/basedb" + "github.com/ssvlabs/ssv/v2/message/signatureverifier" + "github.com/ssvlabs/ssv/v2/message/validation" + "github.com/ssvlabs/ssv/v2/network/commons" + "github.com/ssvlabs/ssv/v2/networkconfig" + "github.com/ssvlabs/ssv/v2/operator/duties/dutystore" + operatorstorage "github.com/ssvlabs/ssv/v2/operator/storage" + ssvtypes "github.com/ssvlabs/ssv/v2/protocol/v2/types" + "github.com/ssvlabs/ssv/v2/registry/storage" + kv "github.com/ssvlabs/ssv/v2/storage/badger" + "github.com/ssvlabs/ssv/v2/storage/basedb" ) func TestMsgValidator(t *testing.T) { diff --git a/network/topics/observability.go b/network/topics/observability.go index 08ac2a5808..b3dfad0b2f 100644 --- a/network/topics/observability.go +++ b/network/topics/observability.go @@ -5,12 +5,12 @@ import ( "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/metric" - "github.com/ssvlabs/ssv/observability" - "github.com/ssvlabs/ssv/observability/metrics" + "github.com/ssvlabs/ssv/v2/observability" + "github.com/ssvlabs/ssv/v2/observability/metrics" ) const ( - observabilityName = "github.com/ssvlabs/ssv/network/topics" + observabilityName = "github.com/ssvlabs/ssv/v2/network/topics" observabilityNamespace = "ssv.p2p.messages" ) diff --git a/network/topics/params/message_rate.go b/network/topics/params/message_rate.go index 4be5df2735..01eb42ff47 100644 --- a/network/topics/params/message_rate.go +++ b/network/topics/params/message_rate.go @@ -4,8 +4,8 @@ import ( "math" "time" - "github.com/ssvlabs/ssv/networkconfig" - "github.com/ssvlabs/ssv/registry/storage" + "github.com/ssvlabs/ssv/v2/networkconfig" + "github.com/ssvlabs/ssv/v2/registry/storage" ) // Threshold and limit parameters diff --git a/network/topics/params/message_rate_test.go b/network/topics/params/message_rate_test.go index 8b043ef3e7..39292d74d7 100644 --- a/network/topics/params/message_rate_test.go +++ b/network/topics/params/message_rate_test.go @@ -8,9 +8,9 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/networkconfig" - "github.com/ssvlabs/ssv/protocol/v2/types" - "github.com/ssvlabs/ssv/registry/storage" + "github.com/ssvlabs/ssv/v2/networkconfig" + "github.com/ssvlabs/ssv/v2/protocol/v2/types" + "github.com/ssvlabs/ssv/v2/registry/storage" ) func createTestingValidators(n int) []*types.SSVShare { diff --git a/network/topics/params/peer_score.go b/network/topics/params/peer_score.go index 451927e9f5..1012241b4d 100644 --- a/network/topics/params/peer_score.go +++ b/network/topics/params/peer_score.go @@ -7,7 +7,7 @@ import ( pubsub "github.com/libp2p/go-libp2p-pubsub" "github.com/libp2p/go-libp2p/core/peer" - "github.com/ssvlabs/ssv/networkconfig" + "github.com/ssvlabs/ssv/v2/networkconfig" ) const ( diff --git a/network/topics/params/scores_test.go b/network/topics/params/scores_test.go index a8eafb16ff..9f0f5e9e3c 100644 --- a/network/topics/params/scores_test.go +++ b/network/topics/params/scores_test.go @@ -9,8 +9,8 @@ import ( pubsub "github.com/libp2p/go-libp2p-pubsub" "github.com/stretchr/testify/require" - "github.com/ssvlabs/ssv/networkconfig" - "github.com/ssvlabs/ssv/registry/storage" + "github.com/ssvlabs/ssv/v2/networkconfig" + "github.com/ssvlabs/ssv/v2/registry/storage" ) func TestTopicScoreParams(t *testing.T) { diff --git a/network/topics/params/topic_score.go b/network/topics/params/topic_score.go index b07c3e9ae4..1e415b0bfc 100644 --- a/network/topics/params/topic_score.go +++ b/network/topics/params/topic_score.go @@ -8,8 +8,8 @@ import ( pubsub "github.com/libp2p/go-libp2p-pubsub" - "github.com/ssvlabs/ssv/networkconfig" - "github.com/ssvlabs/ssv/registry/storage" + "github.com/ssvlabs/ssv/v2/networkconfig" + "github.com/ssvlabs/ssv/v2/registry/storage" ) const ( diff --git a/network/topics/pubsub.go b/network/topics/pubsub.go index 64194d03e5..486fc1db97 100644 --- a/network/topics/pubsub.go +++ b/network/topics/pubsub.go @@ -13,13 +13,13 @@ import ( "github.com/libp2p/go-libp2p/core/peer" "go.uber.org/zap" - "github.com/ssvlabs/ssv/message/validation" - "github.com/ssvlabs/ssv/network" - "github.com/ssvlabs/ssv/network/commons" - "github.com/ssvlabs/ssv/network/peers" - "github.com/ssvlabs/ssv/network/topics/params" - "github.com/ssvlabs/ssv/networkconfig" - "github.com/ssvlabs/ssv/registry/storage" + "github.com/ssvlabs/ssv/v2/message/validation" + "github.com/ssvlabs/ssv/v2/network" + "github.com/ssvlabs/ssv/v2/network/commons" + "github.com/ssvlabs/ssv/v2/network/peers" + "github.com/ssvlabs/ssv/v2/network/topics/params" + "github.com/ssvlabs/ssv/v2/networkconfig" + "github.com/ssvlabs/ssv/v2/registry/storage" ) const ( diff --git a/network/topics/scoring.go b/network/topics/scoring.go index 450408490a..d113e470a5 100644 --- a/network/topics/scoring.go +++ b/network/topics/scoring.go @@ -10,11 +10,11 @@ import ( "github.com/libp2p/go-libp2p/core/peer" "go.uber.org/zap" - "github.com/ssvlabs/ssv/network/commons" - "github.com/ssvlabs/ssv/network/peers" - "github.com/ssvlabs/ssv/network/topics/params" - "github.com/ssvlabs/ssv/observability/log/fields" - "github.com/ssvlabs/ssv/registry/storage" + "github.com/ssvlabs/ssv/v2/network/commons" + "github.com/ssvlabs/ssv/v2/network/peers" + "github.com/ssvlabs/ssv/v2/network/topics/params" + "github.com/ssvlabs/ssv/v2/observability/log/fields" + "github.com/ssvlabs/ssv/v2/registry/storage" ) // DefaultScoringConfig returns the default scoring config diff --git a/network/topics/sub_filter.go b/network/topics/sub_filter.go index fce631b556..49a55502ba 100644 --- a/network/topics/sub_filter.go +++ b/network/topics/sub_filter.go @@ -6,8 +6,8 @@ import ( "github.com/libp2p/go-libp2p/core/peer" "go.uber.org/zap" - "github.com/ssvlabs/ssv/network/commons" - "github.com/ssvlabs/ssv/utils/hashmap" + "github.com/ssvlabs/ssv/v2/network/commons" + "github.com/ssvlabs/ssv/v2/utils/hashmap" ) // SubFilter is a wrapper on top of pubsub.SubscriptionFilter, diff --git a/network/topics/sub_filter_test.go b/network/topics/sub_filter_test.go index 04620facd0..76fc02e408 100644 --- a/network/topics/sub_filter_test.go +++ b/network/topics/sub_filter_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/ssvlabs/ssv/network/commons" - "github.com/ssvlabs/ssv/observability/log" + "github.com/ssvlabs/ssv/v2/network/commons" + "github.com/ssvlabs/ssv/v2/observability/log" ) func TestSubFilter(t *testing.T) { diff --git a/network/topics/tracer.go b/network/topics/tracer.go index fa63d342e3..e5efcad74e 100644 --- a/network/topics/tracer.go +++ b/network/topics/tracer.go @@ -8,7 +8,7 @@ import ( "github.com/libp2p/go-libp2p/core/peer" "go.uber.org/zap" - "github.com/ssvlabs/ssv/observability/log" + "github.com/ssvlabs/ssv/v2/observability/log" ) // psTracer helps to trace pubsub events diff --git a/observability/attributes.go b/observability/attributes.go index 661d093dda..7a5669bf39 100644 --- a/observability/attributes.go +++ b/observability/attributes.go @@ -14,9 +14,9 @@ import ( specqbft "github.com/ssvlabs/ssv-spec/qbft" spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/observability/utils" - "github.com/ssvlabs/ssv/protocol/v2/message" - protocolTypes "github.com/ssvlabs/ssv/protocol/v2/types" + "github.com/ssvlabs/ssv/v2/observability/utils" + "github.com/ssvlabs/ssv/v2/protocol/v2/message" + protocolTypes "github.com/ssvlabs/ssv/v2/protocol/v2/types" ) const ( diff --git a/observability/configurator.go b/observability/configurator.go index 1f7c5034c2..bbf027774f 100644 --- a/observability/configurator.go +++ b/observability/configurator.go @@ -9,9 +9,9 @@ import ( "go.opentelemetry.io/otel" "go.uber.org/zap" - "github.com/ssvlabs/ssv/observability/log" - "github.com/ssvlabs/ssv/observability/metrics" - "github.com/ssvlabs/ssv/observability/traces" + "github.com/ssvlabs/ssv/v2/observability/log" + "github.com/ssvlabs/ssv/v2/observability/metrics" + "github.com/ssvlabs/ssv/v2/observability/traces" ) func init() { diff --git a/observability/log/fields/duty_id.go b/observability/log/fields/duty_id.go index 166e48454d..70840615d6 100644 --- a/observability/log/fields/duty_id.go +++ b/observability/log/fields/duty_id.go @@ -6,7 +6,7 @@ import ( "github.com/attestantio/go-eth2-client/spec/phase0" spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/observability/utils" + "github.com/ssvlabs/ssv/v2/observability/utils" ) func BuildDutyID(epoch phase0.Epoch, slot phase0.Slot, runnerRole spectypes.RunnerRole, index phase0.ValidatorIndex) string { diff --git a/observability/log/fields/fields.go b/observability/log/fields/fields.go index e547bebf1e..1dff45f0a6 100644 --- a/observability/log/fields/fields.go +++ b/observability/log/fields/fields.go @@ -20,10 +20,10 @@ import ( specqbft "github.com/ssvlabs/ssv-spec/qbft" spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/observability/log/fields/stringer" - "github.com/ssvlabs/ssv/observability/utils" - "github.com/ssvlabs/ssv/protocol/v2/message" - "github.com/ssvlabs/ssv/utils/format" + "github.com/ssvlabs/ssv/v2/observability/log/fields/stringer" + "github.com/ssvlabs/ssv/v2/observability/utils" + "github.com/ssvlabs/ssv/v2/protocol/v2/message" + "github.com/ssvlabs/ssv/v2/utils/format" ) const ( diff --git a/observability/logger.go b/observability/logger.go index a481b38c09..9728646480 100644 --- a/observability/logger.go +++ b/observability/logger.go @@ -3,9 +3,9 @@ package observability import ( "go.uber.org/zap" - "github.com/ssvlabs/ssv/observability/log" - "github.com/ssvlabs/ssv/observability/metrics" - "github.com/ssvlabs/ssv/observability/traces" + "github.com/ssvlabs/ssv/v2/observability/log" + "github.com/ssvlabs/ssv/v2/observability/metrics" + "github.com/ssvlabs/ssv/v2/observability/traces" ) func initLogger(l *zap.Logger) *zap.Logger { diff --git a/observability/metrics/handler.go b/observability/metrics/handler.go index 2ec3f04f3d..5ecbd72631 100644 --- a/observability/metrics/handler.go +++ b/observability/metrics/handler.go @@ -14,9 +14,9 @@ import ( "github.com/prometheus/client_golang/prometheus/promhttp" "go.uber.org/zap" - "github.com/ssvlabs/ssv/observability/log" - "github.com/ssvlabs/ssv/observability/log/fields" - "github.com/ssvlabs/ssv/storage/basedb" + "github.com/ssvlabs/ssv/v2/observability/log" + "github.com/ssvlabs/ssv/v2/observability/log/fields" + "github.com/ssvlabs/ssv/v2/storage/basedb" ) type ( diff --git a/operator/datastore/data_store.go b/operator/datastore/data_store.go index e62cdf124e..9287ec086d 100644 --- a/operator/datastore/data_store.go +++ b/operator/datastore/data_store.go @@ -5,7 +5,7 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" - registrystorage "github.com/ssvlabs/ssv/registry/storage" + registrystorage "github.com/ssvlabs/ssv/v2/registry/storage" ) // OperatorDataStore defines an interface for operations related to operator data. diff --git a/operator/datastore/data_store_test.go b/operator/datastore/data_store_test.go index 5b3f96f2d0..1cd2137212 100644 --- a/operator/datastore/data_store_test.go +++ b/operator/datastore/data_store_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - registrystorage "github.com/ssvlabs/ssv/registry/storage" + registrystorage "github.com/ssvlabs/ssv/v2/registry/storage" ) func TestNewOperatorDataStore(t *testing.T) { diff --git a/operator/duties/attester.go b/operator/duties/attester.go index b66975db61..6f586b6634 100644 --- a/operator/duties/attester.go +++ b/operator/duties/attester.go @@ -14,11 +14,11 @@ import ( "go.opentelemetry.io/otel/trace" "go.uber.org/zap" - "github.com/ssvlabs/ssv/observability" - "github.com/ssvlabs/ssv/observability/log/fields" - "github.com/ssvlabs/ssv/observability/traces" - "github.com/ssvlabs/ssv/operator/duties/dutystore" - "github.com/ssvlabs/ssv/protocol/v2/types" + "github.com/ssvlabs/ssv/v2/observability" + "github.com/ssvlabs/ssv/v2/observability/log/fields" + "github.com/ssvlabs/ssv/v2/observability/traces" + "github.com/ssvlabs/ssv/v2/operator/duties/dutystore" + "github.com/ssvlabs/ssv/v2/protocol/v2/types" ) type AttesterHandler struct { diff --git a/operator/duties/attester_test.go b/operator/duties/attester_test.go index e9b2df73dc..0b862cf904 100644 --- a/operator/duties/attester_test.go +++ b/operator/duties/attester_test.go @@ -17,10 +17,10 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/networkconfig" - "github.com/ssvlabs/ssv/operator/duties/dutystore" - "github.com/ssvlabs/ssv/protocol/v2/types" - "github.com/ssvlabs/ssv/utils/hashmap" + "github.com/ssvlabs/ssv/v2/networkconfig" + "github.com/ssvlabs/ssv/v2/operator/duties/dutystore" + "github.com/ssvlabs/ssv/v2/protocol/v2/types" + "github.com/ssvlabs/ssv/v2/utils/hashmap" ) func TestAttesterHandlerShouldExecuteRespectsMinParticipationEpoch(t *testing.T) { diff --git a/operator/duties/base_handler.go b/operator/duties/base_handler.go index fd84d4ae91..800c5278b0 100644 --- a/operator/duties/base_handler.go +++ b/operator/duties/base_handler.go @@ -6,8 +6,8 @@ import ( "github.com/attestantio/go-eth2-client/spec/phase0" "go.uber.org/zap" - "github.com/ssvlabs/ssv/networkconfig" - "github.com/ssvlabs/ssv/operator/slotticker" + "github.com/ssvlabs/ssv/v2/networkconfig" + "github.com/ssvlabs/ssv/v2/operator/slotticker" ) //go:generate go tool -modfile=../../tool.mod mockgen -package=duties -destination=./base_handler_mock.go -source=./base_handler.go diff --git a/operator/duties/beacon_adapter.go b/operator/duties/beacon_adapter.go index 27a2d95856..e936cb46f5 100644 --- a/operator/duties/beacon_adapter.go +++ b/operator/duties/beacon_adapter.go @@ -12,9 +12,9 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" "go.uber.org/zap" - goclient "github.com/ssvlabs/ssv/beacon/goclient" - "github.com/ssvlabs/ssv/networkconfig" - beaconprotocol "github.com/ssvlabs/ssv/protocol/v2/blockchain/beacon" + goclient "github.com/ssvlabs/ssv/v2/beacon/goclient" + "github.com/ssvlabs/ssv/v2/networkconfig" + beaconprotocol "github.com/ssvlabs/ssv/v2/protocol/v2/blockchain/beacon" ) type validatorPubkeyProvider interface { diff --git a/operator/duties/beacon_adapter_test.go b/operator/duties/beacon_adapter_test.go index c49712927a..2db7d2c5a5 100644 --- a/operator/duties/beacon_adapter_test.go +++ b/operator/duties/beacon_adapter_test.go @@ -14,8 +14,8 @@ import ( "go.uber.org/mock/gomock" "go.uber.org/zap" - "github.com/ssvlabs/ssv/networkconfig" - beaconmock "github.com/ssvlabs/ssv/protocol/v2/blockchain/beacon" + "github.com/ssvlabs/ssv/v2/networkconfig" + beaconmock "github.com/ssvlabs/ssv/v2/protocol/v2/blockchain/beacon" ) // committeeAwareMock augments the generated BeaconNode mock with diff --git a/operator/duties/committee.go b/operator/duties/committee.go index 1ddda27ba4..b9f783ec30 100644 --- a/operator/duties/committee.go +++ b/operator/duties/committee.go @@ -11,10 +11,10 @@ import ( "go.opentelemetry.io/otel/trace" "go.uber.org/zap" - "github.com/ssvlabs/ssv/observability" - "github.com/ssvlabs/ssv/observability/log/fields" - "github.com/ssvlabs/ssv/operator/duties/dutystore" - "github.com/ssvlabs/ssv/protocol/v2/types" + "github.com/ssvlabs/ssv/v2/observability" + "github.com/ssvlabs/ssv/v2/observability/log/fields" + "github.com/ssvlabs/ssv/v2/operator/duties/dutystore" + "github.com/ssvlabs/ssv/v2/protocol/v2/types" ) type committeeDutiesMap map[spectypes.CommitteeID]*committeeDuty diff --git a/operator/duties/committee_test.go b/operator/duties/committee_test.go index f6ab45b931..8f2e94b51c 100644 --- a/operator/duties/committee_test.go +++ b/operator/duties/committee_test.go @@ -15,10 +15,10 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/networkconfig" - "github.com/ssvlabs/ssv/operator/duties/dutystore" - ssvtypes "github.com/ssvlabs/ssv/protocol/v2/types" - "github.com/ssvlabs/ssv/utils/hashmap" + "github.com/ssvlabs/ssv/v2/networkconfig" + "github.com/ssvlabs/ssv/v2/operator/duties/dutystore" + ssvtypes "github.com/ssvlabs/ssv/v2/protocol/v2/types" + "github.com/ssvlabs/ssv/v2/utils/hashmap" ) func setupCommitteeDutiesMock( diff --git a/operator/duties/observability.go b/operator/duties/observability.go index b76f1a53ec..17b7f3804d 100644 --- a/operator/duties/observability.go +++ b/operator/duties/observability.go @@ -8,12 +8,12 @@ import ( "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/metric" - "github.com/ssvlabs/ssv/observability" - "github.com/ssvlabs/ssv/observability/metrics" + "github.com/ssvlabs/ssv/v2/observability" + "github.com/ssvlabs/ssv/v2/observability/metrics" ) const ( - observabilityName = "github.com/ssvlabs/ssv/operator/duties" + observabilityName = "github.com/ssvlabs/ssv/v2/operator/duties" observabilityNamespace = "ssv.duty" ) diff --git a/operator/duties/proposer.go b/operator/duties/proposer.go index 5bc399f365..6b2ea1c6f3 100644 --- a/operator/duties/proposer.go +++ b/operator/duties/proposer.go @@ -12,10 +12,10 @@ import ( "go.opentelemetry.io/otel/trace" "go.uber.org/zap" - "github.com/ssvlabs/ssv/observability" - "github.com/ssvlabs/ssv/observability/log/fields" - "github.com/ssvlabs/ssv/observability/traces" - "github.com/ssvlabs/ssv/operator/duties/dutystore" + "github.com/ssvlabs/ssv/v2/observability" + "github.com/ssvlabs/ssv/v2/observability/log/fields" + "github.com/ssvlabs/ssv/v2/observability/traces" + "github.com/ssvlabs/ssv/v2/operator/duties/dutystore" ) type ProposerHandler struct { diff --git a/operator/duties/proposer_test.go b/operator/duties/proposer_test.go index 108b15425a..6c24dfcdfa 100644 --- a/operator/duties/proposer_test.go +++ b/operator/duties/proposer_test.go @@ -14,9 +14,9 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" - "github.com/ssvlabs/ssv/operator/duties/dutystore" - "github.com/ssvlabs/ssv/protocol/v2/types" - "github.com/ssvlabs/ssv/utils/hashmap" + "github.com/ssvlabs/ssv/v2/operator/duties/dutystore" + "github.com/ssvlabs/ssv/v2/protocol/v2/types" + "github.com/ssvlabs/ssv/v2/utils/hashmap" ) func setupProposerDutiesMock( diff --git a/operator/duties/provider_allshares.go b/operator/duties/provider_allshares.go index d2dabb359b..38732fb768 100644 --- a/operator/duties/provider_allshares.go +++ b/operator/duties/provider_allshares.go @@ -3,8 +3,8 @@ package duties import ( "github.com/attestantio/go-eth2-client/spec/phase0" - "github.com/ssvlabs/ssv/protocol/v2/types" - registrystorage "github.com/ssvlabs/ssv/registry/storage" + "github.com/ssvlabs/ssv/v2/protocol/v2/types" + registrystorage "github.com/ssvlabs/ssv/v2/registry/storage" ) // allSharesProvider adapts a ValidatorStore to act as a ValidatorProvider diff --git a/operator/duties/provider_allshares_test.go b/operator/duties/provider_allshares_test.go index 74be7622a6..9913d108c4 100644 --- a/operator/duties/provider_allshares_test.go +++ b/operator/duties/provider_allshares_test.go @@ -10,9 +10,9 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" - types "github.com/ssvlabs/ssv/protocol/v2/types" - registrystorage "github.com/ssvlabs/ssv/registry/storage" - "github.com/ssvlabs/ssv/registry/storage/mocks" + types "github.com/ssvlabs/ssv/v2/protocol/v2/types" + registrystorage "github.com/ssvlabs/ssv/v2/registry/storage" + "github.com/ssvlabs/ssv/v2/registry/storage/mocks" ) func TestAllSharesProviderDelegates(t *testing.T) { diff --git a/operator/duties/scheduler.go b/operator/duties/scheduler.go index ae6b4164c9..396014e9da 100644 --- a/operator/duties/scheduler.go +++ b/operator/duties/scheduler.go @@ -18,14 +18,14 @@ import ( "go.opentelemetry.io/otel/trace" "go.uber.org/zap" - "github.com/ssvlabs/ssv/network" - "github.com/ssvlabs/ssv/networkconfig" - "github.com/ssvlabs/ssv/observability" - "github.com/ssvlabs/ssv/observability/log" - "github.com/ssvlabs/ssv/observability/log/fields" - "github.com/ssvlabs/ssv/operator/duties/dutystore" - "github.com/ssvlabs/ssv/operator/slotticker" - "github.com/ssvlabs/ssv/protocol/v2/types" + "github.com/ssvlabs/ssv/v2/network" + "github.com/ssvlabs/ssv/v2/networkconfig" + "github.com/ssvlabs/ssv/v2/observability" + "github.com/ssvlabs/ssv/v2/observability/log" + "github.com/ssvlabs/ssv/v2/observability/log/fields" + "github.com/ssvlabs/ssv/v2/operator/duties/dutystore" + "github.com/ssvlabs/ssv/v2/operator/slotticker" + "github.com/ssvlabs/ssv/v2/protocol/v2/types" ) //go:generate go tool -modfile=../../tool.mod mockgen -package=duties -destination=./scheduler_mock.go -source=./scheduler.go diff --git a/operator/duties/scheduler_mock.go b/operator/duties/scheduler_mock.go index c103b4a0ae..6bc21a131f 100644 --- a/operator/duties/scheduler_mock.go +++ b/operator/duties/scheduler_mock.go @@ -19,7 +19,7 @@ import ( phase0 "github.com/attestantio/go-eth2-client/spec/phase0" types "github.com/ethereum/go-ethereum/core/types" types0 "github.com/ssvlabs/ssv-spec/types" - types1 "github.com/ssvlabs/ssv/protocol/v2/types" + types1 "github.com/ssvlabs/ssv/v2/protocol/v2/types" gomock "go.uber.org/mock/gomock" zap "go.uber.org/zap" ) diff --git a/operator/duties/scheduler_test.go b/operator/duties/scheduler_test.go index e0b064f837..14d1d97a05 100644 --- a/operator/duties/scheduler_test.go +++ b/operator/duties/scheduler_test.go @@ -15,10 +15,10 @@ import ( "go.uber.org/mock/gomock" "go.uber.org/zap" - "github.com/ssvlabs/ssv/networkconfig" - "github.com/ssvlabs/ssv/observability/log" - "github.com/ssvlabs/ssv/operator/slotticker" - mockslotticker "github.com/ssvlabs/ssv/operator/slotticker/mocks" + "github.com/ssvlabs/ssv/v2/networkconfig" + "github.com/ssvlabs/ssv/v2/observability/log" + "github.com/ssvlabs/ssv/v2/operator/slotticker" + mockslotticker "github.com/ssvlabs/ssv/v2/operator/slotticker/mocks" ) const ( diff --git a/operator/duties/sync_committee.go b/operator/duties/sync_committee.go index cfaca99838..e00b7a12ff 100644 --- a/operator/duties/sync_committee.go +++ b/operator/duties/sync_committee.go @@ -15,11 +15,11 @@ import ( "go.opentelemetry.io/otel/trace" "go.uber.org/zap" - "github.com/ssvlabs/ssv/observability" - "github.com/ssvlabs/ssv/observability/log/fields" - "github.com/ssvlabs/ssv/observability/traces" - "github.com/ssvlabs/ssv/operator/duties/dutystore" - "github.com/ssvlabs/ssv/protocol/v2/types" + "github.com/ssvlabs/ssv/v2/observability" + "github.com/ssvlabs/ssv/v2/observability/log/fields" + "github.com/ssvlabs/ssv/v2/observability/traces" + "github.com/ssvlabs/ssv/v2/operator/duties/dutystore" + "github.com/ssvlabs/ssv/v2/protocol/v2/types" ) type SyncCommitteeHandler struct { diff --git a/operator/duties/sync_committee_test.go b/operator/duties/sync_committee_test.go index 5cdba1820e..fa6d9fd353 100644 --- a/operator/duties/sync_committee_test.go +++ b/operator/duties/sync_committee_test.go @@ -15,10 +15,10 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/networkconfig" - "github.com/ssvlabs/ssv/operator/duties/dutystore" - ssvtypes "github.com/ssvlabs/ssv/protocol/v2/types" - "github.com/ssvlabs/ssv/utils/hashmap" + "github.com/ssvlabs/ssv/v2/networkconfig" + "github.com/ssvlabs/ssv/v2/operator/duties/dutystore" + ssvtypes "github.com/ssvlabs/ssv/v2/protocol/v2/types" + "github.com/ssvlabs/ssv/v2/utils/hashmap" ) func TestSyncCommitteeHandlerShouldExecuteIgnoresMinParticipationEpoch(t *testing.T) { diff --git a/operator/duties/validator_registration_test.go b/operator/duties/validator_registration_test.go index 57a206dfd0..30754bbc6d 100644 --- a/operator/duties/validator_registration_test.go +++ b/operator/duties/validator_registration_test.go @@ -11,7 +11,7 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" "github.com/stretchr/testify/require" - "github.com/ssvlabs/ssv/protocol/v2/types" + "github.com/ssvlabs/ssv/v2/protocol/v2/types" ) func TestValidatorRegistrationHandler_HandleDuties(t *testing.T) { diff --git a/operator/duties/voluntary_exit.go b/operator/duties/voluntary_exit.go index f8f9d82018..6c5bb49e43 100644 --- a/operator/duties/voluntary_exit.go +++ b/operator/duties/voluntary_exit.go @@ -12,9 +12,9 @@ import ( "go.opentelemetry.io/otel/trace" "go.uber.org/zap" - "github.com/ssvlabs/ssv/observability" - "github.com/ssvlabs/ssv/observability/log/fields" - "github.com/ssvlabs/ssv/operator/duties/dutystore" + "github.com/ssvlabs/ssv/v2/observability" + "github.com/ssvlabs/ssv/v2/observability/log/fields" + "github.com/ssvlabs/ssv/v2/operator/duties/dutystore" ) // voluntaryExitSlotsToPostpone defines how many slots we want to wait out before diff --git a/operator/duties/voluntary_exit_test.go b/operator/duties/voluntary_exit_test.go index fa90e63eb1..b80086f0cd 100644 --- a/operator/duties/voluntary_exit_test.go +++ b/operator/duties/voluntary_exit_test.go @@ -14,7 +14,7 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/operator/duties/dutystore" + "github.com/ssvlabs/ssv/v2/operator/duties/dutystore" ) func TestVoluntaryExitHandler_HandleDuties(t *testing.T) { diff --git a/operator/dutytracer/collector.go b/operator/dutytracer/collector.go index 73d9a48a8e..8b66687da2 100644 --- a/operator/dutytracer/collector.go +++ b/operator/dutytracer/collector.go @@ -19,17 +19,17 @@ import ( specqbft "github.com/ssvlabs/ssv-spec/qbft" spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/exporter" - "github.com/ssvlabs/ssv/exporter/rolemask" - "github.com/ssvlabs/ssv/exporter/store" - "github.com/ssvlabs/ssv/networkconfig" - "github.com/ssvlabs/ssv/observability/log/fields" - "github.com/ssvlabs/ssv/operator/duties/dutystore" - "github.com/ssvlabs/ssv/operator/slotticker" - "github.com/ssvlabs/ssv/protocol/v2/ssv/queue" - ssvtypes "github.com/ssvlabs/ssv/protocol/v2/types" - registrystorage "github.com/ssvlabs/ssv/registry/storage" - "github.com/ssvlabs/ssv/utils/hashmap" + "github.com/ssvlabs/ssv/v2/exporter" + "github.com/ssvlabs/ssv/v2/exporter/rolemask" + "github.com/ssvlabs/ssv/v2/exporter/store" + "github.com/ssvlabs/ssv/v2/networkconfig" + "github.com/ssvlabs/ssv/v2/observability/log/fields" + "github.com/ssvlabs/ssv/v2/operator/duties/dutystore" + "github.com/ssvlabs/ssv/v2/operator/slotticker" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv/queue" + ssvtypes "github.com/ssvlabs/ssv/v2/protocol/v2/types" + registrystorage "github.com/ssvlabs/ssv/v2/registry/storage" + "github.com/ssvlabs/ssv/v2/utils/hashmap" ) type DecidedInfo struct { diff --git a/operator/dutytracer/collector_bench_test.go b/operator/dutytracer/collector_bench_test.go index 26f3c47052..4f864f9f99 100644 --- a/operator/dutytracer/collector_bench_test.go +++ b/operator/dutytracer/collector_bench_test.go @@ -16,13 +16,13 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" "go.uber.org/zap" - "github.com/ssvlabs/ssv/exporter" - "github.com/ssvlabs/ssv/exporter/store" - "github.com/ssvlabs/ssv/networkconfig" - "github.com/ssvlabs/ssv/protocol/v2/ssv/queue" - registrystorage "github.com/ssvlabs/ssv/registry/storage" - kv "github.com/ssvlabs/ssv/storage/badger" - "github.com/ssvlabs/ssv/storage/basedb" + "github.com/ssvlabs/ssv/v2/exporter" + "github.com/ssvlabs/ssv/v2/exporter/store" + "github.com/ssvlabs/ssv/v2/networkconfig" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv/queue" + registrystorage "github.com/ssvlabs/ssv/v2/registry/storage" + kv "github.com/ssvlabs/ssv/v2/storage/badger" + "github.com/ssvlabs/ssv/v2/storage/basedb" ) func BenchmarkTracer(b *testing.B) { diff --git a/operator/dutytracer/collector_quorum_test.go b/operator/dutytracer/collector_quorum_test.go index 99deec06c8..38592aac2c 100644 --- a/operator/dutytracer/collector_quorum_test.go +++ b/operator/dutytracer/collector_quorum_test.go @@ -12,11 +12,11 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/exporter" - "github.com/ssvlabs/ssv/networkconfig" - ssvtypes "github.com/ssvlabs/ssv/protocol/v2/types" - "github.com/ssvlabs/ssv/registry/storage" - registrystoragemocks "github.com/ssvlabs/ssv/registry/storage/mocks" + "github.com/ssvlabs/ssv/v2/exporter" + "github.com/ssvlabs/ssv/v2/networkconfig" + ssvtypes "github.com/ssvlabs/ssv/v2/protocol/v2/types" + "github.com/ssvlabs/ssv/v2/registry/storage" + registrystoragemocks "github.com/ssvlabs/ssv/v2/registry/storage/mocks" ) // TestCollector_QuorumAfterFlush tests the critical scenario where signatures arrive diff --git a/operator/dutytracer/collector_schedule_test.go b/operator/dutytracer/collector_schedule_test.go index 0caa8872fb..26dc904911 100644 --- a/operator/dutytracer/collector_schedule_test.go +++ b/operator/dutytracer/collector_schedule_test.go @@ -11,12 +11,12 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/zap" - "github.com/ssvlabs/ssv/exporter/rolemask" - "github.com/ssvlabs/ssv/networkconfig" - "github.com/ssvlabs/ssv/operator/duties/dutystore" - ssvtypes "github.com/ssvlabs/ssv/protocol/v2/types" - registrystorage "github.com/ssvlabs/ssv/registry/storage" - "github.com/ssvlabs/ssv/utils/hashmap" + "github.com/ssvlabs/ssv/v2/exporter/rolemask" + "github.com/ssvlabs/ssv/v2/networkconfig" + "github.com/ssvlabs/ssv/v2/operator/duties/dutystore" + ssvtypes "github.com/ssvlabs/ssv/v2/protocol/v2/types" + registrystorage "github.com/ssvlabs/ssv/v2/registry/storage" + "github.com/ssvlabs/ssv/v2/utils/hashmap" ) type mockValidatorStore struct { diff --git a/operator/dutytracer/collector_test.go b/operator/dutytracer/collector_test.go index 373c9fb3bf..de0784481a 100644 --- a/operator/dutytracer/collector_test.go +++ b/operator/dutytracer/collector_test.go @@ -19,17 +19,17 @@ import ( "go.uber.org/zap" "go.uber.org/zap/zaptest/observer" - "github.com/ssvlabs/ssv/exporter" - "github.com/ssvlabs/ssv/exporter/rolemask" - "github.com/ssvlabs/ssv/exporter/store" - "github.com/ssvlabs/ssv/networkconfig" - "github.com/ssvlabs/ssv/protocol/v2/ssv/queue" - ssvtypes "github.com/ssvlabs/ssv/protocol/v2/types" - "github.com/ssvlabs/ssv/registry/storage" - registrystoragemocks "github.com/ssvlabs/ssv/registry/storage/mocks" - kv "github.com/ssvlabs/ssv/storage/badger" - "github.com/ssvlabs/ssv/storage/basedb" - "github.com/ssvlabs/ssv/utils/hashmap" + "github.com/ssvlabs/ssv/v2/exporter" + "github.com/ssvlabs/ssv/v2/exporter/rolemask" + "github.com/ssvlabs/ssv/v2/exporter/store" + "github.com/ssvlabs/ssv/v2/networkconfig" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv/queue" + ssvtypes "github.com/ssvlabs/ssv/v2/protocol/v2/types" + "github.com/ssvlabs/ssv/v2/registry/storage" + registrystoragemocks "github.com/ssvlabs/ssv/v2/registry/storage/mocks" + kv "github.com/ssvlabs/ssv/v2/storage/badger" + "github.com/ssvlabs/ssv/v2/storage/basedb" + "github.com/ssvlabs/ssv/v2/utils/hashmap" ) // These tests are deliberately written in a progressive manner to ensure that only the expected values are diff --git a/operator/dutytracer/eviction.go b/operator/dutytracer/eviction.go index 3a412429e3..6b912319b5 100644 --- a/operator/dutytracer/eviction.go +++ b/operator/dutytracer/eviction.go @@ -10,9 +10,9 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/exporter" - "github.com/ssvlabs/ssv/observability/log/fields" - "github.com/ssvlabs/ssv/utils/hashmap" + "github.com/ssvlabs/ssv/v2/exporter" + "github.com/ssvlabs/ssv/v2/observability/log/fields" + "github.com/ssvlabs/ssv/v2/utils/hashmap" ) func (c *Collector) dumpLinkToDBPeriodically(slot phase0.Slot) (totalSaved int) { diff --git a/operator/dutytracer/eviction_test.go b/operator/dutytracer/eviction_test.go index a37210fc5f..6f3932298a 100644 --- a/operator/dutytracer/eviction_test.go +++ b/operator/dutytracer/eviction_test.go @@ -14,11 +14,11 @@ import ( "go.uber.org/zap" "go.uber.org/zap/zaptest/observer" - "github.com/ssvlabs/ssv/exporter/store" - "github.com/ssvlabs/ssv/networkconfig" - "github.com/ssvlabs/ssv/registry/storage" - kv "github.com/ssvlabs/ssv/storage/pebble" - "github.com/ssvlabs/ssv/utils/hashmap" + "github.com/ssvlabs/ssv/v2/exporter/store" + "github.com/ssvlabs/ssv/v2/networkconfig" + "github.com/ssvlabs/ssv/v2/registry/storage" + kv "github.com/ssvlabs/ssv/v2/storage/pebble" + "github.com/ssvlabs/ssv/v2/utils/hashmap" ) func TestEviction(t *testing.T) { diff --git a/operator/dutytracer/observability.go b/operator/dutytracer/observability.go index 1661254e5a..33c92b8dc2 100644 --- a/operator/dutytracer/observability.go +++ b/operator/dutytracer/observability.go @@ -6,11 +6,11 @@ import ( "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/metric" - "github.com/ssvlabs/ssv/observability/metrics" + "github.com/ssvlabs/ssv/v2/observability/metrics" ) const ( - observabilityName = "github.com/ssvlabs/ssv/operator/dutytracer" + observabilityName = "github.com/ssvlabs/ssv/v2/operator/dutytracer" observabilityNamespace = "ssv.dutytracer" ) diff --git a/operator/dutytracer/store.go b/operator/dutytracer/store.go index 35bb5f1029..057a7253c9 100644 --- a/operator/dutytracer/store.go +++ b/operator/dutytracer/store.go @@ -9,9 +9,9 @@ import ( "github.com/hashicorp/go-multierror" spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/exporter" - "github.com/ssvlabs/ssv/exporter/rolemask" - "github.com/ssvlabs/ssv/utils/hashmap" + "github.com/ssvlabs/ssv/v2/exporter" + "github.com/ssvlabs/ssv/v2/exporter/rolemask" + "github.com/ssvlabs/ssv/v2/utils/hashmap" ) // ParticipantsRangeIndexEntry mirrors qbftstorage.ParticipantsRangeEntry but uses a validator index diff --git a/operator/dutytracer/store_metrics.go b/operator/dutytracer/store_metrics.go index 2af831a1d8..a06332aa24 100644 --- a/operator/dutytracer/store_metrics.go +++ b/operator/dutytracer/store_metrics.go @@ -10,9 +10,9 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/exporter" - "github.com/ssvlabs/ssv/exporter/rolemask" - "github.com/ssvlabs/ssv/exporter/store" + "github.com/ssvlabs/ssv/v2/exporter" + "github.com/ssvlabs/ssv/v2/exporter/rolemask" + "github.com/ssvlabs/ssv/v2/exporter/store" ) type DutyTraceStoreMetrics struct { diff --git a/operator/dutytracer/store_test.go b/operator/dutytracer/store_test.go index 4035dfb372..67d6fe2229 100644 --- a/operator/dutytracer/store_test.go +++ b/operator/dutytracer/store_test.go @@ -14,15 +14,15 @@ import ( eth2apiv1 "github.com/attestantio/go-eth2-client/api/v1" - "github.com/ssvlabs/ssv/exporter" - "github.com/ssvlabs/ssv/exporter/store" - "github.com/ssvlabs/ssv/networkconfig" - "github.com/ssvlabs/ssv/protocol/v2/types" - registrystorage "github.com/ssvlabs/ssv/registry/storage" - registrymocks "github.com/ssvlabs/ssv/registry/storage/mocks" - kv "github.com/ssvlabs/ssv/storage/badger" - "github.com/ssvlabs/ssv/storage/basedb" - "github.com/ssvlabs/ssv/utils/hashmap" + "github.com/ssvlabs/ssv/v2/exporter" + "github.com/ssvlabs/ssv/v2/exporter/store" + "github.com/ssvlabs/ssv/v2/networkconfig" + "github.com/ssvlabs/ssv/v2/protocol/v2/types" + registrystorage "github.com/ssvlabs/ssv/v2/registry/storage" + registrymocks "github.com/ssvlabs/ssv/v2/registry/storage/mocks" + kv "github.com/ssvlabs/ssv/v2/storage/badger" + "github.com/ssvlabs/ssv/v2/storage/basedb" + "github.com/ssvlabs/ssv/v2/utils/hashmap" ) // setCommitteeLink is a test helper that directly sets validator-to-committee links in the collector's in-memory map diff --git a/operator/fee_recipient/controller.go b/operator/fee_recipient/controller.go index a6b3722575..6def356241 100644 --- a/operator/fee_recipient/controller.go +++ b/operator/fee_recipient/controller.go @@ -9,11 +9,11 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" "go.uber.org/zap" - "github.com/ssvlabs/ssv/networkconfig" - operatordatastore "github.com/ssvlabs/ssv/operator/datastore" - "github.com/ssvlabs/ssv/operator/slotticker" - beaconprotocol "github.com/ssvlabs/ssv/protocol/v2/blockchain/beacon" - "github.com/ssvlabs/ssv/protocol/v2/types" + "github.com/ssvlabs/ssv/v2/networkconfig" + operatordatastore "github.com/ssvlabs/ssv/v2/operator/datastore" + "github.com/ssvlabs/ssv/v2/operator/slotticker" + beaconprotocol "github.com/ssvlabs/ssv/v2/protocol/v2/blockchain/beacon" + "github.com/ssvlabs/ssv/v2/protocol/v2/types" ) //go:generate go tool -modfile=../../tool.mod mockgen -package=mocks -destination=./mocks/controller.go -source=./controller.go diff --git a/operator/fee_recipient/controller_test.go b/operator/fee_recipient/controller_test.go index d77688a884..bb7ad8cc4a 100644 --- a/operator/fee_recipient/controller_test.go +++ b/operator/fee_recipient/controller_test.go @@ -17,16 +17,16 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/networkconfig" - "github.com/ssvlabs/ssv/observability/log" - operatordatastore "github.com/ssvlabs/ssv/operator/datastore" - "github.com/ssvlabs/ssv/operator/slotticker" - "github.com/ssvlabs/ssv/operator/slotticker/mocks" - "github.com/ssvlabs/ssv/protocol/v2/blockchain/beacon" - "github.com/ssvlabs/ssv/protocol/v2/types" - registrystorage "github.com/ssvlabs/ssv/registry/storage" - kv "github.com/ssvlabs/ssv/storage/badger" - "github.com/ssvlabs/ssv/storage/basedb" + "github.com/ssvlabs/ssv/v2/networkconfig" + "github.com/ssvlabs/ssv/v2/observability/log" + operatordatastore "github.com/ssvlabs/ssv/v2/operator/datastore" + "github.com/ssvlabs/ssv/v2/operator/slotticker" + "github.com/ssvlabs/ssv/v2/operator/slotticker/mocks" + "github.com/ssvlabs/ssv/v2/protocol/v2/blockchain/beacon" + "github.com/ssvlabs/ssv/v2/protocol/v2/types" + registrystorage "github.com/ssvlabs/ssv/v2/registry/storage" + kv "github.com/ssvlabs/ssv/v2/storage/badger" + "github.com/ssvlabs/ssv/v2/storage/basedb" ) // testRecipientStorage: in-memory overrides for owner->custom recipient diff --git a/operator/fee_recipient/mocks/controller.go b/operator/fee_recipient/mocks/controller.go index bdb579a554..3ae6815f3b 100644 --- a/operator/fee_recipient/mocks/controller.go +++ b/operator/fee_recipient/mocks/controller.go @@ -15,7 +15,7 @@ import ( bellatrix "github.com/attestantio/go-eth2-client/spec/bellatrix" types "github.com/ssvlabs/ssv-spec/types" - types0 "github.com/ssvlabs/ssv/protocol/v2/types" + types0 "github.com/ssvlabs/ssv/v2/protocol/v2/types" gomock "go.uber.org/mock/gomock" ) diff --git a/operator/node.go b/operator/node.go index a0e1a4287f..8d80ede741 100644 --- a/operator/node.go +++ b/operator/node.go @@ -14,27 +14,27 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/eth/executionclient" - "github.com/ssvlabs/ssv/exporter" - "github.com/ssvlabs/ssv/exporter/api" - exporterstore "github.com/ssvlabs/ssv/exporter/store" - "github.com/ssvlabs/ssv/exporter2" - qbftstorage "github.com/ssvlabs/ssv/ibft/storage" - "github.com/ssvlabs/ssv/network" - "github.com/ssvlabs/ssv/networkconfig" - "github.com/ssvlabs/ssv/observability/log" - "github.com/ssvlabs/ssv/observability/log/fields" - "github.com/ssvlabs/ssv/operator/duties" - "github.com/ssvlabs/ssv/operator/duties/dutystore" - dutytracer "github.com/ssvlabs/ssv/operator/dutytracer" - "github.com/ssvlabs/ssv/operator/fee_recipient" - "github.com/ssvlabs/ssv/operator/slotticker" - "github.com/ssvlabs/ssv/operator/storage" - "github.com/ssvlabs/ssv/operator/validator" - beaconprotocol "github.com/ssvlabs/ssv/protocol/v2/blockchain/beacon" - "github.com/ssvlabs/ssv/protocol/v2/message" - storage2 "github.com/ssvlabs/ssv/registry/storage" - "github.com/ssvlabs/ssv/storage/basedb" + "github.com/ssvlabs/ssv/v2/eth/executionclient" + "github.com/ssvlabs/ssv/v2/exporter" + "github.com/ssvlabs/ssv/v2/exporter/api" + exporterstore "github.com/ssvlabs/ssv/v2/exporter/store" + "github.com/ssvlabs/ssv/v2/exporter2" + qbftstorage "github.com/ssvlabs/ssv/v2/ibft/storage" + "github.com/ssvlabs/ssv/v2/network" + "github.com/ssvlabs/ssv/v2/networkconfig" + "github.com/ssvlabs/ssv/v2/observability/log" + "github.com/ssvlabs/ssv/v2/observability/log/fields" + "github.com/ssvlabs/ssv/v2/operator/duties" + "github.com/ssvlabs/ssv/v2/operator/duties/dutystore" + dutytracer "github.com/ssvlabs/ssv/v2/operator/dutytracer" + "github.com/ssvlabs/ssv/v2/operator/fee_recipient" + "github.com/ssvlabs/ssv/v2/operator/slotticker" + "github.com/ssvlabs/ssv/v2/operator/storage" + "github.com/ssvlabs/ssv/v2/operator/validator" + beaconprotocol "github.com/ssvlabs/ssv/v2/protocol/v2/blockchain/beacon" + "github.com/ssvlabs/ssv/v2/protocol/v2/message" + storage2 "github.com/ssvlabs/ssv/v2/registry/storage" + "github.com/ssvlabs/ssv/v2/storage/basedb" ) // Options contains options to create the node diff --git a/operator/node_query_test.go b/operator/node_query_test.go index 4759805e34..c6ca158544 100644 --- a/operator/node_query_test.go +++ b/operator/node_query_test.go @@ -13,17 +13,17 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/exporter" - "github.com/ssvlabs/ssv/exporter/api" - dutytracestore "github.com/ssvlabs/ssv/exporter/store" - "github.com/ssvlabs/ssv/exporter2" - ibftstorage "github.com/ssvlabs/ssv/ibft/storage" - "github.com/ssvlabs/ssv/networkconfig" - dutytracer "github.com/ssvlabs/ssv/operator/dutytracer" - "github.com/ssvlabs/ssv/operator/validator" - registrystoragemocks "github.com/ssvlabs/ssv/registry/storage/mocks" - kv "github.com/ssvlabs/ssv/storage/badger" - "github.com/ssvlabs/ssv/storage/basedb" + "github.com/ssvlabs/ssv/v2/exporter" + "github.com/ssvlabs/ssv/v2/exporter/api" + dutytracestore "github.com/ssvlabs/ssv/v2/exporter/store" + "github.com/ssvlabs/ssv/v2/exporter2" + ibftstorage "github.com/ssvlabs/ssv/v2/ibft/storage" + "github.com/ssvlabs/ssv/v2/networkconfig" + dutytracer "github.com/ssvlabs/ssv/v2/operator/dutytracer" + "github.com/ssvlabs/ssv/v2/operator/validator" + registrystoragemocks "github.com/ssvlabs/ssv/v2/registry/storage/mocks" + kv "github.com/ssvlabs/ssv/v2/storage/badger" + "github.com/ssvlabs/ssv/v2/storage/basedb" ) type validatorDutyKey struct { diff --git a/operator/node_test.go b/operator/node_test.go index b994f9dcc4..9a512a3ee3 100644 --- a/operator/node_test.go +++ b/operator/node_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/ssvlabs/ssv/exporter" + "github.com/ssvlabs/ssv/v2/exporter" ) func TestShouldRunDutyScheduler(t *testing.T) { diff --git a/operator/slotticker/slotticker.go b/operator/slotticker/slotticker.go index 6255bfd0d5..ab3cfa7075 100644 --- a/operator/slotticker/slotticker.go +++ b/operator/slotticker/slotticker.go @@ -6,8 +6,8 @@ import ( "github.com/attestantio/go-eth2-client/spec/phase0" "go.uber.org/zap" - "github.com/ssvlabs/ssv/observability/log" - "github.com/ssvlabs/ssv/utils/casts" + "github.com/ssvlabs/ssv/v2/observability/log" + "github.com/ssvlabs/ssv/v2/utils/casts" ) //go:generate go tool -modfile=../../tool.mod mockgen -package=mocks -destination=./mocks/slotticker.go -source=./slotticker.go diff --git a/operator/storage/storage.go b/operator/storage/storage.go index 2ad5d9fdce..2800198cec 100644 --- a/operator/storage/storage.go +++ b/operator/storage/storage.go @@ -12,10 +12,10 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/networkconfig" - registry "github.com/ssvlabs/ssv/protocol/v2/blockchain/eth1" - registrystorage "github.com/ssvlabs/ssv/registry/storage" - "github.com/ssvlabs/ssv/storage/basedb" + "github.com/ssvlabs/ssv/v2/networkconfig" + registry "github.com/ssvlabs/ssv/v2/protocol/v2/blockchain/eth1" + registrystorage "github.com/ssvlabs/ssv/v2/registry/storage" + "github.com/ssvlabs/ssv/v2/storage/basedb" ) var ( diff --git a/operator/storage/storage_test.go b/operator/storage/storage_test.go index 8a5fff96a6..c84e88817e 100644 --- a/operator/storage/storage_test.go +++ b/operator/storage/storage_test.go @@ -13,14 +13,14 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/observability/log" "github.com/ssvlabs/ssv/ssvsigner/keys" + "github.com/ssvlabs/ssv/v2/observability/log" - "github.com/ssvlabs/ssv/networkconfig" - "github.com/ssvlabs/ssv/protocol/v2/types" - registrystorage "github.com/ssvlabs/ssv/registry/storage" - kv "github.com/ssvlabs/ssv/storage/badger" - "github.com/ssvlabs/ssv/storage/basedb" + "github.com/ssvlabs/ssv/v2/networkconfig" + "github.com/ssvlabs/ssv/v2/protocol/v2/types" + registrystorage "github.com/ssvlabs/ssv/v2/registry/storage" + kv "github.com/ssvlabs/ssv/v2/storage/badger" + "github.com/ssvlabs/ssv/v2/storage/basedb" ) var ( diff --git a/operator/validator/controller.go b/operator/validator/controller.go index cfd3865b18..2f6c4b5986 100644 --- a/operator/validator/controller.go +++ b/operator/validator/controller.go @@ -17,37 +17,37 @@ import ( "github.com/ssvlabs/ssv/ssvsigner/ekm" - "github.com/ssvlabs/ssv/doppelganger" - "github.com/ssvlabs/ssv/exporter" - "github.com/ssvlabs/ssv/ibft/storage" - "github.com/ssvlabs/ssv/message/validation" - "github.com/ssvlabs/ssv/network" - "github.com/ssvlabs/ssv/network/commons" - "github.com/ssvlabs/ssv/networkconfig" - "github.com/ssvlabs/ssv/observability" - "github.com/ssvlabs/ssv/observability/log" - "github.com/ssvlabs/ssv/observability/log/fields" - "github.com/ssvlabs/ssv/observability/traces" - operatordatastore "github.com/ssvlabs/ssv/operator/datastore" - "github.com/ssvlabs/ssv/operator/duties" - dutytracer "github.com/ssvlabs/ssv/operator/dutytracer" - nodestorage "github.com/ssvlabs/ssv/operator/storage" - "github.com/ssvlabs/ssv/operator/validator/metadata" - "github.com/ssvlabs/ssv/operator/validators" - beaconprotocol "github.com/ssvlabs/ssv/protocol/v2/blockchain/beacon" - "github.com/ssvlabs/ssv/protocol/v2/message" - protocolp2p "github.com/ssvlabs/ssv/protocol/v2/p2p" - "github.com/ssvlabs/ssv/protocol/v2/qbft" - qbftcontroller "github.com/ssvlabs/ssv/protocol/v2/qbft/controller" - "github.com/ssvlabs/ssv/protocol/v2/qbft/roundtimer" - "github.com/ssvlabs/ssv/protocol/v2/queue/worker" - "github.com/ssvlabs/ssv/protocol/v2/ssv" - "github.com/ssvlabs/ssv/protocol/v2/ssv/queue" - "github.com/ssvlabs/ssv/protocol/v2/ssv/runner" - "github.com/ssvlabs/ssv/protocol/v2/ssv/validator" - ssvtypes "github.com/ssvlabs/ssv/protocol/v2/types" - registrystorage "github.com/ssvlabs/ssv/registry/storage" - "github.com/ssvlabs/ssv/storage/basedb" + "github.com/ssvlabs/ssv/v2/doppelganger" + "github.com/ssvlabs/ssv/v2/exporter" + "github.com/ssvlabs/ssv/v2/ibft/storage" + "github.com/ssvlabs/ssv/v2/message/validation" + "github.com/ssvlabs/ssv/v2/network" + "github.com/ssvlabs/ssv/v2/network/commons" + "github.com/ssvlabs/ssv/v2/networkconfig" + "github.com/ssvlabs/ssv/v2/observability" + "github.com/ssvlabs/ssv/v2/observability/log" + "github.com/ssvlabs/ssv/v2/observability/log/fields" + "github.com/ssvlabs/ssv/v2/observability/traces" + operatordatastore "github.com/ssvlabs/ssv/v2/operator/datastore" + "github.com/ssvlabs/ssv/v2/operator/duties" + dutytracer "github.com/ssvlabs/ssv/v2/operator/dutytracer" + nodestorage "github.com/ssvlabs/ssv/v2/operator/storage" + "github.com/ssvlabs/ssv/v2/operator/validator/metadata" + "github.com/ssvlabs/ssv/v2/operator/validators" + beaconprotocol "github.com/ssvlabs/ssv/v2/protocol/v2/blockchain/beacon" + "github.com/ssvlabs/ssv/v2/protocol/v2/message" + protocolp2p "github.com/ssvlabs/ssv/v2/protocol/v2/p2p" + "github.com/ssvlabs/ssv/v2/protocol/v2/qbft" + qbftcontroller "github.com/ssvlabs/ssv/v2/protocol/v2/qbft/controller" + "github.com/ssvlabs/ssv/v2/protocol/v2/qbft/roundtimer" + "github.com/ssvlabs/ssv/v2/protocol/v2/queue/worker" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv/queue" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv/runner" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv/validator" + ssvtypes "github.com/ssvlabs/ssv/v2/protocol/v2/types" + registrystorage "github.com/ssvlabs/ssv/v2/registry/storage" + "github.com/ssvlabs/ssv/v2/storage/basedb" ) //go:generate go tool -modfile=../../tool.mod mockgen -package=mocks -destination=./mocks/controller.go -source=./controller.go diff --git a/operator/validator/controller_bench_test.go b/operator/validator/controller_bench_test.go index 486346cf32..300dad5cc5 100644 --- a/operator/validator/controller_bench_test.go +++ b/operator/validator/controller_bench_test.go @@ -15,10 +15,10 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/zap" - "github.com/ssvlabs/ssv/networkconfig" - "github.com/ssvlabs/ssv/operator/validators" - "github.com/ssvlabs/ssv/protocol/v2/ssv/queue" - validatorprotocol "github.com/ssvlabs/ssv/protocol/v2/ssv/validator" + "github.com/ssvlabs/ssv/v2/networkconfig" + "github.com/ssvlabs/ssv/v2/operator/validators" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv/queue" + validatorprotocol "github.com/ssvlabs/ssv/v2/protocol/v2/ssv/validator" ) const ( diff --git a/operator/validator/controller_test.go b/operator/validator/controller_test.go index 1055cd1901..d9374c3071 100644 --- a/operator/validator/controller_test.go +++ b/operator/validator/controller_test.go @@ -20,31 +20,31 @@ import ( "go.uber.org/mock/gomock" "go.uber.org/zap" - "github.com/ssvlabs/ssv/ekmadapter" "github.com/ssvlabs/ssv/ssvsigner/ekm" "github.com/ssvlabs/ssv/ssvsigner/keys" - - "github.com/ssvlabs/ssv/beacon/goclient" - "github.com/ssvlabs/ssv/exporter" - ibftstorage "github.com/ssvlabs/ssv/ibft/storage" - "github.com/ssvlabs/ssv/network" - "github.com/ssvlabs/ssv/networkconfig" - "github.com/ssvlabs/ssv/observability/log" - operatordatastore "github.com/ssvlabs/ssv/operator/datastore" - "github.com/ssvlabs/ssv/operator/duties" - "github.com/ssvlabs/ssv/operator/storage" - "github.com/ssvlabs/ssv/operator/validator/metadata" - "github.com/ssvlabs/ssv/operator/validator/mocks" - "github.com/ssvlabs/ssv/operator/validators" - "github.com/ssvlabs/ssv/protocol/v2/blockchain/beacon" - "github.com/ssvlabs/ssv/protocol/v2/queue/worker" - "github.com/ssvlabs/ssv/protocol/v2/ssv/queue" - "github.com/ssvlabs/ssv/protocol/v2/ssv/runner" - "github.com/ssvlabs/ssv/protocol/v2/ssv/validator" - "github.com/ssvlabs/ssv/protocol/v2/types" - registrystorage "github.com/ssvlabs/ssv/registry/storage" - kv "github.com/ssvlabs/ssv/storage/badger" - "github.com/ssvlabs/ssv/storage/basedb" + "github.com/ssvlabs/ssv/v2/ekmadapter" + + "github.com/ssvlabs/ssv/v2/beacon/goclient" + "github.com/ssvlabs/ssv/v2/exporter" + ibftstorage "github.com/ssvlabs/ssv/v2/ibft/storage" + "github.com/ssvlabs/ssv/v2/network" + "github.com/ssvlabs/ssv/v2/networkconfig" + "github.com/ssvlabs/ssv/v2/observability/log" + operatordatastore "github.com/ssvlabs/ssv/v2/operator/datastore" + "github.com/ssvlabs/ssv/v2/operator/duties" + "github.com/ssvlabs/ssv/v2/operator/storage" + "github.com/ssvlabs/ssv/v2/operator/validator/metadata" + "github.com/ssvlabs/ssv/v2/operator/validator/mocks" + "github.com/ssvlabs/ssv/v2/operator/validators" + "github.com/ssvlabs/ssv/v2/protocol/v2/blockchain/beacon" + "github.com/ssvlabs/ssv/v2/protocol/v2/queue/worker" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv/queue" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv/runner" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv/validator" + "github.com/ssvlabs/ssv/v2/protocol/v2/types" + registrystorage "github.com/ssvlabs/ssv/v2/registry/storage" + kv "github.com/ssvlabs/ssv/v2/storage/badger" + "github.com/ssvlabs/ssv/v2/storage/basedb" ) var secretKeyStrings = []string{ diff --git a/operator/validator/metadata/mocks.go b/operator/validator/metadata/mocks.go index dc417dc4c1..4039461320 100644 --- a/operator/validator/metadata/mocks.go +++ b/operator/validator/metadata/mocks.go @@ -12,10 +12,10 @@ package metadata import ( reflect "reflect" - beacon "github.com/ssvlabs/ssv/protocol/v2/blockchain/beacon" - types "github.com/ssvlabs/ssv/protocol/v2/types" - storage "github.com/ssvlabs/ssv/registry/storage" - basedb "github.com/ssvlabs/ssv/storage/basedb" + beacon "github.com/ssvlabs/ssv/v2/protocol/v2/blockchain/beacon" + types "github.com/ssvlabs/ssv/v2/protocol/v2/types" + storage "github.com/ssvlabs/ssv/v2/registry/storage" + basedb "github.com/ssvlabs/ssv/v2/storage/basedb" gomock "go.uber.org/mock/gomock" ) diff --git a/operator/validator/metadata/sync_batch.go b/operator/validator/metadata/sync_batch.go index fd81fab968..44683baafb 100644 --- a/operator/validator/metadata/sync_batch.go +++ b/operator/validator/metadata/sync_batch.go @@ -3,7 +3,7 @@ package metadata import ( spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/protocol/v2/blockchain/beacon" + "github.com/ssvlabs/ssv/v2/protocol/v2/blockchain/beacon" ) // SyncBatch represents the validator metadata before and after a sync. diff --git a/operator/validator/metadata/sync_batch_test.go b/operator/validator/metadata/sync_batch_test.go index 479a93f5c5..f5ee678d3e 100644 --- a/operator/validator/metadata/sync_batch_test.go +++ b/operator/validator/metadata/sync_batch_test.go @@ -8,7 +8,7 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/protocol/v2/blockchain/beacon" + "github.com/ssvlabs/ssv/v2/protocol/v2/blockchain/beacon" ) func TestDetectValidatorStateChanges(t *testing.T) { diff --git a/operator/validator/metadata/syncer.go b/operator/validator/metadata/syncer.go index 4b71b4c4c5..db8e9245e7 100644 --- a/operator/validator/metadata/syncer.go +++ b/operator/validator/metadata/syncer.go @@ -13,13 +13,13 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" - networkcommons "github.com/ssvlabs/ssv/network/commons" - "github.com/ssvlabs/ssv/observability/log" - "github.com/ssvlabs/ssv/observability/log/fields" - "github.com/ssvlabs/ssv/protocol/v2/blockchain/beacon" - ssvtypes "github.com/ssvlabs/ssv/protocol/v2/types" - registrystorage "github.com/ssvlabs/ssv/registry/storage" - "github.com/ssvlabs/ssv/storage/basedb" + networkcommons "github.com/ssvlabs/ssv/v2/network/commons" + "github.com/ssvlabs/ssv/v2/observability/log" + "github.com/ssvlabs/ssv/v2/observability/log/fields" + "github.com/ssvlabs/ssv/v2/protocol/v2/blockchain/beacon" + ssvtypes "github.com/ssvlabs/ssv/v2/protocol/v2/types" + registrystorage "github.com/ssvlabs/ssv/v2/registry/storage" + "github.com/ssvlabs/ssv/v2/storage/basedb" ) //go:generate go tool -modfile=../../../tool.mod mockgen -package=metadata -destination=./mocks.go -source=./syncer.go diff --git a/operator/validator/metadata/syncer_test.go b/operator/validator/metadata/syncer_test.go index b517b224c1..414b79143a 100644 --- a/operator/validator/metadata/syncer_test.go +++ b/operator/validator/metadata/syncer_test.go @@ -15,12 +15,12 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/beacon/goclient" - "github.com/ssvlabs/ssv/network/commons" - "github.com/ssvlabs/ssv/observability/log" - "github.com/ssvlabs/ssv/protocol/v2/blockchain/beacon" - ssvtypes "github.com/ssvlabs/ssv/protocol/v2/types" - "github.com/ssvlabs/ssv/storage/basedb" + "github.com/ssvlabs/ssv/v2/beacon/goclient" + "github.com/ssvlabs/ssv/v2/network/commons" + "github.com/ssvlabs/ssv/v2/observability/log" + "github.com/ssvlabs/ssv/v2/protocol/v2/blockchain/beacon" + ssvtypes "github.com/ssvlabs/ssv/v2/protocol/v2/types" + "github.com/ssvlabs/ssv/v2/storage/basedb" ) const ( diff --git a/operator/validator/metrics.go b/operator/validator/metrics.go index 9a5935a134..32a0e5c7f8 100644 --- a/operator/validator/metrics.go +++ b/operator/validator/metrics.go @@ -3,8 +3,8 @@ package validator import ( "go.uber.org/zap" - "github.com/ssvlabs/ssv/observability/log/fields" - "github.com/ssvlabs/ssv/protocol/v2/types" + "github.com/ssvlabs/ssv/v2/observability/log/fields" + "github.com/ssvlabs/ssv/v2/protocol/v2/types" ) func (c *Controller) reportValidatorStatus(share *types.SSVShare) { diff --git a/operator/validator/mocks/controller.go b/operator/validator/mocks/controller.go index 89ea0b7ddb..9812fbc45f 100644 --- a/operator/validator/mocks/controller.go +++ b/operator/validator/mocks/controller.go @@ -13,11 +13,11 @@ import ( reflect "reflect" types "github.com/ssvlabs/ssv-spec/types" - network "github.com/ssvlabs/ssv/network" - commons "github.com/ssvlabs/ssv/network/commons" - types0 "github.com/ssvlabs/ssv/protocol/v2/types" - storage "github.com/ssvlabs/ssv/registry/storage" - basedb "github.com/ssvlabs/ssv/storage/basedb" + network "github.com/ssvlabs/ssv/v2/network" + commons "github.com/ssvlabs/ssv/v2/network/commons" + types0 "github.com/ssvlabs/ssv/v2/protocol/v2/types" + storage "github.com/ssvlabs/ssv/v2/registry/storage" + basedb "github.com/ssvlabs/ssv/v2/storage/basedb" gomock "go.uber.org/mock/gomock" ) diff --git a/operator/validator/observability.go b/operator/validator/observability.go index 9c372aa820..4df8274f16 100644 --- a/operator/validator/observability.go +++ b/operator/validator/observability.go @@ -8,12 +8,12 @@ import ( "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/metric" - "github.com/ssvlabs/ssv/observability" - "github.com/ssvlabs/ssv/observability/metrics" + "github.com/ssvlabs/ssv/v2/observability" + "github.com/ssvlabs/ssv/v2/observability/metrics" ) const ( - observabilityName = "github.com/ssvlabs/ssv/operator/validator" + observabilityName = "github.com/ssvlabs/ssv/v2/operator/validator" observabilityNamespace = "ssv.validator" ) diff --git a/operator/validator/router.go b/operator/validator/router.go index 71b54b61d8..b9ce24733b 100644 --- a/operator/validator/router.go +++ b/operator/validator/router.go @@ -8,7 +8,7 @@ import ( "go.opentelemetry.io/otel/metric" "go.uber.org/zap" - "github.com/ssvlabs/ssv/network" + "github.com/ssvlabs/ssv/v2/network" ) const bufSize = 65536 diff --git a/operator/validator/router_test.go b/operator/validator/router_test.go index ec26e52aa7..cc7c21e94e 100644 --- a/operator/validator/router_test.go +++ b/operator/validator/router_test.go @@ -13,9 +13,9 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/networkconfig" - "github.com/ssvlabs/ssv/observability/log" - "github.com/ssvlabs/ssv/protocol/v2/ssv/queue" + "github.com/ssvlabs/ssv/v2/networkconfig" + "github.com/ssvlabs/ssv/v2/observability/log" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv/queue" ) func TestRouter(t *testing.T) { diff --git a/operator/validator/task_executor.go b/operator/validator/task_executor.go index b9596cf7a1..002833e56d 100644 --- a/operator/validator/task_executor.go +++ b/operator/validator/task_executor.go @@ -11,11 +11,11 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/observability/log" - "github.com/ssvlabs/ssv/observability/log/fields" - "github.com/ssvlabs/ssv/operator/duties" - "github.com/ssvlabs/ssv/protocol/v2/ssv/validator" - "github.com/ssvlabs/ssv/protocol/v2/types" + "github.com/ssvlabs/ssv/v2/observability/log" + "github.com/ssvlabs/ssv/v2/observability/log/fields" + "github.com/ssvlabs/ssv/v2/operator/duties" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv/validator" + "github.com/ssvlabs/ssv/v2/protocol/v2/types" ) func (c *Controller) taskLogger(taskName string, fields ...zap.Field) *zap.Logger { diff --git a/operator/validator/task_executor_test.go b/operator/validator/task_executor_test.go index 3aa363443e..9d5724d66d 100644 --- a/operator/validator/task_executor_test.go +++ b/operator/validator/task_executor_test.go @@ -16,16 +16,16 @@ import ( "github.com/ssvlabs/ssv/ssvsigner/keys" - ibftstorage "github.com/ssvlabs/ssv/ibft/storage" - "github.com/ssvlabs/ssv/networkconfig" - "github.com/ssvlabs/ssv/observability/log" - operatordatastore "github.com/ssvlabs/ssv/operator/datastore" - "github.com/ssvlabs/ssv/operator/validators" - "github.com/ssvlabs/ssv/protocol/v2/ssv/runner" - "github.com/ssvlabs/ssv/protocol/v2/ssv/validator" - "github.com/ssvlabs/ssv/protocol/v2/types" - "github.com/ssvlabs/ssv/registry/storage" - "github.com/ssvlabs/ssv/utils/threshold" + ibftstorage "github.com/ssvlabs/ssv/v2/ibft/storage" + "github.com/ssvlabs/ssv/v2/networkconfig" + "github.com/ssvlabs/ssv/v2/observability/log" + operatordatastore "github.com/ssvlabs/ssv/v2/operator/datastore" + "github.com/ssvlabs/ssv/v2/operator/validators" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv/runner" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv/validator" + "github.com/ssvlabs/ssv/v2/protocol/v2/types" + "github.com/ssvlabs/ssv/v2/registry/storage" + "github.com/ssvlabs/ssv/v2/utils/threshold" ) func TestController_LiquidateCluster(t *testing.T) { diff --git a/operator/validators/testutils.go b/operator/validators/testutils.go index c1835fd511..922328b6fb 100644 --- a/operator/validators/testutils.go +++ b/operator/validators/testutils.go @@ -3,7 +3,7 @@ package validators import ( spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/protocol/v2/ssv/validator" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv/validator" ) // Test helper to set initial state during tests. diff --git a/operator/validators/validators_map.go b/operator/validators/validators_map.go index a328b85f68..65a1e9949b 100644 --- a/operator/validators/validators_map.go +++ b/operator/validators/validators_map.go @@ -7,7 +7,7 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/protocol/v2/ssv/validator" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv/validator" ) // TODO: use queues diff --git a/protocol/v2/qbft/controller/controller.go b/protocol/v2/qbft/controller/controller.go index 3e0ef738f1..a1f72d86a5 100644 --- a/protocol/v2/qbft/controller/controller.go +++ b/protocol/v2/qbft/controller/controller.go @@ -14,13 +14,13 @@ import ( "go.opentelemetry.io/otel/trace" "go.uber.org/zap" - qbftstorage "github.com/ssvlabs/ssv/ibft/storage" - "github.com/ssvlabs/ssv/observability" - "github.com/ssvlabs/ssv/observability/traces" - "github.com/ssvlabs/ssv/protocol/v2/qbft" - "github.com/ssvlabs/ssv/protocol/v2/qbft/instance" - "github.com/ssvlabs/ssv/protocol/v2/ssv" - ssvtypes "github.com/ssvlabs/ssv/protocol/v2/types" + qbftstorage "github.com/ssvlabs/ssv/v2/ibft/storage" + "github.com/ssvlabs/ssv/v2/observability" + "github.com/ssvlabs/ssv/v2/observability/traces" + "github.com/ssvlabs/ssv/v2/protocol/v2/qbft" + "github.com/ssvlabs/ssv/v2/protocol/v2/qbft/instance" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv" + ssvtypes "github.com/ssvlabs/ssv/v2/protocol/v2/types" ) // NewDecidedHandler handles newly saved decided messages. diff --git a/protocol/v2/qbft/controller/controller_test.go b/protocol/v2/qbft/controller/controller_test.go index b7ae039eac..f8cc97799a 100644 --- a/protocol/v2/qbft/controller/controller_test.go +++ b/protocol/v2/qbft/controller/controller_test.go @@ -12,12 +12,12 @@ import ( "github.com/ssvlabs/ssv/ssvsigner/ekm" - "github.com/ssvlabs/ssv/observability/log" - "github.com/ssvlabs/ssv/protocol/v2/qbft" - "github.com/ssvlabs/ssv/protocol/v2/qbft/instance" - "github.com/ssvlabs/ssv/protocol/v2/qbft/roundtimer" - "github.com/ssvlabs/ssv/protocol/v2/ssv" - "github.com/ssvlabs/ssv/protocol/v2/types" + "github.com/ssvlabs/ssv/v2/observability/log" + "github.com/ssvlabs/ssv/v2/protocol/v2/qbft" + "github.com/ssvlabs/ssv/v2/protocol/v2/qbft/instance" + "github.com/ssvlabs/ssv/v2/protocol/v2/qbft/roundtimer" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv" + "github.com/ssvlabs/ssv/v2/protocol/v2/types" ) func TestController_Marshaling(t *testing.T) { diff --git a/protocol/v2/qbft/controller/decided.go b/protocol/v2/qbft/controller/decided.go index 226931f119..0db9243b9f 100644 --- a/protocol/v2/qbft/controller/decided.go +++ b/protocol/v2/qbft/controller/decided.go @@ -9,8 +9,8 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" "go.uber.org/zap" - "github.com/ssvlabs/ssv/protocol/v2/qbft/instance" - "github.com/ssvlabs/ssv/protocol/v2/ssv" + "github.com/ssvlabs/ssv/v2/protocol/v2/qbft/instance" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv" ) // UponDecided returns "decided msg" if the corresponding QBFT instance is "completed" (marked as decided) by the diff --git a/protocol/v2/qbft/controller/observability.go b/protocol/v2/qbft/controller/observability.go index aa7d8c76f6..b6d8920093 100644 --- a/protocol/v2/qbft/controller/observability.go +++ b/protocol/v2/qbft/controller/observability.go @@ -5,7 +5,7 @@ import ( ) const ( - observabilityName = "github.com/ssvlabs/ssv/protocol/v2/qbft/controller" + observabilityName = "github.com/ssvlabs/ssv/v2/protocol/v2/qbft/controller" observabilityNamespace = "ssv.validator" ) diff --git a/protocol/v2/qbft/controller/timer.go b/protocol/v2/qbft/controller/timer.go index 23139ff289..a4ec3e83b7 100644 --- a/protocol/v2/qbft/controller/timer.go +++ b/protocol/v2/qbft/controller/timer.go @@ -7,9 +7,9 @@ import ( "go.opentelemetry.io/otel/codes" "go.uber.org/zap" - "github.com/ssvlabs/ssv/observability" - "github.com/ssvlabs/ssv/observability/traces" - "github.com/ssvlabs/ssv/protocol/v2/types" + "github.com/ssvlabs/ssv/v2/observability" + "github.com/ssvlabs/ssv/v2/observability/traces" + "github.com/ssvlabs/ssv/v2/protocol/v2/types" ) // OnQBFTRoundTimeout is trigger upon timeout for the given height diff --git a/protocol/v2/qbft/controller/types.go b/protocol/v2/qbft/controller/types.go index d7d6a1c67c..140a340a1c 100644 --- a/protocol/v2/qbft/controller/types.go +++ b/protocol/v2/qbft/controller/types.go @@ -7,7 +7,7 @@ import ( specqbft "github.com/ssvlabs/ssv-spec/qbft" - "github.com/ssvlabs/ssv/protocol/v2/qbft/instance" + "github.com/ssvlabs/ssv/v2/protocol/v2/qbft/instance" ) const ( diff --git a/protocol/v2/qbft/controller/types_test.go b/protocol/v2/qbft/controller/types_test.go index 516c67018a..fb9c2ddc9b 100644 --- a/protocol/v2/qbft/controller/types_test.go +++ b/protocol/v2/qbft/controller/types_test.go @@ -8,7 +8,7 @@ import ( specqbft "github.com/ssvlabs/ssv-spec/qbft" "github.com/stretchr/testify/require" - "github.com/ssvlabs/ssv/protocol/v2/qbft/instance" + "github.com/ssvlabs/ssv/v2/protocol/v2/qbft/instance" ) func TestInstances_FindInstance(t *testing.T) { diff --git a/protocol/v2/qbft/instance/commit.go b/protocol/v2/qbft/instance/commit.go index 0a3d432ce4..139dc09ddc 100644 --- a/protocol/v2/qbft/instance/commit.go +++ b/protocol/v2/qbft/instance/commit.go @@ -10,8 +10,8 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" "go.uber.org/zap" - "github.com/ssvlabs/ssv/observability/log/fields" - ssvtypes "github.com/ssvlabs/ssv/protocol/v2/types" + "github.com/ssvlabs/ssv/v2/observability/log/fields" + ssvtypes "github.com/ssvlabs/ssv/v2/protocol/v2/types" ) // uponCommit records this commit message, and returns true if this commit message makes this instance decided. diff --git a/protocol/v2/qbft/instance/instance.go b/protocol/v2/qbft/instance/instance.go index 5a1da47550..469d793606 100644 --- a/protocol/v2/qbft/instance/instance.go +++ b/protocol/v2/qbft/instance/instance.go @@ -14,12 +14,12 @@ import ( "go.opentelemetry.io/otel/trace" "go.uber.org/zap" - "github.com/ssvlabs/ssv/observability" - "github.com/ssvlabs/ssv/observability/log" - "github.com/ssvlabs/ssv/observability/log/fields" - "github.com/ssvlabs/ssv/protocol/v2/qbft" - "github.com/ssvlabs/ssv/protocol/v2/ssv" - ssvtypes "github.com/ssvlabs/ssv/protocol/v2/types" + "github.com/ssvlabs/ssv/v2/observability" + "github.com/ssvlabs/ssv/v2/observability/log" + "github.com/ssvlabs/ssv/v2/observability/log/fields" + "github.com/ssvlabs/ssv/v2/protocol/v2/qbft" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv" + ssvtypes "github.com/ssvlabs/ssv/v2/protocol/v2/types" ) // Instance represents a single QBFT instance. It is NOT thread-safe. diff --git a/protocol/v2/qbft/instance/metrics.go b/protocol/v2/qbft/instance/metrics.go index 0aa8ed0979..f1754aa4e2 100644 --- a/protocol/v2/qbft/instance/metrics.go +++ b/protocol/v2/qbft/instance/metrics.go @@ -9,8 +9,8 @@ import ( "go.opentelemetry.io/otel/metric" "go.uber.org/zap" - "github.com/ssvlabs/ssv/observability" - "github.com/ssvlabs/ssv/observability/log/fields" + "github.com/ssvlabs/ssv/v2/observability" + "github.com/ssvlabs/ssv/v2/observability/log/fields" ) type metricsRecorder struct { diff --git a/protocol/v2/qbft/instance/observability.go b/protocol/v2/qbft/instance/observability.go index 2bf2dcfcb9..db411ab7e8 100644 --- a/protocol/v2/qbft/instance/observability.go +++ b/protocol/v2/qbft/instance/observability.go @@ -5,12 +5,12 @@ import ( "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/metric" - "github.com/ssvlabs/ssv/observability" - "github.com/ssvlabs/ssv/observability/metrics" + "github.com/ssvlabs/ssv/v2/observability" + "github.com/ssvlabs/ssv/v2/observability/metrics" ) const ( - observabilityName = "github.com/ssvlabs/ssv/protocol/v2/qbft" + observabilityName = "github.com/ssvlabs/ssv/v2/protocol/v2/qbft" observabilityNamespace = "ssv.validator" ) diff --git a/protocol/v2/qbft/instance/prepare.go b/protocol/v2/qbft/instance/prepare.go index e1f937138d..51ae939dac 100644 --- a/protocol/v2/qbft/instance/prepare.go +++ b/protocol/v2/qbft/instance/prepare.go @@ -9,8 +9,8 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" "go.uber.org/zap" - "github.com/ssvlabs/ssv/observability/log/fields" - ssvtypes "github.com/ssvlabs/ssv/protocol/v2/types" + "github.com/ssvlabs/ssv/v2/observability/log/fields" + ssvtypes "github.com/ssvlabs/ssv/v2/protocol/v2/types" ) // uponPrepare process prepare message diff --git a/protocol/v2/qbft/instance/proposal.go b/protocol/v2/qbft/instance/proposal.go index 7d9ecc83b6..de4ceacf22 100644 --- a/protocol/v2/qbft/instance/proposal.go +++ b/protocol/v2/qbft/instance/proposal.go @@ -10,7 +10,7 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" "go.uber.org/zap" - ssvtypes "github.com/ssvlabs/ssv/protocol/v2/types" + ssvtypes "github.com/ssvlabs/ssv/v2/protocol/v2/types" ) // uponProposal process proposal message diff --git a/protocol/v2/qbft/instance/round_change.go b/protocol/v2/qbft/instance/round_change.go index d6b9e1dc87..d8d762b839 100644 --- a/protocol/v2/qbft/instance/round_change.go +++ b/protocol/v2/qbft/instance/round_change.go @@ -11,8 +11,8 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" "go.uber.org/zap" - "github.com/ssvlabs/ssv/observability/log/fields" - ssvtypes "github.com/ssvlabs/ssv/protocol/v2/types" + "github.com/ssvlabs/ssv/v2/observability/log/fields" + ssvtypes "github.com/ssvlabs/ssv/v2/protocol/v2/types" ) // uponRoundChange process round change messages. diff --git a/protocol/v2/qbft/instance/test_helpers_test.go b/protocol/v2/qbft/instance/test_helpers_test.go index f4fb171a8f..0061ccea28 100644 --- a/protocol/v2/qbft/instance/test_helpers_test.go +++ b/protocol/v2/qbft/instance/test_helpers_test.go @@ -13,10 +13,10 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/zap" - qbftconfig "github.com/ssvlabs/ssv/protocol/v2/qbft" - "github.com/ssvlabs/ssv/protocol/v2/qbft/roundtimer" - "github.com/ssvlabs/ssv/protocol/v2/ssv" "github.com/ssvlabs/ssv/ssvsigner/ekm" + qbftconfig "github.com/ssvlabs/ssv/v2/protocol/v2/qbft" + "github.com/ssvlabs/ssv/v2/protocol/v2/qbft/roundtimer" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv" ) type instanceTestEnv struct { diff --git a/protocol/v2/qbft/instance/timeout.go b/protocol/v2/qbft/instance/timeout.go index 9b66edf15e..8783c21484 100644 --- a/protocol/v2/qbft/instance/timeout.go +++ b/protocol/v2/qbft/instance/timeout.go @@ -9,8 +9,8 @@ import ( "go.opentelemetry.io/otel/trace" "go.uber.org/zap" - "github.com/ssvlabs/ssv/observability" - "github.com/ssvlabs/ssv/observability/traces" + "github.com/ssvlabs/ssv/v2/observability" + "github.com/ssvlabs/ssv/v2/observability/traces" ) func (i *Instance) UponRoundTimeout(ctx context.Context, logger *zap.Logger) error { diff --git a/protocol/v2/qbft/roundtimer/timer.go b/protocol/v2/qbft/roundtimer/timer.go index 171e9260ab..1fd21c61bf 100644 --- a/protocol/v2/qbft/roundtimer/timer.go +++ b/protocol/v2/qbft/roundtimer/timer.go @@ -10,8 +10,8 @@ import ( specqbft "github.com/ssvlabs/ssv-spec/qbft" spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/networkconfig" - "github.com/ssvlabs/ssv/utils/casts" + "github.com/ssvlabs/ssv/v2/networkconfig" + "github.com/ssvlabs/ssv/v2/utils/casts" ) type OnRoundTimeoutF func(round specqbft.Round) diff --git a/protocol/v2/qbft/roundtimer/timer_test.go b/protocol/v2/qbft/roundtimer/timer_test.go index 18f6737e48..02f5295bfe 100644 --- a/protocol/v2/qbft/roundtimer/timer_test.go +++ b/protocol/v2/qbft/roundtimer/timer_test.go @@ -14,7 +14,7 @@ import ( specqbft "github.com/ssvlabs/ssv-spec/qbft" spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/networkconfig" + "github.com/ssvlabs/ssv/v2/networkconfig" ) const ( diff --git a/protocol/v2/qbft/spectest/controller_type.go b/protocol/v2/qbft/spectest/controller_type.go index f3bcde705a..c755dcf0ec 100644 --- a/protocol/v2/qbft/spectest/controller_type.go +++ b/protocol/v2/qbft/spectest/controller_type.go @@ -20,12 +20,12 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/zap" - "github.com/ssvlabs/ssv/ibft/storage" - "github.com/ssvlabs/ssv/protocol/v2/qbft" - "github.com/ssvlabs/ssv/protocol/v2/qbft/controller" - "github.com/ssvlabs/ssv/protocol/v2/qbft/roundtimer" - "github.com/ssvlabs/ssv/protocol/v2/ssv" - protocoltesting "github.com/ssvlabs/ssv/protocol/v2/testing" + "github.com/ssvlabs/ssv/v2/ibft/storage" + "github.com/ssvlabs/ssv/v2/protocol/v2/qbft" + "github.com/ssvlabs/ssv/v2/protocol/v2/qbft/controller" + "github.com/ssvlabs/ssv/v2/protocol/v2/qbft/roundtimer" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv" + protocoltesting "github.com/ssvlabs/ssv/v2/protocol/v2/testing" ) func RunControllerSpecTest(t *testing.T, test *spectests.ControllerSpecTest) { diff --git a/protocol/v2/qbft/spectest/msg_processing_type.go b/protocol/v2/qbft/spectest/msg_processing_type.go index 496e1825f0..a864bf2629 100644 --- a/protocol/v2/qbft/spectest/msg_processing_type.go +++ b/protocol/v2/qbft/spectest/msg_processing_type.go @@ -18,12 +18,12 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/zap" - "github.com/ssvlabs/ssv/ibft/storage" - "github.com/ssvlabs/ssv/protocol/v2/qbft" - "github.com/ssvlabs/ssv/protocol/v2/qbft/instance" - "github.com/ssvlabs/ssv/protocol/v2/qbft/roundtimer" - "github.com/ssvlabs/ssv/protocol/v2/ssv" - protocoltesting "github.com/ssvlabs/ssv/protocol/v2/testing" + "github.com/ssvlabs/ssv/v2/ibft/storage" + "github.com/ssvlabs/ssv/v2/protocol/v2/qbft" + "github.com/ssvlabs/ssv/v2/protocol/v2/qbft/instance" + "github.com/ssvlabs/ssv/v2/protocol/v2/qbft/roundtimer" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv" + protocoltesting "github.com/ssvlabs/ssv/v2/protocol/v2/testing" ) // RunMsgProcessing processes MsgProcessingSpecTest. It probably may be removed. diff --git a/protocol/v2/qbft/spectest/qbft_mapping_test.go b/protocol/v2/qbft/spectest/qbft_mapping_test.go index 4bf0fa2dfa..94652d4113 100644 --- a/protocol/v2/qbft/spectest/qbft_mapping_test.go +++ b/protocol/v2/qbft/spectest/qbft_mapping_test.go @@ -15,11 +15,11 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/zap" - "github.com/ssvlabs/ssv/ibft/storage" - "github.com/ssvlabs/ssv/protocol/v2/qbft/instance" - "github.com/ssvlabs/ssv/protocol/v2/qbft/roundtimer" - "github.com/ssvlabs/ssv/protocol/v2/ssv" - protocoltesting "github.com/ssvlabs/ssv/protocol/v2/testing" + "github.com/ssvlabs/ssv/v2/ibft/storage" + "github.com/ssvlabs/ssv/v2/protocol/v2/qbft/instance" + "github.com/ssvlabs/ssv/v2/protocol/v2/qbft/roundtimer" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv" + protocoltesting "github.com/ssvlabs/ssv/v2/protocol/v2/testing" ) func TestQBFTMapping(t *testing.T) { diff --git a/protocol/v2/qbft/spectest/timeout_type.go b/protocol/v2/qbft/spectest/timeout_type.go index f792ab0b3b..3fc94b2220 100644 --- a/protocol/v2/qbft/spectest/timeout_type.go +++ b/protocol/v2/qbft/spectest/timeout_type.go @@ -11,9 +11,9 @@ import ( "github.com/ssvlabs/ssv-spec/types/testingutils" "github.com/stretchr/testify/require" - "github.com/ssvlabs/ssv/protocol/v2/qbft/instance" - "github.com/ssvlabs/ssv/protocol/v2/qbft/roundtimer" - protocoltesting "github.com/ssvlabs/ssv/protocol/v2/testing" + "github.com/ssvlabs/ssv/v2/protocol/v2/qbft/instance" + "github.com/ssvlabs/ssv/v2/protocol/v2/qbft/roundtimer" + protocoltesting "github.com/ssvlabs/ssv/v2/protocol/v2/testing" ) type SpecTest struct { diff --git a/protocol/v2/queue/worker/message_worker.go b/protocol/v2/queue/worker/message_worker.go index 86751ee816..1ad8caf588 100644 --- a/protocol/v2/queue/worker/message_worker.go +++ b/protocol/v2/queue/worker/message_worker.go @@ -7,9 +7,9 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/network" - "github.com/ssvlabs/ssv/observability/log/fields" - "github.com/ssvlabs/ssv/protocol/v2/ssv/queue" + "github.com/ssvlabs/ssv/v2/network" + "github.com/ssvlabs/ssv/v2/observability/log/fields" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv/queue" ) // MsgHandler func that receive message.SSVMessage to handle diff --git a/protocol/v2/queue/worker/message_worker_test.go b/protocol/v2/queue/worker/message_worker_test.go index 8a8d367993..4e9a50e757 100644 --- a/protocol/v2/queue/worker/message_worker_test.go +++ b/protocol/v2/queue/worker/message_worker_test.go @@ -14,9 +14,9 @@ import ( "go.uber.org/zap" "go.uber.org/zap/zaptest/observer" - "github.com/ssvlabs/ssv/network" - "github.com/ssvlabs/ssv/observability/log" - "github.com/ssvlabs/ssv/protocol/v2/ssv/queue" + "github.com/ssvlabs/ssv/v2/network" + "github.com/ssvlabs/ssv/v2/observability/log" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv/queue" ) func TestWorker(t *testing.T) { diff --git a/protocol/v2/ssv/partial_sig_container.go b/protocol/v2/ssv/partial_sig_container.go index bcd3002140..d61cd29572 100644 --- a/protocol/v2/ssv/partial_sig_container.go +++ b/protocol/v2/ssv/partial_sig_container.go @@ -11,8 +11,8 @@ import ( "github.com/attestantio/go-eth2-client/spec/phase0" spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/protocol/v2/types" - "github.com/ssvlabs/ssv/utils/threshold" + "github.com/ssvlabs/ssv/v2/protocol/v2/types" + "github.com/ssvlabs/ssv/v2/utils/threshold" ) // PartialSigContainer collects partial signatures during post-consensus. diff --git a/protocol/v2/ssv/queue/message_prioritizer_test.go b/protocol/v2/ssv/queue/message_prioritizer_test.go index db5abab942..97d08ed1e9 100644 --- a/protocol/v2/ssv/queue/message_prioritizer_test.go +++ b/protocol/v2/ssv/queue/message_prioritizer_test.go @@ -16,9 +16,9 @@ import ( "github.com/ssvlabs/ssv-spec/types/testingutils" "github.com/stretchr/testify/require" - "github.com/ssvlabs/ssv/protocol/v2/message" - "github.com/ssvlabs/ssv/protocol/v2/types" - "github.com/ssvlabs/ssv/utils/casts" + "github.com/ssvlabs/ssv/v2/protocol/v2/message" + "github.com/ssvlabs/ssv/v2/protocol/v2/types" + "github.com/ssvlabs/ssv/v2/utils/casts" ) var messagePriorityTests = []struct { diff --git a/protocol/v2/ssv/queue/messages.go b/protocol/v2/ssv/queue/messages.go index 26814cc893..2fceb415ef 100644 --- a/protocol/v2/ssv/queue/messages.go +++ b/protocol/v2/ssv/queue/messages.go @@ -7,8 +7,8 @@ import ( specqbft "github.com/ssvlabs/ssv-spec/qbft" spectypes "github.com/ssvlabs/ssv-spec/types" - ssvmessage "github.com/ssvlabs/ssv/protocol/v2/message" - ssvtypes "github.com/ssvlabs/ssv/protocol/v2/types" + ssvmessage "github.com/ssvlabs/ssv/v2/protocol/v2/message" + ssvtypes "github.com/ssvlabs/ssv/v2/protocol/v2/types" ) var ( diff --git a/protocol/v2/ssv/queue/observability.go b/protocol/v2/ssv/queue/observability.go index d6abf09854..d436382bbe 100644 --- a/protocol/v2/ssv/queue/observability.go +++ b/protocol/v2/ssv/queue/observability.go @@ -8,13 +8,13 @@ import ( "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/metric" - "github.com/ssvlabs/ssv/observability" - "github.com/ssvlabs/ssv/observability/metrics" - "github.com/ssvlabs/ssv/observability/utils" + "github.com/ssvlabs/ssv/v2/observability" + "github.com/ssvlabs/ssv/v2/observability/metrics" + "github.com/ssvlabs/ssv/v2/observability/utils" ) const ( - observabilityName = "github.com/ssvlabs/ssv/protocol/v2/ssv/queue" + observabilityName = "github.com/ssvlabs/ssv/v2/protocol/v2/ssv/queue" observabilityNamespace = "ssv.queue" ) diff --git a/protocol/v2/ssv/queue/queue.go b/protocol/v2/ssv/queue/queue.go index 4bd6e537af..eb05273496 100644 --- a/protocol/v2/ssv/queue/queue.go +++ b/protocol/v2/ssv/queue/queue.go @@ -6,7 +6,7 @@ import ( "go.uber.org/zap" - "github.com/ssvlabs/ssv/observability/log" + "github.com/ssvlabs/ssv/v2/observability/log" ) const ( diff --git a/protocol/v2/ssv/queue/queue_test.go b/protocol/v2/ssv/queue/queue_test.go index 28c38866f2..fcc5dac591 100644 --- a/protocol/v2/ssv/queue/queue_test.go +++ b/protocol/v2/ssv/queue/queue_test.go @@ -18,7 +18,7 @@ import ( specqbft "github.com/ssvlabs/ssv-spec/qbft" spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/observability/log" + "github.com/ssvlabs/ssv/v2/observability/log" ) var mockState = &State{ diff --git a/protocol/v2/ssv/runner/aggregator.go b/protocol/v2/ssv/runner/aggregator.go index 03b9b46599..7ed53dbb4c 100644 --- a/protocol/v2/ssv/runner/aggregator.go +++ b/protocol/v2/ssv/runner/aggregator.go @@ -21,13 +21,12 @@ import ( "go.uber.org/zap" "github.com/ssvlabs/ssv/ssvsigner/ekm" - - "github.com/ssvlabs/ssv/observability" - "github.com/ssvlabs/ssv/observability/log/fields" - "github.com/ssvlabs/ssv/protocol/v2/blockchain/beacon" - "github.com/ssvlabs/ssv/protocol/v2/qbft/controller" - "github.com/ssvlabs/ssv/protocol/v2/ssv" - ssvtypes "github.com/ssvlabs/ssv/protocol/v2/types" + "github.com/ssvlabs/ssv/v2/observability" + "github.com/ssvlabs/ssv/v2/observability/log/fields" + "github.com/ssvlabs/ssv/v2/protocol/v2/blockchain/beacon" + "github.com/ssvlabs/ssv/v2/protocol/v2/qbft/controller" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv" + ssvtypes "github.com/ssvlabs/ssv/v2/protocol/v2/types" ) type AggregatorRunner struct { diff --git a/protocol/v2/ssv/runner/committee.go b/protocol/v2/ssv/runner/committee.go index d588664a24..4fde070d45 100644 --- a/protocol/v2/ssv/runner/committee.go +++ b/protocol/v2/ssv/runner/committee.go @@ -26,13 +26,12 @@ import ( "go.uber.org/zap" "github.com/ssvlabs/ssv/ssvsigner/ekm" - - "github.com/ssvlabs/ssv/observability" - "github.com/ssvlabs/ssv/observability/log/fields" - "github.com/ssvlabs/ssv/protocol/v2/blockchain/beacon" - "github.com/ssvlabs/ssv/protocol/v2/qbft/controller" - "github.com/ssvlabs/ssv/protocol/v2/ssv" - ssvtypes "github.com/ssvlabs/ssv/protocol/v2/types" + "github.com/ssvlabs/ssv/v2/observability" + "github.com/ssvlabs/ssv/v2/observability/log/fields" + "github.com/ssvlabs/ssv/v2/protocol/v2/blockchain/beacon" + "github.com/ssvlabs/ssv/v2/protocol/v2/qbft/controller" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv" + ssvtypes "github.com/ssvlabs/ssv/v2/protocol/v2/types" ) type CommitteeDutyGuard interface { diff --git a/protocol/v2/ssv/runner/committee_test.go b/protocol/v2/ssv/runner/committee_test.go index aac22034c5..d4f5cf0f86 100644 --- a/protocol/v2/ssv/runner/committee_test.go +++ b/protocol/v2/ssv/runner/committee_test.go @@ -17,12 +17,12 @@ import ( "go.uber.org/zap" "go.uber.org/zap/zaptest" - "github.com/ssvlabs/ssv/networkconfig" - "github.com/ssvlabs/ssv/protocol/v2/qbft/controller" - "github.com/ssvlabs/ssv/protocol/v2/qbft/roundtimer" - "github.com/ssvlabs/ssv/protocol/v2/ssv" - protocoltesting "github.com/ssvlabs/ssv/protocol/v2/testing" "github.com/ssvlabs/ssv/ssvsigner/ekm" + "github.com/ssvlabs/ssv/v2/networkconfig" + "github.com/ssvlabs/ssv/v2/protocol/v2/qbft/controller" + "github.com/ssvlabs/ssv/v2/protocol/v2/qbft/roundtimer" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv" + protocoltesting "github.com/ssvlabs/ssv/v2/protocol/v2/testing" ) type guardCall struct { diff --git a/protocol/v2/ssv/runner/observability.go b/protocol/v2/ssv/runner/observability.go index e0d85d26ec..6f3109039e 100644 --- a/protocol/v2/ssv/runner/observability.go +++ b/protocol/v2/ssv/runner/observability.go @@ -12,12 +12,12 @@ import ( "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/metric" - "github.com/ssvlabs/ssv/observability" - "github.com/ssvlabs/ssv/observability/metrics" + "github.com/ssvlabs/ssv/v2/observability" + "github.com/ssvlabs/ssv/v2/observability/metrics" ) const ( - observabilityName = "github.com/ssvlabs/ssv/protocol/v2/ssv/runner" + observabilityName = "github.com/ssvlabs/ssv/v2/protocol/v2/ssv/runner" observabilityNamespace = "ssv.runner" ) diff --git a/protocol/v2/ssv/runner/proposer.go b/protocol/v2/ssv/runner/proposer.go index 06316ea8a6..10aa0e4f36 100644 --- a/protocol/v2/ssv/runner/proposer.go +++ b/protocol/v2/ssv/runner/proposer.go @@ -21,14 +21,13 @@ import ( "go.uber.org/zap" "github.com/ssvlabs/ssv/ssvsigner/ekm" - - "github.com/ssvlabs/ssv/observability" - "github.com/ssvlabs/ssv/observability/log/fields" - "github.com/ssvlabs/ssv/protocol/v2/blockchain/beacon" - blindutil "github.com/ssvlabs/ssv/protocol/v2/blockchain/beacon/blind" - "github.com/ssvlabs/ssv/protocol/v2/qbft/controller" - "github.com/ssvlabs/ssv/protocol/v2/ssv" - ssvtypes "github.com/ssvlabs/ssv/protocol/v2/types" + "github.com/ssvlabs/ssv/v2/observability" + "github.com/ssvlabs/ssv/v2/observability/log/fields" + "github.com/ssvlabs/ssv/v2/protocol/v2/blockchain/beacon" + blindutil "github.com/ssvlabs/ssv/v2/protocol/v2/blockchain/beacon/blind" + "github.com/ssvlabs/ssv/v2/protocol/v2/qbft/controller" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv" + ssvtypes "github.com/ssvlabs/ssv/v2/protocol/v2/types" ) type ProposerRunner struct { diff --git a/protocol/v2/ssv/runner/proposer_test.go b/protocol/v2/ssv/runner/proposer_test.go index 9f766de876..df506712b9 100644 --- a/protocol/v2/ssv/runner/proposer_test.go +++ b/protocol/v2/ssv/runner/proposer_test.go @@ -16,14 +16,14 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/zap" - "github.com/ssvlabs/ssv/networkconfig" - "github.com/ssvlabs/ssv/protocol/v2/blockchain/beacon" - blindutil "github.com/ssvlabs/ssv/protocol/v2/blockchain/beacon/blind" - "github.com/ssvlabs/ssv/protocol/v2/qbft/instance" - "github.com/ssvlabs/ssv/protocol/v2/qbft/roundtimer" - "github.com/ssvlabs/ssv/protocol/v2/ssv" - protocoltesting "github.com/ssvlabs/ssv/protocol/v2/testing" "github.com/ssvlabs/ssv/ssvsigner/ekm" + "github.com/ssvlabs/ssv/v2/networkconfig" + "github.com/ssvlabs/ssv/v2/protocol/v2/blockchain/beacon" + blindutil "github.com/ssvlabs/ssv/v2/protocol/v2/blockchain/beacon/blind" + "github.com/ssvlabs/ssv/v2/protocol/v2/qbft/instance" + "github.com/ssvlabs/ssv/v2/protocol/v2/qbft/roundtimer" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv" + protocoltesting "github.com/ssvlabs/ssv/v2/protocol/v2/testing" ) type proposerTestBeacon struct { diff --git a/protocol/v2/ssv/runner/runner.go b/protocol/v2/ssv/runner/runner.go index 9f910681c7..b3ec4e6127 100644 --- a/protocol/v2/ssv/runner/runner.go +++ b/protocol/v2/ssv/runner/runner.go @@ -17,13 +17,13 @@ import ( "github.com/ssvlabs/ssv/ssvsigner/ekm" - "github.com/ssvlabs/ssv/networkconfig" - "github.com/ssvlabs/ssv/observability/log/fields" - "github.com/ssvlabs/ssv/protocol/v2/blockchain/beacon" - "github.com/ssvlabs/ssv/protocol/v2/qbft/controller" - "github.com/ssvlabs/ssv/protocol/v2/qbft/instance" - "github.com/ssvlabs/ssv/protocol/v2/ssv" - ssvtypes "github.com/ssvlabs/ssv/protocol/v2/types" + "github.com/ssvlabs/ssv/v2/networkconfig" + "github.com/ssvlabs/ssv/v2/observability/log/fields" + "github.com/ssvlabs/ssv/v2/protocol/v2/blockchain/beacon" + "github.com/ssvlabs/ssv/v2/protocol/v2/qbft/controller" + "github.com/ssvlabs/ssv/v2/protocol/v2/qbft/instance" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv" + ssvtypes "github.com/ssvlabs/ssv/v2/protocol/v2/types" ) type Getters interface { diff --git a/protocol/v2/ssv/runner/runner_signatures.go b/protocol/v2/ssv/runner/runner_signatures.go index f0aa8c09bc..58d2d256a1 100644 --- a/protocol/v2/ssv/runner/runner_signatures.go +++ b/protocol/v2/ssv/runner/runner_signatures.go @@ -10,9 +10,9 @@ import ( "github.com/herumi/bls-eth-go-binary/bls" spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/networkconfig" - "github.com/ssvlabs/ssv/protocol/v2/ssv" - ssvtypes "github.com/ssvlabs/ssv/protocol/v2/types" + "github.com/ssvlabs/ssv/v2/networkconfig" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv" + ssvtypes "github.com/ssvlabs/ssv/v2/protocol/v2/types" ) func signBeaconObject( diff --git a/protocol/v2/ssv/runner/runner_state.go b/protocol/v2/ssv/runner/runner_state.go index 41c7383ca9..8b3e3803fb 100644 --- a/protocol/v2/ssv/runner/runner_state.go +++ b/protocol/v2/ssv/runner/runner_state.go @@ -9,8 +9,8 @@ import ( "github.com/attestantio/go-eth2-client/spec/phase0" spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/protocol/v2/qbft/instance" - "github.com/ssvlabs/ssv/protocol/v2/ssv" + "github.com/ssvlabs/ssv/v2/protocol/v2/qbft/instance" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv" ) // State holds all the relevant progress the duty execution progress diff --git a/protocol/v2/ssv/runner/runner_validations.go b/protocol/v2/ssv/runner/runner_validations.go index 5bda011781..99f4bff15a 100644 --- a/protocol/v2/ssv/runner/runner_validations.go +++ b/protocol/v2/ssv/runner/runner_validations.go @@ -12,7 +12,7 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/protocol/v2/ssv" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv" ) func (b *BaseRunner) ValidatePreConsensusMsg( diff --git a/protocol/v2/ssv/runner/sync_committee_contribution.go b/protocol/v2/ssv/runner/sync_committee_contribution.go index 88621f038c..9c33e49d22 100644 --- a/protocol/v2/ssv/runner/sync_committee_contribution.go +++ b/protocol/v2/ssv/runner/sync_committee_contribution.go @@ -18,13 +18,12 @@ import ( "go.uber.org/zap" "github.com/ssvlabs/ssv/ssvsigner/ekm" - - "github.com/ssvlabs/ssv/observability" - "github.com/ssvlabs/ssv/observability/log/fields" - "github.com/ssvlabs/ssv/protocol/v2/blockchain/beacon" - "github.com/ssvlabs/ssv/protocol/v2/qbft/controller" - "github.com/ssvlabs/ssv/protocol/v2/ssv" - ssvtypes "github.com/ssvlabs/ssv/protocol/v2/types" + "github.com/ssvlabs/ssv/v2/observability" + "github.com/ssvlabs/ssv/v2/observability/log/fields" + "github.com/ssvlabs/ssv/v2/protocol/v2/blockchain/beacon" + "github.com/ssvlabs/ssv/v2/protocol/v2/qbft/controller" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv" + ssvtypes "github.com/ssvlabs/ssv/v2/protocol/v2/types" ) type SyncCommitteeAggregatorRunner struct { diff --git a/protocol/v2/ssv/runner/validator_registration.go b/protocol/v2/ssv/runner/validator_registration.go index 5234cff9b3..1375c2f281 100644 --- a/protocol/v2/ssv/runner/validator_registration.go +++ b/protocol/v2/ssv/runner/validator_registration.go @@ -23,12 +23,12 @@ import ( "github.com/ssvlabs/ssv/ssvsigner/ekm" - "github.com/ssvlabs/ssv/networkconfig" - "github.com/ssvlabs/ssv/observability" - "github.com/ssvlabs/ssv/observability/log/fields" - "github.com/ssvlabs/ssv/operator/slotticker" - "github.com/ssvlabs/ssv/protocol/v2/blockchain/beacon" - ssvtypes "github.com/ssvlabs/ssv/protocol/v2/types" + "github.com/ssvlabs/ssv/v2/networkconfig" + "github.com/ssvlabs/ssv/v2/observability" + "github.com/ssvlabs/ssv/v2/observability/log/fields" + "github.com/ssvlabs/ssv/v2/operator/slotticker" + "github.com/ssvlabs/ssv/v2/protocol/v2/blockchain/beacon" + ssvtypes "github.com/ssvlabs/ssv/v2/protocol/v2/types" ) const ( diff --git a/protocol/v2/ssv/runner/voluntary_exit.go b/protocol/v2/ssv/runner/voluntary_exit.go index 15185fc32d..09fda706f3 100644 --- a/protocol/v2/ssv/runner/voluntary_exit.go +++ b/protocol/v2/ssv/runner/voluntary_exit.go @@ -16,11 +16,10 @@ import ( "go.uber.org/zap" "github.com/ssvlabs/ssv/ssvsigner/ekm" - - "github.com/ssvlabs/ssv/observability" - "github.com/ssvlabs/ssv/observability/log/fields" - "github.com/ssvlabs/ssv/protocol/v2/blockchain/beacon" - ssvtypes "github.com/ssvlabs/ssv/protocol/v2/types" + "github.com/ssvlabs/ssv/v2/observability" + "github.com/ssvlabs/ssv/v2/observability/log/fields" + "github.com/ssvlabs/ssv/v2/protocol/v2/blockchain/beacon" + ssvtypes "github.com/ssvlabs/ssv/v2/protocol/v2/types" ) // VoluntaryExitRunner implements validator voluntary exit duty - this duty doesn't diff --git a/protocol/v2/ssv/spectest/committee_msg_processing_type.go b/protocol/v2/ssv/spectest/committee_msg_processing_type.go index 3f521d7ca2..722bdcd9e9 100644 --- a/protocol/v2/ssv/spectest/committee_msg_processing_type.go +++ b/protocol/v2/ssv/spectest/committee_msg_processing_type.go @@ -19,12 +19,12 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/zap" - "github.com/ssvlabs/ssv/ibft/storage" - "github.com/ssvlabs/ssv/networkconfig" - "github.com/ssvlabs/ssv/protocol/v2/ssv/queue" - "github.com/ssvlabs/ssv/protocol/v2/ssv/runner" - "github.com/ssvlabs/ssv/protocol/v2/ssv/validator" - protocoltesting "github.com/ssvlabs/ssv/protocol/v2/testing" + "github.com/ssvlabs/ssv/v2/ibft/storage" + "github.com/ssvlabs/ssv/v2/networkconfig" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv/queue" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv/runner" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv/validator" + protocoltesting "github.com/ssvlabs/ssv/v2/protocol/v2/testing" ) type CommitteeSpecTest struct { diff --git a/protocol/v2/ssv/spectest/msg_processing_type.go b/protocol/v2/ssv/spectest/msg_processing_type.go index 053143c8f1..2094f89163 100644 --- a/protocol/v2/ssv/spectest/msg_processing_type.go +++ b/protocol/v2/ssv/spectest/msg_processing_type.go @@ -19,15 +19,15 @@ import ( "github.com/ssvlabs/ssv/ssvsigner/ekm" - "github.com/ssvlabs/ssv/networkconfig" - "github.com/ssvlabs/ssv/protocol/v2/qbft/controller" - "github.com/ssvlabs/ssv/protocol/v2/qbft/roundtimer" - "github.com/ssvlabs/ssv/protocol/v2/ssv" - "github.com/ssvlabs/ssv/protocol/v2/ssv/queue" - "github.com/ssvlabs/ssv/protocol/v2/ssv/runner" - ssvprotocoltesting "github.com/ssvlabs/ssv/protocol/v2/ssv/testing" - "github.com/ssvlabs/ssv/protocol/v2/ssv/validator" - protocoltesting "github.com/ssvlabs/ssv/protocol/v2/testing" + "github.com/ssvlabs/ssv/v2/networkconfig" + "github.com/ssvlabs/ssv/v2/protocol/v2/qbft/controller" + "github.com/ssvlabs/ssv/v2/protocol/v2/qbft/roundtimer" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv/queue" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv/runner" + ssvprotocoltesting "github.com/ssvlabs/ssv/v2/protocol/v2/ssv/testing" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv/validator" + protocoltesting "github.com/ssvlabs/ssv/v2/protocol/v2/testing" ) type MsgProcessingSpecTest struct { diff --git a/protocol/v2/ssv/spectest/multi_msg_processing_type.go b/protocol/v2/ssv/spectest/multi_msg_processing_type.go index c094bd436e..10a6be938a 100644 --- a/protocol/v2/ssv/spectest/multi_msg_processing_type.go +++ b/protocol/v2/ssv/spectest/multi_msg_processing_type.go @@ -8,7 +8,7 @@ import ( "go.uber.org/zap" - protocoltesting "github.com/ssvlabs/ssv/protocol/v2/testing" + protocoltesting "github.com/ssvlabs/ssv/v2/protocol/v2/testing" ) type MultiMsgProcessingSpecTest struct { diff --git a/protocol/v2/ssv/spectest/multi_start_new_runner_duty_type.go b/protocol/v2/ssv/spectest/multi_start_new_runner_duty_type.go index 36967df94b..83d13fff09 100644 --- a/protocol/v2/ssv/spectest/multi_start_new_runner_duty_type.go +++ b/protocol/v2/ssv/spectest/multi_start_new_runner_duty_type.go @@ -16,10 +16,10 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/zap" - "github.com/ssvlabs/ssv/protocol/v2/qbft/roundtimer" - "github.com/ssvlabs/ssv/protocol/v2/ssv" - "github.com/ssvlabs/ssv/protocol/v2/ssv/runner" - protocoltesting "github.com/ssvlabs/ssv/protocol/v2/testing" + "github.com/ssvlabs/ssv/v2/protocol/v2/qbft/roundtimer" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv/runner" + protocoltesting "github.com/ssvlabs/ssv/v2/protocol/v2/testing" ) type StartNewRunnerDutySpecTest struct { diff --git a/protocol/v2/ssv/spectest/runner_construction_type.go b/protocol/v2/ssv/spectest/runner_construction_type.go index 51b35a8378..a80f9e655f 100644 --- a/protocol/v2/ssv/spectest/runner_construction_type.go +++ b/protocol/v2/ssv/spectest/runner_construction_type.go @@ -7,9 +7,9 @@ import ( "github.com/ssvlabs/ssv-spec/types" "github.com/stretchr/testify/require" - protocoltesting "github.com/ssvlabs/ssv/protocol/v2/testing" + protocoltesting "github.com/ssvlabs/ssv/v2/protocol/v2/testing" - runnertesting "github.com/ssvlabs/ssv/protocol/v2/ssv/testing" + runnertesting "github.com/ssvlabs/ssv/v2/protocol/v2/ssv/testing" ) type RunnerConstructionSpecTest struct { diff --git a/protocol/v2/ssv/spectest/ssv_mapping_test.go b/protocol/v2/ssv/spectest/ssv_mapping_test.go index 6d101b7921..468db54efc 100644 --- a/protocol/v2/ssv/spectest/ssv_mapping_test.go +++ b/protocol/v2/ssv/spectest/ssv_mapping_test.go @@ -23,16 +23,16 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/zap" - "github.com/ssvlabs/ssv/ibft/storage" - "github.com/ssvlabs/ssv/networkconfig" - "github.com/ssvlabs/ssv/protocol/v2/qbft/controller" - "github.com/ssvlabs/ssv/protocol/v2/qbft/instance" - "github.com/ssvlabs/ssv/protocol/v2/qbft/roundtimer" - "github.com/ssvlabs/ssv/protocol/v2/ssv" - "github.com/ssvlabs/ssv/protocol/v2/ssv/runner" - ssvtesting "github.com/ssvlabs/ssv/protocol/v2/ssv/testing" - "github.com/ssvlabs/ssv/protocol/v2/ssv/validator" - protocoltesting "github.com/ssvlabs/ssv/protocol/v2/testing" + "github.com/ssvlabs/ssv/v2/ibft/storage" + "github.com/ssvlabs/ssv/v2/networkconfig" + "github.com/ssvlabs/ssv/v2/protocol/v2/qbft/controller" + "github.com/ssvlabs/ssv/v2/protocol/v2/qbft/instance" + "github.com/ssvlabs/ssv/v2/protocol/v2/qbft/roundtimer" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv/runner" + ssvtesting "github.com/ssvlabs/ssv/v2/protocol/v2/ssv/testing" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv/validator" + protocoltesting "github.com/ssvlabs/ssv/v2/protocol/v2/testing" ) func TestSSVMapping(t *testing.T) { diff --git a/protocol/v2/ssv/spectest/sync_committee_aggregator_proof_type.go b/protocol/v2/ssv/spectest/sync_committee_aggregator_proof_type.go index d693467c04..14397306df 100644 --- a/protocol/v2/ssv/spectest/sync_committee_aggregator_proof_type.go +++ b/protocol/v2/ssv/spectest/sync_committee_aggregator_proof_type.go @@ -13,11 +13,11 @@ import ( typescomparable "github.com/ssvlabs/ssv-spec/types/testingutils/comparable" "github.com/stretchr/testify/require" - "github.com/ssvlabs/ssv/ibft/storage" - "github.com/ssvlabs/ssv/protocol/v2/ssv/queue" - "github.com/ssvlabs/ssv/protocol/v2/ssv/runner" - ssvtesting "github.com/ssvlabs/ssv/protocol/v2/ssv/testing" - protocoltesting "github.com/ssvlabs/ssv/protocol/v2/testing" + "github.com/ssvlabs/ssv/v2/ibft/storage" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv/queue" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv/runner" + ssvtesting "github.com/ssvlabs/ssv/v2/protocol/v2/ssv/testing" + protocoltesting "github.com/ssvlabs/ssv/v2/protocol/v2/testing" ) func RunSyncCommitteeAggProof(t *testing.T, test *synccommitteeaggregator.SyncCommitteeAggregatorProofSpecTest) { diff --git a/protocol/v2/ssv/spectest/util.go b/protocol/v2/ssv/spectest/util.go index a5fbf03da0..c2143f730d 100644 --- a/protocol/v2/ssv/spectest/util.go +++ b/protocol/v2/ssv/spectest/util.go @@ -8,10 +8,10 @@ import ( typescomparable "github.com/ssvlabs/ssv-spec/types/testingutils/comparable" "github.com/stretchr/testify/require" - "github.com/ssvlabs/ssv/ibft/storage" - "github.com/ssvlabs/ssv/networkconfig" - blindutil "github.com/ssvlabs/ssv/protocol/v2/blockchain/beacon/blind" - "github.com/ssvlabs/ssv/protocol/v2/ssv/runner" + "github.com/ssvlabs/ssv/v2/ibft/storage" + "github.com/ssvlabs/ssv/v2/networkconfig" + blindutil "github.com/ssvlabs/ssv/v2/protocol/v2/blockchain/beacon/blind" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv/runner" ) func runnerForTest(t *testing.T, runnerType runner.Runner, name string, testType string) runner.Runner { diff --git a/protocol/v2/ssv/spectest/value_checker.go b/protocol/v2/ssv/spectest/value_checker.go index b11d14bf52..480d98f44b 100644 --- a/protocol/v2/ssv/spectest/value_checker.go +++ b/protocol/v2/ssv/spectest/value_checker.go @@ -15,9 +15,9 @@ import ( "github.com/ssvlabs/ssv/ssvsigner/ekm" - "github.com/ssvlabs/ssv/networkconfig" - "github.com/ssvlabs/ssv/protocol/v2/ssv" - "github.com/ssvlabs/ssv/protocol/v2/ssv/runner" + "github.com/ssvlabs/ssv/v2/networkconfig" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv/runner" ) // ValCheckSpecTest wraps valcheck.SpecTest but uses our implementation's value checkers diff --git a/protocol/v2/ssv/testing/mocks/validator_registration_submitter.go b/protocol/v2/ssv/testing/mocks/validator_registration_submitter.go index 806391ee09..20c47bb0dd 100644 --- a/protocol/v2/ssv/testing/mocks/validator_registration_submitter.go +++ b/protocol/v2/ssv/testing/mocks/validator_registration_submitter.go @@ -5,7 +5,7 @@ import ( "github.com/attestantio/go-eth2-client/api" - "github.com/ssvlabs/ssv/protocol/v2/blockchain/beacon" + "github.com/ssvlabs/ssv/v2/protocol/v2/blockchain/beacon" ) type ValidatorRegistrationSubmitter struct { diff --git a/protocol/v2/ssv/testing/runner.go b/protocol/v2/ssv/testing/runner.go index d2d5e89515..a029f89521 100644 --- a/protocol/v2/ssv/testing/runner.go +++ b/protocol/v2/ssv/testing/runner.go @@ -13,14 +13,14 @@ import ( "github.com/ssvlabs/ssv/ssvsigner/ekm" - "github.com/ssvlabs/ssv/doppelganger" - "github.com/ssvlabs/ssv/networkconfig" - "github.com/ssvlabs/ssv/protocol/v2/qbft/controller" - "github.com/ssvlabs/ssv/protocol/v2/ssv" - "github.com/ssvlabs/ssv/protocol/v2/ssv/runner" - "github.com/ssvlabs/ssv/protocol/v2/ssv/testing/mocks" - "github.com/ssvlabs/ssv/protocol/v2/ssv/validator" - protocoltesting "github.com/ssvlabs/ssv/protocol/v2/testing" + "github.com/ssvlabs/ssv/v2/doppelganger" + "github.com/ssvlabs/ssv/v2/networkconfig" + "github.com/ssvlabs/ssv/v2/protocol/v2/qbft/controller" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv/runner" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv/testing/mocks" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv/validator" + protocoltesting "github.com/ssvlabs/ssv/v2/protocol/v2/testing" ) var TestingHighestDecidedSlot = phase0.Slot(0) diff --git a/protocol/v2/ssv/testing/storage.go b/protocol/v2/ssv/testing/storage.go index d4218e0a2c..5a5c0b0cb8 100644 --- a/protocol/v2/ssv/testing/storage.go +++ b/protocol/v2/ssv/testing/storage.go @@ -8,9 +8,9 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" - qbftstorage "github.com/ssvlabs/ssv/ibft/storage" - kv "github.com/ssvlabs/ssv/storage/badger" - "github.com/ssvlabs/ssv/storage/basedb" + qbftstorage "github.com/ssvlabs/ssv/v2/ibft/storage" + kv "github.com/ssvlabs/ssv/v2/storage/badger" + "github.com/ssvlabs/ssv/v2/storage/basedb" ) var db basedb.Database diff --git a/protocol/v2/ssv/testing/validator.go b/protocol/v2/ssv/testing/validator.go index b39288ee0f..c70485e4bd 100644 --- a/protocol/v2/ssv/testing/validator.go +++ b/protocol/v2/ssv/testing/validator.go @@ -9,11 +9,11 @@ import ( "github.com/ssvlabs/ssv/ssvsigner/ekm" - "github.com/ssvlabs/ssv/networkconfig" - "github.com/ssvlabs/ssv/protocol/v2/ssv/runner" - "github.com/ssvlabs/ssv/protocol/v2/ssv/validator" - "github.com/ssvlabs/ssv/protocol/v2/testing" - "github.com/ssvlabs/ssv/protocol/v2/types" + "github.com/ssvlabs/ssv/v2/networkconfig" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv/runner" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv/validator" + "github.com/ssvlabs/ssv/v2/protocol/v2/testing" + "github.com/ssvlabs/ssv/v2/protocol/v2/types" ) var BaseValidator = func(logger *zap.Logger, keySet *spectestingutils.TestKeySet) *validator.Validator { diff --git a/protocol/v2/ssv/validator/committee.go b/protocol/v2/ssv/validator/committee.go index 81d8ee4cad..80180b85bc 100644 --- a/protocol/v2/ssv/validator/committee.go +++ b/protocol/v2/ssv/validator/committee.go @@ -15,15 +15,15 @@ import ( "go.opentelemetry.io/otel/trace" "go.uber.org/zap" - "github.com/ssvlabs/ssv/networkconfig" - "github.com/ssvlabs/ssv/observability" - "github.com/ssvlabs/ssv/observability/log" - "github.com/ssvlabs/ssv/observability/log/fields" - "github.com/ssvlabs/ssv/observability/traces" - "github.com/ssvlabs/ssv/protocol/v2/message" - "github.com/ssvlabs/ssv/protocol/v2/ssv/queue" - "github.com/ssvlabs/ssv/protocol/v2/ssv/runner" - "github.com/ssvlabs/ssv/protocol/v2/types" + "github.com/ssvlabs/ssv/v2/networkconfig" + "github.com/ssvlabs/ssv/v2/observability" + "github.com/ssvlabs/ssv/v2/observability/log" + "github.com/ssvlabs/ssv/v2/observability/log/fields" + "github.com/ssvlabs/ssv/v2/observability/traces" + "github.com/ssvlabs/ssv/v2/protocol/v2/message" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv/queue" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv/runner" + "github.com/ssvlabs/ssv/v2/protocol/v2/types" ) type CommitteeRunnerFunc func(slot phase0.Slot, shares map[phase0.ValidatorIndex]*spectypes.Share, attestingValidators []phase0.BLSPubKey, dutyGuard runner.CommitteeDutyGuard) (*runner.CommitteeRunner, error) diff --git a/protocol/v2/ssv/validator/committee_observer.go b/protocol/v2/ssv/validator/committee_observer.go index 6d52957d7f..4d6cdf22b2 100644 --- a/protocol/v2/ssv/validator/committee_observer.go +++ b/protocol/v2/ssv/validator/committee_observer.go @@ -17,15 +17,15 @@ import ( specqbft "github.com/ssvlabs/ssv-spec/qbft" spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/ibft/storage" - "github.com/ssvlabs/ssv/message/validation" - "github.com/ssvlabs/ssv/networkconfig" - "github.com/ssvlabs/ssv/observability/log/fields" - qbftcontroller "github.com/ssvlabs/ssv/protocol/v2/qbft/controller" - "github.com/ssvlabs/ssv/protocol/v2/ssv" - "github.com/ssvlabs/ssv/protocol/v2/ssv/queue" - ssvtypes "github.com/ssvlabs/ssv/protocol/v2/types" - registrystorage "github.com/ssvlabs/ssv/registry/storage" + "github.com/ssvlabs/ssv/v2/ibft/storage" + "github.com/ssvlabs/ssv/v2/message/validation" + "github.com/ssvlabs/ssv/v2/networkconfig" + "github.com/ssvlabs/ssv/v2/observability/log/fields" + qbftcontroller "github.com/ssvlabs/ssv/v2/protocol/v2/qbft/controller" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv/queue" + ssvtypes "github.com/ssvlabs/ssv/v2/protocol/v2/types" + registrystorage "github.com/ssvlabs/ssv/v2/registry/storage" ) type CommitteeObserver struct { diff --git a/protocol/v2/ssv/validator/committee_observer_test.go b/protocol/v2/ssv/validator/committee_observer_test.go index bff005d6b7..92851f8018 100644 --- a/protocol/v2/ssv/validator/committee_observer_test.go +++ b/protocol/v2/ssv/validator/committee_observer_test.go @@ -12,8 +12,8 @@ import ( "go.uber.org/zap" "go.uber.org/zap/zaptest/observer" - "github.com/ssvlabs/ssv/protocol/v2/ssv" - registrystoragemocks "github.com/ssvlabs/ssv/registry/storage/mocks" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv" + registrystoragemocks "github.com/ssvlabs/ssv/v2/registry/storage/mocks" ) func TestCommitteeObserver_VerifySig_MissingValidatorLogsContext(t *testing.T) { diff --git a/protocol/v2/ssv/validator/committee_queue.go b/protocol/v2/ssv/validator/committee_queue.go index 72342bd5ae..49980877a5 100644 --- a/protocol/v2/ssv/validator/committee_queue.go +++ b/protocol/v2/ssv/validator/committee_queue.go @@ -15,13 +15,13 @@ import ( "go.opentelemetry.io/otel/trace" "go.uber.org/zap" - "github.com/ssvlabs/ssv/observability" - "github.com/ssvlabs/ssv/observability/log/fields" - "github.com/ssvlabs/ssv/observability/traces" - "github.com/ssvlabs/ssv/protocol/v2/message" - "github.com/ssvlabs/ssv/protocol/v2/ssv/queue" - "github.com/ssvlabs/ssv/protocol/v2/ssv/runner" - "github.com/ssvlabs/ssv/protocol/v2/types" + "github.com/ssvlabs/ssv/v2/observability" + "github.com/ssvlabs/ssv/v2/observability/log/fields" + "github.com/ssvlabs/ssv/v2/observability/traces" + "github.com/ssvlabs/ssv/v2/protocol/v2/message" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv/queue" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv/runner" + "github.com/ssvlabs/ssv/v2/protocol/v2/types" ) // EnqueueMessage enqueues a spectypes.SSVMessage for processing. diff --git a/protocol/v2/ssv/validator/committee_queue_test.go b/protocol/v2/ssv/validator/committee_queue_test.go index 415e063d11..b75235a248 100644 --- a/protocol/v2/ssv/validator/committee_queue_test.go +++ b/protocol/v2/ssv/validator/committee_queue_test.go @@ -19,14 +19,14 @@ import ( "go.uber.org/mock/gomock" "go.uber.org/zap" - "github.com/ssvlabs/ssv/networkconfig" - "github.com/ssvlabs/ssv/observability/log" - "github.com/ssvlabs/ssv/protocol/v2/message" - "github.com/ssvlabs/ssv/protocol/v2/qbft/controller" - "github.com/ssvlabs/ssv/protocol/v2/qbft/instance" - "github.com/ssvlabs/ssv/protocol/v2/ssv/queue" - "github.com/ssvlabs/ssv/protocol/v2/ssv/runner" - "github.com/ssvlabs/ssv/protocol/v2/types" + "github.com/ssvlabs/ssv/v2/networkconfig" + "github.com/ssvlabs/ssv/v2/observability/log" + "github.com/ssvlabs/ssv/v2/protocol/v2/message" + "github.com/ssvlabs/ssv/v2/protocol/v2/qbft/controller" + "github.com/ssvlabs/ssv/v2/protocol/v2/qbft/instance" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv/queue" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv/runner" + "github.com/ssvlabs/ssv/v2/protocol/v2/types" ) // makeTestSSVMessage creates a test SignedSSVMessage for testing queue handling. diff --git a/protocol/v2/ssv/validator/domain_cache.go b/protocol/v2/ssv/validator/domain_cache.go index 0210dc0e64..553d906305 100644 --- a/protocol/v2/ssv/validator/domain_cache.go +++ b/protocol/v2/ssv/validator/domain_cache.go @@ -7,7 +7,7 @@ import ( "github.com/attestantio/go-eth2-client/spec/phase0" "github.com/jellydator/ttlcache/v3" - "github.com/ssvlabs/ssv/protocol/v2/blockchain/beacon" + "github.com/ssvlabs/ssv/v2/protocol/v2/blockchain/beacon" ) type DomainCache struct { diff --git a/protocol/v2/ssv/validator/duty_executor.go b/protocol/v2/ssv/validator/duty_executor.go index 84494d8ac3..6ad7503096 100644 --- a/protocol/v2/ssv/validator/duty_executor.go +++ b/protocol/v2/ssv/validator/duty_executor.go @@ -11,11 +11,11 @@ import ( "go.opentelemetry.io/otel/trace" "go.uber.org/zap" - "github.com/ssvlabs/ssv/observability" - "github.com/ssvlabs/ssv/observability/traces" - "github.com/ssvlabs/ssv/protocol/v2/message" - "github.com/ssvlabs/ssv/protocol/v2/ssv/queue" - "github.com/ssvlabs/ssv/protocol/v2/types" + "github.com/ssvlabs/ssv/v2/observability" + "github.com/ssvlabs/ssv/v2/observability/traces" + "github.com/ssvlabs/ssv/v2/protocol/v2/message" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv/queue" + "github.com/ssvlabs/ssv/v2/protocol/v2/types" ) func (v *Validator) ExecuteDuty(ctx context.Context, logger *zap.Logger, duty *spectypes.ValidatorDuty) error { diff --git a/protocol/v2/ssv/validator/msg_queue.go b/protocol/v2/ssv/validator/msg_queue.go index 9fcdd80679..fd61684536 100644 --- a/protocol/v2/ssv/validator/msg_queue.go +++ b/protocol/v2/ssv/validator/msg_queue.go @@ -12,10 +12,10 @@ import ( "go.opentelemetry.io/otel/trace" "go.uber.org/zap" - "github.com/ssvlabs/ssv/observability/log/fields" - "github.com/ssvlabs/ssv/protocol/v2/message" - "github.com/ssvlabs/ssv/protocol/v2/ssv/queue" - ssvtypes "github.com/ssvlabs/ssv/protocol/v2/types" + "github.com/ssvlabs/ssv/v2/observability/log/fields" + "github.com/ssvlabs/ssv/v2/protocol/v2/message" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv/queue" + ssvtypes "github.com/ssvlabs/ssv/v2/protocol/v2/types" ) // MessageHandler process the provided message. Message processing can fail with retryable or diff --git a/protocol/v2/ssv/validator/msg_queue_test.go b/protocol/v2/ssv/validator/msg_queue_test.go index 64f90bdeef..5756e61c11 100644 --- a/protocol/v2/ssv/validator/msg_queue_test.go +++ b/protocol/v2/ssv/validator/msg_queue_test.go @@ -11,9 +11,9 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" "github.com/stretchr/testify/require" - "github.com/ssvlabs/ssv/protocol/v2/message" - "github.com/ssvlabs/ssv/protocol/v2/ssv/queue" - ssvtypes "github.com/ssvlabs/ssv/protocol/v2/types" + "github.com/ssvlabs/ssv/v2/protocol/v2/message" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv/queue" + ssvtypes "github.com/ssvlabs/ssv/v2/protocol/v2/types" ) func TestMKey_Format(t *testing.T) { diff --git a/protocol/v2/ssv/validator/observability.go b/protocol/v2/ssv/validator/observability.go index f9f3c50230..61b0636cd4 100644 --- a/protocol/v2/ssv/validator/observability.go +++ b/protocol/v2/ssv/validator/observability.go @@ -5,7 +5,7 @@ import ( ) const ( - observabilityName = "github.com/ssvlabs/ssv/protocol/v2/ssv/validator" + observabilityName = "github.com/ssvlabs/ssv/v2/protocol/v2/ssv/validator" observabilityNamespace = "ssv.validator" ) diff --git a/protocol/v2/ssv/validator/opts.go b/protocol/v2/ssv/validator/opts.go index aebab5b7d9..afbdc0eb62 100644 --- a/protocol/v2/ssv/validator/opts.go +++ b/protocol/v2/ssv/validator/opts.go @@ -8,14 +8,14 @@ import ( "github.com/ssvlabs/ssv/ssvsigner/ekm" - "github.com/ssvlabs/ssv/exporter" - "github.com/ssvlabs/ssv/ibft/storage" - "github.com/ssvlabs/ssv/message/validation" - "github.com/ssvlabs/ssv/networkconfig" - "github.com/ssvlabs/ssv/protocol/v2/blockchain/beacon" - qbftctrl "github.com/ssvlabs/ssv/protocol/v2/qbft/controller" - "github.com/ssvlabs/ssv/protocol/v2/ssv/runner" - ssvtypes "github.com/ssvlabs/ssv/protocol/v2/types" + "github.com/ssvlabs/ssv/v2/exporter" + "github.com/ssvlabs/ssv/v2/ibft/storage" + "github.com/ssvlabs/ssv/v2/message/validation" + "github.com/ssvlabs/ssv/v2/networkconfig" + "github.com/ssvlabs/ssv/v2/protocol/v2/blockchain/beacon" + qbftctrl "github.com/ssvlabs/ssv/v2/protocol/v2/qbft/controller" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv/runner" + ssvtypes "github.com/ssvlabs/ssv/v2/protocol/v2/types" ) // defaultValidatorQueueSize is the default capacity of the per-validator-per-role diff --git a/protocol/v2/ssv/validator/queue_validator.go b/protocol/v2/ssv/validator/queue_validator.go index 3e35765a4c..b1f79bc61d 100644 --- a/protocol/v2/ssv/validator/queue_validator.go +++ b/protocol/v2/ssv/validator/queue_validator.go @@ -14,13 +14,13 @@ import ( "go.opentelemetry.io/otel/trace" "go.uber.org/zap" - "github.com/ssvlabs/ssv/observability" - "github.com/ssvlabs/ssv/observability/log/fields" - "github.com/ssvlabs/ssv/observability/traces" - "github.com/ssvlabs/ssv/protocol/v2/message" - "github.com/ssvlabs/ssv/protocol/v2/ssv/queue" - "github.com/ssvlabs/ssv/protocol/v2/ssv/runner" - "github.com/ssvlabs/ssv/protocol/v2/types" + "github.com/ssvlabs/ssv/v2/observability" + "github.com/ssvlabs/ssv/v2/observability/log/fields" + "github.com/ssvlabs/ssv/v2/observability/traces" + "github.com/ssvlabs/ssv/v2/protocol/v2/message" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv/queue" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv/runner" + "github.com/ssvlabs/ssv/v2/protocol/v2/types" ) // EnqueueMessage enqueues a spectypes.SSVMessage for processing. diff --git a/protocol/v2/ssv/validator/timer.go b/protocol/v2/ssv/validator/timer.go index 81014e301d..322077825d 100644 --- a/protocol/v2/ssv/validator/timer.go +++ b/protocol/v2/ssv/validator/timer.go @@ -10,12 +10,12 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" "go.uber.org/zap" - "github.com/ssvlabs/ssv/observability/log/fields" - "github.com/ssvlabs/ssv/protocol/v2/message" - "github.com/ssvlabs/ssv/protocol/v2/qbft/roundtimer" - "github.com/ssvlabs/ssv/protocol/v2/ssv" - "github.com/ssvlabs/ssv/protocol/v2/ssv/queue" - "github.com/ssvlabs/ssv/protocol/v2/types" + "github.com/ssvlabs/ssv/v2/observability/log/fields" + "github.com/ssvlabs/ssv/v2/protocol/v2/message" + "github.com/ssvlabs/ssv/v2/protocol/v2/qbft/roundtimer" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv/queue" + "github.com/ssvlabs/ssv/v2/protocol/v2/types" ) // newQBFTRoundTimerF returns a QBFTRoundTimerF that builds a RoundTimer for a QBFT instance and wires diff --git a/protocol/v2/ssv/validator/validator.go b/protocol/v2/ssv/validator/validator.go index 420fa1ff3f..92aeb2e355 100644 --- a/protocol/v2/ssv/validator/validator.go +++ b/protocol/v2/ssv/validator/validator.go @@ -13,16 +13,16 @@ import ( "github.com/ssvlabs/ssv/ssvsigner/ekm" - "github.com/ssvlabs/ssv/message/validation" - "github.com/ssvlabs/ssv/networkconfig" - "github.com/ssvlabs/ssv/observability" - "github.com/ssvlabs/ssv/observability/log" - "github.com/ssvlabs/ssv/observability/log/fields" - "github.com/ssvlabs/ssv/observability/traces" - "github.com/ssvlabs/ssv/protocol/v2/message" - "github.com/ssvlabs/ssv/protocol/v2/ssv/queue" - "github.com/ssvlabs/ssv/protocol/v2/ssv/runner" - ssvtypes "github.com/ssvlabs/ssv/protocol/v2/types" + "github.com/ssvlabs/ssv/v2/message/validation" + "github.com/ssvlabs/ssv/v2/networkconfig" + "github.com/ssvlabs/ssv/v2/observability" + "github.com/ssvlabs/ssv/v2/observability/log" + "github.com/ssvlabs/ssv/v2/observability/log/fields" + "github.com/ssvlabs/ssv/v2/observability/traces" + "github.com/ssvlabs/ssv/v2/protocol/v2/message" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv/queue" + "github.com/ssvlabs/ssv/v2/protocol/v2/ssv/runner" + ssvtypes "github.com/ssvlabs/ssv/v2/protocol/v2/types" ) // Validator represents an SSV ETH consensus validator Share assigned, coordinates duty execution and more. diff --git a/protocol/v2/ssv/value_check.go b/protocol/v2/ssv/value_check.go index 55cedfd579..a88cc41715 100644 --- a/protocol/v2/ssv/value_check.go +++ b/protocol/v2/ssv/value_check.go @@ -10,7 +10,7 @@ import ( "github.com/ssvlabs/ssv/ssvsigner/ekm" - "github.com/ssvlabs/ssv/networkconfig" + "github.com/ssvlabs/ssv/v2/networkconfig" ) type ValueChecker interface { diff --git a/protocol/v2/testing/logger.go b/protocol/v2/testing/logger.go index bb5ff7caa3..977cc78e3d 100644 --- a/protocol/v2/testing/logger.go +++ b/protocol/v2/testing/logger.go @@ -8,7 +8,7 @@ import ( "go.uber.org/zap" "go.uber.org/zap/zapcore" - "github.com/ssvlabs/ssv/observability/log" + "github.com/ssvlabs/ssv/v2/observability/log" ) const specTestLogLevelEnv = "SSV_SPECTEST_LOG_LEVEL" diff --git a/protocol/v2/testing/temp_testing_beacon_network.go b/protocol/v2/testing/temp_testing_beacon_network.go index 12361287bd..2c19a28438 100644 --- a/protocol/v2/testing/temp_testing_beacon_network.go +++ b/protocol/v2/testing/temp_testing_beacon_network.go @@ -12,7 +12,7 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" spectestingutils "github.com/ssvlabs/ssv-spec/types/testingutils" - "github.com/ssvlabs/ssv/protocol/v2/blockchain/beacon" + "github.com/ssvlabs/ssv/v2/protocol/v2/blockchain/beacon" ) type BeaconNodeWrapped struct { diff --git a/protocol/v2/testing/utils.go b/protocol/v2/testing/utils.go index c425bfa65e..0266eacf79 100644 --- a/protocol/v2/testing/utils.go +++ b/protocol/v2/testing/utils.go @@ -10,8 +10,8 @@ import ( "github.com/ssvlabs/ssv/ssvsigner/ekm" - "github.com/ssvlabs/ssv/protocol/v2/qbft" - "github.com/ssvlabs/ssv/protocol/v2/qbft/controller" + "github.com/ssvlabs/ssv/v2/protocol/v2/qbft" + "github.com/ssvlabs/ssv/v2/protocol/v2/qbft/controller" ) type TestingValueChecker struct{} diff --git a/protocol/v2/types/ssvshare.go b/protocol/v2/types/ssvshare.go index b286b729c1..337a8545f4 100644 --- a/protocol/v2/types/ssvshare.go +++ b/protocol/v2/types/ssvshare.go @@ -14,8 +14,8 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/networkconfig" - "github.com/ssvlabs/ssv/protocol/v2/blockchain/beacon" + "github.com/ssvlabs/ssv/v2/networkconfig" + "github.com/ssvlabs/ssv/v2/protocol/v2/blockchain/beacon" ) const ( diff --git a/protocol/v2/types/ssvshare_test.go b/protocol/v2/types/ssvshare_test.go index 2497e00e12..3f1dd75ab2 100644 --- a/protocol/v2/types/ssvshare_test.go +++ b/protocol/v2/types/ssvshare_test.go @@ -11,7 +11,7 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/networkconfig" + "github.com/ssvlabs/ssv/v2/networkconfig" ) func TestSSVShare_BelongsToOperator(t *testing.T) { diff --git a/registry/storage/mocks/operators.go b/registry/storage/mocks/operators.go index 69b5a8811d..a2ee97daa6 100644 --- a/registry/storage/mocks/operators.go +++ b/registry/storage/mocks/operators.go @@ -13,8 +13,8 @@ import ( reflect "reflect" types "github.com/ssvlabs/ssv-spec/types" - storage "github.com/ssvlabs/ssv/registry/storage" - basedb "github.com/ssvlabs/ssv/storage/basedb" + storage "github.com/ssvlabs/ssv/v2/registry/storage" + basedb "github.com/ssvlabs/ssv/v2/storage/basedb" gomock "go.uber.org/mock/gomock" ) diff --git a/registry/storage/mocks/validatorstore.go b/registry/storage/mocks/validatorstore.go index 7a7c1c9090..ee2742710a 100644 --- a/registry/storage/mocks/validatorstore.go +++ b/registry/storage/mocks/validatorstore.go @@ -15,8 +15,8 @@ import ( bellatrix "github.com/attestantio/go-eth2-client/spec/bellatrix" phase0 "github.com/attestantio/go-eth2-client/spec/phase0" types "github.com/ssvlabs/ssv-spec/types" - types0 "github.com/ssvlabs/ssv/protocol/v2/types" - storage "github.com/ssvlabs/ssv/registry/storage" + types0 "github.com/ssvlabs/ssv/v2/protocol/v2/types" + storage "github.com/ssvlabs/ssv/v2/registry/storage" gomock "go.uber.org/mock/gomock" ) diff --git a/registry/storage/operators.go b/registry/storage/operators.go index 36829032d3..b2582e1ad8 100644 --- a/registry/storage/operators.go +++ b/registry/storage/operators.go @@ -12,8 +12,8 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/observability/log/fields" - "github.com/ssvlabs/ssv/storage/basedb" + "github.com/ssvlabs/ssv/v2/observability/log/fields" + "github.com/ssvlabs/ssv/v2/storage/basedb" ) //go:generate go tool -modfile=../../tool.mod mockgen -package=mocks -destination=./mocks/operators.go -source=./operators.go diff --git a/registry/storage/operators_test.go b/registry/storage/operators_test.go index 68e2fd0f83..05445b6911 100644 --- a/registry/storage/operators_test.go +++ b/registry/storage/operators_test.go @@ -12,10 +12,10 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/observability/log" - "github.com/ssvlabs/ssv/registry/storage" - kv "github.com/ssvlabs/ssv/storage/badger" - "github.com/ssvlabs/ssv/storage/basedb" + "github.com/ssvlabs/ssv/v2/observability/log" + "github.com/ssvlabs/ssv/v2/registry/storage" + kv "github.com/ssvlabs/ssv/v2/storage/badger" + "github.com/ssvlabs/ssv/v2/storage/basedb" ) func TestStorage_SaveAndGetOperatorData(t *testing.T) { diff --git a/registry/storage/recipients.go b/registry/storage/recipients.go index 7e50ed1ca5..eace8bbdfa 100644 --- a/registry/storage/recipients.go +++ b/registry/storage/recipients.go @@ -10,7 +10,7 @@ import ( "github.com/ethereum/go-ethereum/common" "go.uber.org/zap" - "github.com/ssvlabs/ssv/storage/basedb" + "github.com/ssvlabs/ssv/v2/storage/basedb" ) //go:generate go tool -modfile=../../tool.mod mockgen -package=mocks -destination=./mocks/recipients.go -source=./recipients.go diff --git a/registry/storage/recipients_test.go b/registry/storage/recipients_test.go index f58a133402..1770607350 100644 --- a/registry/storage/recipients_test.go +++ b/registry/storage/recipients_test.go @@ -9,10 +9,10 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/zap" - "github.com/ssvlabs/ssv/observability/log" - "github.com/ssvlabs/ssv/registry/storage" - kv "github.com/ssvlabs/ssv/storage/badger" - "github.com/ssvlabs/ssv/storage/basedb" + "github.com/ssvlabs/ssv/v2/observability/log" + "github.com/ssvlabs/ssv/v2/registry/storage" + kv "github.com/ssvlabs/ssv/v2/storage/badger" + "github.com/ssvlabs/ssv/v2/storage/basedb" ) func TestStorage_DropRecipients(t *testing.T) { diff --git a/registry/storage/shares.go b/registry/storage/shares.go index 278860baef..b6fe5c8ac0 100644 --- a/registry/storage/shares.go +++ b/registry/storage/shares.go @@ -18,10 +18,10 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/networkconfig" - "github.com/ssvlabs/ssv/protocol/v2/blockchain/beacon" - "github.com/ssvlabs/ssv/protocol/v2/types" - "github.com/ssvlabs/ssv/storage/basedb" + "github.com/ssvlabs/ssv/v2/networkconfig" + "github.com/ssvlabs/ssv/v2/protocol/v2/blockchain/beacon" + "github.com/ssvlabs/ssv/v2/protocol/v2/types" + "github.com/ssvlabs/ssv/v2/storage/basedb" ) //go:generate go tool -modfile=../../tool.mod sszgen -path ./shares.go --objs Share diff --git a/registry/storage/shares_test.go b/registry/storage/shares_test.go index 16cc76f388..dd53445c09 100644 --- a/registry/storage/shares_test.go +++ b/registry/storage/shares_test.go @@ -27,14 +27,14 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/beacon/goclient" - "github.com/ssvlabs/ssv/networkconfig" - "github.com/ssvlabs/ssv/observability/log" - beaconprotocol "github.com/ssvlabs/ssv/protocol/v2/blockchain/beacon" - ssvtypes "github.com/ssvlabs/ssv/protocol/v2/types" - kv "github.com/ssvlabs/ssv/storage/badger" - "github.com/ssvlabs/ssv/storage/basedb" - "github.com/ssvlabs/ssv/utils/threshold" + "github.com/ssvlabs/ssv/v2/beacon/goclient" + "github.com/ssvlabs/ssv/v2/networkconfig" + "github.com/ssvlabs/ssv/v2/observability/log" + beaconprotocol "github.com/ssvlabs/ssv/v2/protocol/v2/blockchain/beacon" + ssvtypes "github.com/ssvlabs/ssv/v2/protocol/v2/types" + kv "github.com/ssvlabs/ssv/v2/storage/badger" + "github.com/ssvlabs/ssv/v2/storage/basedb" + "github.com/ssvlabs/ssv/v2/utils/threshold" ) func init() { diff --git a/registry/storage/validatorstore.go b/registry/storage/validatorstore.go index 4d7a0e4988..9c1387113b 100644 --- a/registry/storage/validatorstore.go +++ b/registry/storage/validatorstore.go @@ -13,8 +13,8 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/networkconfig" - "github.com/ssvlabs/ssv/protocol/v2/types" + "github.com/ssvlabs/ssv/v2/networkconfig" + "github.com/ssvlabs/ssv/v2/protocol/v2/types" ) //go:generate go tool -modfile=../../tool.mod mockgen -package=mocks -destination=./mocks/validatorstore.go -source=./validatorstore.go diff --git a/registry/storage/validatorstore_test.go b/registry/storage/validatorstore_test.go index 7fb062372d..fdfc378c17 100644 --- a/registry/storage/validatorstore_test.go +++ b/registry/storage/validatorstore_test.go @@ -23,9 +23,9 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/beacon/goclient" - "github.com/ssvlabs/ssv/networkconfig" - ssvtypes "github.com/ssvlabs/ssv/protocol/v2/types" + "github.com/ssvlabs/ssv/v2/beacon/goclient" + "github.com/ssvlabs/ssv/v2/networkconfig" + ssvtypes "github.com/ssvlabs/ssv/v2/protocol/v2/types" ) var share1 = &ssvtypes.SSVShare{ diff --git a/scripts/ssvsigner_boundary.sh b/scripts/ssvsigner_boundary.sh index 8e63cb12f7..00ac45e8e5 100755 --- a/scripts/ssvsigner_boundary.sh +++ b/scripts/ssvsigner_boundary.sh @@ -12,7 +12,7 @@ ALL_IMPORTS="$( OUT="$( printf '%s\n' "$ALL_IMPORTS" \ | sort -u \ - | grep '^github.com/ssvlabs/ssv/' \ + | grep -E '^github.com/ssvlabs/ssv($|/)' \ | grep -Ev '^github.com/ssvlabs/ssv/ssvsigner($|/)' || true )" diff --git a/ssvsigner/go.mod b/ssvsigner/go.mod index 8ab6c448fd..2e6f49e3b3 100644 --- a/ssvsigner/go.mod +++ b/ssvsigner/go.mod @@ -31,6 +31,7 @@ require ( github.com/sourcegraph/conc v0.3.0 github.com/ssvlabs/eth2-key-manager v1.5.6 github.com/ssvlabs/ssv-spec v1.2.2 + github.com/ssvlabs/ssv/v2 v2.4.1-0.20260410160750-6c2315b84627 github.com/stretchr/testify v1.11.1 github.com/testcontainers/testcontainers-go v0.37.0 github.com/valyala/fasthttp v1.58.0 @@ -118,3 +119,4 @@ require ( gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) +replace github.com/ssvlabs/ssv/v2 => ../ diff --git a/storage/badger/badger.go b/storage/badger/badger.go index 8b8874afa9..943759f6ed 100644 --- a/storage/badger/badger.go +++ b/storage/badger/badger.go @@ -11,9 +11,9 @@ import ( "github.com/dgraph-io/badger/v4" "go.uber.org/zap" - "github.com/ssvlabs/ssv/observability/log" - "github.com/ssvlabs/ssv/observability/log/fields" - "github.com/ssvlabs/ssv/storage/basedb" + "github.com/ssvlabs/ssv/v2/observability/log" + "github.com/ssvlabs/ssv/v2/observability/log/fields" + "github.com/ssvlabs/ssv/v2/storage/basedb" ) // DB struct diff --git a/storage/badger/badger_test.go b/storage/badger/badger_test.go index 57a43e8fc2..e8ae5dce3b 100644 --- a/storage/badger/badger_test.go +++ b/storage/badger/badger_test.go @@ -16,8 +16,8 @@ import ( "go.uber.org/zap" "go.uber.org/zap/zaptest/observer" - "github.com/ssvlabs/ssv/observability/log" - "github.com/ssvlabs/ssv/storage/basedb" + "github.com/ssvlabs/ssv/v2/observability/log" + "github.com/ssvlabs/ssv/v2/storage/basedb" ) // setupDB creates a BadgerDB instance for testing with given options and handles cleanup. diff --git a/storage/badger/gc_test.go b/storage/badger/gc_test.go index d477cec9e0..b706316631 100644 --- a/storage/badger/gc_test.go +++ b/storage/badger/gc_test.go @@ -12,8 +12,8 @@ import ( "go.uber.org/zap/zapcore" "go.uber.org/zap/zaptest/observer" - "github.com/ssvlabs/ssv/observability/log" - "github.com/ssvlabs/ssv/storage/basedb" + "github.com/ssvlabs/ssv/v2/observability/log" + "github.com/ssvlabs/ssv/v2/storage/basedb" ) // TestQuickGC_EmptyDB verifies that QuickGC succeeds on an empty database. diff --git a/storage/badger/logger.go b/storage/badger/logger.go index 70770af79f..28831a7ea6 100644 --- a/storage/badger/logger.go +++ b/storage/badger/logger.go @@ -6,7 +6,7 @@ import ( "github.com/dgraph-io/badger/v4" "go.uber.org/zap" - "github.com/ssvlabs/ssv/observability/log" + "github.com/ssvlabs/ssv/v2/observability/log" ) // badgerLogger is a wrapper for badger.Logger diff --git a/storage/badger/logger_test.go b/storage/badger/logger_test.go index 1ed7f33615..e1759e01f5 100644 --- a/storage/badger/logger_test.go +++ b/storage/badger/logger_test.go @@ -9,7 +9,7 @@ import ( "go.uber.org/zap/zapcore" "go.uber.org/zap/zaptest/observer" - "github.com/ssvlabs/ssv/observability/log" + "github.com/ssvlabs/ssv/v2/observability/log" ) // setupLoggerTest creates a badgerLogger with an observer for testing. diff --git a/storage/badger/testutils.go b/storage/badger/testutils.go index bd41118053..f69f6a56d1 100644 --- a/storage/badger/testutils.go +++ b/storage/badger/testutils.go @@ -3,7 +3,7 @@ package badger import ( "go.uber.org/zap" - "github.com/ssvlabs/ssv/storage/basedb" + "github.com/ssvlabs/ssv/v2/storage/basedb" ) // NewInMemory creates an in-memory DB instance. diff --git a/storage/badger/txn.go b/storage/badger/txn.go index e96c8c4683..b1fb550340 100644 --- a/storage/badger/txn.go +++ b/storage/badger/txn.go @@ -5,7 +5,7 @@ import ( "github.com/dgraph-io/badger/v4" - "github.com/ssvlabs/ssv/storage/basedb" + "github.com/ssvlabs/ssv/v2/storage/basedb" ) type badgerTxn struct { diff --git a/storage/badger/txn_test.go b/storage/badger/txn_test.go index 10d6a3e701..b5deb0c5b7 100644 --- a/storage/badger/txn_test.go +++ b/storage/badger/txn_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/ssvlabs/ssv/storage/basedb" + "github.com/ssvlabs/ssv/v2/storage/basedb" ) // setupTxn creates a transaction for testing. diff --git a/storage/pebble/common.go b/storage/pebble/common.go index fdeddf1050..09b135d505 100644 --- a/storage/pebble/common.go +++ b/storage/pebble/common.go @@ -8,7 +8,7 @@ import ( "github.com/cockroachdb/pebble" "go.uber.org/zap" - "github.com/ssvlabs/ssv/storage/basedb" + "github.com/ssvlabs/ssv/v2/storage/basedb" ) func getter(key []byte, dbFetch func(key []byte) ([]byte, io.Closer, error)) (basedb.Obj, bool, error) { diff --git a/storage/pebble/pebble.go b/storage/pebble/pebble.go index 0994c6d31d..33c4cd0b27 100644 --- a/storage/pebble/pebble.go +++ b/storage/pebble/pebble.go @@ -7,7 +7,7 @@ import ( "github.com/cockroachdb/pebble" "go.uber.org/zap" - "github.com/ssvlabs/ssv/storage/basedb" + "github.com/ssvlabs/ssv/v2/storage/basedb" ) var _ basedb.Database = &DB{} diff --git a/storage/pebble/pebble_test.go b/storage/pebble/pebble_test.go index 0cf552f2bd..8bdcadbc6a 100644 --- a/storage/pebble/pebble_test.go +++ b/storage/pebble/pebble_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/zap" - "github.com/ssvlabs/ssv/storage/basedb" + "github.com/ssvlabs/ssv/v2/storage/basedb" ) func setupTestDB(t *testing.T) *DB { diff --git a/storage/pebble/txn.go b/storage/pebble/txn.go index 04cb200c4a..d8c255618f 100644 --- a/storage/pebble/txn.go +++ b/storage/pebble/txn.go @@ -6,7 +6,7 @@ import ( "github.com/cockroachdb/pebble" "go.uber.org/zap" - "github.com/ssvlabs/ssv/storage/basedb" + "github.com/ssvlabs/ssv/v2/storage/basedb" ) type txn struct { diff --git a/storage/pebble/txn_test.go b/storage/pebble/txn_test.go index c6ade3ade1..e4df78b4c4 100644 --- a/storage/pebble/txn_test.go +++ b/storage/pebble/txn_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/zap" - "github.com/ssvlabs/ssv/storage/basedb" + "github.com/ssvlabs/ssv/v2/storage/basedb" ) func TestPebbleTxn_Commit(t *testing.T) { diff --git a/tool.mod b/tool.mod index 08abb9b3ec..b1378a2517 100644 --- a/tool.mod +++ b/tool.mod @@ -1,5 +1,5 @@ // Tools require their own go.mod because dependency versions conflict with ssv's dependencies -module github.com/ssvlabs/ssv +module github.com/ssvlabs/ssv/v2 go 1.26 diff --git a/utils/boot_node/node.go b/utils/boot_node/node.go index 94442e1a16..0ad9924ac3 100644 --- a/utils/boot_node/node.go +++ b/utils/boot_node/node.go @@ -16,11 +16,11 @@ import ( "github.com/prysmaticlabs/prysm/v4/network" "go.uber.org/zap" - "github.com/ssvlabs/ssv/network/discovery" - "github.com/ssvlabs/ssv/networkconfig" - "github.com/ssvlabs/ssv/observability/log" - "github.com/ssvlabs/ssv/observability/log/fields" - "github.com/ssvlabs/ssv/utils" + "github.com/ssvlabs/ssv/v2/network/discovery" + "github.com/ssvlabs/ssv/v2/networkconfig" + "github.com/ssvlabs/ssv/v2/observability/log" + "github.com/ssvlabs/ssv/v2/observability/log/fields" + "github.com/ssvlabs/ssv/v2/utils" ) // Options contains options to create the node diff --git a/utils/keys.go b/utils/keys.go index 7e68d540e6..69329f1c08 100644 --- a/utils/keys.go +++ b/utils/keys.go @@ -9,8 +9,8 @@ import ( "github.com/libp2p/go-libp2p/core/crypto" "go.uber.org/zap" - "github.com/ssvlabs/ssv/network/commons" - "github.com/ssvlabs/ssv/observability/log/fields" + "github.com/ssvlabs/ssv/v2/network/commons" + "github.com/ssvlabs/ssv/v2/observability/log/fields" ) // ECDSAPrivateKey extracts the ecdsa.PrivateKey from the given string or generate a new key diff --git a/utils/tasks/retry.go b/utils/tasks/retry.go index f912fda5a5..8dae225dbf 100644 --- a/utils/tasks/retry.go +++ b/utils/tasks/retry.go @@ -1,6 +1,6 @@ package tasks -import "github.com/ssvlabs/ssv/protocol/v2/queue" +import "github.com/ssvlabs/ssv/v2/protocol/v2/queue" // Fn represents a function to execute type Fn = queue.Fn diff --git a/utils/ttl/map.go b/utils/ttl/map.go index c7f0b0e076..509a5979a9 100644 --- a/utils/ttl/map.go +++ b/utils/ttl/map.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/ssvlabs/ssv/utils/hashmap" + "github.com/ssvlabs/ssv/v2/utils/hashmap" ) // Map implements a thread-safe map with automatic TTL-based expiry.