From 864e4007a65387e0cf20e966e1b6ff2065493011 Mon Sep 17 00:00:00 2001 From: Nikita Kryuchkov Date: Fri, 13 Mar 2026 14:55:18 +0300 Subject: [PATCH 01/11] go.mod: fix module path for v2 tags --- README.md | 2 +- api/handlers/exporter/committee_http.go | 2 +- api/handlers/exporter/committee_model.go | 6 +- api/handlers/exporter/common_model.go | 4 +- api/handlers/exporter/decided_http.go | 2 +- api/handlers/exporter/decided_model.go | 6 +- api/handlers/exporter/decided_v1_http.go | 2 +- api/handlers/exporter/exporter.go | 14 +- api/handlers/exporter/exporter_test.go | 18 +-- api/handlers/exporter/helpers.go | 2 +- api/handlers/exporter/validator_http.go | 2 +- api/handlers/exporter/validator_model.go | 6 +- api/handlers/node/mock_test.go | 4 +- api/handlers/node/node.go | 8 +- api/handlers/node/node_test.go | 8 +- api/handlers/validators/model.go | 4 +- api/handlers/validators/validators.go | 6 +- api/handlers/validators/validators_test.go | 10 +- api/server/server.go | 10 +- api/server/server_test.go | 10 +- api/types.go | 2 +- beacon/goclient/attest.go | 2 +- beacon/goclient/attest_test.go | 2 +- beacon/goclient/committees_test.go | 2 +- beacon/goclient/events.go | 2 +- beacon/goclient/events_test.go | 2 +- beacon/goclient/genesis_test.go | 6 +- beacon/goclient/goclient.go | 8 +- beacon/goclient/goclient_test.go | 2 +- beacon/goclient/observability.go | 8 +- beacon/goclient/options.go | 2 +- beacon/goclient/proposer.go | 6 +- beacon/goclient/proposer_test.go | 4 +- beacon/goclient/signing_test.go | 4 +- beacon/goclient/spec.go | 2 +- beacon/goclient/spec_test.go | 4 +- beacon/goclient/validator.go | 2 +- cli/bootnode/boot_node.go | 10 +- cli/cli.go | 4 +- cli/export_keys_from_mnemonic.go | 4 +- cli/flags/export_keys_from_mnemonic.go | 4 +- cli/flags/threshold.go | 2 +- cli/generate_config.go | 2 +- cli/generate_operator_keys.go | 2 +- cli/operator/node.go | 100 +++++++------- cli/operator/node_test.go | 8 +- cli/operator/prober.go | 2 +- cli/threshold.go | 8 +- cmd/ssvnode/main.go | 2 +- doppelganger/doppelganger.go | 12 +- doppelganger/doppelganger_test.go | 4 +- doppelganger/mock.go | 2 +- doppelganger/observability.go | 6 +- eth/ethtest/cluster_liquidated_test.go | 2 +- eth/ethtest/cluster_reactivated_test.go | 2 +- eth/ethtest/common_test.go | 12 +- eth/ethtest/eth_e2e_test.go | 6 +- eth/ethtest/operator_added_test.go | 2 +- eth/ethtest/utils_test.go | 34 ++--- eth/ethtest/validator_added_test.go | 4 +- eth/ethtest/validator_exited_test.go | 2 +- eth/ethtest/validator_removed_test.go | 2 +- eth/eventhandler/event_handler.go | 22 +-- eth/eventhandler/event_handler_test.go | 40 +++--- eth/eventhandler/handlers.go | 12 +- eth/eventhandler/local_events_test.go | 8 +- eth/eventhandler/mockgen.go | 2 +- eth/eventhandler/mocks/task_executor.go | 6 +- eth/eventhandler/observability.go | 6 +- eth/eventhandler/options.go | 2 +- eth/eventhandler/task.go | 2 +- eth/eventhandler/task_executor_test.go | 8 +- eth/eventhandler/validation.go | 6 +- eth/eventhandler/validation_test.go | 10 +- eth/eventparser/event_parser.go | 2 +- eth/eventparser/event_parser_test.go | 4 +- eth/eventsyncer/event_syncer.go | 8 +- eth/eventsyncer/event_syncer_mock.go | 2 +- eth/eventsyncer/event_syncer_test.go | 32 ++--- eth/eventsyncer/options.go | 2 +- eth/executionclient/execution_client.go | 6 +- eth/executionclient/execution_client_test.go | 4 +- eth/executionclient/mocks.go | 2 +- eth/executionclient/multi_client.go | 2 +- eth/executionclient/multi_client_test.go | 2 +- eth/executionclient/observability.go | 8 +- eth/executionclient/options.go | 2 +- eth/localevents/local_events.go | 2 +- eth/localevents/local_events_test.go | 4 +- exporter/api/decided/stream.go | 12 +- exporter/api/msg.go | 2 +- exporter/api/query_handlers.go | 6 +- exporter/api/query_handlers_test.go | 12 +- exporter/api/server.go | 6 +- exporter/api/server_test.go | 2 +- exporter/api/testutils.go | 2 +- exporter/store/store.go | 6 +- exporter/store/store_test.go | 10 +- exporter2/committee.go | 6 +- exporter2/decided.go | 4 +- exporter2/exporter.go | 12 +- exporter2/models.go | 4 +- exporter2/validator.go | 6 +- go.mod | 130 +++++++++--------- go.sum | 38 +++-- ibft/storage/observability.go | 6 +- ibft/storage/participant_store.go | 2 +- ibft/storage/store.go | 6 +- ibft/storage/store_test.go | 8 +- ibft/storage/stores.go | 2 +- identity/store.go | 6 +- identity/store_test.go | 8 +- message/signatureverifier/mock.go | 4 +- .../signatureverifier/signature_verifier.go | 4 +- message/validation/consensus_validation.go | 8 +- .../validation/consensus_validation_test.go | 2 +- message/validation/errors.go | 4 +- message/validation/logger_fields.go | 6 +- message/validation/logger_fields_test.go | 2 +- message/validation/observability.go | 6 +- message/validation/self.go | 2 +- message/validation/signed_ssv_message.go | 2 +- message/validation/validation.go | 18 +-- message/validation/validation_test.go | 26 ++-- migrations/migration_0_example.go | 2 +- migrations/migration_1_example.go | 2 +- migrations/migration_2_encrypt_shares.go | 2 +- ...onfiglock_add_alan_fork_to_network_name.go | 2 +- migrations/migration_5_gob.go | 4 +- migrations/migration_5_share_gob_to_ssz.go | 6 +- .../migration_5_share_gob_to_ssz_test.go | 2 +- migrations/migration_6_model.go | 2 +- migrations/migration_6_share_exit_epoch.go | 8 +- .../migration_6_share_exit_epoch_test.go | 10 +- ...migration_7_derive_signer_key_with_hkdf.go | 2 +- ...tion_7_derive_signer_key_with_hkdf_test.go | 10 +- ...tion_8_populate_validator_index_mapping.go | 6 +- ...8_populate_validator_index_mapping_test.go | 6 +- migrations/migrations.go | 10 +- migrations/migrations_test.go | 6 +- network/discovery/dv5_filters.go | 2 +- network/discovery/dv5_routing.go | 4 +- network/discovery/dv5_service.go | 16 +-- network/discovery/dv5_service_test.go | 14 +- network/discovery/enode.go | 2 +- network/discovery/enode_test.go | 2 +- network/discovery/local_service.go | 2 +- network/discovery/node_record.go | 4 +- network/discovery/observability.go | 6 +- network/discovery/options.go | 6 +- network/discovery/service.go | 6 +- network/discovery/service_test.go | 6 +- network/discovery/subnets.go | 4 +- network/discovery/testutils.go | 8 +- network/discovery/util_test.go | 10 +- network/network.go | 4 +- network/p2p/config.go | 14 +- network/p2p/observability.go | 12 +- network/p2p/p2p.go | 36 ++--- network/p2p/p2p_discovery.go | 8 +- network/p2p/p2p_discovery_test.go | 2 +- network/p2p/p2p_pubsub.go | 10 +- network/p2p/p2p_reporter.go | 6 +- network/p2p/p2p_setup.go | 16 +-- network/p2p/p2p_test.go | 6 +- network/p2p/p2p_validation_test.go | 6 +- network/p2p/testutils.go | 28 ++-- network/peers/conn_manager.go | 4 +- network/peers/connections/conn_gater.go | 6 +- network/peers/connections/conn_handler.go | 12 +- network/peers/connections/filters.go | 4 +- network/peers/connections/filters_test.go | 2 +- network/peers/connections/handshaker.go | 10 +- network/peers/connections/handshaker_test.go | 4 +- network/peers/connections/helpers_test.go | 10 +- .../connections/mock/mock_node_info_idx.go | 4 +- .../mock/mock_stream_controller.go | 2 +- network/peers/connections/observability.go | 6 +- network/peers/gossipsub_score_index.go | 2 +- network/peers/index.go | 4 +- network/peers/peer_info.go | 2 +- network/peers/peers_index.go | 2 +- network/peers/scores_test.go | 4 +- network/peers/subnets.go | 2 +- network/peers/subnets_test.go | 4 +- network/records/entries.go | 2 +- network/records/metadata.go | 2 +- network/records/node_info_test.go | 2 +- network/records/subnets.go | 2 +- network/records/subnets_test.go | 2 +- network/streams/controller_test.go | 2 +- network/streams/observability.go | 6 +- network/testing/keys.go | 2 +- network/testing/local.go | 2 +- network/topics/controller.go | 4 +- network/topics/controller_test.go | 24 ++-- network/topics/msg_id.go | 2 +- network/topics/msg_validator_test.go | 20 +-- network/topics/observability.go | 6 +- network/topics/params/message_rate.go | 4 +- network/topics/params/message_rate_test.go | 6 +- network/topics/params/peer_score.go | 2 +- network/topics/params/scores_test.go | 4 +- network/topics/params/topic_score.go | 4 +- network/topics/pubsub.go | 14 +- network/topics/scoring.go | 12 +- network/topics/sub_filter.go | 4 +- network/topics/sub_filter_test.go | 4 +- network/topics/tracer.go | 2 +- nodeprobe/nodeprobe.go | 2 +- nodeprobe/nodeprobe_test.go | 2 +- observability/attributes.go | 6 +- observability/configurator.go | 6 +- observability/log/fields/duty_id.go | 2 +- observability/log/fields/fields.go | 8 +- observability/logger.go | 6 +- observability/metrics/handler.go | 6 +- operator/datastore/data_store.go | 2 +- operator/datastore/data_store_test.go | 2 +- operator/duties/attester.go | 12 +- operator/duties/attester_test.go | 6 +- operator/duties/base_handler.go | 4 +- operator/duties/base_handler_mock.go | 4 +- operator/duties/beacon_adapter.go | 6 +- operator/duties/beacon_adapter_test.go | 4 +- operator/duties/committee.go | 8 +- operator/duties/committee_test.go | 8 +- operator/duties/observability.go | 6 +- operator/duties/proposer.go | 8 +- operator/duties/proposer_test.go | 6 +- operator/duties/provider_allshares.go | 4 +- operator/duties/provider_allshares_test.go | 6 +- operator/duties/scheduler.go | 18 +-- operator/duties/scheduler_mock.go | 2 +- operator/duties/scheduler_test.go | 8 +- operator/duties/sync_committee.go | 12 +- operator/duties/sync_committee_test.go | 6 +- .../duties/validator_registration_test.go | 2 +- operator/duties/voluntary_exit.go | 6 +- operator/duties/voluntary_exit_test.go | 2 +- operator/dutytracer/collector.go | 22 +-- operator/dutytracer/collector_bench_test.go | 14 +- operator/dutytracer/collector_quorum_test.go | 10 +- .../dutytracer/collector_schedule_test.go | 12 +- operator/dutytracer/collector_test.go | 22 +-- operator/dutytracer/eviction.go | 6 +- operator/dutytracer/eviction_test.go | 10 +- operator/dutytracer/observability.go | 4 +- operator/dutytracer/store.go | 6 +- operator/dutytracer/store_metrics.go | 6 +- operator/dutytracer/store_test.go | 18 +-- operator/fee_recipient/controller.go | 10 +- operator/fee_recipient/controller_test.go | 20 +-- operator/fee_recipient/mocks/controller.go | 2 +- operator/node.go | 42 +++--- operator/node_query_test.go | 22 +-- operator/slotticker/slotticker.go | 4 +- operator/storage/storage.go | 8 +- operator/storage/storage_test.go | 12 +- operator/validator/controller.go | 62 ++++----- operator/validator/controller_test.go | 42 +++--- operator/validator/metadata/mocks.go | 8 +- operator/validator/metadata/sync_batch.go | 2 +- .../validator/metadata/sync_batch_test.go | 2 +- operator/validator/metadata/syncer.go | 14 +- operator/validator/metadata/syncer_test.go | 12 +- operator/validator/metrics.go | 4 +- operator/validator/mocks/controller.go | 10 +- operator/validator/observability.go | 6 +- operator/validator/router.go | 2 +- operator/validator/router_test.go | 6 +- operator/validator/task_executor.go | 10 +- operator/validator/task_executor_test.go | 20 +-- operator/validators/testutils.go | 2 +- operator/validators/validators_map.go | 2 +- protocol/v2/qbft/config.go | 2 +- protocol/v2/qbft/controller/controller.go | 14 +- .../v2/qbft/controller/controller_test.go | 10 +- protocol/v2/qbft/controller/decided.go | 2 +- protocol/v2/qbft/controller/observability.go | 2 +- protocol/v2/qbft/controller/timer.go | 6 +- protocol/v2/qbft/controller/types.go | 2 +- protocol/v2/qbft/controller/types_test.go | 2 +- protocol/v2/qbft/instance/commit.go | 4 +- protocol/v2/qbft/instance/instance.go | 12 +- protocol/v2/qbft/instance/metrics.go | 4 +- protocol/v2/qbft/instance/observability.go | 6 +- protocol/v2/qbft/instance/prepare.go | 4 +- protocol/v2/qbft/instance/proposal.go | 2 +- protocol/v2/qbft/instance/round_change.go | 4 +- protocol/v2/qbft/instance/timeout.go | 4 +- protocol/v2/qbft/roundtimer/timer.go | 4 +- protocol/v2/qbft/roundtimer/timer_test.go | 2 +- protocol/v2/qbft/spectest/controller_type.go | 10 +- .../v2/qbft/spectest/msg_processing_type.go | 8 +- .../v2/qbft/spectest/qbft_mapping_test.go | 6 +- protocol/v2/qbft/spectest/timeout_type.go | 6 +- protocol/v2/queue/worker/message_worker.go | 4 +- .../v2/queue/worker/message_worker_test.go | 6 +- protocol/v2/ssv/partial_sig_container.go | 4 +- .../v2/ssv/queue/message_prioritizer_test.go | 6 +- protocol/v2/ssv/queue/messages.go | 4 +- protocol/v2/ssv/queue/observability.go | 8 +- protocol/v2/ssv/queue/queue.go | 2 +- protocol/v2/ssv/queue/queue_test.go | 2 +- protocol/v2/ssv/runner/aggregator.go | 14 +- protocol/v2/ssv/runner/committee.go | 14 +- protocol/v2/ssv/runner/observability.go | 6 +- protocol/v2/ssv/runner/proposer.go | 16 +-- protocol/v2/ssv/runner/runner.go | 14 +- protocol/v2/ssv/runner/runner_signatures.go | 4 +- protocol/v2/ssv/runner/runner_state.go | 4 +- protocol/v2/ssv/runner/runner_validations.go | 2 +- .../ssv/runner/sync_committee_contribution.go | 14 +- protocol/v2/ssv/runner/timer.go | 4 +- .../v2/ssv/runner/validator_registration.go | 12 +- protocol/v2/ssv/runner/voluntary_exit.go | 10 +- .../spectest/committee_msg_processing_type.go | 12 +- .../v2/ssv/spectest/msg_processing_type.go | 14 +- .../ssv/spectest/multi_msg_processing_type.go | 2 +- .../multi_start_new_runner_duty_type.go | 4 +- .../ssv/spectest/runner_construction_type.go | 4 +- protocol/v2/ssv/spectest/ssv_mapping_test.go | 16 +-- .../sync_committee_aggregator_proof_type.go | 10 +- protocol/v2/ssv/spectest/util.go | 8 +- protocol/v2/ssv/spectest/value_checker.go | 6 +- .../mocks/validator_registration_submitter.go | 2 +- protocol/v2/ssv/testing/runner.go | 16 +-- protocol/v2/ssv/testing/storage.go | 6 +- protocol/v2/ssv/testing/validator.go | 10 +- protocol/v2/ssv/validator/committee.go | 18 +-- .../v2/ssv/validator/committee_observer.go | 18 +-- protocol/v2/ssv/validator/committee_queue.go | 14 +- .../v2/ssv/validator/committee_queue_test.go | 16 +-- protocol/v2/ssv/validator/domain_cache.go | 2 +- protocol/v2/ssv/validator/duty_executor.go | 10 +- protocol/v2/ssv/validator/msg_queue.go | 6 +- protocol/v2/ssv/validator/observability.go | 2 +- protocol/v2/ssv/validator/opts.go | 16 +-- protocol/v2/ssv/validator/queue_validator.go | 14 +- protocol/v2/ssv/validator/timer.go | 10 +- protocol/v2/ssv/validator/validator.go | 20 +-- protocol/v2/ssv/value_check.go | 2 +- protocol/v2/testing/logger.go | 2 +- .../v2/testing/temp_testing_beacon_network.go | 2 +- protocol/v2/testing/utils.go | 6 +- protocol/v2/types/ssvshare.go | 4 +- protocol/v2/types/ssvshare_test.go | 2 +- registry/storage/mocks/operators.go | 4 +- registry/storage/mocks/validatorstore.go | 4 +- registry/storage/operators.go | 4 +- registry/storage/operators_test.go | 8 +- registry/storage/recipients.go | 2 +- registry/storage/recipients_test.go | 8 +- registry/storage/shares.go | 8 +- registry/storage/shares_test.go | 16 +-- registry/storage/validatorstore.go | 4 +- registry/storage/validatorstore_test.go | 6 +- ssvsigner/client.go | 2 +- ssvsigner/cmd/purge-keys/purge-keys.go | 2 +- ssvsigner/e2e/common/beacon_config.go | 2 +- ssvsigner/e2e/testenv/environment.go | 4 +- ssvsigner/e2e/testenv/key_managers.go | 4 +- ssvsigner/ekm/key_manager.go | 2 +- ssvsigner/ekm/local_key_manager.go | 4 +- ssvsigner/ekm/local_key_manager_test.go | 8 +- ssvsigner/ekm/mock.go | 2 +- ssvsigner/ekm/remote_key_manager.go | 4 +- ssvsigner/ekm/remote_key_manager_test.go | 2 +- ssvsigner/ekm/signer_storage.go | 8 +- ssvsigner/ekm/signer_storage_test.go | 10 +- ssvsigner/ekm/slashing_protector.go | 4 +- ssvsigner/ekm/slashing_protector_test.go | 8 +- ssvsigner/go.mod | 4 +- ssvsigner/observability.go | 2 +- ssvsigner/server.go | 2 +- storage/badger/badger.go | 6 +- storage/badger/badger_test.go | 4 +- storage/badger/gc_test.go | 4 +- storage/badger/logger.go | 2 +- storage/badger/logger_test.go | 2 +- storage/badger/testutils.go | 2 +- storage/badger/txn.go | 2 +- storage/badger/txn_test.go | 2 +- storage/pebble/common.go | 2 +- storage/pebble/pebble.go | 2 +- storage/pebble/pebble_test.go | 2 +- storage/pebble/txn.go | 2 +- storage/pebble/txn_test.go | 2 +- tool.mod | 2 +- utils/boot_node/node.go | 10 +- utils/hashmap/hashmap_test.go | 2 +- utils/keys.go | 4 +- utils/tasks/retry.go | 2 +- utils/ttl/map.go | 2 +- utils/ttl/map_test.go | 2 +- 396 files changed, 1457 insertions(+), 1461 deletions(-) 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 5506bea6db..bfc921edf7 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/network/commons" - "github.com/ssvlabs/ssv/network/records" - "github.com/ssvlabs/ssv/nodeprobe" + "github.com/ssvlabs/ssv/v2/api" + "github.com/ssvlabs/ssv/v2/network/commons" + "github.com/ssvlabs/ssv/v2/network/records" + "github.com/ssvlabs/ssv/v2/nodeprobe" ) type Node struct { diff --git a/api/handlers/node/node_test.go b/api/handlers/node/node_test.go index 94d822b8dd..8541e465dd 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/network/commons" - "github.com/ssvlabs/ssv/network/records" - "github.com/ssvlabs/ssv/nodeprobe" + "github.com/ssvlabs/ssv/v2/api" + "github.com/ssvlabs/ssv/v2/network/commons" + "github.com/ssvlabs/ssv/v2/network/records" + "github.com/ssvlabs/ssv/v2/nodeprobe" ) // 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/attest.go b/beacon/goclient/attest.go index 1969165cfa..203d2c0b52 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" ) type ( diff --git a/beacon/goclient/attest_test.go b/beacon/goclient/attest_test.go index ada88ed8e6..f1aa7736fe 100644 --- a/beacon/goclient/attest_test.go +++ b/beacon/goclient/attest_test.go @@ -18,7 +18,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/events.go b/beacon/goclient/events.go index e1440a1131..60a8dbe370 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 7f8e99ecf4..ca2d901b8a 100644 --- a/beacon/goclient/events_test.go +++ b/beacon/goclient/events_test.go @@ -12,7 +12,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 3d38544f43..1d722ae173 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 b8316e3ca4..a8b579037c 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 476f9081c9..bd30162489 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 c788741502..6f75e40ac9 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. @@ -249,7 +249,7 @@ collect: // that this is a MEV block; it is a reasonable assumption to make in // the usual operating environment. // Returning as soon as we fetch at least 1 MEV block is good enough, - // see https://github.com/ssvlabs/ssv/pull/2631#issuecomment-3678879204 + // see https://github.com/ssvlabs/ssv/v2/pull/2631#issuecomment-3678879204 // Note: We may want to add an operator option to disable this behavior // in the future. break collect 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 b42173ad15..554911280c 100644 --- a/beacon/goclient/signing_test.go +++ b/beacon/goclient/signing_test.go @@ -10,8 +10,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_computeVoluntaryExitDomain(t *testing.T) { 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/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 76a33dd0bd..00b01ca934 100644 --- a/cli/operator/node.go +++ b/cli/operator/node.go @@ -32,54 +32,54 @@ import ( "github.com/ssvlabs/ssv/ssvsigner/keystore" ssvsignertls "github.com/ssvlabs/ssv/ssvsigner/tls" - 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" - 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/nodeprobe" - "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" - "github.com/ssvlabs/ssv/utils/format" + 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/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" + 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/nodeprobe" + "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" + "github.com/ssvlabs/ssv/v2/utils/format" ) type KeyStore struct { @@ -106,7 +106,7 @@ type config struct { KeyStore KeyStore `yaml:"KeyStore"` SSVSigner SSVSignerConfig `yaml:"SSVSigner" env-prefix:"SSV_SIGNER_"` Graffiti string `yaml:"Graffiti" env:"GRAFFITI" env-description:"Custom graffiti for block proposals" env-default:"ssv.network"` - ProposerDelay time.Duration `yaml:"ProposerDelay" env:"PROPOSER_DELAY" env-description:"Duration to wait out before requesting Ethereum block to propose if this Operator is proposer-duty Leader (eg. 300ms). See https://github.com/ssvlabs/ssv/blob/main/docs/MEV_CONSIDERATIONS.md#getting-started-with-mev-configuration for detailed instructions on how to use it."` + ProposerDelay time.Duration `yaml:"ProposerDelay" env:"PROPOSER_DELAY" env-description:"Duration to wait out before requesting Ethereum block to propose if this Operator is proposer-duty Leader (eg. 300ms). See https://github.com/ssvlabs/ssv/v2/blob/main/docs/MEV_CONSIDERATIONS.md#getting-started-with-mev-configuration for detailed instructions on how to use it."` AllowDangerousProposerDelay bool `yaml:"AllowDangerousProposerDelay" env:"ALLOW_DANGEROUS_PROPOSER_DELAY" env-description:"Allow ProposerDelay values higher than 1s (dangerous, may cause missed block proposals)"` OperatorPrivateKey string `yaml:"OperatorPrivateKey" env:"OPERATOR_KEY" env-description:"Operator private key for contract event decryption"` MetricsAPIPort int `yaml:"MetricsAPIPort" env:"METRICS_API_PORT" env-description:"Port for metrics API server"` @@ -1030,7 +1030,7 @@ func setupSSVNetwork(logger *zap.Logger) (*networkconfig.SSV, error) { return nil, errors.New("custom domain type must be 4 bytes") } - // https://github.com/ssvlabs/ssv/pull/1808 incremented the post-fork domain type by 1, so we have to maintain the compatibility. + // https://github.com/ssvlabs/ssv/v2/pull/1808 incremented the post-fork domain type by 1, so we have to maintain the compatibility. postForkDomain := binary.BigEndian.Uint32(domainBytes) + 1 binary.BigEndian.PutUint32(ssvConfig.DomainType[:], postForkDomain) diff --git a/cli/operator/node_test.go b/cli/operator/node_test.go index 6c63efc2f0..bf82717248 100644 --- a/cli/operator/node_test.go +++ b/cli/operator/node_test.go @@ -9,10 +9,10 @@ import ( "go.uber.org/zap/zapcore" "go.uber.org/zap/zaptest/observer" - "github.com/ssvlabs/ssv/networkconfig" - operatorstorage "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" + operatorstorage "github.com/ssvlabs/ssv/v2/operator/storage" + kv "github.com/ssvlabs/ssv/v2/storage/badger" + "github.com/ssvlabs/ssv/v2/storage/basedb" ) func Test_verifyConfig(t *testing.T) { diff --git a/cli/operator/prober.go b/cli/operator/prober.go index 63e57e09cf..8e40c9240e 100644 --- a/cli/operator/prober.go +++ b/cli/operator/prober.go @@ -6,7 +6,7 @@ import ( "go.uber.org/zap" - "github.com/ssvlabs/ssv/nodeprobe" + "github.com/ssvlabs/ssv/v2/nodeprobe" ) // List of prober prober-nodes. 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/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 d65f2656c1..d0633b8977 100644 --- a/eth/ethtest/eth_e2e_test.go +++ b/eth/ethtest/eth_e2e_test.go @@ -12,9 +12,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 bf45dd9b45..8ed9ea89aa 100644 --- a/eth/ethtest/utils_test.go +++ b/eth/ethtest/utils_test.go @@ -18,23 +18,23 @@ import ( "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/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 6904e95ebe..4d4c03a714 100644 --- a/eth/eventhandler/event_handler.go +++ b/eth/eventhandler/event_handler.go @@ -19,17 +19,17 @@ import ( "github.com/ssvlabs/ssv/ssvsigner/ekm" "github.com/ssvlabs/ssv/ssvsigner/keys" - "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 db49c465e4..c3a8208c30 100644 --- a/eth/eventhandler/event_handler_test.go +++ b/eth/eventhandler/event_handler_test.go @@ -29,26 +29,26 @@ import ( "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/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 5371e0bb1b..4249698d4f 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 c35b923dfd..22839cebc5 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 82f423a57a..045969cdbf 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 c00bf79254..9fad5e77c9 100644 --- a/eth/eventsyncer/event_syncer.go +++ b/eth/eventsyncer/event_syncer.go @@ -12,15 +12,15 @@ 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 // TODO: check if something from these PRs need to be ported: -// https://github.com/ssvlabs/ssv/pull/1053 +// https://github.com/ssvlabs/ssv/v2/pull/1053 const ( defaultStalenessThreshold = 300 * time.Second 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 59c54f51ff..32ec1caed8 100644 --- a/eth/eventsyncer/event_syncer_test.go +++ b/eth/eventsyncer/event_syncer_test.go @@ -25,22 +25,22 @@ import ( "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/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/execution_client.go b/eth/executionclient/execution_client.go index 0ef5cd36c9..5df27677f7 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 c0e2173bdc..7e961a1524 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 b767797eed..5ca6cd2477 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 2240a089a9..a5a23b27ac 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 2817fd0aee..828757903e 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 61ab1f8d21..2004b6a859 100644 --- a/exporter/api/testutils.go +++ b/exporter/api/testutils.go @@ -10,7 +10,7 @@ import ( "github.com/pkg/errors" "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 812f18859b..253ec4bd7b 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/ssvlabs/ssv +module github.com/ssvlabs/ssv/v2 go 1.25 @@ -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 @@ -34,6 +36,7 @@ require ( github.com/patrickmn/go-cache v2.1.0+incompatible github.com/pkg/errors v0.9.1 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 @@ -48,62 +51,24 @@ 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.38.0 + go.opentelemetry.io/otel/exporters/prometheus v0.58.0 + go.opentelemetry.io/otel/metric v1.38.0 go.opentelemetry.io/otel/sdk v1.38.0 go.opentelemetry.io/otel/sdk/metric v1.38.0 + go.opentelemetry.io/otel/trace v1.38.0 go.uber.org/mock v0.5.2 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 - golang.org/x/mod v0.28.0 - golang.org/x/sync v0.17.0 - golang.org/x/text v0.29.0 + golang.org/x/mod v0.29.0 + golang.org/x/sync v0.18.0 + golang.org/x/text v0.31.0 gopkg.in/natefinch/lumberjack.v2 v2.2.1 gopkg.in/yaml.v3 v3.0.1 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/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-20250908211612-aef8a434d053 // 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 +81,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 +89,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 +122,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 +154,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 +167,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 +182,28 @@ 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/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.38.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.38.0 - go.opentelemetry.io/otel/trace v1.38.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 - golang.org/x/crypto v0.42.0 // indirect - golang.org/x/net v0.44.0 // indirect - golang.org/x/sys v0.36.0 // indirect - golang.org/x/term v0.35.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.37.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,9 +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 ( + // 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/go.sum b/go.sum index c48fbd7122..305ac03a82 100644 --- a/go.sum +++ b/go.sum @@ -733,8 +733,6 @@ github.com/ssvlabs/go-eth2-client v0.6.31-0.20250922150906-26179dd60c9c h1:iNQoR github.com/ssvlabs/go-eth2-client v0.6.31-0.20250922150906-26179dd60c9c/go.mod h1:fvULSL9WtNskkOB4i+Yyr6BKpNHXvmpGZj9969fCrfY= github.com/ssvlabs/ssv-spec v1.2.2 h1:as84CsvYAL4+czKBVeQSlxjDYVmU1wClwhc7YNcoBzY= github.com/ssvlabs/ssv-spec v1.2.2/go.mod h1:GedhFYGHVJRYYH3nEp05Gn14tyvg6VbTbaIxrMtI7Cg= -github.com/ssvlabs/ssv/ssvsigner v0.0.0-20251027161822-0b67ab2cd4f3 h1:eIn/PpHupEa+8lp3E1Q1kNx0IK6udBqCNVEWaC9JlnM= -github.com/ssvlabs/ssv/ssvsigner v0.0.0-20251027161822-0b67ab2cd4f3/go.mod h1:VSxiqWR75EXq29KpoAnp+M9w0MrE6AirTgoQ5LBiAwg= github.com/status-im/keycard-go v0.2.0 h1:QDLFswOQu1r5jsycloeQh3bVU8n/NatHHaZobtDnDzA= github.com/status-im/keycard-go v0.2.0/go.mod h1:wlp8ZLbsmrF6g6WjugPAx+IzoLrkdf9+mHxBEeo3Hbg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -899,8 +897,8 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/crypto v0.8.0/go.mod h1:mRqEX+O9/h5TFCrQhkgjo2yKi0yYA+9ecGkdQoHrywE= golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw= golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg= -golang.org/x/crypto v0.42.0 h1:chiH31gIWm57EkTXpwnqf8qeuMUi0yekh6mT2AvFlqI= -golang.org/x/crypto v0.42.0/go.mod h1:4+rDnOTJhQCx2q7/j6rAN5XDw8kPjeaXEUR2eL94ix8= +golang.org/x/crypto v0.45.0 h1:jMBrvKuj23MTlT0bQEOBcAE0mjg8mK9RXFhRH6nyF3Q= +golang.org/x/crypto v0.45.0/go.mod h1:XTGrrkGJve7CYK7J8PEww4aY7gM3qMCElcJQ8n8JdX4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20250911091902-df9299821621 h1:2id6c1/gto0kaHYyrixvknJ8tUK/Qs5IsmBtrc+FtgU= golang.org/x/exp v0.0.0-20250911091902-df9299821621/go.mod h1:TwQYMMnGpvZyc+JpB/UAuTNIsVJifOlSkrZkhcvpVUk= @@ -914,8 +912,8 @@ golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.28.0 h1:gQBtGhjxykdjY9YhZpSlZIsbnaE2+PgjfLWUQTnoZ1U= -golang.org/x/mod v0.28.0/go.mod h1:yfB/L0NOf/kmEbXjzCPOx1iK1fRutOydrCMsqRhEBxI= +golang.org/x/mod v0.29.0 h1:HV8lRxZC4l2cr3Zq1LvtOsi/ThTgWnUk/y64QSs8GwA= +golang.org/x/mod v0.29.0/go.mod h1:NyhrlYXJ2H4eJiRy/WDBO6HMqZQ6q9nk4JzS3NuCK+w= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -949,8 +947,8 @@ golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI= golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= -golang.org/x/net v0.44.0 h1:evd8IRDyfNBMBTTY5XRF1vaZlD+EmWx6x8PkhR04H/I= -golang.org/x/net v0.44.0/go.mod h1:ECOoLqd5U3Lhyeyo/QDCEVQ4sNgYsqvCZ722XogGieY= +golang.org/x/net v0.47.0 h1:Mx+4dIFzqraBXUugkia1OOvlD6LemFo1ALMHjrXDOhY= +golang.org/x/net v0.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU= golang.org/x/oauth2 v0.0.0-20170912212905-13449ad91cb2/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -970,8 +968,8 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug= -golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI= +golang.org/x/sync v0.18.0 h1:kr88TuHDroi+UVf+0hZnirlk8o8T+4MrK6mr60WkH/I= +golang.org/x/sync v0.18.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -1013,10 +1011,10 @@ golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.36.0 h1:KVRy2GtZBrk1cBYA7MKu5bEZFxQk4NIDV6RLVcC8o0k= -golang.org/x/sys v0.36.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= -golang.org/x/telemetry v0.0.0-20250908211612-aef8a434d053 h1:dHQOQddU4YHS5gY33/6klKjq7Gp3WwMyOXGNp5nzRj8= -golang.org/x/telemetry v0.0.0-20250908211612-aef8a434d053/go.mod h1:+nZKN+XVh4LCiA9DV3ywrzN4gumyCnKjau3NGb9SGoE= +golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc= +golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= +golang.org/x/telemetry v0.0.0-20251008203120-078029d740a8 h1:LvzTn0GQhWuvKH/kVRS3R3bVAsdQWI7hvfLHGgh9+lU= +golang.org/x/telemetry v0.0.0-20251008203120-078029d740a8/go.mod h1:Pi4ztBfryZoJEkyFTI5/Ocsu2jXyDr6iSdgJiYE/uwE= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= @@ -1025,8 +1023,8 @@ golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY= golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= golang.org/x/term v0.11.0/go.mod h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU= golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY= -golang.org/x/term v0.35.0 h1:bZBVKBudEyhRcajGcNc3jIfWPqV4y/Kt2XcoigOWtDQ= -golang.org/x/term v0.35.0/go.mod h1:TPGtkTLesOwf2DE8CgVYiZinHAOuy5AYUYT1lENIZnA= +golang.org/x/term v0.37.0 h1:8EGAD0qCmHYZg6J17DvsMy9/wJ7/D/4pV/wfnld5lTU= +golang.org/x/term v0.37.0/go.mod h1:5pB4lxRNYYVZuTLmy8oR2BH8dflOR+IbTYFD8fi3254= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= @@ -1038,8 +1036,8 @@ golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -golang.org/x/text v0.29.0 h1:1neNs90w9YzJ9BocxfsQNHKuAT4pkghyXc4nhZ6sJvk= -golang.org/x/text v0.29.0/go.mod h1:7MhJOA9CD2qZyOKYazxdYMF85OwPdEr9jTtBpO7ydH4= +golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM= +golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM= golang.org/x/time v0.0.0-20170424234030-8be79e1e0910/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -1062,8 +1060,8 @@ golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= -golang.org/x/tools v0.37.0 h1:DVSRzp7FwePZW356yEAChSdNcQo6Nsp+fex1SUW09lE= -golang.org/x/tools v0.37.0/go.mod h1:MBN5QPQtLMHVdvsbtarmTNukZDdgwdwlO5qGacAzF0w= +golang.org/x/tools v0.38.0 h1:Hx2Xv8hISq8Lm16jvBZ2VQf+RLmbd7wVUsALibYI/IQ= +golang.org/x/tools v0.38.0/go.mod h1:yEsQ/d/YK8cjh0L6rZlY8tgtlKiBNTL14pGDJPJpYQs= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= 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 eadb86eadf..b6160083e4 100644 --- a/ibft/storage/store.go +++ b/ibft/storage/store.go @@ -13,9 +13,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 8c96ed9232..74d29833e4 100644 --- a/identity/store.go +++ b/identity/store.go @@ -7,9 +7,9 @@ import ( "github.com/pkg/errors" "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 f316f2589d..1f341c3723 100644 --- a/identity/store_test.go +++ b/identity/store_test.go @@ -7,10 +7,10 @@ import ( gcrypto "github.com/ethereum/go-ethereum/crypto" "github.com/stretchr/testify/require" - "github.com/ssvlabs/ssv/network/commons" - "github.com/ssvlabs/ssv/observability/log" - 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 49ddf21e36..b53934aa79 100644 --- a/message/validation/consensus_validation.go +++ b/message/validation/consensus_validation.go @@ -15,10 +15,10 @@ 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/utils/casts" + "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" + "github.com/ssvlabs/ssv/v2/utils/casts" ) func (mv *messageValidator) validateConsensusMessage( diff --git a/message/validation/consensus_validation_test.go b/message/validation/consensus_validation_test.go index 85a1a40fe0..264dd5234a 100644 --- a/message/validation/consensus_validation_test.go +++ b/message/validation/consensus_validation_test.go @@ -7,7 +7,7 @@ import ( specqbft "github.com/ssvlabs/ssv-spec/qbft" "github.com/stretchr/testify/require" - "github.com/ssvlabs/ssv/protocol/v2/qbft/roundtimer" + "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 7664830582..88e538659f 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 66720375a3..4a8571ddbf 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. @@ -179,7 +179,7 @@ func (mv *messageValidator) handleSignedSSVMessage( return decodedMessage, err } - // TODO: leverage the validatorStore to keep track of committees' indices and return them in Committee methods (which already return a Committee struct that we should add an Indices filter to): https://github.com/ssvlabs/ssv/pull/1393#discussion_r1667681686 + // TODO: leverage the validatorStore to keep track of committees' indices and return them in Committee methods (which already return a Committee struct that we should add an Indices filter to): https://github.com/ssvlabs/ssv/v2/pull/1393#discussion_r1667681686 committeeInfo, err := mv.getCommitteeAndValidatorIndices(signedSSVMessage.SSVMessage.GetID()) if err != nil { return decodedMessage, err diff --git a/message/validation/validation_test.go b/message/validation/validation_test.go index 535e886a0e..58812c0026 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 60bc261273..f990af7b76 100644 --- a/migrations/migration_1_example.go +++ b/migrations/migration_1_example.go @@ -6,7 +6,7 @@ import ( "github.com/pkg/errors" "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 f760805451..03fcce2585 100644 --- a/migrations/migration_7_derive_signer_key_with_hkdf_test.go +++ b/migrations/migration_7_derive_signer_key_with_hkdf_test.go @@ -15,11 +15,11 @@ import ( "github.com/ssvlabs/ssv/ssvsigner/ekm" "github.com/ssvlabs/ssv/ssvsigner/keys" - "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 a934a8e5c3..dd9db791ff 100644 --- a/migrations/migrations.go +++ b/migrations/migrations.go @@ -11,11 +11,11 @@ import ( "github.com/ssvlabs/ssv/ssvsigner/ekm" "github.com/ssvlabs/ssv/ssvsigner/keys" - "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 9048d07446..198758d5ba 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 79a4e0ac60..82d599c2fa 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" ) // limitNodeFilter returns true if the limit is exceeded diff --git a/network/discovery/dv5_routing.go b/network/discovery/dv5_routing.go index 243ef46d48..7e03708757 100644 --- a/network/discovery/dv5_routing.go +++ b/network/discovery/dv5_routing.go @@ -9,8 +9,8 @@ import ( "github.com/pkg/errors" "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 a579413f51..8896550c78 100644 --- a/network/discovery/dv5_service.go +++ b/network/discovery/dv5_service.go @@ -14,13 +14,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 ( @@ -156,7 +156,7 @@ func (dvs *DiscV5Service) Node(logger *zap.Logger, info peer.AddrInfo) (*enode.N // which lets other components to determine whether we'll want to connect to this node or not. func (dvs *DiscV5Service) Bootstrap(handler HandleNewPeer) error { // Log every 10th skipped peer. - // TODO: remove once we've merged https://github.com/ssvlabs/ssv/pull/1803 + // TODO: remove once we've merged https://github.com/ssvlabs/ssv/v2/pull/1803 const logFrequency = 10 var skippedPeers uint64 = 0 diff --git a/network/discovery/dv5_service_test.go b/network/discovery/dv5_service_test.go index 0a36213da2..0c54ffc85c 100644 --- a/network/discovery/dv5_service_test.go +++ b/network/discovery/dv5_service_test.go @@ -15,13 +15,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 c75026deef..90d515695c 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 dcc70bd72f..916553e500 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 0af6e77966..b70a0b9ce8 100644 --- a/network/discovery/options.go +++ b/network/discovery/options.go @@ -9,9 +9,9 @@ import ( "github.com/pkg/errors" "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 4b1e2c4b17..6b95e573bd 100644 --- a/network/discovery/service_test.go +++ b/network/discovery/service_test.go @@ -13,9 +13,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 f945671725..bb674fc593 100644 --- a/network/discovery/subnets.go +++ b/network/discovery/subnets.go @@ -4,8 +4,8 @@ import ( "fmt" "strconv" - "github.com/ssvlabs/ssv/network/commons" - "github.com/ssvlabs/ssv/utils/format" + "github.com/ssvlabs/ssv/v2/network/commons" + "github.com/ssvlabs/ssv/v2/utils/format" ) 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 1e28ad04dd..f6a999728e 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 bc053a51c6..bf99e4d541 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 bc8b829cd5..03f2ee2b37 100644 --- a/network/p2p/config.go +++ b/network/p2p/config.go @@ -18,13 +18,13 @@ import ( "github.com/ssvlabs/ssv/ssvsigner/keys" - "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 fa2ff33947..9a30d26a29 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 1e766c24d2..e139ee6a13 100644 --- a/network/p2p/p2p.go +++ b/network/p2p/p2p.go @@ -22,23 +22,23 @@ import ( "github.com/ssvlabs/ssv/ssvsigner/keys" - "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 @@ -465,7 +465,7 @@ func (n *p2pNetwork) isReady() bool { // NOTE: it won't subscribe to the subnets (use subscribeToFixedSubnets for that) func (n *p2pNetwork) UpdateSubnets() { // TODO: this is a temporary fix to update subnets when validators are added/removed, - // there is a pending PR to replace this: https://github.com/ssvlabs/ssv/pull/990 + // there is a pending PR to replace this: https://github.com/ssvlabs/ssv/v2/pull/990 ticker := time.NewTicker(time.Second) registeredSubnets := commons.Subnets{} defer ticker.Stop() diff --git a/network/p2p/p2p_discovery.go b/network/p2p/p2p_discovery.go index f050d059cf..5b5f8acd1d 100644 --- a/network/p2p/p2p_discovery.go +++ b/network/p2p/p2p_discovery.go @@ -10,10 +10,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" ) func (n *p2pNetwork) startDiscovery() error { diff --git a/network/p2p/p2p_discovery_test.go b/network/p2p/p2p_discovery_test.go index 31597b098c..977f902fdf 100644 --- a/network/p2p/p2p_discovery_test.go +++ b/network/p2p/p2p_discovery_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/ssvlabs/ssv/network/commons" + "github.com/ssvlabs/ssv/v2/network/commons" ) // 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 4f12bdd393..f25133a236 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_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 4adaf71ebd..e4711c75fa 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_test.go b/network/p2p/p2p_test.go index e75d2645d4..5154878f8c 100644 --- a/network/p2p/p2p_test.go +++ b/network/p2p/p2p_test.go @@ -20,9 +20,9 @@ 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/networkconfig" - ssvtypes "github.com/ssvlabs/ssv/protocol/v2/types" + "github.com/ssvlabs/ssv/v2/network" + "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_validation_test.go b/network/p2p/p2p_validation_test.go index a2df0198d6..d4129d299b 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 11a363065d..202023c0d3 100644 --- a/network/p2p/testutils.go +++ b/network/p2p/testutils.go @@ -14,20 +14,20 @@ 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/utils/format" + "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" + "github.com/ssvlabs/ssv/v2/utils/format" ) // 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/connections/conn_gater.go b/network/peers/connections/conn_gater.go index 4cc27c545a..330bca9fcb 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_handler.go b/network/peers/connections/conn_handler.go index 2daf8cda92..accf562d72 100644 --- a/network/peers/connections/conn_handler.go +++ b/network/peers/connections/conn_handler.go @@ -11,12 +11,12 @@ import ( "github.com/pkg/errors" "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/filters.go b/network/peers/connections/filters.go index a233ca9c94..3ccf04cba7 100644 --- a/network/peers/connections/filters.go +++ b/network/peers/connections/filters.go @@ -4,8 +4,8 @@ import ( "github.com/libp2p/go-libp2p/core/peer" "github.com/pkg/errors" - "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 c002f45127..514405c448 100644 --- a/network/peers/connections/handshaker.go +++ b/network/peers/connections/handshaker.go @@ -15,11 +15,11 @@ import ( "github.com/ssvlabs/ssv/ssvsigner/keys" - "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 ea42d0dc0b..71fa6f3cd5 100644 --- a/network/peers/connections/helpers_test.go +++ b/network/peers/connections/helpers_test.go @@ -7,12 +7,12 @@ import ( "github.com/libp2p/go-libp2p/core/peer" "github.com/stretchr/testify/require" - "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" ) type TestData struct { diff --git a/network/peers/connections/mock/mock_node_info_idx.go b/network/peers/connections/mock/mock_node_info_idx.go index 93247a174c..95d45be2e1 100644 --- a/network/peers/connections/mock/mock_node_info_idx.go +++ b/network/peers/connections/mock/mock_node_info_idx.go @@ -4,8 +4,8 @@ import ( "github.com/libp2p/go-libp2p/core/peer" "github.com/pkg/errors" - "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 c568162657..26a0e11d57 100644 --- a/network/peers/connections/mock/mock_stream_controller.go +++ b/network/peers/connections/mock/mock_stream_controller.go @@ -7,7 +7,7 @@ import ( "github.com/pkg/errors" "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 92dd60c216..2a8c2bbd67 100644 --- a/network/peers/index.go +++ b/network/peers/index.go @@ -8,8 +8,8 @@ import ( ma "github.com/multiformats/go-multiaddr" "github.com/pkg/errors" - "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 7d2817df09..af61a7e3bb 100644 --- a/network/peers/peers_index.go +++ b/network/peers/peers_index.go @@ -10,7 +10,7 @@ import ( "github.com/pkg/errors" "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 7c447ad6cd..c04a09d46d 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 e4d4b0263a..5c76a6cadc 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/pkg/errors" - "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_test.go b/network/streams/controller_test.go index 2db1ad988c..a9d1282115 100644 --- a/network/streams/controller_test.go +++ b/network/streams/controller_test.go @@ -11,7 +11,7 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/observability/log" + "github.com/ssvlabs/ssv/v2/observability/log" ) func TestStreamCtrl(t *testing.T) { diff --git a/network/streams/observability.go b/network/streams/observability.go index d2b2f1b21b..a722b1ea0e 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 a9ad9f0cff..2ccb21ee7f 100644 --- a/network/testing/keys.go +++ b/network/testing/keys.go @@ -5,8 +5,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 1abcd2a675..7b2bc20df7 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" ) var ( 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 900f4bb462..92c0d60fb7 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 729908e659..9a8af24194 100644 --- a/network/topics/msg_validator_test.go +++ b/network/topics/msg_validator_test.go @@ -16,16 +16,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 83a537c330..6dc020dd1d 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 cc1c78c5dd..2d2c22b944 100644 --- a/network/topics/params/topic_score.go +++ b/network/topics/params/topic_score.go @@ -7,8 +7,8 @@ import ( pubsub "github.com/libp2p/go-libp2p-pubsub" "github.com/pkg/errors" - "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 cd7a27d3ad..d099b3f766 100644 --- a/network/topics/pubsub.go +++ b/network/topics/pubsub.go @@ -13,13 +13,13 @@ import ( "github.com/pkg/errors" "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..6c89d10b7d 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 @@ -131,7 +131,7 @@ func scoreInspector(logger *zap.Logger, p7 := peerScores.BehaviourPenalty w7 := peerScoreParams.BehaviourPenaltyWeight - // Short logs per topic https://github.com/ssvlabs/ssv/issues/1666 + // Short logs per topic https://github.com/ssvlabs/ssv/v2/issues/1666 invalidMessagesStats := formatInvalidMessageStats(filtered) if inspections%logFrequency != 0 { 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/nodeprobe/nodeprobe.go b/nodeprobe/nodeprobe.go index 14456664e8..1c94499fd8 100644 --- a/nodeprobe/nodeprobe.go +++ b/nodeprobe/nodeprobe.go @@ -9,7 +9,7 @@ import ( "go.uber.org/zap" - "github.com/ssvlabs/ssv/utils/hashmap" + "github.com/ssvlabs/ssv/v2/utils/hashmap" ) // node represents a node being probed. diff --git a/nodeprobe/nodeprobe_test.go b/nodeprobe/nodeprobe_test.go index 4b8b5105a1..920e0e7af9 100644 --- a/nodeprobe/nodeprobe_test.go +++ b/nodeprobe/nodeprobe_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/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 20ba6601fb..0949344746 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 89746b9791..8dd34056b9 100644 --- a/operator/duties/attester.go +++ b/operator/duties/attester.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/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/utils" + "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" + "github.com/ssvlabs/ssv/v2/utils" ) type AttesterHandler struct { diff --git a/operator/duties/attester_test.go b/operator/duties/attester_test.go index 57a580362c..3c7e92f7f7 100644 --- a/operator/duties/attester_test.go +++ b/operator/duties/attester_test.go @@ -14,9 +14,9 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" - "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 setupAttesterDutiesMock( diff --git a/operator/duties/base_handler.go b/operator/duties/base_handler.go index 5b2e8f21c9..ac916e0ab8 100644 --- a/operator/duties/base_handler.go +++ b/operator/duties/base_handler.go @@ -7,8 +7,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/base_handler_mock.go b/operator/duties/base_handler_mock.go index 683a87018e..167204df68 100644 --- a/operator/duties/base_handler_mock.go +++ b/operator/duties/base_handler_mock.go @@ -13,8 +13,8 @@ import ( context "context" reflect "reflect" - networkconfig "github.com/ssvlabs/ssv/networkconfig" - slotticker "github.com/ssvlabs/ssv/operator/slotticker" + networkconfig "github.com/ssvlabs/ssv/v2/networkconfig" + slotticker "github.com/ssvlabs/ssv/v2/operator/slotticker" gomock "go.uber.org/mock/gomock" zap "go.uber.org/zap" ) diff --git a/operator/duties/beacon_adapter.go b/operator/duties/beacon_adapter.go index bbeab81491..e96541a711 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 19be1d7ccc..e27b279a24 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 b9ff472502..80c2a13e14 100644 --- a/operator/duties/committee_test.go +++ b/operator/duties/committee_test.go @@ -14,10 +14,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 ecfe93bf8f..2adbb26e06 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 c37be02c47..5e8fdf3fda 100644 --- a/operator/duties/proposer_test.go +++ b/operator/duties/proposer_test.go @@ -12,9 +12,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(s *Scheduler, dutiesMap *hashmap.Map[phase0.Epoch, []*eth2apiv1.ProposerDuty]) (chan struct{}, chan []*spectypes.ValidatorDuty) { 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 5fb48b7c31..d52052c15e 100644 --- a/operator/duties/scheduler.go +++ b/operator/duties/scheduler.go @@ -18,15 +18,15 @@ 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/utils" + "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" + "github.com/ssvlabs/ssv/v2/utils" ) //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 e813a65974..7901ab555a 100644 --- a/operator/duties/scheduler_mock.go +++ b/operator/duties/scheduler_mock.go @@ -18,7 +18,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 3e583a4992..e138f1fc92 100644 --- a/operator/duties/scheduler_test.go +++ b/operator/duties/scheduler_test.go @@ -14,10 +14,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 c8cd380176..b022b6b6d0 100644 --- a/operator/duties/sync_committee.go +++ b/operator/duties/sync_committee.go @@ -15,12 +15,12 @@ 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/utils" + "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" + "github.com/ssvlabs/ssv/v2/utils" ) type SyncCommitteeHandler struct { diff --git a/operator/duties/sync_committee_test.go b/operator/duties/sync_committee_test.go index 1275632846..add672915c 100644 --- a/operator/duties/sync_committee_test.go +++ b/operator/duties/sync_committee_test.go @@ -14,9 +14,9 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" - "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/operator/duties/dutystore" + ssvtypes "github.com/ssvlabs/ssv/v2/protocol/v2/types" + "github.com/ssvlabs/ssv/v2/utils/hashmap" ) func setupSyncCommitteeDutiesMock( 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 bbb5af8664..f77013abc9 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 170b13dd39..97c5ef2e2a 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 cd5439a1b5..2137910f95 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 9c02f7b3c2..c280aec3f9 100644 --- a/operator/dutytracer/collector_test.go +++ b/operator/dutytracer/collector_test.go @@ -18,17 +18,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 3c86288fcd..2f274fa072 100644 --- a/operator/dutytracer/store.go +++ b/operator/dutytracer/store.go @@ -9,9 +9,9 @@ import ( "github.com/pkg/errors" 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 9054ae6fc5..5447d1b357 100644 --- a/operator/node.go +++ b/operator/node.go @@ -13,27 +13,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/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 1ee78c0926..846d8199c4 100644 --- a/operator/storage/storage.go +++ b/operator/storage/storage.go @@ -13,10 +13,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 0ab0ebdd83..e52b0aff9b 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_test.go b/operator/validator/controller_test.go index beae05092f..b7f8440642 100644 --- a/operator/validator/controller_test.go +++ b/operator/validator/controller_test.go @@ -23,27 +23,27 @@ import ( "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/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 218d726eba..62d31e7e9c 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 f3c1a93996..3495c0cae9 100644 --- a/operator/validator/router.go +++ b/operator/validator/router.go @@ -5,7 +5,7 @@ import ( "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 0ca2e9d0ea..b122efcbdf 100644 --- a/operator/validator/router_test.go +++ b/operator/validator/router_test.go @@ -10,9 +10,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/config.go b/protocol/v2/qbft/config.go index 663ad58dba..1e8705be0e 100644 --- a/protocol/v2/qbft/config.go +++ b/protocol/v2/qbft/config.go @@ -6,7 +6,7 @@ import ( "github.com/ssvlabs/ssv/ssvsigner/ekm" - "github.com/ssvlabs/ssv/protocol/v2/qbft/roundtimer" + "github.com/ssvlabs/ssv/v2/protocol/v2/qbft/roundtimer" ) type signing interface { diff --git a/protocol/v2/qbft/controller/controller.go b/protocol/v2/qbft/controller/controller.go index 5ca218ba8e..d62a05c647 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 dec5d395a5..e516108281 100644 --- a/protocol/v2/qbft/controller/controller_test.go +++ b/protocol/v2/qbft/controller/controller_test.go @@ -10,11 +10,11 @@ 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/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/types" ) func TestController_Marshaling(t *testing.T) { diff --git a/protocol/v2/qbft/controller/decided.go b/protocol/v2/qbft/controller/decided.go index c76350cfe1..cc83794bda 100644 --- a/protocol/v2/qbft/controller/decided.go +++ b/protocol/v2/qbft/controller/decided.go @@ -8,7 +8,7 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" "go.uber.org/zap" - "github.com/ssvlabs/ssv/protocol/v2/qbft/instance" + "github.com/ssvlabs/ssv/v2/protocol/v2/qbft/instance" ) // UponDecided returns decided msg if decided, nil otherwise 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 213883cb69..cb50521b5a 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" ) // OnTimeout 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 c1f9c8146d..2cc26c796b 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 01e1fb4f31..f2c1c89e82 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 e4dfd5defa..dcf41ef34f 100644 --- a/protocol/v2/qbft/instance/commit.go +++ b/protocol/v2/qbft/instance/commit.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" ) // UponCommit returns true if a quorum of commit messages was received. diff --git a/protocol/v2/qbft/instance/instance.go b/protocol/v2/qbft/instance/instance.go index 3379145760..898a731be2 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 is a single QBFT instance that starts with a Start call (including a value). 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 b78371dc14..d97dc9a6ea 100644 --- a/protocol/v2/qbft/instance/prepare.go +++ b/protocol/v2/qbft/instance/prepare.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" ) // uponPrepare process prepare message diff --git a/protocol/v2/qbft/instance/proposal.go b/protocol/v2/qbft/instance/proposal.go index 01cb7fdec5..efd257b123 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 5aa59bcd63..9c453cc41e 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/timeout.go b/protocol/v2/qbft/instance/timeout.go index 309022b1be..852044b797 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 dce5b3354e..c224dedcd9 100644 --- a/protocol/v2/qbft/roundtimer/timer.go +++ b/protocol/v2/qbft/roundtimer/timer.go @@ -11,8 +11,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" ) //go:generate go tool -modfile=../../../../tool.mod mockgen -package=mocks -destination=./mocks/timer.go -source=./timer.go diff --git a/protocol/v2/qbft/roundtimer/timer_test.go b/protocol/v2/qbft/roundtimer/timer_test.go index bbbb070148..58bda401a1 100644 --- a/protocol/v2/qbft/roundtimer/timer_test.go +++ b/protocol/v2/qbft/roundtimer/timer_test.go @@ -13,7 +13,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 3f8d6e4e6e..c0d6302ec4 100644 --- a/protocol/v2/qbft/spectest/controller_type.go +++ b/protocol/v2/qbft/spectest/controller_type.go @@ -19,11 +19,11 @@ 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" - 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" + 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 727e9811a1..1daaf548af 100644 --- a/protocol/v2/qbft/spectest/msg_processing_type.go +++ b/protocol/v2/qbft/spectest/msg_processing_type.go @@ -16,10 +16,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/protocol/v2/qbft" - "github.com/ssvlabs/ssv/protocol/v2/qbft/instance" - 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" + 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 c6458ab5b9..6d539f803c 100644 --- a/protocol/v2/qbft/spectest/qbft_mapping_test.go +++ b/protocol/v2/qbft/spectest/qbft_mapping_test.go @@ -12,9 +12,9 @@ import ( "github.com/ssvlabs/ssv-spec/types/testingutils" "github.com/stretchr/testify/require" - "github.com/ssvlabs/ssv/ibft/storage" - "github.com/ssvlabs/ssv/protocol/v2/qbft/instance" - protocoltesting "github.com/ssvlabs/ssv/protocol/v2/testing" + "github.com/ssvlabs/ssv/v2/ibft/storage" + "github.com/ssvlabs/ssv/v2/protocol/v2/qbft/instance" + 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 178925d1d3..deb55922fc 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 a8d4283bc7..08f7f1ccb1 100644 --- a/protocol/v2/queue/worker/message_worker.go +++ b/protocol/v2/queue/worker/message_worker.go @@ -5,8 +5,8 @@ import ( "go.uber.org/zap" - "github.com/ssvlabs/ssv/network" - "github.com/ssvlabs/ssv/protocol/v2/ssv/queue" + "github.com/ssvlabs/ssv/v2/network" + "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 f626ef52f1..2805755c1b 100644 --- a/protocol/v2/queue/worker/message_worker_test.go +++ b/protocol/v2/queue/worker/message_worker_test.go @@ -9,9 +9,9 @@ import ( "github.com/stretchr/testify/require" - "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 2d18d1076d..a98d6cb8de 100644 --- a/protocol/v2/ssv/partial_sig_container.go +++ b/protocol/v2/ssv/partial_sig_container.go @@ -11,8 +11,8 @@ import ( specssv "github.com/ssvlabs/ssv-spec/ssv" 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" ) type SigningRoot string diff --git a/protocol/v2/ssv/queue/message_prioritizer_test.go b/protocol/v2/ssv/queue/message_prioritizer_test.go index 89a2591743..4c3937b43f 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 c4f374a907..ee9d18891c 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 50f26e9488..81ed93c585 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 d2c803bd51..2ba75c6839 100644 --- a/protocol/v2/ssv/queue/queue.go +++ b/protocol/v2/ssv/queue/queue.go @@ -8,7 +8,7 @@ import ( "go.opentelemetry.io/otel/metric" "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 6f468be541..d3eccac37b 100644 --- a/protocol/v2/ssv/queue/queue_test.go +++ b/protocol/v2/ssv/queue/queue_test.go @@ -16,7 +16,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 7c164b2be3..ffd44fcfc8 100644 --- a/protocol/v2/ssv/runner/aggregator.go +++ b/protocol/v2/ssv/runner/aggregator.go @@ -22,13 +22,13 @@ 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/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/networkconfig" + "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 5961427f99..a40785f8d2 100644 --- a/protocol/v2/ssv/runner/committee.go +++ b/protocol/v2/ssv/runner/committee.go @@ -27,13 +27,13 @@ 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/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/networkconfig" + "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/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 e8681c0619..d53a69e69b 100644 --- a/protocol/v2/ssv/runner/proposer.go +++ b/protocol/v2/ssv/runner/proposer.go @@ -22,14 +22,14 @@ 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/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/networkconfig" + "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/runner.go b/protocol/v2/ssv/runner/runner.go index 710bd23e05..561eac741b 100644 --- a/protocol/v2/ssv/runner/runner.go +++ b/protocol/v2/ssv/runner/runner.go @@ -18,13 +18,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 8d409049e8..0afce0127c 100644 --- a/protocol/v2/ssv/runner/runner_signatures.go +++ b/protocol/v2/ssv/runner/runner_signatures.go @@ -10,8 +10,8 @@ import ( "github.com/pkg/errors" spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/protocol/v2/ssv" - ssvtypes "github.com/ssvlabs/ssv/protocol/v2/types" + "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 c50f14cd15..8c8acdf479 100644 --- a/protocol/v2/ssv/runner/runner_state.go +++ b/protocol/v2/ssv/runner/runner_state.go @@ -8,8 +8,8 @@ import ( "github.com/pkg/errors" 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 9968531b75..e58c3df032 100644 --- a/protocol/v2/ssv/runner/runner_validations.go +++ b/protocol/v2/ssv/runner/runner_validations.go @@ -13,7 +13,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 fc364a1a44..18f8b72f38 100644 --- a/protocol/v2/ssv/runner/sync_committee_contribution.go +++ b/protocol/v2/ssv/runner/sync_committee_contribution.go @@ -19,13 +19,13 @@ 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/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/networkconfig" + "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/timer.go b/protocol/v2/ssv/runner/timer.go index 64bcec1e27..958fa91beb 100644 --- a/protocol/v2/ssv/runner/timer.go +++ b/protocol/v2/ssv/runner/timer.go @@ -7,8 +7,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/qbft/roundtimer" + "github.com/ssvlabs/ssv/v2/protocol/v2/qbft/instance" + "github.com/ssvlabs/ssv/v2/protocol/v2/qbft/roundtimer" ) type TimeoutF func(ctx context.Context, logger *zap.Logger, identifier spectypes.MessageID, height specqbft.Height) roundtimer.OnRoundTimeoutF diff --git a/protocol/v2/ssv/runner/validator_registration.go b/protocol/v2/ssv/runner/validator_registration.go index c30cd74fb5..1637cba5bb 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 5505eef98e..7fe39816cc 100644 --- a/protocol/v2/ssv/runner/voluntary_exit.go +++ b/protocol/v2/ssv/runner/voluntary_exit.go @@ -17,11 +17,11 @@ 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/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/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 d2c5939974..32b93f1ed4 100644 --- a/protocol/v2/ssv/spectest/committee_msg_processing_type.go +++ b/protocol/v2/ssv/spectest/committee_msg_processing_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/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 9626510864..c754fb5f5a 100644 --- a/protocol/v2/ssv/spectest/msg_processing_type.go +++ b/protocol/v2/ssv/spectest/msg_processing_type.go @@ -19,13 +19,13 @@ 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/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/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 86cceb4efc..053c13d9e4 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 5de5257cbe..e671d8b2f6 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 @@ -15,8 +15,8 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/zap" - "github.com/ssvlabs/ssv/protocol/v2/ssv/runner" - protocoltesting "github.com/ssvlabs/ssv/protocol/v2/testing" + "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 2b51755d2e..2ac7475a09 100644 --- a/protocol/v2/ssv/spectest/ssv_mapping_test.go +++ b/protocol/v2/ssv/spectest/ssv_mapping_test.go @@ -23,14 +23,14 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" spectestingutils "github.com/ssvlabs/ssv-spec/types/testingutils" - "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/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/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 cb392c8c0c..9de25e29c9 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 a7927f13f7..db186b4481 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 ee0f990a21..7ebdf8a846 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 e7fe52d2ef..ce4f641706 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 4f638c701e..6c3ff12d7c 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 5bb827660b..513ff47855 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_queue.go b/protocol/v2/ssv/validator/committee_queue.go index 359d8bac86..045f9422f2 100644 --- a/protocol/v2/ssv/validator/committee_queue.go +++ b/protocol/v2/ssv/validator/committee_queue.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" ) // queueContainer wraps a queue with its corresponding state diff --git a/protocol/v2/ssv/validator/committee_queue_test.go b/protocol/v2/ssv/validator/committee_queue_test.go index 4668012ff4..d6c71462c2 100644 --- a/protocol/v2/ssv/validator/committee_queue_test.go +++ b/protocol/v2/ssv/validator/committee_queue_test.go @@ -19,13 +19,13 @@ 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/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/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. @@ -1479,7 +1479,7 @@ func TestConsumeQueueBurstTraffic(t *testing.T) { // This test suite highlights a known behavior where the queue drops messages when full, // even high-priority ones, due to its non-blocking intake. // This behavior and potential improvements are tracked -// in GitHub issue #1680 (https://github.com/ssvlabs/ssv/issues/1680). +// in GitHub issue #1680 (https://github.com/ssvlabs/ssv/v2/issues/1680). func TestQueueLoadAndSaturationScenarios(t *testing.T) { ctrl := gomock.NewController(t) defer ctrl.Finish() 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 499c394ce9..8df9205167 100644 --- a/protocol/v2/ssv/validator/msg_queue.go +++ b/protocol/v2/ssv/validator/msg_queue.go @@ -10,9 +10,9 @@ import ( "go.opentelemetry.io/otel/trace" "go.uber.org/zap" - "github.com/ssvlabs/ssv/observability/log/fields" - "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/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/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 620c9e09f5..545777eb85 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" ) // Options represents validator-specific options. diff --git a/protocol/v2/ssv/validator/queue_validator.go b/protocol/v2/ssv/validator/queue_validator.go index 1a5a986b40..e91e33662a 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 218a82adf7..3956833128 100644 --- a/protocol/v2/ssv/validator/timer.go +++ b/protocol/v2/ssv/validator/timer.go @@ -10,11 +10,11 @@ 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/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/queue" + "github.com/ssvlabs/ssv/v2/protocol/v2/types" ) func (v *Validator) onTimeout(ctx context.Context, logger *zap.Logger, identifier spectypes.MessageID, height specqbft.Height) roundtimer.OnRoundTimeoutF { diff --git a/protocol/v2/ssv/validator/validator.go b/protocol/v2/ssv/validator/validator.go index aef67a34a4..f89debe90d 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 192254aced..86d682ec1e 100644 --- a/protocol/v2/testing/utils.go +++ b/protocol/v2/testing/utils.go @@ -10,9 +10,9 @@ 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/protocol/v2/qbft/roundtimer" + "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" ) type TestingValueChecker struct{} diff --git a/protocol/v2/types/ssvshare.go b/protocol/v2/types/ssvshare.go index 25fe5acd48..1c5a22638d 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 c16ff133c6..3361c23a00 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 e2fa6651c0..64f201bd11 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 babaa878c8..9b65158a32 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/ssvsigner/client.go b/ssvsigner/client.go index 2733b8d67b..8fa42319a7 100644 --- a/ssvsigner/client.go +++ b/ssvsigner/client.go @@ -14,7 +14,7 @@ import ( "github.com/carlmjohnson/requests" "go.uber.org/zap" - "github.com/ssvlabs/ssv/observability/log/fields" + "github.com/ssvlabs/ssv/v2/observability/log/fields" "github.com/ssvlabs/ssv/ssvsigner/web3signer" ) diff --git a/ssvsigner/cmd/purge-keys/purge-keys.go b/ssvsigner/cmd/purge-keys/purge-keys.go index 08bfd58f56..bcaa8d9aac 100644 --- a/ssvsigner/cmd/purge-keys/purge-keys.go +++ b/ssvsigner/cmd/purge-keys/purge-keys.go @@ -14,7 +14,7 @@ import ( "github.com/herumi/bls-eth-go-binary/bls" "go.uber.org/zap" - "github.com/ssvlabs/ssv/observability/log/fields" + "github.com/ssvlabs/ssv/v2/observability/log/fields" "github.com/ssvlabs/ssv/ssvsigner/cmd/internal/logger" diff --git a/ssvsigner/e2e/common/beacon_config.go b/ssvsigner/e2e/common/beacon_config.go index a7fa6e2217..d9b0df5743 100644 --- a/ssvsigner/e2e/common/beacon_config.go +++ b/ssvsigner/e2e/common/beacon_config.go @@ -8,7 +8,7 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/networkconfig" + "github.com/ssvlabs/ssv/v2/networkconfig" ) // MainnetBeaconConfig is the beacon configuration for the mainnet diff --git a/ssvsigner/e2e/testenv/environment.go b/ssvsigner/e2e/testenv/environment.go index 4eee284793..be2b580691 100644 --- a/ssvsigner/e2e/testenv/environment.go +++ b/ssvsigner/e2e/testenv/environment.go @@ -12,13 +12,13 @@ import ( "github.com/attestantio/go-eth2-client/spec/phase0" "github.com/testcontainers/testcontainers-go" - "github.com/ssvlabs/ssv/networkconfig" "github.com/ssvlabs/ssv/ssvsigner" "github.com/ssvlabs/ssv/ssvsigner/e2e/common" "github.com/ssvlabs/ssv/ssvsigner/ekm" "github.com/ssvlabs/ssv/ssvsigner/keys" "github.com/ssvlabs/ssv/ssvsigner/web3signer" - "github.com/ssvlabs/ssv/storage/basedb" + "github.com/ssvlabs/ssv/v2/networkconfig" + "github.com/ssvlabs/ssv/v2/storage/basedb" ) // TestEnvironment manages the complete E2E test infrastructure diff --git a/ssvsigner/e2e/testenv/key_managers.go b/ssvsigner/e2e/testenv/key_managers.go index 328d78ed5d..37bb05c5de 100644 --- a/ssvsigner/e2e/testenv/key_managers.go +++ b/ssvsigner/e2e/testenv/key_managers.go @@ -7,8 +7,8 @@ import ( "go.uber.org/zap" "go.uber.org/zap/zaptest" - "github.com/ssvlabs/ssv/storage/badger" - "github.com/ssvlabs/ssv/storage/basedb" + "github.com/ssvlabs/ssv/v2/storage/badger" + "github.com/ssvlabs/ssv/v2/storage/basedb" "github.com/ssvlabs/ssv/ssvsigner/ekm" ) diff --git a/ssvsigner/ekm/key_manager.go b/ssvsigner/ekm/key_manager.go index fc24a5ba4b..637b3c296f 100644 --- a/ssvsigner/ekm/key_manager.go +++ b/ssvsigner/ekm/key_manager.go @@ -7,7 +7,7 @@ import ( ssz "github.com/ferranbt/fastssz" spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/storage/basedb" + "github.com/ssvlabs/ssv/v2/storage/basedb" ) type ShareDecryptionError struct { diff --git a/ssvsigner/ekm/local_key_manager.go b/ssvsigner/ekm/local_key_manager.go index 5bb9182991..42d92e92f2 100644 --- a/ssvsigner/ekm/local_key_manager.go +++ b/ssvsigner/ekm/local_key_manager.go @@ -30,8 +30,8 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/networkconfig" - "github.com/ssvlabs/ssv/storage/basedb" + "github.com/ssvlabs/ssv/v2/networkconfig" + "github.com/ssvlabs/ssv/v2/storage/basedb" "github.com/ssvlabs/ssv/ssvsigner/keys" ) diff --git a/ssvsigner/ekm/local_key_manager_test.go b/ssvsigner/ekm/local_key_manager_test.go index 02066a381a..34e5b35812 100644 --- a/ssvsigner/ekm/local_key_manager_test.go +++ b/ssvsigner/ekm/local_key_manager_test.go @@ -19,11 +19,11 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" "github.com/ssvlabs/ssv-spec/types/testingutils" - "github.com/ssvlabs/ssv/networkconfig" - "github.com/ssvlabs/ssv/observability/log" "github.com/ssvlabs/ssv/ssvsigner/keys" - "github.com/ssvlabs/ssv/storage/basedb" - "github.com/ssvlabs/ssv/utils/threshold" + "github.com/ssvlabs/ssv/v2/networkconfig" + "github.com/ssvlabs/ssv/v2/observability/log" + "github.com/ssvlabs/ssv/v2/storage/basedb" + "github.com/ssvlabs/ssv/v2/utils/threshold" ) const ( diff --git a/ssvsigner/ekm/mock.go b/ssvsigner/ekm/mock.go index 38494c4c4f..86e624ee62 100644 --- a/ssvsigner/ekm/mock.go +++ b/ssvsigner/ekm/mock.go @@ -7,7 +7,7 @@ import ( "github.com/ssvlabs/eth2-key-manager/core" "github.com/stretchr/testify/mock" - "github.com/ssvlabs/ssv/storage/basedb" + "github.com/ssvlabs/ssv/v2/storage/basedb" ssvclient "github.com/ssvlabs/ssv/ssvsigner" "github.com/ssvlabs/ssv/ssvsigner/web3signer" diff --git a/ssvsigner/ekm/remote_key_manager.go b/ssvsigner/ekm/remote_key_manager.go index bc68f1bea8..fe6e6a481b 100644 --- a/ssvsigner/ekm/remote_key_manager.go +++ b/ssvsigner/ekm/remote_key_manager.go @@ -18,8 +18,8 @@ import ( spectypes "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv/networkconfig" - "github.com/ssvlabs/ssv/storage/basedb" + "github.com/ssvlabs/ssv/v2/networkconfig" + "github.com/ssvlabs/ssv/v2/storage/basedb" "github.com/ssvlabs/ssv/ssvsigner" "github.com/ssvlabs/ssv/ssvsigner/keys" diff --git a/ssvsigner/ekm/remote_key_manager_test.go b/ssvsigner/ekm/remote_key_manager_test.go index 897cab8bd1..a8561dd51f 100644 --- a/ssvsigner/ekm/remote_key_manager_test.go +++ b/ssvsigner/ekm/remote_key_manager_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/suite" "go.uber.org/zap" - "github.com/ssvlabs/ssv/networkconfig" + "github.com/ssvlabs/ssv/v2/networkconfig" "github.com/ssvlabs/ssv/ssvsigner" "github.com/ssvlabs/ssv/ssvsigner/web3signer" diff --git a/ssvsigner/ekm/signer_storage.go b/ssvsigner/ekm/signer_storage.go index 08b3830e08..f7e5bc1281 100644 --- a/ssvsigner/ekm/signer_storage.go +++ b/ssvsigner/ekm/signer_storage.go @@ -19,10 +19,10 @@ import ( "github.com/ssvlabs/eth2-key-manager/wallets/hd" "go.uber.org/zap" - "github.com/ssvlabs/ssv/networkconfig" - "github.com/ssvlabs/ssv/observability/log" - registry "github.com/ssvlabs/ssv/protocol/v2/blockchain/eth1" - "github.com/ssvlabs/ssv/storage/basedb" + "github.com/ssvlabs/ssv/v2/networkconfig" + "github.com/ssvlabs/ssv/v2/observability/log" + registry "github.com/ssvlabs/ssv/v2/protocol/v2/blockchain/eth1" + "github.com/ssvlabs/ssv/v2/storage/basedb" ) // signer_storage.go provides a concrete implementation of Storage (backed by diff --git a/ssvsigner/ekm/signer_storage_test.go b/ssvsigner/ekm/signer_storage_test.go index 0397e148b5..915b085129 100644 --- a/ssvsigner/ekm/signer_storage_test.go +++ b/ssvsigner/ekm/signer_storage_test.go @@ -17,11 +17,11 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/zap" - "github.com/ssvlabs/ssv/networkconfig" - "github.com/ssvlabs/ssv/observability/log" - kv "github.com/ssvlabs/ssv/storage/badger" - "github.com/ssvlabs/ssv/storage/basedb" - "github.com/ssvlabs/ssv/utils/threshold" + "github.com/ssvlabs/ssv/v2/networkconfig" + "github.com/ssvlabs/ssv/v2/observability/log" + kv "github.com/ssvlabs/ssv/v2/storage/badger" + "github.com/ssvlabs/ssv/v2/storage/basedb" + "github.com/ssvlabs/ssv/v2/utils/threshold" ) func _byteArray(input string) []byte { diff --git a/ssvsigner/ekm/slashing_protector.go b/ssvsigner/ekm/slashing_protector.go index 75a2975e47..bf0a817e40 100644 --- a/ssvsigner/ekm/slashing_protector.go +++ b/ssvsigner/ekm/slashing_protector.go @@ -8,8 +8,8 @@ import ( slashingprotection "github.com/ssvlabs/eth2-key-manager/slashing_protection" "go.uber.org/zap" - "github.com/ssvlabs/ssv/networkconfig" - "github.com/ssvlabs/ssv/storage/basedb" + "github.com/ssvlabs/ssv/v2/networkconfig" + "github.com/ssvlabs/ssv/v2/storage/basedb" ) // slashing_protector.go provides SlashingProtector, a wrapper around diff --git a/ssvsigner/ekm/slashing_protector_test.go b/ssvsigner/ekm/slashing_protector_test.go index d1181e3f1b..d279f5ce93 100644 --- a/ssvsigner/ekm/slashing_protector_test.go +++ b/ssvsigner/ekm/slashing_protector_test.go @@ -14,11 +14,11 @@ import ( "github.com/ssvlabs/ssv-spec/types/testingutils" "github.com/stretchr/testify/require" - "github.com/ssvlabs/ssv/networkconfig" - "github.com/ssvlabs/ssv/observability/log" "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" + "github.com/ssvlabs/ssv/v2/observability/log" + kv "github.com/ssvlabs/ssv/v2/storage/badger" + "github.com/ssvlabs/ssv/v2/storage/basedb" ) func TestSlashing(t *testing.T) { diff --git a/ssvsigner/go.mod b/ssvsigner/go.mod index 136cd7dd11..ede4d2b3b1 100644 --- a/ssvsigner/go.mod +++ b/ssvsigner/go.mod @@ -30,8 +30,8 @@ require ( github.com/prysmaticlabs/go-bitfield v0.0.0-20240618144021-706c95b2dd15 github.com/sourcegraph/conc v0.3.0 github.com/ssvlabs/eth2-key-manager v1.5.6 - github.com/ssvlabs/ssv v1.2.1-0.20250904093034-64dc248758c3 github.com/ssvlabs/ssv-spec v1.2.2 + github.com/ssvlabs/ssv/v2 v2.4.2 github.com/stretchr/testify v1.11.1 github.com/testcontainers/testcontainers-go v0.37.0 github.com/valyala/fasthttp v1.58.0 @@ -159,4 +159,4 @@ require ( // This avoids circular dependency issues where ssvsigner would need to reference specific SSV commits // that subsequently change. When ssvsigner is extracted to a separate repository, this will be // replaced with explicit version management. -replace github.com/ssvlabs/ssv => ../ +replace github.com/ssvlabs/ssv/v2 => ../ diff --git a/ssvsigner/observability.go b/ssvsigner/observability.go index 1e51feb90b..91c8792e70 100644 --- a/ssvsigner/observability.go +++ b/ssvsigner/observability.go @@ -10,7 +10,7 @@ import ( "go.opentelemetry.io/otel/metric" semconv "go.opentelemetry.io/otel/semconv/v1.37.0" - "github.com/ssvlabs/ssv/observability/metrics" + "github.com/ssvlabs/ssv/v2/observability/metrics" ) const ( diff --git a/ssvsigner/server.go b/ssvsigner/server.go index 99b1ff04f0..b191d1170a 100644 --- a/ssvsigner/server.go +++ b/ssvsigner/server.go @@ -20,7 +20,7 @@ import ( "github.com/valyala/fasthttp" "go.uber.org/zap" - "github.com/ssvlabs/ssv/observability/log/fields" + "github.com/ssvlabs/ssv/v2/observability/log/fields" "github.com/ssvlabs/ssv/ssvsigner/keys" "github.com/ssvlabs/ssv/ssvsigner/keystore" diff --git a/storage/badger/badger.go b/storage/badger/badger.go index f9a4b3b4d5..b13dd30827 100644 --- a/storage/badger/badger.go +++ b/storage/badger/badger.go @@ -11,9 +11,9 @@ import ( "github.com/pkg/errors" "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 21c99abc48..a0b79e0ad2 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.25 diff --git a/utils/boot_node/node.go b/utils/boot_node/node.go index d7997520de..2c79b96c29 100644 --- a/utils/boot_node/node.go +++ b/utils/boot_node/node.go @@ -17,11 +17,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/hashmap/hashmap_test.go b/utils/hashmap/hashmap_test.go index 094fefddfe..389536afd7 100644 --- a/utils/hashmap/hashmap_test.go +++ b/utils/hashmap/hashmap_test.go @@ -457,7 +457,7 @@ func TestGetOrInsertHangIssue67(t *testing.T) { wg.Wait() } -// See https://github.com/ssvlabs/ssv/issues/1682 +// See https://github.com/ssvlabs/ssv/v2/issues/1682 func TestIssue1682(t *testing.T) { t.Parallel() diff --git a/utils/keys.go b/utils/keys.go index 7e31948300..186fa76b22 100644 --- a/utils/keys.go +++ b/utils/keys.go @@ -9,8 +9,8 @@ import ( "github.com/pkg/errors" "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 cdbbaf77d4..dfe22e45aa 100644 --- a/utils/ttl/map.go +++ b/utils/ttl/map.go @@ -3,7 +3,7 @@ package ttl import ( "time" - "github.com/ssvlabs/ssv/utils/hashmap" + "github.com/ssvlabs/ssv/v2/utils/hashmap" ) // Map implements a thread-safe map with a sync.Map under the hood. diff --git a/utils/ttl/map_test.go b/utils/ttl/map_test.go index e3ca250f0e..6395c1e14d 100644 --- a/utils/ttl/map_test.go +++ b/utils/ttl/map_test.go @@ -457,7 +457,7 @@ func TestGetOrInsertHangIssue67(t *testing.T) { wg.Wait() } -// See https://github.com/ssvlabs/ssv/issues/1682 +// See https://github.com/ssvlabs/ssv/v2/issues/1682 func TestIssue1682(t *testing.T) { t.Parallel() From b7e88ab544be52e8987932c06591ebc118c31c81 Mon Sep 17 00:00:00 2001 From: Nikita Kryuchkov Date: Fri, 13 Mar 2026 15:06:06 +0300 Subject: [PATCH 02/11] ssvsigner: use root v2 pseudo-version --- ssvsigner/go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ssvsigner/go.mod b/ssvsigner/go.mod index ede4d2b3b1..7e4feba701 100644 --- a/ssvsigner/go.mod +++ b/ssvsigner/go.mod @@ -31,7 +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.2 + github.com/ssvlabs/ssv/v2 v2.4.1-0.20260313115518-864e4007a653 github.com/stretchr/testify v1.11.1 github.com/testcontainers/testcontainers-go v0.37.0 github.com/valyala/fasthttp v1.58.0 From 73c2ea34a958d24d68bc57ed08479fcde021096f Mon Sep 17 00:00:00 2001 From: Nikita Kryuchkov Date: Fri, 13 Mar 2026 15:07:52 +0300 Subject: [PATCH 03/11] go.mod: use ssvsigner pseudo-version --- go.mod | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 253ec4bd7b..25f3be1a5e 100644 --- a/go.mod +++ b/go.mod @@ -45,7 +45,7 @@ require ( github.com/spf13/cobra v1.8.1 github.com/ssvlabs/eth2-key-manager v1.5.6 github.com/ssvlabs/ssv-spec v1.2.2 - github.com/ssvlabs/ssv/ssvsigner v0.0.0-20251027161822-0b67ab2cd4f3 + github.com/ssvlabs/ssv/ssvsigner v0.0.0-20260313120606-b7e88ab544be github.com/status-im/keycard-go v0.2.0 github.com/stretchr/testify v1.11.1 github.com/wealdtech/go-eth2-types/v2 v2.8.1 @@ -278,5 +278,4 @@ replace ( 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 ) From 8cfeffaf30ac47e75d4d407ff5f701eb71977301 Mon Sep 17 00:00:00 2001 From: Nikita Kryuchkov Date: Fri, 13 Mar 2026 15:32:35 +0300 Subject: [PATCH 04/11] go.sum: add ssvsigner pseudo-version checksums --- go.sum | 2 ++ 1 file changed, 2 insertions(+) diff --git a/go.sum b/go.sum index 305ac03a82..29a10f9c32 100644 --- a/go.sum +++ b/go.sum @@ -733,6 +733,8 @@ github.com/ssvlabs/go-eth2-client v0.6.31-0.20250922150906-26179dd60c9c h1:iNQoR github.com/ssvlabs/go-eth2-client v0.6.31-0.20250922150906-26179dd60c9c/go.mod h1:fvULSL9WtNskkOB4i+Yyr6BKpNHXvmpGZj9969fCrfY= github.com/ssvlabs/ssv-spec v1.2.2 h1:as84CsvYAL4+czKBVeQSlxjDYVmU1wClwhc7YNcoBzY= github.com/ssvlabs/ssv-spec v1.2.2/go.mod h1:GedhFYGHVJRYYH3nEp05Gn14tyvg6VbTbaIxrMtI7Cg= +github.com/ssvlabs/ssv/ssvsigner v0.0.0-20260313120606-b7e88ab544be h1:eqGjZBpu4XPCNi/YKudTEzvpGOC0vTAZ6Kz57h31BX8= +github.com/ssvlabs/ssv/ssvsigner v0.0.0-20260313120606-b7e88ab544be/go.mod h1:L0dGMLCe9COvPg0+vBV4pzT1djp9wodkJH9cUQvP4AM= github.com/status-im/keycard-go v0.2.0 h1:QDLFswOQu1r5jsycloeQh3bVU8n/NatHHaZobtDnDzA= github.com/status-im/keycard-go v0.2.0/go.mod h1:wlp8ZLbsmrF6g6WjugPAx+IzoLrkdf9+mHxBEeo3Hbg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= From a69a0682fe0f9be79663444e3504ec29ead6f483 Mon Sep 17 00:00:00 2001 From: Nikita Kryuchkov Date: Wed, 25 Mar 2026 15:34:26 +0300 Subject: [PATCH 05/11] fix test imports after stage merge --- protocol/v2/ssv/runner/proposer_test.go | 12 ++++++------ protocol/v2/ssv/validator/committee_observer_test.go | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/protocol/v2/ssv/runner/proposer_test.go b/protocol/v2/ssv/runner/proposer_test.go index b671ddbe34..8f9fcad9a9 100644 --- a/protocol/v2/ssv/runner/proposer_test.go +++ b/protocol/v2/ssv/runner/proposer_test.go @@ -16,13 +16,13 @@ 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/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/ssv" + protocoltesting "github.com/ssvlabs/ssv/v2/protocol/v2/testing" ) type proposerTestBeacon 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) { From f67968f8cdcb3aefa50cf131888922690880ebac Mon Sep 17 00:00:00 2001 From: Nikita Kryuchkov Date: Wed, 25 Mar 2026 16:46:23 +0300 Subject: [PATCH 06/11] revert github url changes in comments --- beacon/goclient/proposer.go | 2 +- cli/operator/node.go | 2 +- eth/eventsyncer/event_syncer.go | 2 +- message/validation/validation.go | 2 +- network/discovery/dv5_service.go | 2 +- network/p2p/p2p.go | 2 +- network/topics/scoring.go | 2 +- protocol/v2/ssv/validator/committee_queue_test.go | 2 +- utils/hashmap/hashmap_test.go | 2 +- utils/ttl/map_test.go | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/beacon/goclient/proposer.go b/beacon/goclient/proposer.go index 6f75e40ac9..f50f1988e0 100644 --- a/beacon/goclient/proposer.go +++ b/beacon/goclient/proposer.go @@ -249,7 +249,7 @@ collect: // that this is a MEV block; it is a reasonable assumption to make in // the usual operating environment. // Returning as soon as we fetch at least 1 MEV block is good enough, - // see https://github.com/ssvlabs/ssv/v2/pull/2631#issuecomment-3678879204 + // see https://github.com/ssvlabs/ssv/pull/2631#issuecomment-3678879204 // Note: We may want to add an operator option to disable this behavior // in the future. break collect diff --git a/cli/operator/node.go b/cli/operator/node.go index f829005fb3..8cf4e617b3 100644 --- a/cli/operator/node.go +++ b/cli/operator/node.go @@ -106,7 +106,7 @@ type config struct { KeyStore KeyStore `yaml:"KeyStore"` SSVSigner SSVSignerConfig `yaml:"SSVSigner" env-prefix:"SSV_SIGNER_"` Graffiti string `yaml:"Graffiti" env:"GRAFFITI" env-description:"Custom graffiti for block proposals" env-default:"ssv.network"` - ProposerDelay time.Duration `yaml:"ProposerDelay" env:"PROPOSER_DELAY" env-description:"Duration to wait out before requesting Ethereum block to propose if this Operator is proposer-duty Leader (eg. 300ms). See https://github.com/ssvlabs/ssv/v2/blob/main/docs/MEV_CONSIDERATIONS.md#getting-started-with-mev-configuration for detailed instructions on how to use it."` + ProposerDelay time.Duration `yaml:"ProposerDelay" env:"PROPOSER_DELAY" env-description:"Duration to wait out before requesting Ethereum block to propose if this Operator is proposer-duty Leader (eg. 300ms). See https://github.com/ssvlabs/ssv/blob/main/docs/MEV_CONSIDERATIONS.md#getting-started-with-mev-configuration for detailed instructions on how to use it."` AllowDangerousProposerDelay bool `yaml:"AllowDangerousProposerDelay" env:"ALLOW_DANGEROUS_PROPOSER_DELAY" env-description:"Allow ProposerDelay values higher than 1s (dangerous, may cause missed block proposals)"` OperatorPrivateKey string `yaml:"OperatorPrivateKey" env:"OPERATOR_KEY" env-description:"Operator private key for contract event decryption"` MetricsAPIPort int `yaml:"MetricsAPIPort" env:"METRICS_API_PORT" env-description:"Port for metrics API server"` diff --git a/eth/eventsyncer/event_syncer.go b/eth/eventsyncer/event_syncer.go index 9fad5e77c9..46a2ebb9a8 100644 --- a/eth/eventsyncer/event_syncer.go +++ b/eth/eventsyncer/event_syncer.go @@ -20,7 +20,7 @@ import ( //go:generate go tool -modfile=../../tool.mod mockgen -package=eventsyncer -destination=./event_syncer_mock.go -source=./event_syncer.go // TODO: check if something from these PRs need to be ported: -// https://github.com/ssvlabs/ssv/v2/pull/1053 +// https://github.com/ssvlabs/ssv/pull/1053 const ( defaultStalenessThreshold = 300 * time.Second diff --git a/message/validation/validation.go b/message/validation/validation.go index 4a8571ddbf..4f90ba30ff 100644 --- a/message/validation/validation.go +++ b/message/validation/validation.go @@ -179,7 +179,7 @@ func (mv *messageValidator) handleSignedSSVMessage( return decodedMessage, err } - // TODO: leverage the validatorStore to keep track of committees' indices and return them in Committee methods (which already return a Committee struct that we should add an Indices filter to): https://github.com/ssvlabs/ssv/v2/pull/1393#discussion_r1667681686 + // TODO: leverage the validatorStore to keep track of committees' indices and return them in Committee methods (which already return a Committee struct that we should add an Indices filter to): https://github.com/ssvlabs/ssv/pull/1393#discussion_r1667681686 committeeInfo, err := mv.getCommitteeAndValidatorIndices(signedSSVMessage.SSVMessage.GetID()) if err != nil { return decodedMessage, err diff --git a/network/discovery/dv5_service.go b/network/discovery/dv5_service.go index 8896550c78..80cc374f27 100644 --- a/network/discovery/dv5_service.go +++ b/network/discovery/dv5_service.go @@ -156,7 +156,7 @@ func (dvs *DiscV5Service) Node(logger *zap.Logger, info peer.AddrInfo) (*enode.N // which lets other components to determine whether we'll want to connect to this node or not. func (dvs *DiscV5Service) Bootstrap(handler HandleNewPeer) error { // Log every 10th skipped peer. - // TODO: remove once we've merged https://github.com/ssvlabs/ssv/v2/pull/1803 + // TODO: remove once we've merged https://github.com/ssvlabs/ssv/pull/1803 const logFrequency = 10 var skippedPeers uint64 = 0 diff --git a/network/p2p/p2p.go b/network/p2p/p2p.go index 1725c2497a..0656022a1f 100644 --- a/network/p2p/p2p.go +++ b/network/p2p/p2p.go @@ -472,7 +472,7 @@ func (n *p2pNetwork) isReady() bool { // NOTE: it won't subscribe to the subnets (use subscribeToFixedSubnets for that) func (n *p2pNetwork) UpdateSubnets() { // TODO: this is a temporary fix to update subnets when validators are added/removed, - // there is a pending PR to replace this: https://github.com/ssvlabs/ssv/v2/pull/990 + // there is a pending PR to replace this: https://github.com/ssvlabs/ssv/pull/990 ticker := time.NewTicker(time.Second) registeredSubnets := commons.Subnets{} defer ticker.Stop() diff --git a/network/topics/scoring.go b/network/topics/scoring.go index 6c89d10b7d..d113e470a5 100644 --- a/network/topics/scoring.go +++ b/network/topics/scoring.go @@ -131,7 +131,7 @@ func scoreInspector(logger *zap.Logger, p7 := peerScores.BehaviourPenalty w7 := peerScoreParams.BehaviourPenaltyWeight - // Short logs per topic https://github.com/ssvlabs/ssv/v2/issues/1666 + // Short logs per topic https://github.com/ssvlabs/ssv/issues/1666 invalidMessagesStats := formatInvalidMessageStats(filtered) if inspections%logFrequency != 0 { diff --git a/protocol/v2/ssv/validator/committee_queue_test.go b/protocol/v2/ssv/validator/committee_queue_test.go index d6c71462c2..9386a8e401 100644 --- a/protocol/v2/ssv/validator/committee_queue_test.go +++ b/protocol/v2/ssv/validator/committee_queue_test.go @@ -1479,7 +1479,7 @@ func TestConsumeQueueBurstTraffic(t *testing.T) { // This test suite highlights a known behavior where the queue drops messages when full, // even high-priority ones, due to its non-blocking intake. // This behavior and potential improvements are tracked -// in GitHub issue #1680 (https://github.com/ssvlabs/ssv/v2/issues/1680). +// in GitHub issue #1680 (https://github.com/ssvlabs/ssv/issues/1680). func TestQueueLoadAndSaturationScenarios(t *testing.T) { ctrl := gomock.NewController(t) defer ctrl.Finish() diff --git a/utils/hashmap/hashmap_test.go b/utils/hashmap/hashmap_test.go index 389536afd7..094fefddfe 100644 --- a/utils/hashmap/hashmap_test.go +++ b/utils/hashmap/hashmap_test.go @@ -457,7 +457,7 @@ func TestGetOrInsertHangIssue67(t *testing.T) { wg.Wait() } -// See https://github.com/ssvlabs/ssv/v2/issues/1682 +// See https://github.com/ssvlabs/ssv/issues/1682 func TestIssue1682(t *testing.T) { t.Parallel() diff --git a/utils/ttl/map_test.go b/utils/ttl/map_test.go index 1c2f86c0b4..187bb5b21d 100644 --- a/utils/ttl/map_test.go +++ b/utils/ttl/map_test.go @@ -458,7 +458,7 @@ func TestGetOrInsertHangIssue67(t *testing.T) { wg.Wait() } -// See https://github.com/ssvlabs/ssv/v2/issues/1682 +// See https://github.com/ssvlabs/ssv/issues/1682 func TestIssue1682(t *testing.T) { t.Parallel() From de493cefb76c8cebafb37e6b4dda447cd008b378 Mon Sep 17 00:00:00 2001 From: Nikita Kryuchkov Date: Wed, 25 Mar 2026 16:51:39 +0300 Subject: [PATCH 07/11] fix remaining github comment url --- cli/operator/node.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/operator/node.go b/cli/operator/node.go index 8cf4e617b3..f6d9c80229 100644 --- a/cli/operator/node.go +++ b/cli/operator/node.go @@ -1032,7 +1032,7 @@ func setupSSVNetwork(logger *zap.Logger) (*networkconfig.SSV, error) { return nil, errors.New("custom domain type must be 4 bytes") } - // https://github.com/ssvlabs/ssv/v2/pull/1808 incremented the post-fork domain type by 1, so we have to maintain the compatibility. + // https://github.com/ssvlabs/ssv/pull/1808 incremented the post-fork domain type by 1, so we have to maintain the compatibility. postForkDomain := binary.BigEndian.Uint32(domainBytes) + 1 binary.BigEndian.PutUint32(ssvConfig.DomainType[:], postForkDomain) From 518f541180da999bd001bb5acce3f601fb644e54 Mon Sep 17 00:00:00 2001 From: Nikita Kryuchkov Date: Fri, 10 Apr 2026 19:17:01 +0300 Subject: [PATCH 08/11] update go.mod --- go.mod | 2 +- ssvsigner/go.mod | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 0159396cf8..9b65e6b87f 100644 --- a/go.mod +++ b/go.mod @@ -45,7 +45,7 @@ require ( github.com/spf13/cobra v1.8.1 github.com/ssvlabs/eth2-key-manager v1.5.6 github.com/ssvlabs/ssv-spec v1.2.2 - github.com/ssvlabs/ssv/ssvsigner v0.0.0-20260330141425-a81fe06c7bec + github.com/ssvlabs/ssv/ssvsigner v0.0.0-20260410160750-6c2315b84627 github.com/status-im/keycard-go v0.2.0 github.com/stretchr/testify v1.11.1 github.com/wealdtech/go-eth2-types/v2 v2.8.1 diff --git a/ssvsigner/go.mod b/ssvsigner/go.mod index 7e4feba701..1d85e9fc61 100644 --- a/ssvsigner/go.mod +++ b/ssvsigner/go.mod @@ -31,7 +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.20260313115518-864e4007a653 + 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 From 6e01126f469825878c068eb5510f26bb9290cdce Mon Sep 17 00:00:00 2001 From: Nikita Kryuchkov Date: Thu, 23 Apr 2026 20:13:05 +0300 Subject: [PATCH 09/11] fix pre-v2 leftovers --- .github/workflows/dutytracer-bench.yml | 4 ++-- .golangci.yaml | 2 +- Makefile | 2 +- scripts/ssvsigner_boundary.sh | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) 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/.golangci.yaml b/.golangci.yaml index d968099471..d06c8f1786 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -126,7 +126,7 @@ formatters: simplify: true goimports: local-prefixes: - - github.com/ssvlabs/ssv/ + - github.com/ssvlabs/ssv/v2 exclusions: generated: lax paths: diff --git a/Makefile b/Makefile index 733080f23b..6ad6ba1370 100644 --- a/Makefile +++ b/Makefile @@ -193,4 +193,4 @@ format: # (see https://github.com/golang/go/issues/71676 for details). In practice however # it's not always possible to fix that on the generator side, so we have to use a # work-around here to filter out generated files on our own. - $(RUN_TOOL) goimports -l -w -local github.com/ssvlabs/ssv/ $$(find . -name '*.go' -not -path "*mock*") + $(RUN_TOOL) goimports -l -w -local github.com/ssvlabs/ssv/v2 $$(find . -name '*.go' -not -path "*mock*") 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 )" From 7319df8dc135879377f253fe152911ddb7eb23e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mom=C4=8Dilo=20Miladinovi=C4=87?= Date: Fri, 8 May 2026 17:11:46 +0200 Subject: [PATCH 10/11] fix: rewrite stale ssv imports in stage-added files These two files were added on stage with `github.com/ssvlabs/ssv/...` imports and slipped through the v2 path rewrite during the merge from stage. Update them to use the `github.com/ssvlabs/ssv/v2/...` paths the module declares. --- beacon/goclient/error_paths_test.go | 2 +- operator/validator/controller_bench_test.go | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) 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/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 ( From e9dfbeba2f884ddc8916aca3eaed75c289469c4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mom=C4=8Dilo=20Miladinovi=C4=87?= Date: Fri, 8 May 2026 17:12:11 +0200 Subject: [PATCH 11/11] go.mod: tidy after stage merge Bumps go.opentelemetry.io/otel, otel/metric, and otel/trace from v1.38.0 to v1.41.0 to match the versions stage already pulls in transitively. Run via `go mod tidy`. --- go.mod | 6 +++--- go.sum | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index 3fddd2806f..e228aa31ec 100644 --- a/go.mod +++ b/go.mod @@ -51,12 +51,12 @@ require ( 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.38.0 + go.opentelemetry.io/otel v1.41.0 go.opentelemetry.io/otel/exporters/prometheus v0.58.0 - go.opentelemetry.io/otel/metric v1.38.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.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 diff --git a/go.sum b/go.sum index d2a02009e3..c1a5ecdc6a 100644 --- a/go.sum +++ b/go.sum @@ -824,8 +824,8 @@ go.opentelemetry.io/contrib/exporters/autoexport v0.61.0 h1:XfzKtKSrbtYk9TNCF8dk go.opentelemetry.io/contrib/exporters/autoexport v0.61.0/go.mod h1:N6otC+qXTD5bAnbK2O1f/1SXq3cX+3KYSWrkBUqG0cw= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 h1:RbKq8BG0FI8OiXhBfcRtqqHcZcka+gU3cskNuf05R18= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0/go.mod h1:h06DGIukJOevXaj/xrNjhi/2098RZzcLTbc0jDAUbsg= -go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8= -go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM= +go.opentelemetry.io/otel v1.41.0 h1:YlEwVsGAlCvczDILpUXpIpPSL/VPugt7zHThEMLce1c= +go.opentelemetry.io/otel v1.41.0/go.mod h1:Yt4UwgEKeT05QbLwbyHXEwhnjxNO6D8L5PQP51/46dE= go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.12.2 h1:06ZeJRe5BnYXceSM9Vya83XXVaNGe3H1QqsvqRANQq8= go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.12.2/go.mod h1:DvPtKE63knkDVP88qpatBj81JxN+w1bqfVbsbCbj1WY= go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.12.2 h1:tPLwQlXbJ8NSOfZc4OkgU5h2A38M4c9kfHSVc4PFQGs= @@ -850,8 +850,8 @@ go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.38.0 h1:kJxSDN4SgWWTjG/ go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.38.0/go.mod h1:mgIOzS7iZeKJdeB8/NYHrJ48fdGc71Llo5bJ1J4DWUE= go.opentelemetry.io/otel/log v0.12.2 h1:yob9JVHn2ZY24byZeaXpTVoPS6l+UrrxmxmPKohXTwc= go.opentelemetry.io/otel/log v0.12.2/go.mod h1:ShIItIxSYxufUMt+1H5a2wbckGli3/iCfuEbVZi/98E= -go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA= -go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI= +go.opentelemetry.io/otel/metric v1.41.0 h1:rFnDcs4gRzBcsO9tS8LCpgR0dxg4aaxWlJxCno7JlTQ= +go.opentelemetry.io/otel/metric v1.41.0/go.mod h1:xPvCwd9pU0VN8tPZYzDZV/BMj9CM9vs00GuBjeKhJps= go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E= go.opentelemetry.io/otel/sdk v1.38.0/go.mod h1:ghmNdGlVemJI3+ZB5iDEuk4bWA3GkTpW+DOoZMYBVVg= go.opentelemetry.io/otel/sdk/log v0.12.2 h1:yNoETvTByVKi7wHvYS6HMcZrN5hFLD7I++1xIZ/k6W0= @@ -860,8 +860,8 @@ go.opentelemetry.io/otel/sdk/log/logtest v0.0.0-20250521073539-a85ae98dcedc h1:u go.opentelemetry.io/otel/sdk/log/logtest v0.0.0-20250521073539-a85ae98dcedc/go.mod h1:TY/N/FT7dmFrP/r5ym3g0yysP1DefqGpAZr4f82P0dE= go.opentelemetry.io/otel/sdk/metric v1.38.0 h1:aSH66iL0aZqo//xXzQLYozmWrXxyFkBJ6qT5wthqPoM= go.opentelemetry.io/otel/sdk/metric v1.38.0/go.mod h1:dg9PBnW9XdQ1Hd6ZnRz689CbtrUp0wMMs9iPcgT9EZA= -go.opentelemetry.io/otel/trace v1.38.0 h1:Fxk5bKrDZJUH+AMyyIXGcFAPah0oRcT+LuNtJrmcNLE= -go.opentelemetry.io/otel/trace v1.38.0/go.mod h1:j1P9ivuFsTceSWe1oY+EeW3sc+Pp42sO++GHkg4wwhs= +go.opentelemetry.io/otel/trace v1.41.0 h1:Vbk2co6bhj8L59ZJ6/xFTskY+tGAbOnCtQGVVa9TIN0= +go.opentelemetry.io/otel/trace v1.41.0/go.mod h1:U1NU4ULCoxeDKc09yCWdWe+3QoyweJcISEVa1RBzOis= go.opentelemetry.io/proto/otlp v1.7.1 h1:gTOMpGDb0WTBOP8JaO72iL3auEZhVmAQg4ipjOVAtj4= go.opentelemetry.io/proto/otlp v1.7.1/go.mod h1:b2rVh6rfI/s2pHWNlB7ILJcRALpcNDzKhACevjI+ZnE= go.uber.org/dig v1.19.0 h1:BACLhebsYdpQ7IROQ1AGPjrXcP5dF80U3gKoFzbaq/4=