diff --git a/message/signatureverifier/mock.go b/message/signatureverifier/mock.go
index 491de32e7b..f21397ccff 100644
--- a/message/signatureverifier/mock.go
+++ b/message/signatureverifier/mock.go
@@ -1,5 +1,10 @@
 // Code generated by MockGen. DO NOT EDIT.
 // Source: ./signature_verifier.go
+//
+// Generated by this command:
+//
+//	mockgen -package=signatureverifier -destination=./mock.go -source=./signature_verifier.go
+//
 
 // Package signatureverifier is a generated GoMock package.
 package signatureverifier
@@ -7,10 +12,10 @@ package signatureverifier
 import (
 	reflect "reflect"
 
-	gomock "github.com/golang/mock/gomock"
 	types "github.com/ssvlabs/ssv-spec/types"
 	storage "github.com/ssvlabs/ssv/registry/storage"
 	basedb "github.com/ssvlabs/ssv/storage/basedb"
+	gomock "go.uber.org/mock/gomock"
 )
 
 // MockSignatureVerifier is a mock of SignatureVerifier interface.
@@ -45,7 +50,7 @@ func (m *MockSignatureVerifier) VerifySignature(operatorID types.OperatorID, mes
 }
 
 // VerifySignature indicates an expected call of VerifySignature.
-func (mr *MockSignatureVerifierMockRecorder) VerifySignature(operatorID, message, signature interface{}) *gomock.Call {
+func (mr *MockSignatureVerifierMockRecorder) VerifySignature(operatorID, message, signature any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "VerifySignature", reflect.TypeOf((*MockSignatureVerifier)(nil).VerifySignature), operatorID, message, signature)
 }
@@ -84,7 +89,7 @@ func (m *MockOperatorStore) GetOperatorData(r basedb.Reader, id types.OperatorID
 }
 
 // GetOperatorData indicates an expected call of GetOperatorData.
-func (mr *MockOperatorStoreMockRecorder) GetOperatorData(r, id interface{}) *gomock.Call {
+func (mr *MockOperatorStoreMockRecorder) GetOperatorData(r, id any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetOperatorData", reflect.TypeOf((*MockOperatorStore)(nil).GetOperatorData), r, id)
 }
diff --git a/operator/duties/base_handler_mock.go b/operator/duties/base_handler_mock.go
index 1b4d333c7e..a39f148be9 100644
--- a/operator/duties/base_handler_mock.go
+++ b/operator/duties/base_handler_mock.go
@@ -1,5 +1,10 @@
 // Code generated by MockGen. DO NOT EDIT.
 // Source: ./base_handler.go
+//
+// Generated by this command:
+//
+//	mockgen -package=duties -destination=./base_handler_mock.go -source=./base_handler.go
+//
 
 // Package duties is a generated GoMock package.
 package duties
@@ -8,9 +13,9 @@ import (
 	context "context"
 	reflect "reflect"
 
-	gomock "github.com/golang/mock/gomock"
 	networkconfig "github.com/ssvlabs/ssv/networkconfig"
 	slotticker "github.com/ssvlabs/ssv/operator/slotticker"
+	gomock "go.uber.org/mock/gomock"
 	zap "go.uber.org/zap"
 )
 
@@ -44,7 +49,7 @@ func (m *MockdutyHandler) HandleDuties(arg0 context.Context) {
 }
 
 // HandleDuties indicates an expected call of HandleDuties.
-func (mr *MockdutyHandlerMockRecorder) HandleDuties(arg0 interface{}) *gomock.Call {
+func (mr *MockdutyHandlerMockRecorder) HandleDuties(arg0 any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HandleDuties", reflect.TypeOf((*MockdutyHandler)(nil).HandleDuties), arg0)
 }
@@ -56,7 +61,7 @@ func (m *MockdutyHandler) HandleInitialDuties(arg0 context.Context) {
 }
 
 // HandleInitialDuties indicates an expected call of HandleInitialDuties.
-func (mr *MockdutyHandlerMockRecorder) HandleInitialDuties(arg0 interface{}) *gomock.Call {
+func (mr *MockdutyHandlerMockRecorder) HandleInitialDuties(arg0 any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HandleInitialDuties", reflect.TypeOf((*MockdutyHandler)(nil).HandleInitialDuties), arg0)
 }
@@ -76,13 +81,13 @@ func (mr *MockdutyHandlerMockRecorder) Name() *gomock.Call {
 }
 
 // Setup mocks base method.
-func (m *MockdutyHandler) Setup(name string, logger *zap.Logger, beaconNode BeaconNode, executionClient ExecutionClient, network networkconfig.NetworkConfig, validatorProvider ValidatorProvider, validatorController ValidatorController, dutiesExecutor DutiesExecutor, slotTickerProvider slotticker.Provider, reorgEvents chan ReorgEvent, indicesChange chan struct{}) {
+func (m *MockdutyHandler) Setup(name string, logger *zap.Logger, beaconNode BeaconNode, executionClient ExecutionClient, network networkconfig.NetworkConfig, validatorProvider ValidatorProvider, validatorController ValidatorController, dutyExecutor DutiesExecutor, slotTickerProvider slotticker.Provider, reorgEvents chan ReorgEvent, indicesChange chan struct{}) {
 	m.ctrl.T.Helper()
-	m.ctrl.Call(m, "Setup", name, logger, beaconNode, executionClient, network, validatorProvider, validatorController, dutiesExecutor, slotTickerProvider, reorgEvents, indicesChange)
+	m.ctrl.Call(m, "Setup", name, logger, beaconNode, executionClient, network, validatorProvider, validatorController, dutyExecutor, slotTickerProvider, reorgEvents, indicesChange)
 }
 
 // Setup indicates an expected call of Setup.
-func (mr *MockdutyHandlerMockRecorder) Setup(name, logger, beaconNode, executionClient, network, validatorProvider, validatorController, dutiesExecutor, slotTickerProvider, reorgEvents, indicesChange interface{}) *gomock.Call {
+func (mr *MockdutyHandlerMockRecorder) Setup(name, logger, beaconNode, executionClient, network, validatorProvider, validatorController, dutyExecutor, slotTickerProvider, reorgEvents, indicesChange any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Setup", reflect.TypeOf((*MockdutyHandler)(nil).Setup), name, logger, beaconNode, executionClient, network, validatorProvider, validatorController, dutiesExecutor, slotTickerProvider, reorgEvents, indicesChange)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Setup", reflect.TypeOf((*MockdutyHandler)(nil).Setup), name, logger, beaconNode, executionClient, network, validatorProvider, validatorController, dutyExecutor, slotTickerProvider, reorgEvents, indicesChange)
 }
diff --git a/operator/duties/scheduler_mock.go b/operator/duties/scheduler_mock.go
index 1fe56851c6..5aa613b741 100644
--- a/operator/duties/scheduler_mock.go
+++ b/operator/duties/scheduler_mock.go
@@ -1,5 +1,10 @@
 // Code generated by MockGen. DO NOT EDIT.
 // Source: ./scheduler.go
+//
+// Generated by this command:
+//
+//	mockgen -package=duties -destination=./scheduler_mock.go -source=./scheduler.go
+//
 
 // Package duties is a generated GoMock package.
 package duties
@@ -13,10 +18,10 @@ import (
 	v1 "github.com/attestantio/go-eth2-client/api/v1"
 	phase0 "github.com/attestantio/go-eth2-client/spec/phase0"
 	types "github.com/ethereum/go-ethereum/core/types"
-	gomock "github.com/golang/mock/gomock"
 	types0 "github.com/ssvlabs/ssv-spec-pre-cc/types"
 	types1 "github.com/ssvlabs/ssv-spec/types"
 	types2 "github.com/ssvlabs/ssv/protocol/v2/types"
+	gomock "go.uber.org/mock/gomock"
 	zap "go.uber.org/zap"
 )
 
@@ -50,7 +55,7 @@ func (m *MockDutiesExecutor) ExecuteCommitteeDuties(logger *zap.Logger, duties c
 }
 
 // ExecuteCommitteeDuties indicates an expected call of ExecuteCommitteeDuties.
-func (mr *MockDutiesExecutorMockRecorder) ExecuteCommitteeDuties(logger, duties interface{}) *gomock.Call {
+func (mr *MockDutiesExecutorMockRecorder) ExecuteCommitteeDuties(logger, duties any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ExecuteCommitteeDuties", reflect.TypeOf((*MockDutiesExecutor)(nil).ExecuteCommitteeDuties), logger, duties)
 }
@@ -62,7 +67,7 @@ func (m *MockDutiesExecutor) ExecuteDuties(logger *zap.Logger, duties []*types1.
 }
 
 // ExecuteDuties indicates an expected call of ExecuteDuties.
-func (mr *MockDutiesExecutorMockRecorder) ExecuteDuties(logger, duties interface{}) *gomock.Call {
+func (mr *MockDutiesExecutorMockRecorder) ExecuteDuties(logger, duties any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ExecuteDuties", reflect.TypeOf((*MockDutiesExecutor)(nil).ExecuteDuties), logger, duties)
 }
@@ -74,7 +79,7 @@ func (m *MockDutiesExecutor) ExecuteGenesisDuties(logger *zap.Logger, duties []*
 }
 
 // ExecuteGenesisDuties indicates an expected call of ExecuteGenesisDuties.
-func (mr *MockDutiesExecutorMockRecorder) ExecuteGenesisDuties(logger, duties interface{}) *gomock.Call {
+func (mr *MockDutiesExecutorMockRecorder) ExecuteGenesisDuties(logger, duties any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ExecuteGenesisDuties", reflect.TypeOf((*MockDutiesExecutor)(nil).ExecuteGenesisDuties), logger, duties)
 }
@@ -109,7 +114,7 @@ func (m *MockDutyExecutor) ExecuteCommitteeDuty(logger *zap.Logger, committeeID
 }
 
 // ExecuteCommitteeDuty indicates an expected call of ExecuteCommitteeDuty.
-func (mr *MockDutyExecutorMockRecorder) ExecuteCommitteeDuty(logger, committeeID, duty interface{}) *gomock.Call {
+func (mr *MockDutyExecutorMockRecorder) ExecuteCommitteeDuty(logger, committeeID, duty any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ExecuteCommitteeDuty", reflect.TypeOf((*MockDutyExecutor)(nil).ExecuteCommitteeDuty), logger, committeeID, duty)
 }
@@ -121,7 +126,7 @@ func (m *MockDutyExecutor) ExecuteDuty(logger *zap.Logger, duty *types1.Validato
 }
 
 // ExecuteDuty indicates an expected call of ExecuteDuty.
-func (mr *MockDutyExecutorMockRecorder) ExecuteDuty(logger, duty interface{}) *gomock.Call {
+func (mr *MockDutyExecutorMockRecorder) ExecuteDuty(logger, duty any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ExecuteDuty", reflect.TypeOf((*MockDutyExecutor)(nil).ExecuteDuty), logger, duty)
 }
@@ -133,7 +138,7 @@ func (m *MockDutyExecutor) ExecuteGenesisDuty(logger *zap.Logger, duty *types0.D
 }
 
 // ExecuteGenesisDuty indicates an expected call of ExecuteGenesisDuty.
-func (mr *MockDutyExecutorMockRecorder) ExecuteGenesisDuty(logger, duty interface{}) *gomock.Call {
+func (mr *MockDutyExecutorMockRecorder) ExecuteGenesisDuty(logger, duty any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ExecuteGenesisDuty", reflect.TypeOf((*MockDutyExecutor)(nil).ExecuteGenesisDuty), logger, duty)
 }
@@ -171,7 +176,7 @@ func (m *MockBeaconNode) AttesterDuties(ctx context.Context, epoch phase0.Epoch,
 }
 
 // AttesterDuties indicates an expected call of AttesterDuties.
-func (mr *MockBeaconNodeMockRecorder) AttesterDuties(ctx, epoch, validatorIndices interface{}) *gomock.Call {
+func (mr *MockBeaconNodeMockRecorder) AttesterDuties(ctx, epoch, validatorIndices any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AttesterDuties", reflect.TypeOf((*MockBeaconNode)(nil).AttesterDuties), ctx, epoch, validatorIndices)
 }
@@ -185,7 +190,7 @@ func (m *MockBeaconNode) Events(ctx context.Context, topics []string, handler cl
 }
 
 // Events indicates an expected call of Events.
-func (mr *MockBeaconNodeMockRecorder) Events(ctx, topics, handler interface{}) *gomock.Call {
+func (mr *MockBeaconNodeMockRecorder) Events(ctx, topics, handler any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Events", reflect.TypeOf((*MockBeaconNode)(nil).Events), ctx, topics, handler)
 }
@@ -200,7 +205,7 @@ func (m *MockBeaconNode) ProposerDuties(ctx context.Context, epoch phase0.Epoch,
 }
 
 // ProposerDuties indicates an expected call of ProposerDuties.
-func (mr *MockBeaconNodeMockRecorder) ProposerDuties(ctx, epoch, validatorIndices interface{}) *gomock.Call {
+func (mr *MockBeaconNodeMockRecorder) ProposerDuties(ctx, epoch, validatorIndices any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ProposerDuties", reflect.TypeOf((*MockBeaconNode)(nil).ProposerDuties), ctx, epoch, validatorIndices)
 }
@@ -214,7 +219,7 @@ func (m *MockBeaconNode) SubmitBeaconCommitteeSubscriptions(ctx context.Context,
 }
 
 // SubmitBeaconCommitteeSubscriptions indicates an expected call of SubmitBeaconCommitteeSubscriptions.
-func (mr *MockBeaconNodeMockRecorder) SubmitBeaconCommitteeSubscriptions(ctx, subscription interface{}) *gomock.Call {
+func (mr *MockBeaconNodeMockRecorder) SubmitBeaconCommitteeSubscriptions(ctx, subscription any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SubmitBeaconCommitteeSubscriptions", reflect.TypeOf((*MockBeaconNode)(nil).SubmitBeaconCommitteeSubscriptions), ctx, subscription)
 }
@@ -228,7 +233,7 @@ func (m *MockBeaconNode) SubmitSyncCommitteeSubscriptions(ctx context.Context, s
 }
 
 // SubmitSyncCommitteeSubscriptions indicates an expected call of SubmitSyncCommitteeSubscriptions.
-func (mr *MockBeaconNodeMockRecorder) SubmitSyncCommitteeSubscriptions(ctx, subscription interface{}) *gomock.Call {
+func (mr *MockBeaconNodeMockRecorder) SubmitSyncCommitteeSubscriptions(ctx, subscription any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SubmitSyncCommitteeSubscriptions", reflect.TypeOf((*MockBeaconNode)(nil).SubmitSyncCommitteeSubscriptions), ctx, subscription)
 }
@@ -243,7 +248,7 @@ func (m *MockBeaconNode) SyncCommitteeDuties(ctx context.Context, epoch phase0.E
 }
 
 // SyncCommitteeDuties indicates an expected call of SyncCommitteeDuties.
-func (mr *MockBeaconNodeMockRecorder) SyncCommitteeDuties(ctx, epoch, indices interface{}) *gomock.Call {
+func (mr *MockBeaconNodeMockRecorder) SyncCommitteeDuties(ctx, epoch, indices any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SyncCommitteeDuties", reflect.TypeOf((*MockBeaconNode)(nil).SyncCommitteeDuties), ctx, epoch, indices)
 }
@@ -281,7 +286,7 @@ func (m *MockExecutionClient) BlockByNumber(ctx context.Context, blockNumber *bi
 }
 
 // BlockByNumber indicates an expected call of BlockByNumber.
-func (mr *MockExecutionClientMockRecorder) BlockByNumber(ctx, blockNumber interface{}) *gomock.Call {
+func (mr *MockExecutionClientMockRecorder) BlockByNumber(ctx, blockNumber any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BlockByNumber", reflect.TypeOf((*MockExecutionClient)(nil).BlockByNumber), ctx, blockNumber)
 }
@@ -318,7 +323,7 @@ func (m *MockValidatorProvider) ParticipatingValidators(epoch phase0.Epoch) []*t
 }
 
 // ParticipatingValidators indicates an expected call of ParticipatingValidators.
-func (mr *MockValidatorProviderMockRecorder) ParticipatingValidators(epoch interface{}) *gomock.Call {
+func (mr *MockValidatorProviderMockRecorder) ParticipatingValidators(epoch any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ParticipatingValidators", reflect.TypeOf((*MockValidatorProvider)(nil).ParticipatingValidators), epoch)
 }
@@ -332,7 +337,7 @@ func (m *MockValidatorProvider) SelfParticipatingValidators(epoch phase0.Epoch)
 }
 
 // SelfParticipatingValidators indicates an expected call of SelfParticipatingValidators.
-func (mr *MockValidatorProviderMockRecorder) SelfParticipatingValidators(epoch interface{}) *gomock.Call {
+func (mr *MockValidatorProviderMockRecorder) SelfParticipatingValidators(epoch any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SelfParticipatingValidators", reflect.TypeOf((*MockValidatorProvider)(nil).SelfParticipatingValidators), epoch)
 }
@@ -346,7 +351,7 @@ func (m *MockValidatorProvider) Validator(pubKey []byte) *types2.SSVShare {
 }
 
 // Validator indicates an expected call of Validator.
-func (mr *MockValidatorProviderMockRecorder) Validator(pubKey interface{}) *gomock.Call {
+func (mr *MockValidatorProviderMockRecorder) Validator(pubKey any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Validator", reflect.TypeOf((*MockValidatorProvider)(nil).Validator), pubKey)
 }
@@ -383,7 +388,7 @@ func (m *MockValidatorController) AllActiveIndices(epoch phase0.Epoch, afterInit
 }
 
 // AllActiveIndices indicates an expected call of AllActiveIndices.
-func (mr *MockValidatorControllerMockRecorder) AllActiveIndices(epoch, afterInit interface{}) *gomock.Call {
+func (mr *MockValidatorControllerMockRecorder) AllActiveIndices(epoch, afterInit any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AllActiveIndices", reflect.TypeOf((*MockValidatorController)(nil).AllActiveIndices), epoch, afterInit)
 }
diff --git a/operator/fee_recipient/mocks/controller.go b/operator/fee_recipient/mocks/controller.go
index bb7f7fd32c..ef3945ee3c 100644
--- a/operator/fee_recipient/mocks/controller.go
+++ b/operator/fee_recipient/mocks/controller.go
@@ -1,5 +1,10 @@
 // Code generated by MockGen. DO NOT EDIT.
 // Source: ./controller.go
+//
+// Generated by this command:
+//
+//	mockgen -package=mocks -destination=./mocks/controller.go -source=./controller.go
+//
 
 // Package mocks is a generated GoMock package.
 package mocks
@@ -7,7 +12,7 @@ package mocks
 import (
 	reflect "reflect"
 
-	gomock "github.com/golang/mock/gomock"
+	gomock "go.uber.org/mock/gomock"
 	zap "go.uber.org/zap"
 )
 
@@ -41,7 +46,7 @@ func (m *MockRecipientController) Start(logger *zap.Logger) {
 }
 
 // Start indicates an expected call of Start.
-func (mr *MockRecipientControllerMockRecorder) Start(logger interface{}) *gomock.Call {
+func (mr *MockRecipientControllerMockRecorder) Start(logger any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Start", reflect.TypeOf((*MockRecipientController)(nil).Start), logger)
 }
diff --git a/operator/slotticker/mocks/slotticker.go b/operator/slotticker/mocks/slotticker.go
index d988e96b5d..1641c5aebb 100644
--- a/operator/slotticker/mocks/slotticker.go
+++ b/operator/slotticker/mocks/slotticker.go
@@ -1,5 +1,10 @@
 // Code generated by MockGen. DO NOT EDIT.
 // Source: ./slotticker.go
+//
+// Generated by this command:
+//
+//	mockgen -package=mocks -destination=./mocks/slotticker.go -source=./slotticker.go
+//
 
 // Package mocks is a generated GoMock package.
 package mocks
@@ -9,7 +14,7 @@ import (
 	time "time"
 
 	phase0 "github.com/attestantio/go-eth2-client/spec/phase0"
-	gomock "github.com/golang/mock/gomock"
+	gomock "go.uber.org/mock/gomock"
 )
 
 // MockSlotTicker is a mock of SlotTicker interface.
diff --git a/operator/validator/mocks/controller.go b/operator/validator/mocks/controller.go
index 812ff90e7e..23a9cf5888 100644
--- a/operator/validator/mocks/controller.go
+++ b/operator/validator/mocks/controller.go
@@ -1,5 +1,10 @@
 // Code generated by MockGen. DO NOT EDIT.
 // Source: ./controller.go
+//
+// Generated by this command:
+//
+//	mockgen -package=mocks -destination=./mocks/controller.go -source=./controller.go
+//
 
 // Package mocks is a generated GoMock package.
 package mocks
@@ -9,17 +14,17 @@ import (
 
 	phase0 "github.com/attestantio/go-eth2-client/spec/phase0"
 	common "github.com/ethereum/go-ethereum/common"
-	gomock "github.com/golang/mock/gomock"
-	types "github.com/ssvlabs/ssv-spec-pre-cc/types"
-	types0 "github.com/ssvlabs/ssv-spec/types"
+	peer "github.com/libp2p/go-libp2p/core/peer"
+	types "github.com/ssvlabs/ssv-spec/types"
 	network "github.com/ssvlabs/ssv/network"
 	duties "github.com/ssvlabs/ssv/operator/duties"
 	beacon "github.com/ssvlabs/ssv/protocol/v2/blockchain/beacon"
 	protocolp2p "github.com/ssvlabs/ssv/protocol/v2/p2p"
 	validator "github.com/ssvlabs/ssv/protocol/v2/ssv/validator"
-	types1 "github.com/ssvlabs/ssv/protocol/v2/types"
+	types0 "github.com/ssvlabs/ssv/protocol/v2/types"
 	storage "github.com/ssvlabs/ssv/registry/storage"
 	basedb "github.com/ssvlabs/ssv/storage/basedb"
+	gomock "go.uber.org/mock/gomock"
 	zap "go.uber.org/zap"
 )
 
@@ -55,7 +60,7 @@ func (m *MockController) AllActiveIndices(epoch phase0.Epoch, afterInit bool) []
 }
 
 // AllActiveIndices indicates an expected call of AllActiveIndices.
-func (mr *MockControllerMockRecorder) AllActiveIndices(epoch, afterInit interface{}) *gomock.Call {
+func (mr *MockControllerMockRecorder) AllActiveIndices(epoch, afterInit any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AllActiveIndices", reflect.TypeOf((*MockController)(nil).AllActiveIndices), epoch, afterInit)
 }
@@ -69,47 +74,35 @@ func (m *MockController) CommitteeActiveIndices(epoch phase0.Epoch) []phase0.Val
 }
 
 // CommitteeActiveIndices indicates an expected call of CommitteeActiveIndices.
-func (mr *MockControllerMockRecorder) CommitteeActiveIndices(epoch interface{}) *gomock.Call {
+func (mr *MockControllerMockRecorder) CommitteeActiveIndices(epoch any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CommitteeActiveIndices", reflect.TypeOf((*MockController)(nil).CommitteeActiveIndices), epoch)
 }
 
 // ExecuteCommitteeDuty mocks base method.
-func (m *MockController) ExecuteCommitteeDuty(logger *zap.Logger, committeeID types0.CommitteeID, duty *types0.CommitteeDuty) {
+func (m *MockController) ExecuteCommitteeDuty(logger *zap.Logger, committeeID types.CommitteeID, duty *types.CommitteeDuty) {
 	m.ctrl.T.Helper()
 	m.ctrl.Call(m, "ExecuteCommitteeDuty", logger, committeeID, duty)
 }
 
 // ExecuteCommitteeDuty indicates an expected call of ExecuteCommitteeDuty.
-func (mr *MockControllerMockRecorder) ExecuteCommitteeDuty(logger, committeeID, duty interface{}) *gomock.Call {
+func (mr *MockControllerMockRecorder) ExecuteCommitteeDuty(logger, committeeID, duty any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ExecuteCommitteeDuty", reflect.TypeOf((*MockController)(nil).ExecuteCommitteeDuty), logger, committeeID, duty)
 }
 
 // ExecuteDuty mocks base method.
-func (m *MockController) ExecuteDuty(logger *zap.Logger, duty *types0.ValidatorDuty) {
+func (m *MockController) ExecuteDuty(logger *zap.Logger, duty *types.ValidatorDuty) {
 	m.ctrl.T.Helper()
 	m.ctrl.Call(m, "ExecuteDuty", logger, duty)
 }
 
 // ExecuteDuty indicates an expected call of ExecuteDuty.
-func (mr *MockControllerMockRecorder) ExecuteDuty(logger, duty interface{}) *gomock.Call {
+func (mr *MockControllerMockRecorder) ExecuteDuty(logger, duty any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ExecuteDuty", reflect.TypeOf((*MockController)(nil).ExecuteDuty), logger, duty)
 }
 
-// ExecuteGenesisDuty mocks base method.
-func (m *MockController) ExecuteGenesisDuty(logger *zap.Logger, duty *types.Duty) {
-	m.ctrl.T.Helper()
-	m.ctrl.Call(m, "ExecuteGenesisDuty", logger, duty)
-}
-
-// ExecuteGenesisDuty indicates an expected call of ExecuteGenesisDuty.
-func (mr *MockControllerMockRecorder) ExecuteGenesisDuty(logger, duty interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ExecuteGenesisDuty", reflect.TypeOf((*MockController)(nil).ExecuteGenesisDuty), logger, duty)
-}
-
 // ExitValidator mocks base method.
 func (m *MockController) ExitValidator(pubKey phase0.BLSPubKey, blockNumber uint64, validatorIndex phase0.ValidatorIndex) error {
 	m.ctrl.T.Helper()
@@ -119,16 +112,16 @@ func (m *MockController) ExitValidator(pubKey phase0.BLSPubKey, blockNumber uint
 }
 
 // ExitValidator indicates an expected call of ExitValidator.
-func (mr *MockControllerMockRecorder) ExitValidator(pubKey, blockNumber, validatorIndex interface{}) *gomock.Call {
+func (mr *MockControllerMockRecorder) ExitValidator(pubKey, blockNumber, validatorIndex any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ExitValidator", reflect.TypeOf((*MockController)(nil).ExitValidator), pubKey, blockNumber, validatorIndex)
 }
 
 // GetOperatorShares mocks base method.
-func (m *MockController) GetOperatorShares() []*types1.SSVShare {
+func (m *MockController) GetOperatorShares() []*types0.SSVShare {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetOperatorShares")
-	ret0, _ := ret[0].([]*types1.SSVShare)
+	ret0, _ := ret[0].([]*types0.SSVShare)
 	return ret0
 }
 
@@ -139,7 +132,7 @@ func (mr *MockControllerMockRecorder) GetOperatorShares() *gomock.Call {
 }
 
 // GetValidator mocks base method.
-func (m *MockController) GetValidator(pubKey types0.ValidatorPK) (*validator.Validator, bool) {
+func (m *MockController) GetValidator(pubKey types.ValidatorPK) (*validator.Validator, bool) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetValidator", pubKey)
 	ret0, _ := ret[0].(*validator.Validator)
@@ -148,7 +141,7 @@ func (m *MockController) GetValidator(pubKey types0.ValidatorPK) (*validator.Val
 }
 
 // GetValidator indicates an expected call of GetValidator.
-func (mr *MockControllerMockRecorder) GetValidator(pubKey interface{}) *gomock.Call {
+func (mr *MockControllerMockRecorder) GetValidator(pubKey any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetValidator", reflect.TypeOf((*MockController)(nil).GetValidator), pubKey)
 }
@@ -185,7 +178,7 @@ func (mr *MockControllerMockRecorder) IndicesChangeChan() *gomock.Call {
 }
 
 // LiquidateCluster mocks base method.
-func (m *MockController) LiquidateCluster(owner common.Address, operatorIDs []uint64, toLiquidate []*types1.SSVShare) error {
+func (m *MockController) LiquidateCluster(owner common.Address, operatorIDs []uint64, toLiquidate []*types0.SSVShare) error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "LiquidateCluster", owner, operatorIDs, toLiquidate)
 	ret0, _ := ret[0].(error)
@@ -193,13 +186,13 @@ func (m *MockController) LiquidateCluster(owner common.Address, operatorIDs []ui
 }
 
 // LiquidateCluster indicates an expected call of LiquidateCluster.
-func (mr *MockControllerMockRecorder) LiquidateCluster(owner, operatorIDs, toLiquidate interface{}) *gomock.Call {
+func (mr *MockControllerMockRecorder) LiquidateCluster(owner, operatorIDs, toLiquidate any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LiquidateCluster", reflect.TypeOf((*MockController)(nil).LiquidateCluster), owner, operatorIDs, toLiquidate)
 }
 
 // ReactivateCluster mocks base method.
-func (m *MockController) ReactivateCluster(owner common.Address, operatorIDs []uint64, toReactivate []*types1.SSVShare) error {
+func (m *MockController) ReactivateCluster(owner common.Address, operatorIDs []uint64, toReactivate []*types0.SSVShare) error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "ReactivateCluster", owner, operatorIDs, toReactivate)
 	ret0, _ := ret[0].(error)
@@ -207,7 +200,7 @@ func (m *MockController) ReactivateCluster(owner common.Address, operatorIDs []u
 }
 
 // ReactivateCluster indicates an expected call of ReactivateCluster.
-func (mr *MockControllerMockRecorder) ReactivateCluster(owner, operatorIDs, toReactivate interface{}) *gomock.Call {
+func (mr *MockControllerMockRecorder) ReactivateCluster(owner, operatorIDs, toReactivate any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ReactivateCluster", reflect.TypeOf((*MockController)(nil).ReactivateCluster), owner, operatorIDs, toReactivate)
 }
@@ -225,7 +218,7 @@ func (mr *MockControllerMockRecorder) StartNetworkHandlers() *gomock.Call {
 }
 
 // StartValidator mocks base method.
-func (m *MockController) StartValidator(share *types1.SSVShare) error {
+func (m *MockController) StartValidator(share *types0.SSVShare) error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "StartValidator", share)
 	ret0, _ := ret[0].(error)
@@ -233,7 +226,7 @@ func (m *MockController) StartValidator(share *types1.SSVShare) error {
 }
 
 // StartValidator indicates an expected call of StartValidator.
-func (mr *MockControllerMockRecorder) StartValidator(share interface{}) *gomock.Call {
+func (mr *MockControllerMockRecorder) StartValidator(share any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "StartValidator", reflect.TypeOf((*MockController)(nil).StartValidator), share)
 }
@@ -251,7 +244,7 @@ func (mr *MockControllerMockRecorder) StartValidators() *gomock.Call {
 }
 
 // StopValidator mocks base method.
-func (m *MockController) StopValidator(pubKey types0.ValidatorPK) error {
+func (m *MockController) StopValidator(pubKey types.ValidatorPK) error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "StopValidator", pubKey)
 	ret0, _ := ret[0].(error)
@@ -259,7 +252,7 @@ func (m *MockController) StopValidator(pubKey types0.ValidatorPK) error {
 }
 
 // StopValidator indicates an expected call of StopValidator.
-func (mr *MockControllerMockRecorder) StopValidator(pubKey interface{}) *gomock.Call {
+func (mr *MockControllerMockRecorder) StopValidator(pubKey any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "StopValidator", reflect.TypeOf((*MockController)(nil).StopValidator), pubKey)
 }
@@ -273,7 +266,7 @@ func (m *MockController) UpdateFeeRecipient(owner, recipient common.Address) err
 }
 
 // UpdateFeeRecipient indicates an expected call of UpdateFeeRecipient.
-func (mr *MockControllerMockRecorder) UpdateFeeRecipient(owner, recipient interface{}) *gomock.Call {
+func (mr *MockControllerMockRecorder) UpdateFeeRecipient(owner, recipient any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateFeeRecipient", reflect.TypeOf((*MockController)(nil).UpdateFeeRecipient), owner, recipient)
 }
@@ -338,7 +331,7 @@ func (m *MockRecipients) GetRecipientData(r basedb.Reader, owner common.Address)
 }
 
 // GetRecipientData indicates an expected call of GetRecipientData.
-func (mr *MockRecipientsMockRecorder) GetRecipientData(r, owner interface{}) *gomock.Call {
+func (mr *MockRecipientsMockRecorder) GetRecipientData(r, owner any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetRecipientData", reflect.TypeOf((*MockRecipients)(nil).GetRecipientData), r, owner)
 }
@@ -367,40 +360,40 @@ func (m *MockSharesStorage) EXPECT() *MockSharesStorageMockRecorder {
 }
 
 // Get mocks base method.
-func (m *MockSharesStorage) Get(txn basedb.Reader, pubKey []byte) *types1.SSVShare {
+func (m *MockSharesStorage) Get(txn basedb.Reader, pubKey []byte) *types0.SSVShare {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "Get", txn, pubKey)
-	ret0, _ := ret[0].(*types1.SSVShare)
+	ret0, _ := ret[0].(*types0.SSVShare)
 	return ret0
 }
 
 // Get indicates an expected call of Get.
-func (mr *MockSharesStorageMockRecorder) Get(txn, pubKey interface{}) *gomock.Call {
+func (mr *MockSharesStorageMockRecorder) Get(txn, pubKey any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Get", reflect.TypeOf((*MockSharesStorage)(nil).Get), txn, pubKey)
 }
 
 // List mocks base method.
-func (m *MockSharesStorage) List(txn basedb.Reader, filters ...storage.SharesFilter) []*types1.SSVShare {
+func (m *MockSharesStorage) List(txn basedb.Reader, filters ...storage.SharesFilter) []*types0.SSVShare {
 	m.ctrl.T.Helper()
-	varargs := []interface{}{txn}
+	varargs := []any{txn}
 	for _, a := range filters {
 		varargs = append(varargs, a)
 	}
 	ret := m.ctrl.Call(m, "List", varargs...)
-	ret0, _ := ret[0].([]*types1.SSVShare)
+	ret0, _ := ret[0].([]*types0.SSVShare)
 	return ret0
 }
 
 // List indicates an expected call of List.
-func (mr *MockSharesStorageMockRecorder) List(txn interface{}, filters ...interface{}) *gomock.Call {
+func (mr *MockSharesStorageMockRecorder) List(txn any, filters ...any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	varargs := append([]interface{}{txn}, filters...)
+	varargs := append([]any{txn}, filters...)
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "List", reflect.TypeOf((*MockSharesStorage)(nil).List), varargs...)
 }
 
 // Range mocks base method.
-func (m *MockSharesStorage) Range(txn basedb.Reader, fn func(*types1.SSVShare) bool) {
+func (m *MockSharesStorage) Range(txn basedb.Reader, fn func(*types0.SSVShare) bool) {
 	m.ctrl.T.Helper()
 	m.ctrl.Call(m, "Range", txn, fn)
 }
@@ -412,7 +405,7 @@ func (mr *MockSharesStorageMockRecorder) Range(txn, fn interface{}) *gomock.Call
 }
 
 // UpdateValidatorMetadata mocks base method.
-func (m *MockSharesStorage) UpdateValidatorMetadata(pk types0.ValidatorPK, metadata *beacon.ValidatorMetadata) error {
+func (m *MockSharesStorage) UpdateValidatorMetadata(pk types.ValidatorPK, metadata *beacon.ValidatorMetadata) error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "UpdateValidatorMetadata", pk, metadata)
 	ret0, _ := ret[0].(error)
@@ -420,13 +413,13 @@ func (m *MockSharesStorage) UpdateValidatorMetadata(pk types0.ValidatorPK, metad
 }
 
 // UpdateValidatorMetadata indicates an expected call of UpdateValidatorMetadata.
-func (mr *MockSharesStorageMockRecorder) UpdateValidatorMetadata(pk, metadata interface{}) *gomock.Call {
+func (mr *MockSharesStorageMockRecorder) UpdateValidatorMetadata(pk, metadata any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateValidatorMetadata", reflect.TypeOf((*MockSharesStorage)(nil).UpdateValidatorMetadata), pk, metadata)
 }
 
 // UpdateValidatorsMetadata mocks base method.
-func (m *MockSharesStorage) UpdateValidatorsMetadata(arg0 map[types0.ValidatorPK]*beacon.ValidatorMetadata) error {
+func (m *MockSharesStorage) UpdateValidatorsMetadata(arg0 map[types.ValidatorPK]*beacon.ValidatorMetadata) error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "UpdateValidatorsMetadata", arg0)
 	ret0, _ := ret[0].(error)
@@ -434,7 +427,7 @@ func (m *MockSharesStorage) UpdateValidatorsMetadata(arg0 map[types0.ValidatorPK
 }
 
 // UpdateValidatorsMetadata indicates an expected call of UpdateValidatorsMetadata.
-func (mr *MockSharesStorageMockRecorder) UpdateValidatorsMetadata(arg0 interface{}) *gomock.Call {
+func (mr *MockSharesStorageMockRecorder) UpdateValidatorsMetadata(arg0 any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateValidatorsMetadata", reflect.TypeOf((*MockSharesStorage)(nil).UpdateValidatorsMetadata), arg0)
 }
@@ -463,7 +456,7 @@ func (m *MockP2PNetwork) EXPECT() *MockP2PNetworkMockRecorder {
 }
 
 // Broadcast mocks base method.
-func (m *MockP2PNetwork) Broadcast(id types0.MessageID, message *types0.SignedSSVMessage) error {
+func (m *MockP2PNetwork) Broadcast(id types.MessageID, message *types.SignedSSVMessage) error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "Broadcast", id, message)
 	ret0, _ := ret[0].(error)
@@ -471,15 +464,30 @@ func (m *MockP2PNetwork) Broadcast(id types0.MessageID, message *types0.SignedSS
 }
 
 // Broadcast indicates an expected call of Broadcast.
-func (mr *MockP2PNetworkMockRecorder) Broadcast(id, message interface{}) *gomock.Call {
+func (mr *MockP2PNetworkMockRecorder) Broadcast(id, message any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Broadcast", reflect.TypeOf((*MockP2PNetwork)(nil).Broadcast), id, message)
 }
 
+// Peers mocks base method.
+func (m *MockP2PNetwork) Peers(pk types.ValidatorPK) ([]peer.ID, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "Peers", pk)
+	ret0, _ := ret[0].([]peer.ID)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// Peers indicates an expected call of Peers.
+func (mr *MockP2PNetworkMockRecorder) Peers(pk any) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Peers", reflect.TypeOf((*MockP2PNetwork)(nil).Peers), pk)
+}
+
 // RegisterHandlers mocks base method.
 func (m *MockP2PNetwork) RegisterHandlers(logger *zap.Logger, handlers ...*protocolp2p.SyncHandler) {
 	m.ctrl.T.Helper()
-	varargs := []interface{}{logger}
+	varargs := []any{logger}
 	for _, a := range handlers {
 		varargs = append(varargs, a)
 	}
@@ -487,9 +495,9 @@ func (m *MockP2PNetwork) RegisterHandlers(logger *zap.Logger, handlers ...*proto
 }
 
 // RegisterHandlers indicates an expected call of RegisterHandlers.
-func (mr *MockP2PNetworkMockRecorder) RegisterHandlers(logger interface{}, handlers ...interface{}) *gomock.Call {
+func (mr *MockP2PNetworkMockRecorder) RegisterHandlers(logger any, handlers ...any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	varargs := append([]interface{}{logger}, handlers...)
+	varargs := append([]any{logger}, handlers...)
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RegisterHandlers", reflect.TypeOf((*MockP2PNetwork)(nil).RegisterHandlers), varargs...)
 }
 
@@ -502,7 +510,7 @@ func (m *MockP2PNetwork) SubscribeRandoms(logger *zap.Logger, numSubnets int) er
 }
 
 // SubscribeRandoms indicates an expected call of SubscribeRandoms.
-func (mr *MockP2PNetworkMockRecorder) SubscribeRandoms(logger, numSubnets interface{}) *gomock.Call {
+func (mr *MockP2PNetworkMockRecorder) SubscribeRandoms(logger, numSubnets any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SubscribeRandoms", reflect.TypeOf((*MockP2PNetwork)(nil).SubscribeRandoms), logger, numSubnets)
 }
@@ -514,7 +522,44 @@ func (m *MockP2PNetwork) UseMessageRouter(router network.MessageRouter) {
 }
 
 // UseMessageRouter indicates an expected call of UseMessageRouter.
-func (mr *MockP2PNetworkMockRecorder) UseMessageRouter(router interface{}) *gomock.Call {
+func (mr *MockP2PNetworkMockRecorder) UseMessageRouter(router any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UseMessageRouter", reflect.TypeOf((*MockP2PNetwork)(nil).UseMessageRouter), router)
 }
+
+// Mockstarter is a mock of starter interface.
+type Mockstarter struct {
+	ctrl     *gomock.Controller
+	recorder *MockstarterMockRecorder
+}
+
+// MockstarterMockRecorder is the mock recorder for Mockstarter.
+type MockstarterMockRecorder struct {
+	mock *Mockstarter
+}
+
+// NewMockstarter creates a new mock instance.
+func NewMockstarter(ctrl *gomock.Controller) *Mockstarter {
+	mock := &Mockstarter{ctrl: ctrl}
+	mock.recorder = &MockstarterMockRecorder{mock}
+	return mock
+}
+
+// EXPECT returns an object that allows the caller to indicate expected use.
+func (m *Mockstarter) EXPECT() *MockstarterMockRecorder {
+	return m.recorder
+}
+
+// Start mocks base method.
+func (m *Mockstarter) Start() error {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "Start")
+	ret0, _ := ret[0].(error)
+	return ret0
+}
+
+// Start indicates an expected call of Start.
+func (mr *MockstarterMockRecorder) Start() *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Start", reflect.TypeOf((*Mockstarter)(nil).Start))
+}
diff --git a/protocol/v2/blockchain/beacon/mock_client.go b/protocol/v2/blockchain/beacon/mock_client.go
index 991073f8fe..ffc4249761 100644
--- a/protocol/v2/blockchain/beacon/mock_client.go
+++ b/protocol/v2/blockchain/beacon/mock_client.go
@@ -1,5 +1,10 @@
 // Code generated by MockGen. DO NOT EDIT.
 // Source: ./client.go
+//
+// Generated by this command:
+//
+//	mockgen -package=beacon -destination=./mock_client.go -source=./client.go
+//
 
 // Package beacon is a generated GoMock package.
 package beacon
@@ -16,8 +21,8 @@ import (
 	bellatrix "github.com/attestantio/go-eth2-client/spec/bellatrix"
 	phase0 "github.com/attestantio/go-eth2-client/spec/phase0"
 	ssz "github.com/ferranbt/fastssz"
-	gomock "github.com/golang/mock/gomock"
 	types "github.com/ssvlabs/ssv-spec/types"
+	gomock "go.uber.org/mock/gomock"
 )
 
 // MockbeaconDuties is a mock of beaconDuties interface.
@@ -53,7 +58,7 @@ func (m *MockbeaconDuties) AttesterDuties(ctx context.Context, epoch phase0.Epoc
 }
 
 // AttesterDuties indicates an expected call of AttesterDuties.
-func (mr *MockbeaconDutiesMockRecorder) AttesterDuties(ctx, epoch, validatorIndices interface{}) *gomock.Call {
+func (mr *MockbeaconDutiesMockRecorder) AttesterDuties(ctx, epoch, validatorIndices any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AttesterDuties", reflect.TypeOf((*MockbeaconDuties)(nil).AttesterDuties), ctx, epoch, validatorIndices)
 }
@@ -67,7 +72,7 @@ func (m *MockbeaconDuties) Events(ctx context.Context, topics []string, handler
 }
 
 // Events indicates an expected call of Events.
-func (mr *MockbeaconDutiesMockRecorder) Events(ctx, topics, handler interface{}) *gomock.Call {
+func (mr *MockbeaconDutiesMockRecorder) Events(ctx, topics, handler any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Events", reflect.TypeOf((*MockbeaconDuties)(nil).Events), ctx, topics, handler)
 }
@@ -82,7 +87,7 @@ func (m *MockbeaconDuties) ProposerDuties(ctx context.Context, epoch phase0.Epoc
 }
 
 // ProposerDuties indicates an expected call of ProposerDuties.
-func (mr *MockbeaconDutiesMockRecorder) ProposerDuties(ctx, epoch, validatorIndices interface{}) *gomock.Call {
+func (mr *MockbeaconDutiesMockRecorder) ProposerDuties(ctx, epoch, validatorIndices any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ProposerDuties", reflect.TypeOf((*MockbeaconDuties)(nil).ProposerDuties), ctx, epoch, validatorIndices)
 }
@@ -97,7 +102,7 @@ func (m *MockbeaconDuties) SyncCommitteeDuties(ctx context.Context, epoch phase0
 }
 
 // SyncCommitteeDuties indicates an expected call of SyncCommitteeDuties.
-func (mr *MockbeaconDutiesMockRecorder) SyncCommitteeDuties(ctx, epoch, indices interface{}) *gomock.Call {
+func (mr *MockbeaconDutiesMockRecorder) SyncCommitteeDuties(ctx, epoch, indices any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SyncCommitteeDuties", reflect.TypeOf((*MockbeaconDuties)(nil).SyncCommitteeDuties), ctx, epoch, indices)
 }
@@ -134,7 +139,7 @@ func (m *MockbeaconSubscriber) SubmitBeaconCommitteeSubscriptions(ctx context.Co
 }
 
 // SubmitBeaconCommitteeSubscriptions indicates an expected call of SubmitBeaconCommitteeSubscriptions.
-func (mr *MockbeaconSubscriberMockRecorder) SubmitBeaconCommitteeSubscriptions(ctx, subscription interface{}) *gomock.Call {
+func (mr *MockbeaconSubscriberMockRecorder) SubmitBeaconCommitteeSubscriptions(ctx, subscription any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SubmitBeaconCommitteeSubscriptions", reflect.TypeOf((*MockbeaconSubscriber)(nil).SubmitBeaconCommitteeSubscriptions), ctx, subscription)
 }
@@ -148,7 +153,7 @@ func (m *MockbeaconSubscriber) SubmitSyncCommitteeSubscriptions(ctx context.Cont
 }
 
 // SubmitSyncCommitteeSubscriptions indicates an expected call of SubmitSyncCommitteeSubscriptions.
-func (mr *MockbeaconSubscriberMockRecorder) SubmitSyncCommitteeSubscriptions(ctx, subscription interface{}) *gomock.Call {
+func (mr *MockbeaconSubscriberMockRecorder) SubmitSyncCommitteeSubscriptions(ctx, subscription any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SubmitSyncCommitteeSubscriptions", reflect.TypeOf((*MockbeaconSubscriber)(nil).SubmitSyncCommitteeSubscriptions), ctx, subscription)
 }
@@ -186,7 +191,7 @@ func (m *MockbeaconValidator) GetValidatorData(validatorPubKeys []phase0.BLSPubK
 }
 
 // GetValidatorData indicates an expected call of GetValidatorData.
-func (mr *MockbeaconValidatorMockRecorder) GetValidatorData(validatorPubKeys interface{}) *gomock.Call {
+func (mr *MockbeaconValidatorMockRecorder) GetValidatorData(validatorPubKeys any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetValidatorData", reflect.TypeOf((*MockbeaconValidator)(nil).GetValidatorData), validatorPubKeys)
 }
@@ -223,7 +228,7 @@ func (m *Mockproposer) SubmitProposalPreparation(feeRecipients map[phase0.Valida
 }
 
 // SubmitProposalPreparation indicates an expected call of SubmitProposalPreparation.
-func (mr *MockproposerMockRecorder) SubmitProposalPreparation(feeRecipients interface{}) *gomock.Call {
+func (mr *MockproposerMockRecorder) SubmitProposalPreparation(feeRecipients any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SubmitProposalPreparation", reflect.TypeOf((*Mockproposer)(nil).SubmitProposalPreparation), feeRecipients)
 }
@@ -252,7 +257,7 @@ func (m *Mocksigner) EXPECT() *MocksignerMockRecorder {
 }
 
 // ComputeSigningRoot mocks base method.
-func (m *Mocksigner) ComputeSigningRoot(object interface{}, domain phase0.Domain) ([32]byte, error) {
+func (m *Mocksigner) ComputeSigningRoot(object any, domain phase0.Domain) ([32]byte, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "ComputeSigningRoot", object, domain)
 	ret0, _ := ret[0].([32]byte)
@@ -261,7 +266,7 @@ func (m *Mocksigner) ComputeSigningRoot(object interface{}, domain phase0.Domain
 }
 
 // ComputeSigningRoot indicates an expected call of ComputeSigningRoot.
-func (mr *MocksignerMockRecorder) ComputeSigningRoot(object, domain interface{}) *gomock.Call {
+func (mr *MocksignerMockRecorder) ComputeSigningRoot(object, domain any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ComputeSigningRoot", reflect.TypeOf((*Mocksigner)(nil).ComputeSigningRoot), object, domain)
 }
@@ -299,13 +304,13 @@ func (m *MockBeaconNode) AttesterDuties(ctx context.Context, epoch phase0.Epoch,
 }
 
 // AttesterDuties indicates an expected call of AttesterDuties.
-func (mr *MockBeaconNodeMockRecorder) AttesterDuties(ctx, epoch, validatorIndices interface{}) *gomock.Call {
+func (mr *MockBeaconNodeMockRecorder) AttesterDuties(ctx, epoch, validatorIndices any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AttesterDuties", reflect.TypeOf((*MockBeaconNode)(nil).AttesterDuties), ctx, epoch, validatorIndices)
 }
 
 // ComputeSigningRoot mocks base method.
-func (m *MockBeaconNode) ComputeSigningRoot(object interface{}, domain phase0.Domain) ([32]byte, error) {
+func (m *MockBeaconNode) ComputeSigningRoot(object any, domain phase0.Domain) ([32]byte, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "ComputeSigningRoot", object, domain)
 	ret0, _ := ret[0].([32]byte)
@@ -314,7 +319,7 @@ func (m *MockBeaconNode) ComputeSigningRoot(object interface{}, domain phase0.Do
 }
 
 // ComputeSigningRoot indicates an expected call of ComputeSigningRoot.
-func (mr *MockBeaconNodeMockRecorder) ComputeSigningRoot(object, domain interface{}) *gomock.Call {
+func (mr *MockBeaconNodeMockRecorder) ComputeSigningRoot(object, domain any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ComputeSigningRoot", reflect.TypeOf((*MockBeaconNode)(nil).ComputeSigningRoot), object, domain)
 }
@@ -329,7 +334,7 @@ func (m *MockBeaconNode) DomainData(epoch phase0.Epoch, domain phase0.DomainType
 }
 
 // DomainData indicates an expected call of DomainData.
-func (mr *MockBeaconNodeMockRecorder) DomainData(epoch, domain interface{}) *gomock.Call {
+func (mr *MockBeaconNodeMockRecorder) DomainData(epoch, domain any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DomainData", reflect.TypeOf((*MockBeaconNode)(nil).DomainData), epoch, domain)
 }
@@ -343,7 +348,7 @@ func (m *MockBeaconNode) Events(ctx context.Context, topics []string, handler cl
 }
 
 // Events indicates an expected call of Events.
-func (mr *MockBeaconNodeMockRecorder) Events(ctx, topics, handler interface{}) *gomock.Call {
+func (mr *MockBeaconNodeMockRecorder) Events(ctx, topics, handler any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Events", reflect.TypeOf((*MockBeaconNode)(nil).Events), ctx, topics, handler)
 }
@@ -359,7 +364,7 @@ func (m *MockBeaconNode) GetAttestationData(slot phase0.Slot, committeeIndex pha
 }
 
 // GetAttestationData indicates an expected call of GetAttestationData.
-func (mr *MockBeaconNodeMockRecorder) GetAttestationData(slot, committeeIndex interface{}) *gomock.Call {
+func (mr *MockBeaconNodeMockRecorder) GetAttestationData(slot, committeeIndex any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetAttestationData", reflect.TypeOf((*MockBeaconNode)(nil).GetAttestationData), slot, committeeIndex)
 }
@@ -375,7 +380,7 @@ func (m *MockBeaconNode) GetBeaconBlock(slot phase0.Slot, graffiti, randao []byt
 }
 
 // GetBeaconBlock indicates an expected call of GetBeaconBlock.
-func (mr *MockBeaconNodeMockRecorder) GetBeaconBlock(slot, graffiti, randao interface{}) *gomock.Call {
+func (mr *MockBeaconNodeMockRecorder) GetBeaconBlock(slot, graffiti, randao any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetBeaconBlock", reflect.TypeOf((*MockBeaconNode)(nil).GetBeaconBlock), slot, graffiti, randao)
 }
@@ -405,7 +410,7 @@ func (m *MockBeaconNode) GetSyncCommitteeContribution(slot phase0.Slot, selectio
 }
 
 // GetSyncCommitteeContribution indicates an expected call of GetSyncCommitteeContribution.
-func (mr *MockBeaconNodeMockRecorder) GetSyncCommitteeContribution(slot, selectionProofs, subnetIDs interface{}) *gomock.Call {
+func (mr *MockBeaconNodeMockRecorder) GetSyncCommitteeContribution(slot, selectionProofs, subnetIDs any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetSyncCommitteeContribution", reflect.TypeOf((*MockBeaconNode)(nil).GetSyncCommitteeContribution), slot, selectionProofs, subnetIDs)
 }
@@ -421,7 +426,7 @@ func (m *MockBeaconNode) GetSyncMessageBlockRoot(slot phase0.Slot) (phase0.Root,
 }
 
 // GetSyncMessageBlockRoot indicates an expected call of GetSyncMessageBlockRoot.
-func (mr *MockBeaconNodeMockRecorder) GetSyncMessageBlockRoot(slot interface{}) *gomock.Call {
+func (mr *MockBeaconNodeMockRecorder) GetSyncMessageBlockRoot(slot any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetSyncMessageBlockRoot", reflect.TypeOf((*MockBeaconNode)(nil).GetSyncMessageBlockRoot), slot)
 }
@@ -436,7 +441,7 @@ func (m *MockBeaconNode) GetValidatorData(validatorPubKeys []phase0.BLSPubKey) (
 }
 
 // GetValidatorData indicates an expected call of GetValidatorData.
-func (mr *MockBeaconNodeMockRecorder) GetValidatorData(validatorPubKeys interface{}) *gomock.Call {
+func (mr *MockBeaconNodeMockRecorder) GetValidatorData(validatorPubKeys any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetValidatorData", reflect.TypeOf((*MockBeaconNode)(nil).GetValidatorData), validatorPubKeys)
 }
@@ -451,7 +456,7 @@ func (m *MockBeaconNode) IsSyncCommitteeAggregator(proof []byte) (bool, error) {
 }
 
 // IsSyncCommitteeAggregator indicates an expected call of IsSyncCommitteeAggregator.
-func (mr *MockBeaconNodeMockRecorder) IsSyncCommitteeAggregator(proof interface{}) *gomock.Call {
+func (mr *MockBeaconNodeMockRecorder) IsSyncCommitteeAggregator(proof any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsSyncCommitteeAggregator", reflect.TypeOf((*MockBeaconNode)(nil).IsSyncCommitteeAggregator), proof)
 }
@@ -466,7 +471,7 @@ func (m *MockBeaconNode) ProposerDuties(ctx context.Context, epoch phase0.Epoch,
 }
 
 // ProposerDuties indicates an expected call of ProposerDuties.
-func (mr *MockBeaconNodeMockRecorder) ProposerDuties(ctx, epoch, validatorIndices interface{}) *gomock.Call {
+func (mr *MockBeaconNodeMockRecorder) ProposerDuties(ctx, epoch, validatorIndices any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ProposerDuties", reflect.TypeOf((*MockBeaconNode)(nil).ProposerDuties), ctx, epoch, validatorIndices)
 }
@@ -482,7 +487,7 @@ func (m *MockBeaconNode) SubmitAggregateSelectionProof(slot phase0.Slot, committ
 }
 
 // SubmitAggregateSelectionProof indicates an expected call of SubmitAggregateSelectionProof.
-func (mr *MockBeaconNodeMockRecorder) SubmitAggregateSelectionProof(slot, committeeIndex, committeeLength, index, slotSig interface{}) *gomock.Call {
+func (mr *MockBeaconNodeMockRecorder) SubmitAggregateSelectionProof(slot, committeeIndex, committeeLength, index, slotSig any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SubmitAggregateSelectionProof", reflect.TypeOf((*MockBeaconNode)(nil).SubmitAggregateSelectionProof), slot, committeeIndex, committeeLength, index, slotSig)
 }
@@ -496,7 +501,7 @@ func (m *MockBeaconNode) SubmitAttestations(attestations []*phase0.Attestation)
 }
 
 // SubmitAttestations indicates an expected call of SubmitAttestations.
-func (mr *MockBeaconNodeMockRecorder) SubmitAttestations(attestations interface{}) *gomock.Call {
+func (mr *MockBeaconNodeMockRecorder) SubmitAttestations(attestations any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SubmitAttestations", reflect.TypeOf((*MockBeaconNode)(nil).SubmitAttestations), attestations)
 }
@@ -510,7 +515,7 @@ func (m *MockBeaconNode) SubmitBeaconBlock(block *api.VersionedProposal, sig pha
 }
 
 // SubmitBeaconBlock indicates an expected call of SubmitBeaconBlock.
-func (mr *MockBeaconNodeMockRecorder) SubmitBeaconBlock(block, sig interface{}) *gomock.Call {
+func (mr *MockBeaconNodeMockRecorder) SubmitBeaconBlock(block, sig any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SubmitBeaconBlock", reflect.TypeOf((*MockBeaconNode)(nil).SubmitBeaconBlock), block, sig)
 }
@@ -524,7 +529,7 @@ func (m *MockBeaconNode) SubmitBeaconCommitteeSubscriptions(ctx context.Context,
 }
 
 // SubmitBeaconCommitteeSubscriptions indicates an expected call of SubmitBeaconCommitteeSubscriptions.
-func (mr *MockBeaconNodeMockRecorder) SubmitBeaconCommitteeSubscriptions(ctx, subscription interface{}) *gomock.Call {
+func (mr *MockBeaconNodeMockRecorder) SubmitBeaconCommitteeSubscriptions(ctx, subscription any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SubmitBeaconCommitteeSubscriptions", reflect.TypeOf((*MockBeaconNode)(nil).SubmitBeaconCommitteeSubscriptions), ctx, subscription)
 }
@@ -538,7 +543,7 @@ func (m *MockBeaconNode) SubmitBlindedBeaconBlock(block *api.VersionedBlindedPro
 }
 
 // SubmitBlindedBeaconBlock indicates an expected call of SubmitBlindedBeaconBlock.
-func (mr *MockBeaconNodeMockRecorder) SubmitBlindedBeaconBlock(block, sig interface{}) *gomock.Call {
+func (mr *MockBeaconNodeMockRecorder) SubmitBlindedBeaconBlock(block, sig any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SubmitBlindedBeaconBlock", reflect.TypeOf((*MockBeaconNode)(nil).SubmitBlindedBeaconBlock), block, sig)
 }
@@ -552,7 +557,7 @@ func (m *MockBeaconNode) SubmitProposalPreparation(feeRecipients map[phase0.Vali
 }
 
 // SubmitProposalPreparation indicates an expected call of SubmitProposalPreparation.
-func (mr *MockBeaconNodeMockRecorder) SubmitProposalPreparation(feeRecipients interface{}) *gomock.Call {
+func (mr *MockBeaconNodeMockRecorder) SubmitProposalPreparation(feeRecipients any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SubmitProposalPreparation", reflect.TypeOf((*MockBeaconNode)(nil).SubmitProposalPreparation), feeRecipients)
 }
@@ -566,7 +571,7 @@ func (m *MockBeaconNode) SubmitSignedAggregateSelectionProof(msg *phase0.SignedA
 }
 
 // SubmitSignedAggregateSelectionProof indicates an expected call of SubmitSignedAggregateSelectionProof.
-func (mr *MockBeaconNodeMockRecorder) SubmitSignedAggregateSelectionProof(msg interface{}) *gomock.Call {
+func (mr *MockBeaconNodeMockRecorder) SubmitSignedAggregateSelectionProof(msg any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SubmitSignedAggregateSelectionProof", reflect.TypeOf((*MockBeaconNode)(nil).SubmitSignedAggregateSelectionProof), msg)
 }
@@ -580,7 +585,7 @@ func (m *MockBeaconNode) SubmitSignedContributionAndProof(contribution *altair.S
 }
 
 // SubmitSignedContributionAndProof indicates an expected call of SubmitSignedContributionAndProof.
-func (mr *MockBeaconNodeMockRecorder) SubmitSignedContributionAndProof(contribution interface{}) *gomock.Call {
+func (mr *MockBeaconNodeMockRecorder) SubmitSignedContributionAndProof(contribution any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SubmitSignedContributionAndProof", reflect.TypeOf((*MockBeaconNode)(nil).SubmitSignedContributionAndProof), contribution)
 }
@@ -594,7 +599,7 @@ func (m *MockBeaconNode) SubmitSyncCommitteeSubscriptions(ctx context.Context, s
 }
 
 // SubmitSyncCommitteeSubscriptions indicates an expected call of SubmitSyncCommitteeSubscriptions.
-func (mr *MockBeaconNodeMockRecorder) SubmitSyncCommitteeSubscriptions(ctx, subscription interface{}) *gomock.Call {
+func (mr *MockBeaconNodeMockRecorder) SubmitSyncCommitteeSubscriptions(ctx, subscription any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SubmitSyncCommitteeSubscriptions", reflect.TypeOf((*MockBeaconNode)(nil).SubmitSyncCommitteeSubscriptions), ctx, subscription)
 }
@@ -608,7 +613,7 @@ func (m *MockBeaconNode) SubmitSyncMessages(msgs []*altair.SyncCommitteeMessage)
 }
 
 // SubmitSyncMessages indicates an expected call of SubmitSyncMessages.
-func (mr *MockBeaconNodeMockRecorder) SubmitSyncMessages(msgs interface{}) *gomock.Call {
+func (mr *MockBeaconNodeMockRecorder) SubmitSyncMessages(msgs any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SubmitSyncMessages", reflect.TypeOf((*MockBeaconNode)(nil).SubmitSyncMessages), msgs)
 }
@@ -622,7 +627,7 @@ func (m *MockBeaconNode) SubmitValidatorRegistration(pubkey []byte, feeRecipient
 }
 
 // SubmitValidatorRegistration indicates an expected call of SubmitValidatorRegistration.
-func (mr *MockBeaconNodeMockRecorder) SubmitValidatorRegistration(pubkey, feeRecipient, sig interface{}) *gomock.Call {
+func (mr *MockBeaconNodeMockRecorder) SubmitValidatorRegistration(pubkey, feeRecipient, sig any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SubmitValidatorRegistration", reflect.TypeOf((*MockBeaconNode)(nil).SubmitValidatorRegistration), pubkey, feeRecipient, sig)
 }
@@ -636,7 +641,7 @@ func (m *MockBeaconNode) SubmitVoluntaryExit(voluntaryExit *phase0.SignedVolunta
 }
 
 // SubmitVoluntaryExit indicates an expected call of SubmitVoluntaryExit.
-func (mr *MockBeaconNodeMockRecorder) SubmitVoluntaryExit(voluntaryExit interface{}) *gomock.Call {
+func (mr *MockBeaconNodeMockRecorder) SubmitVoluntaryExit(voluntaryExit any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SubmitVoluntaryExit", reflect.TypeOf((*MockBeaconNode)(nil).SubmitVoluntaryExit), voluntaryExit)
 }
@@ -651,7 +656,7 @@ func (m *MockBeaconNode) SyncCommitteeDuties(ctx context.Context, epoch phase0.E
 }
 
 // SyncCommitteeDuties indicates an expected call of SyncCommitteeDuties.
-func (mr *MockBeaconNodeMockRecorder) SyncCommitteeDuties(ctx, epoch, indices interface{}) *gomock.Call {
+func (mr *MockBeaconNodeMockRecorder) SyncCommitteeDuties(ctx, epoch, indices any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SyncCommitteeDuties", reflect.TypeOf((*MockBeaconNode)(nil).SyncCommitteeDuties), ctx, epoch, indices)
 }
@@ -666,7 +671,7 @@ func (m *MockBeaconNode) SyncCommitteeSubnetID(index phase0.CommitteeIndex) (uin
 }
 
 // SyncCommitteeSubnetID indicates an expected call of SyncCommitteeSubnetID.
-func (mr *MockBeaconNodeMockRecorder) SyncCommitteeSubnetID(index interface{}) *gomock.Call {
+func (mr *MockBeaconNodeMockRecorder) SyncCommitteeSubnetID(index any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SyncCommitteeSubnetID", reflect.TypeOf((*MockBeaconNode)(nil).SyncCommitteeSubnetID), index)
 }
diff --git a/protocol/v2/blockchain/beacon/mock_validator_metadata.go b/protocol/v2/blockchain/beacon/mock_validator_metadata.go
index d633483362..345eb33cd2 100644
--- a/protocol/v2/blockchain/beacon/mock_validator_metadata.go
+++ b/protocol/v2/blockchain/beacon/mock_validator_metadata.go
@@ -1,5 +1,10 @@
 // Code generated by MockGen. DO NOT EDIT.
 // Source: ./validator_metadata.go
+//
+// Generated by this command:
+//
+//	mockgen -package=beacon -destination=./mock_validator_metadata.go -source=./validator_metadata.go
+//
 
 // Package beacon is a generated GoMock package.
 package beacon
@@ -7,8 +12,8 @@ package beacon
 import (
 	reflect "reflect"
 
-	gomock "github.com/golang/mock/gomock"
 	types "github.com/ssvlabs/ssv-spec/types"
+	gomock "go.uber.org/mock/gomock"
 )
 
 // MockValidatorMetadataStorage is a mock of ValidatorMetadataStorage interface.
@@ -43,7 +48,7 @@ func (m *MockValidatorMetadataStorage) UpdateValidatorMetadata(pk types.Validato
 }
 
 // UpdateValidatorMetadata indicates an expected call of UpdateValidatorMetadata.
-func (mr *MockValidatorMetadataStorageMockRecorder) UpdateValidatorMetadata(pk, metadata interface{}) *gomock.Call {
+func (mr *MockValidatorMetadataStorageMockRecorder) UpdateValidatorMetadata(pk, metadata any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateValidatorMetadata", reflect.TypeOf((*MockValidatorMetadataStorage)(nil).UpdateValidatorMetadata), pk, metadata)
 }
@@ -57,7 +62,7 @@ func (m *MockValidatorMetadataStorage) UpdateValidatorsMetadata(arg0 map[types.V
 }
 
 // UpdateValidatorsMetadata indicates an expected call of UpdateValidatorsMetadata.
-func (mr *MockValidatorMetadataStorageMockRecorder) UpdateValidatorsMetadata(arg0 interface{}) *gomock.Call {
+func (mr *MockValidatorMetadataStorageMockRecorder) UpdateValidatorsMetadata(arg0 any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateValidatorsMetadata", reflect.TypeOf((*MockValidatorMetadataStorage)(nil).UpdateValidatorsMetadata), arg0)
 }
diff --git a/protocol/v2/blockchain/beacon/mocks/network.go b/protocol/v2/blockchain/beacon/mocks/network.go
index cc1c5a0d42..a8bf74f046 100644
--- a/protocol/v2/blockchain/beacon/mocks/network.go
+++ b/protocol/v2/blockchain/beacon/mocks/network.go
@@ -1,5 +1,10 @@
 // Code generated by MockGen. DO NOT EDIT.
 // Source: ./network.go
+//
+// Generated by this command:
+//
+//	mockgen -package=mocks -destination=./mocks/network.go -source=./network.go
+//
 
 // Package mocks is a generated GoMock package.
 package mocks
@@ -9,9 +14,9 @@ import (
 	time "time"
 
 	phase0 "github.com/attestantio/go-eth2-client/spec/phase0"
-	gomock "github.com/golang/mock/gomock"
 	types "github.com/ssvlabs/ssv-spec/types"
 	beacon "github.com/ssvlabs/ssv/protocol/v2/blockchain/beacon"
+	gomock "go.uber.org/mock/gomock"
 )
 
 // MockBeaconNetwork is a mock of BeaconNetwork interface.
@@ -46,7 +51,7 @@ func (m *MockBeaconNetwork) EpochStartTime(epoch phase0.Epoch) time.Time {
 }
 
 // EpochStartTime indicates an expected call of EpochStartTime.
-func (mr *MockBeaconNetworkMockRecorder) EpochStartTime(epoch interface{}) *gomock.Call {
+func (mr *MockBeaconNetworkMockRecorder) EpochStartTime(epoch any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "EpochStartTime", reflect.TypeOf((*MockBeaconNetwork)(nil).EpochStartTime), epoch)
 }
@@ -102,7 +107,7 @@ func (m *MockBeaconNetwork) EstimatedEpochAtSlot(slot phase0.Slot) phase0.Epoch
 }
 
 // EstimatedEpochAtSlot indicates an expected call of EstimatedEpochAtSlot.
-func (mr *MockBeaconNetworkMockRecorder) EstimatedEpochAtSlot(slot interface{}) *gomock.Call {
+func (mr *MockBeaconNetworkMockRecorder) EstimatedEpochAtSlot(slot any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "EstimatedEpochAtSlot", reflect.TypeOf((*MockBeaconNetwork)(nil).EstimatedEpochAtSlot), slot)
 }
@@ -116,7 +121,7 @@ func (m *MockBeaconNetwork) EstimatedSlotAtTime(time int64) phase0.Slot {
 }
 
 // EstimatedSlotAtTime indicates an expected call of EstimatedSlotAtTime.
-func (mr *MockBeaconNetworkMockRecorder) EstimatedSlotAtTime(time interface{}) *gomock.Call {
+func (mr *MockBeaconNetworkMockRecorder) EstimatedSlotAtTime(time any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "EstimatedSlotAtTime", reflect.TypeOf((*MockBeaconNetwork)(nil).EstimatedSlotAtTime), time)
 }
@@ -130,7 +135,7 @@ func (m *MockBeaconNetwork) EstimatedSyncCommitteePeriodAtEpoch(epoch phase0.Epo
 }
 
 // EstimatedSyncCommitteePeriodAtEpoch indicates an expected call of EstimatedSyncCommitteePeriodAtEpoch.
-func (mr *MockBeaconNetworkMockRecorder) EstimatedSyncCommitteePeriodAtEpoch(epoch interface{}) *gomock.Call {
+func (mr *MockBeaconNetworkMockRecorder) EstimatedSyncCommitteePeriodAtEpoch(epoch any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "EstimatedSyncCommitteePeriodAtEpoch", reflect.TypeOf((*MockBeaconNetwork)(nil).EstimatedSyncCommitteePeriodAtEpoch), epoch)
 }
@@ -144,7 +149,7 @@ func (m *MockBeaconNetwork) EstimatedTimeAtSlot(slot phase0.Slot) int64 {
 }
 
 // EstimatedTimeAtSlot indicates an expected call of EstimatedTimeAtSlot.
-func (mr *MockBeaconNetworkMockRecorder) EstimatedTimeAtSlot(slot interface{}) *gomock.Call {
+func (mr *MockBeaconNetworkMockRecorder) EstimatedTimeAtSlot(slot any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "EstimatedTimeAtSlot", reflect.TypeOf((*MockBeaconNetwork)(nil).EstimatedTimeAtSlot), slot)
 }
@@ -158,7 +163,7 @@ func (m *MockBeaconNetwork) FirstEpochOfSyncPeriod(period uint64) phase0.Epoch {
 }
 
 // FirstEpochOfSyncPeriod indicates an expected call of FirstEpochOfSyncPeriod.
-func (mr *MockBeaconNetworkMockRecorder) FirstEpochOfSyncPeriod(period interface{}) *gomock.Call {
+func (mr *MockBeaconNetworkMockRecorder) FirstEpochOfSyncPeriod(period any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FirstEpochOfSyncPeriod", reflect.TypeOf((*MockBeaconNetwork)(nil).FirstEpochOfSyncPeriod), period)
 }
@@ -172,7 +177,7 @@ func (m *MockBeaconNetwork) FirstSlotAtEpoch(epoch phase0.Epoch) phase0.Slot {
 }
 
 // FirstSlotAtEpoch indicates an expected call of FirstSlotAtEpoch.
-func (mr *MockBeaconNetworkMockRecorder) FirstSlotAtEpoch(epoch interface{}) *gomock.Call {
+func (mr *MockBeaconNetworkMockRecorder) FirstSlotAtEpoch(epoch any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FirstSlotAtEpoch", reflect.TypeOf((*MockBeaconNetwork)(nil).FirstSlotAtEpoch), epoch)
 }
@@ -214,7 +219,7 @@ func (m *MockBeaconNetwork) GetEpochFirstSlot(epoch phase0.Epoch) phase0.Slot {
 }
 
 // GetEpochFirstSlot indicates an expected call of GetEpochFirstSlot.
-func (mr *MockBeaconNetworkMockRecorder) GetEpochFirstSlot(epoch interface{}) *gomock.Call {
+func (mr *MockBeaconNetworkMockRecorder) GetEpochFirstSlot(epoch any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetEpochFirstSlot", reflect.TypeOf((*MockBeaconNetwork)(nil).GetEpochFirstSlot), epoch)
 }
@@ -242,7 +247,7 @@ func (m *MockBeaconNetwork) GetSlotEndTime(slot phase0.Slot) time.Time {
 }
 
 // GetSlotEndTime indicates an expected call of GetSlotEndTime.
-func (mr *MockBeaconNetworkMockRecorder) GetSlotEndTime(slot interface{}) *gomock.Call {
+func (mr *MockBeaconNetworkMockRecorder) GetSlotEndTime(slot any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetSlotEndTime", reflect.TypeOf((*MockBeaconNetwork)(nil).GetSlotEndTime), slot)
 }
@@ -256,7 +261,7 @@ func (m *MockBeaconNetwork) GetSlotStartTime(slot phase0.Slot) time.Time {
 }
 
 // GetSlotStartTime indicates an expected call of GetSlotStartTime.
-func (mr *MockBeaconNetworkMockRecorder) GetSlotStartTime(slot interface{}) *gomock.Call {
+func (mr *MockBeaconNetworkMockRecorder) GetSlotStartTime(slot any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetSlotStartTime", reflect.TypeOf((*MockBeaconNetwork)(nil).GetSlotStartTime), slot)
 }
@@ -270,7 +275,7 @@ func (m *MockBeaconNetwork) IsFirstSlotOfEpoch(slot phase0.Slot) bool {
 }
 
 // IsFirstSlotOfEpoch indicates an expected call of IsFirstSlotOfEpoch.
-func (mr *MockBeaconNetworkMockRecorder) IsFirstSlotOfEpoch(slot interface{}) *gomock.Call {
+func (mr *MockBeaconNetworkMockRecorder) IsFirstSlotOfEpoch(slot any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsFirstSlotOfEpoch", reflect.TypeOf((*MockBeaconNetwork)(nil).IsFirstSlotOfEpoch), slot)
 }
@@ -284,7 +289,7 @@ func (m *MockBeaconNetwork) LastSlotOfSyncPeriod(period uint64) phase0.Slot {
 }
 
 // LastSlotOfSyncPeriod indicates an expected call of LastSlotOfSyncPeriod.
-func (mr *MockBeaconNetworkMockRecorder) LastSlotOfSyncPeriod(period interface{}) *gomock.Call {
+func (mr *MockBeaconNetworkMockRecorder) LastSlotOfSyncPeriod(period any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LastSlotOfSyncPeriod", reflect.TypeOf((*MockBeaconNetwork)(nil).LastSlotOfSyncPeriod), period)
 }
diff --git a/protocol/v2/qbft/roundtimer/mocks/timer.go b/protocol/v2/qbft/roundtimer/mocks/timer.go
index 565f393b2f..3e7a4bdb79 100644
--- a/protocol/v2/qbft/roundtimer/mocks/timer.go
+++ b/protocol/v2/qbft/roundtimer/mocks/timer.go
@@ -1,5 +1,10 @@
 // Code generated by MockGen. DO NOT EDIT.
 // Source: ./timer.go
+//
+// Generated by this command:
+//
+//	mockgen -package=mocks -destination=./mocks/timer.go -source=./timer.go
+//
 
 // Package mocks is a generated GoMock package.
 package mocks
@@ -9,8 +14,8 @@ import (
 	time "time"
 
 	phase0 "github.com/attestantio/go-eth2-client/spec/phase0"
-	gomock "github.com/golang/mock/gomock"
 	qbft "github.com/ssvlabs/ssv-spec/qbft"
+	gomock "go.uber.org/mock/gomock"
 )
 
 // MockTimer is a mock of Timer interface.
@@ -43,7 +48,7 @@ func (m *MockTimer) TimeoutForRound(height qbft.Height, round qbft.Round) {
 }
 
 // TimeoutForRound indicates an expected call of TimeoutForRound.
-func (mr *MockTimerMockRecorder) TimeoutForRound(height, round interface{}) *gomock.Call {
+func (mr *MockTimerMockRecorder) TimeoutForRound(height, round any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "TimeoutForRound", reflect.TypeOf((*MockTimer)(nil).TimeoutForRound), height, round)
 }
@@ -80,7 +85,7 @@ func (m *MockBeaconNetwork) GetSlotStartTime(slot phase0.Slot) time.Time {
 }
 
 // GetSlotStartTime indicates an expected call of GetSlotStartTime.
-func (mr *MockBeaconNetworkMockRecorder) GetSlotStartTime(slot interface{}) *gomock.Call {
+func (mr *MockBeaconNetworkMockRecorder) GetSlotStartTime(slot any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetSlotStartTime", reflect.TypeOf((*MockBeaconNetwork)(nil).GetSlotStartTime), slot)
 }
diff --git a/registry/storage/mocks/validatorstore.go b/registry/storage/mocks/validatorstore.go
index 1750f422ff..ef4b1c19c9 100644
--- a/registry/storage/mocks/validatorstore.go
+++ b/registry/storage/mocks/validatorstore.go
@@ -1,5 +1,10 @@
 // Code generated by MockGen. DO NOT EDIT.
 // Source: ./validatorstore.go
+//
+// Generated by this command:
+//
+//	mockgen -package=mocks -destination=./mocks/validatorstore.go -source=./validatorstore.go
+//
 
 // Package mocks is a generated GoMock package.
 package mocks
@@ -8,10 +13,10 @@ import (
 	reflect "reflect"
 
 	phase0 "github.com/attestantio/go-eth2-client/spec/phase0"
-	gomock "github.com/golang/mock/gomock"
 	types "github.com/ssvlabs/ssv-spec/types"
 	types0 "github.com/ssvlabs/ssv/protocol/v2/types"
 	storage "github.com/ssvlabs/ssv/registry/storage"
+	gomock "go.uber.org/mock/gomock"
 )
 
 // MockValidatorStore is a mock of ValidatorStore interface.
@@ -46,7 +51,7 @@ func (m *MockValidatorStore) Committee(id types.CommitteeID) *storage.Committee
 }
 
 // Committee indicates an expected call of Committee.
-func (mr *MockValidatorStoreMockRecorder) Committee(id interface{}) *gomock.Call {
+func (mr *MockValidatorStoreMockRecorder) Committee(id any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Committee", reflect.TypeOf((*MockValidatorStore)(nil).Committee), id)
 }
@@ -74,7 +79,7 @@ func (m *MockValidatorStore) OperatorCommittees(id types.OperatorID) []*storage.
 }
 
 // OperatorCommittees indicates an expected call of OperatorCommittees.
-func (mr *MockValidatorStoreMockRecorder) OperatorCommittees(id interface{}) *gomock.Call {
+func (mr *MockValidatorStoreMockRecorder) OperatorCommittees(id any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "OperatorCommittees", reflect.TypeOf((*MockValidatorStore)(nil).OperatorCommittees), id)
 }
@@ -88,7 +93,7 @@ func (m *MockValidatorStore) OperatorValidators(id types.OperatorID) []*types0.S
 }
 
 // OperatorValidators indicates an expected call of OperatorValidators.
-func (mr *MockValidatorStoreMockRecorder) OperatorValidators(id interface{}) *gomock.Call {
+func (mr *MockValidatorStoreMockRecorder) OperatorValidators(id any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "OperatorValidators", reflect.TypeOf((*MockValidatorStore)(nil).OperatorValidators), id)
 }
@@ -102,7 +107,7 @@ func (m *MockValidatorStore) ParticipatingCommittees(epoch phase0.Epoch) []*stor
 }
 
 // ParticipatingCommittees indicates an expected call of ParticipatingCommittees.
-func (mr *MockValidatorStoreMockRecorder) ParticipatingCommittees(epoch interface{}) *gomock.Call {
+func (mr *MockValidatorStoreMockRecorder) ParticipatingCommittees(epoch any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ParticipatingCommittees", reflect.TypeOf((*MockValidatorStore)(nil).ParticipatingCommittees), epoch)
 }
@@ -116,7 +121,7 @@ func (m *MockValidatorStore) ParticipatingValidators(epoch phase0.Epoch) []*type
 }
 
 // ParticipatingValidators indicates an expected call of ParticipatingValidators.
-func (mr *MockValidatorStoreMockRecorder) ParticipatingValidators(epoch interface{}) *gomock.Call {
+func (mr *MockValidatorStoreMockRecorder) ParticipatingValidators(epoch any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ParticipatingValidators", reflect.TypeOf((*MockValidatorStore)(nil).ParticipatingValidators), epoch)
 }
@@ -130,7 +135,7 @@ func (m *MockValidatorStore) Validator(pubKey []byte) *types0.SSVShare {
 }
 
 // Validator indicates an expected call of Validator.
-func (mr *MockValidatorStoreMockRecorder) Validator(pubKey interface{}) *gomock.Call {
+func (mr *MockValidatorStoreMockRecorder) Validator(pubKey any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Validator", reflect.TypeOf((*MockValidatorStore)(nil).Validator), pubKey)
 }
@@ -144,7 +149,7 @@ func (m *MockValidatorStore) ValidatorByIndex(index phase0.ValidatorIndex) *type
 }
 
 // ValidatorByIndex indicates an expected call of ValidatorByIndex.
-func (mr *MockValidatorStoreMockRecorder) ValidatorByIndex(index interface{}) *gomock.Call {
+func (mr *MockValidatorStoreMockRecorder) ValidatorByIndex(index any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ValidatorByIndex", reflect.TypeOf((*MockValidatorStore)(nil).ValidatorByIndex), index)
 }
@@ -172,7 +177,7 @@ func (m *MockValidatorStore) WithOperatorID(operatorID func() types.OperatorID)
 }
 
 // WithOperatorID indicates an expected call of WithOperatorID.
-func (mr *MockValidatorStoreMockRecorder) WithOperatorID(operatorID interface{}) *gomock.Call {
+func (mr *MockValidatorStoreMockRecorder) WithOperatorID(operatorID any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "WithOperatorID", reflect.TypeOf((*MockValidatorStore)(nil).WithOperatorID), operatorID)
 }
@@ -209,7 +214,7 @@ func (m *MockSelfValidatorStore) Committee(id types.CommitteeID) *storage.Commit
 }
 
 // Committee indicates an expected call of Committee.
-func (mr *MockSelfValidatorStoreMockRecorder) Committee(id interface{}) *gomock.Call {
+func (mr *MockSelfValidatorStoreMockRecorder) Committee(id any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Committee", reflect.TypeOf((*MockSelfValidatorStore)(nil).Committee), id)
 }
@@ -237,7 +242,7 @@ func (m *MockSelfValidatorStore) OperatorCommittees(id types.OperatorID) []*stor
 }
 
 // OperatorCommittees indicates an expected call of OperatorCommittees.
-func (mr *MockSelfValidatorStoreMockRecorder) OperatorCommittees(id interface{}) *gomock.Call {
+func (mr *MockSelfValidatorStoreMockRecorder) OperatorCommittees(id any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "OperatorCommittees", reflect.TypeOf((*MockSelfValidatorStore)(nil).OperatorCommittees), id)
 }
@@ -251,7 +256,7 @@ func (m *MockSelfValidatorStore) OperatorValidators(id types.OperatorID) []*type
 }
 
 // OperatorValidators indicates an expected call of OperatorValidators.
-func (mr *MockSelfValidatorStoreMockRecorder) OperatorValidators(id interface{}) *gomock.Call {
+func (mr *MockSelfValidatorStoreMockRecorder) OperatorValidators(id any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "OperatorValidators", reflect.TypeOf((*MockSelfValidatorStore)(nil).OperatorValidators), id)
 }
@@ -265,7 +270,7 @@ func (m *MockSelfValidatorStore) ParticipatingCommittees(epoch phase0.Epoch) []*
 }
 
 // ParticipatingCommittees indicates an expected call of ParticipatingCommittees.
-func (mr *MockSelfValidatorStoreMockRecorder) ParticipatingCommittees(epoch interface{}) *gomock.Call {
+func (mr *MockSelfValidatorStoreMockRecorder) ParticipatingCommittees(epoch any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ParticipatingCommittees", reflect.TypeOf((*MockSelfValidatorStore)(nil).ParticipatingCommittees), epoch)
 }
@@ -279,7 +284,7 @@ func (m *MockSelfValidatorStore) ParticipatingValidators(epoch phase0.Epoch) []*
 }
 
 // ParticipatingValidators indicates an expected call of ParticipatingValidators.
-func (mr *MockSelfValidatorStoreMockRecorder) ParticipatingValidators(epoch interface{}) *gomock.Call {
+func (mr *MockSelfValidatorStoreMockRecorder) ParticipatingValidators(epoch any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ParticipatingValidators", reflect.TypeOf((*MockSelfValidatorStore)(nil).ParticipatingValidators), epoch)
 }
@@ -307,7 +312,7 @@ func (m *MockSelfValidatorStore) SelfParticipatingCommittees(arg0 phase0.Epoch)
 }
 
 // SelfParticipatingCommittees indicates an expected call of SelfParticipatingCommittees.
-func (mr *MockSelfValidatorStoreMockRecorder) SelfParticipatingCommittees(arg0 interface{}) *gomock.Call {
+func (mr *MockSelfValidatorStoreMockRecorder) SelfParticipatingCommittees(arg0 any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SelfParticipatingCommittees", reflect.TypeOf((*MockSelfValidatorStore)(nil).SelfParticipatingCommittees), arg0)
 }
@@ -321,7 +326,7 @@ func (m *MockSelfValidatorStore) SelfParticipatingValidators(arg0 phase0.Epoch)
 }
 
 // SelfParticipatingValidators indicates an expected call of SelfParticipatingValidators.
-func (mr *MockSelfValidatorStoreMockRecorder) SelfParticipatingValidators(arg0 interface{}) *gomock.Call {
+func (mr *MockSelfValidatorStoreMockRecorder) SelfParticipatingValidators(arg0 any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SelfParticipatingValidators", reflect.TypeOf((*MockSelfValidatorStore)(nil).SelfParticipatingValidators), arg0)
 }
@@ -349,7 +354,7 @@ func (m *MockSelfValidatorStore) Validator(pubKey []byte) *types0.SSVShare {
 }
 
 // Validator indicates an expected call of Validator.
-func (mr *MockSelfValidatorStoreMockRecorder) Validator(pubKey interface{}) *gomock.Call {
+func (mr *MockSelfValidatorStoreMockRecorder) Validator(pubKey any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Validator", reflect.TypeOf((*MockSelfValidatorStore)(nil).Validator), pubKey)
 }
@@ -363,7 +368,7 @@ func (m *MockSelfValidatorStore) ValidatorByIndex(index phase0.ValidatorIndex) *
 }
 
 // ValidatorByIndex indicates an expected call of ValidatorByIndex.
-func (mr *MockSelfValidatorStoreMockRecorder) ValidatorByIndex(index interface{}) *gomock.Call {
+func (mr *MockSelfValidatorStoreMockRecorder) ValidatorByIndex(index any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ValidatorByIndex", reflect.TypeOf((*MockSelfValidatorStore)(nil).ValidatorByIndex), index)
 }
@@ -391,7 +396,7 @@ func (m *MockSelfValidatorStore) WithOperatorID(operatorID func() types.Operator
 }
 
 // WithOperatorID indicates an expected call of WithOperatorID.
-func (mr *MockSelfValidatorStoreMockRecorder) WithOperatorID(operatorID interface{}) *gomock.Call {
+func (mr *MockSelfValidatorStoreMockRecorder) WithOperatorID(operatorID any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "WithOperatorID", reflect.TypeOf((*MockSelfValidatorStore)(nil).WithOperatorID), operatorID)
 }