message validation: check voluntary exit existence (#1468)

message validation: check voluntary exit existence
ssvlabs · Jul 16, 2024 · c5dfdac · c5dfdac
1 parent 86fd07f
commit c5dfdac
Show file tree

Hide file tree

Showing 9 changed files with 88 additions and 16 deletions.
diff --git a/cli/operator/node.go b/cli/operator/node.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"encoding/base64"
 	"fmt"
-	"github.com/ssvlabs/ssv/exporter/convert"
 	"log"
 	"math/big"
 	"net/http"
@@ -30,6 +29,7 @@ import (
 	"github.com/ssvlabs/ssv/eth/localevents"
 	exporterapi "github.com/ssvlabs/ssv/exporter/api"
 	"github.com/ssvlabs/ssv/exporter/api/decided"
+	"github.com/ssvlabs/ssv/exporter/convert"
 	ibftstorage "github.com/ssvlabs/ssv/ibft/storage"
 	ssv_identity "github.com/ssvlabs/ssv/identity"
 	"github.com/ssvlabs/ssv/logging"

diff --git a/eth/eventhandler/handlers.go b/eth/eventhandler/handlers.go
@@ -5,6 +5,7 @@ import (
 	"encoding/hex"
 	"errors"
 	"fmt"
+
 	"github.com/ssvlabs/ssv/exporter/convert"
 
 	"github.com/attestantio/go-eth2-client/spec/phase0"
@@ -511,10 +512,6 @@ func (eh *EventHandler) handleValidatorExited(txn basedb.Txn, event *contract.Co
 		return nil, &MalformedEventError{Err: ErrShareBelongsToDifferentOwner}
 	}
 
-	if !share.BelongsToOperator(eh.operatorDataStore.GetOperatorID()) {
-		return nil, nil
-	}
-
 	if share.BeaconMetadata == nil {
 		return nil, nil
 	}
@@ -523,10 +520,14 @@ func (eh *EventHandler) handleValidatorExited(txn basedb.Txn, event *contract.Co
 	copy(pk[:], share.ValidatorPubKey[:])
 
 	ed := &duties.ExitDescriptor{
+		OwnValidator:   false,
 		PubKey:         pk,
 		ValidatorIndex: share.BeaconMetadata.Index,
 		BlockNumber:    event.Raw.BlockNumber,
 	}
+	if share.BelongsToOperator(eh.operatorDataStore.GetOperatorID()) {
+		ed.OwnValidator = true
+	}
 
 	return ed, nil
 }

diff --git a/message/validation/common_checks.go b/message/validation/common_checks.go
@@ -59,7 +59,7 @@ func (mv *messageValidator) validateDutyCount(
 ) error {
 	dutyCount := signerStateBySlot.DutyCount(mv.netCfg.Beacon.EstimatedEpochAtSlot(msgSlot))
 
-	dutyLimit, exists := mv.dutyLimit(msgID, validatorIndexCount)
+	dutyLimit, exists := mv.dutyLimit(msgID, msgSlot, validatorIndexCount)
 	if !exists {
 		return nil
 	}
@@ -74,10 +74,15 @@ func (mv *messageValidator) validateDutyCount(
 	return nil
 }
 
-func (mv *messageValidator) dutyLimit(msgID spectypes.MessageID, validatorIndexCount int) (int, bool) {
+func (mv *messageValidator) dutyLimit(msgID spectypes.MessageID, slot phase0.Slot, validatorIndexCount int) (int, bool) {
 	switch msgID.GetRoleType() {
-	case spectypes.RoleAggregator, spectypes.RoleValidatorRegistration, spectypes.RoleVoluntaryExit:
-		// TODO: better solution for RoleValidatorRegistration: https://github.com/ssvlabs/ssv/pull/1393#discussion_r1667687976
+	case spectypes.RoleVoluntaryExit:
+		pk := phase0.BLSPubKey{}
+		copy(pk[:], msgID.GetDutyExecutorID())
+
+		return mv.dutyStore.VoluntaryExit.GetDutyCount(slot, pk), true
+
+	case spectypes.RoleAggregator, spectypes.RoleValidatorRegistration:
 		return 2, true
 
 	case spectypes.RoleCommittee:

diff --git a/operator/duties/dutystore/store.go b/operator/duties/dutystore/store.go
@@ -8,12 +8,14 @@ type Store struct {
 	Attester      *Duties[eth2apiv1.AttesterDuty]
 	Proposer      *Duties[eth2apiv1.ProposerDuty]
 	SyncCommittee *SyncCommitteeDuties
+	VoluntaryExit *VoluntaryExitDuties
 }
 
 func New() *Store {
 	return &Store{
 		Attester:      NewDuties[eth2apiv1.AttesterDuty](),
 		Proposer:      NewDuties[eth2apiv1.ProposerDuty](),
 		SyncCommittee: NewSyncCommitteeDuties(),
+		VoluntaryExit: NewVoluntaryExit(),
 	}
 }
diff --git a/operator/duties/dutystore/voluntary_exit.go b/operator/duties/dutystore/voluntary_exit.go
@@ -0,0 +1,51 @@
+package dutystore
+
+import (
+	"sync"
+
+	"github.com/attestantio/go-eth2-client/spec/phase0"
+)
+
+type VoluntaryExitDuties struct {
+	mu sync.RWMutex
+	m  map[phase0.Slot]map[phase0.BLSPubKey]int
+}
+
+func NewVoluntaryExit() *VoluntaryExitDuties {
+	return &VoluntaryExitDuties{
+		m: make(map[phase0.Slot]map[phase0.BLSPubKey]int),
+	}
+}
+
+func (d *VoluntaryExitDuties) GetDutyCount(slot phase0.Slot, pk phase0.BLSPubKey) int {
+	d.mu.RLock()
+	defer d.mu.RUnlock()
+
+	v, ok := d.m[slot]
+	if !ok {
+		return 0
+	}
+
+	return v[pk]
+}
+
+func (d *VoluntaryExitDuties) AddDuty(slot phase0.Slot, pk phase0.BLSPubKey) {
+	d.mu.Lock()
+	defer d.mu.Unlock()
+
+	v, ok := d.m[slot]
+	if !ok {
+		d.m[slot] = map[phase0.BLSPubKey]int{
+			pk: 1,
+		}
+	} else {
+		v[pk]++
+	}
+}
+
+func (d *VoluntaryExitDuties) RemoveSlot(slot phase0.Slot) {
+	d.mu.Lock()
+	defer d.mu.Unlock()
+
+	delete(d.m, slot)
+}
diff --git a/operator/duties/scheduler.go b/operator/duties/scheduler.go
@@ -17,9 +17,8 @@ import (
 	"github.com/prysmaticlabs/prysm/v4/async/event"
 	"github.com/sourcegraph/conc/pool"
 	genesisspectypes "github.com/ssvlabs/ssv-spec-pre-cc/types"
-	"go.uber.org/zap"
-
 	spectypes "github.com/ssvlabs/ssv-spec/types"
+	"go.uber.org/zap"
 
 	"github.com/ssvlabs/ssv/beacon/goclient"
 	"github.com/ssvlabs/ssv/logging"
@@ -149,7 +148,7 @@ func NewScheduler(opts *SchedulerOptions) *Scheduler {
 			NewAttesterHandler(dutyStore.Attester),
 			NewProposerHandler(dutyStore.Proposer),
 			NewSyncCommitteeHandler(dutyStore.SyncCommittee),
-			NewVoluntaryExitHandler(opts.ValidatorExitCh),
+			NewVoluntaryExitHandler(dutyStore.VoluntaryExit, opts.ValidatorExitCh),
 			NewCommitteeHandler(dutyStore.Attester, dutyStore.SyncCommittee),
 		},
 

diff --git a/operator/duties/voluntary_exit.go b/operator/duties/voluntary_exit.go
@@ -9,25 +9,29 @@ import (
 	"go.uber.org/zap"
 
 	"github.com/ssvlabs/ssv/logging/fields"
+	"github.com/ssvlabs/ssv/operator/duties/dutystore"
 )
 
 const voluntaryExitSlotsToPostpone = phase0.Slot(4)
 
 type ExitDescriptor struct {
+	OwnValidator   bool
 	PubKey         phase0.BLSPubKey
 	ValidatorIndex phase0.ValidatorIndex
 	BlockNumber    uint64
 }
 
 type VoluntaryExitHandler struct {
 	baseHandler
+	duties          *dutystore.VoluntaryExitDuties
 	validatorExitCh <-chan ExitDescriptor
 	dutyQueue       []*spectypes.BeaconDuty
 	blockSlots      map[uint64]phase0.Slot
 }
 
-func NewVoluntaryExitHandler(validatorExitCh <-chan ExitDescriptor) *VoluntaryExitHandler {
+func NewVoluntaryExitHandler(duties *dutystore.VoluntaryExitDuties, validatorExitCh <-chan ExitDescriptor) *VoluntaryExitHandler {
 	return &VoluntaryExitHandler{
+		duties:          duties,
 		validatorExitCh: validatorExitCh,
 		dutyQueue:       make([]*spectypes.BeaconDuty, 0),
 		blockSlots:      map[uint64]phase0.Slot{},
@@ -63,6 +67,7 @@ func (h *VoluntaryExitHandler) HandleDuties(ctx context.Context) {
 			}
 
 			h.dutyQueue = pendingDuties
+			h.duties.RemoveSlot(currentSlot - phase0.Slot(h.network.SlotsPerEpoch()))
 
 			if dutyCount := len(dutiesForExecution); dutyCount != 0 {
 				h.dutiesExecutor.ExecuteDuties(h.logger, dutiesForExecution)
@@ -92,6 +97,11 @@ func (h *VoluntaryExitHandler) HandleDuties(ctx context.Context) {
 				ValidatorIndex: exitDescriptor.ValidatorIndex,
 			}
 
+			h.duties.AddDuty(dutySlot, exitDescriptor.PubKey)
+			if !exitDescriptor.OwnValidator {
+				continue
+			}
+
 			h.dutyQueue = append(h.dutyQueue, duty)
 
 			h.logger.Debug("🛠 scheduled duty for execution",

diff --git a/operator/duties/voluntary_exit_test.go b/operator/duties/voluntary_exit_test.go
@@ -15,12 +15,13 @@ import (
 	spectypes "github.com/ssvlabs/ssv-spec/types"
 
 	"github.com/ssvlabs/ssv/beacon/goclient"
+	"github.com/ssvlabs/ssv/operator/duties/dutystore"
 	mocknetwork "github.com/ssvlabs/ssv/protocol/v2/blockchain/beacon/mocks"
 )
 
 func TestVoluntaryExitHandler_HandleDuties(t *testing.T) {
 	exitCh := make(chan ExitDescriptor)
-	handler := NewVoluntaryExitHandler(exitCh)
+	handler := NewVoluntaryExitHandler(dutystore.NewVoluntaryExit(), exitCh)
 
 	currentSlot := &SafeValue[phase0.Slot]{}
 	currentSlot.Set(0)
@@ -38,21 +39,25 @@ func TestVoluntaryExitHandler_HandleDuties(t *testing.T) {
 	const blockNumber = uint64(1)
 
 	normalExit := ExitDescriptor{
+		OwnValidator:   true,
 		PubKey:         phase0.BLSPubKey{1, 2, 3},
 		ValidatorIndex: phase0.ValidatorIndex(1),
 		BlockNumber:    blockNumber,
 	}
 	sameBlockExit := ExitDescriptor{
+		OwnValidator:   true,
 		PubKey:         phase0.BLSPubKey{4, 5, 6},
 		ValidatorIndex: phase0.ValidatorIndex(2),
 		BlockNumber:    normalExit.BlockNumber,
 	}
 	newBlockExit := ExitDescriptor{
+		OwnValidator:   true,
 		PubKey:         phase0.BLSPubKey{1, 2, 3},
 		ValidatorIndex: phase0.ValidatorIndex(1),
 		BlockNumber:    normalExit.BlockNumber + 1,
 	}
 	pastBlockExit := ExitDescriptor{
+		OwnValidator:   true,
 		PubKey:         phase0.BLSPubKey{1, 2, 3},
 		ValidatorIndex: phase0.ValidatorIndex(1),
 		BlockNumber:    normalExit.BlockNumber + 4,

diff --git a/operator/node.go b/operator/node.go
@@ -4,15 +4,14 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/ssvlabs/ssv/network"
-
 	"go.uber.org/zap"
 
 	"github.com/ssvlabs/ssv/eth/executionclient"
 	"github.com/ssvlabs/ssv/exporter/api"
 	qbftstorage "github.com/ssvlabs/ssv/ibft/storage"
 	"github.com/ssvlabs/ssv/logging"
 	"github.com/ssvlabs/ssv/logging/fields"
+	"github.com/ssvlabs/ssv/network"
 	"github.com/ssvlabs/ssv/networkconfig"
 	"github.com/ssvlabs/ssv/operator/duties"
 	"github.com/ssvlabs/ssv/operator/duties/dutystore"