separate attester from sync committee

api/handlers/exporter.go

@@ -150,6 +150,10 @@ func (e *Exporter) CommitteeTraces(w http.ResponseWriter, r *http.Request) error
 		return api.BadRequestError(fmt.Errorf("'from' must be less than or equal to 'to'"))
 	}
 
+	if len(request.Committees) == 0 && len(request.CommitteeIDs) == 0 {
+		return api.BadRequestError(fmt.Errorf("committees are required"))
+	}
+
 	var committeeIDs []spectypes.CommitteeID
 
 	for _, cmt := range request.CommitteeIDs {
@@ -161,8 +165,9 @@ func (e *Exporter) CommitteeTraces(w http.ResponseWriter, r *http.Request) error
 		committeeIDs = append(committeeIDs, id)
 	}
 
-	if len(committeeIDs) == 0 {
-		// map request.Committees
+	if len(committeeIDs) == 0 { // double check
+		id := spectypes.GetCommitteeID(request.Committees)
+		committeeIDs = append(committeeIDs, id)
 	}
 
 	var duties []*model.CommitteeDutyTrace

api/handlers/model.go

@@ -7,7 +7,6 @@ import (
 	"github.com/attestantio/go-eth2-client/spec/phase0"
 	spectypes "github.com/ssvlabs/ssv-spec/types"
 	model "github.com/ssvlabs/ssv/exporter/v2"
-	qbftmsg "github.com/ssvlabs/ssv/protocol/v2/message"
 )
 
 type validatorTraceResponse struct {
@@ -26,7 +25,7 @@ type validatorTrace struct {
 
 type decided struct {
 	Round        uint64                 `json:"round"`
-	BeaconRoot   phase0.Root            `json:"beaconRoot"`
+	BeaconRoot   phase0.Root            `json:"ssvRoot"`
 	Signers      []spectypes.OperatorID `json:"signers"`
 	ReceivedTime time.Time              `json:"time"`
 }
@@ -41,7 +40,7 @@ type round struct {
 
 type proposalTrace struct {
 	Round           uint64               `json:"round"`
-	BeaconRoot      phase0.Root          `json:"beaconRoot"`
+	BeaconRoot      phase0.Root          `json:"ssvRoot"`
 	Signer          spectypes.OperatorID `json:"signer"`
 	RoundChanges    []roundChange        `json:"roundChanges"`
 	PrepareMessages []message            `json:"prepareMessages"`
@@ -56,17 +55,11 @@ type roundChange struct {
 
 type message struct {
 	Round        uint64               `json:"round"`
-	BeaconRoot   phase0.Root          `json:"beaconRoot"`
+	BeaconRoot   phase0.Root          `json:"ssvRoot"`
 	Signer       spectypes.OperatorID `json:"signer"`
 	ReceivedTime time.Time            `json:"time"`
 }
 
-type partialSigMessage struct {
-	BeaconRoot phase0.Root           `json:"beaconRoot"`
-	Signer     spectypes.OperatorID  `json:"signer"`
-	Validator  phase0.ValidatorIndex `json:"validator"`
-}
-
 func toValidatorTrace(t *model.ValidatorDutyTrace) validatorTrace {
 	return validatorTrace{
 		Slot:      t.Slot,
@@ -155,30 +148,31 @@ type committeeTraceResponse struct {
 }
 
 type committeeTrace struct {
-	Slot     phase0.Slot        `json:"slot"`
-	Rounds   []round            `json:"consensus"`
-	Decideds []decided          `json:"decideds"`
-	Post     []committeeMessage `json:"post"`
+	Slot     phase0.Slot `json:"slot"`
+	Rounds   []round     `json:"consensus"`
+	Decideds []decided   `json:"decideds"`
+
+	SyncCommittee []committeeMessage `json:"sync_committee"`
+	Attester      []committeeMessage `json:"attester"`
 
 	CommitteeID string `json:"committeeID"`
 	// OperatorIDs []spectypes.OperatorID `json:"operatorIDs"` not needed?
 }
 
 type committeeMessage struct {
-	Type         string               `json:"type"`
-	Signer       spectypes.OperatorID `json:"signer"`
-	Messages     []partialSigMessage  `json:"messages"`
-	ReceivedTime time.Time            `json:"time"`
+	Signers      []spectypes.OperatorID `json:"signers"`
+	ReceivedTime time.Time              `json:"time"`
 }
 
 func toCommitteeTrace(t *model.CommitteeDutyTrace) committeeTrace {
 	return committeeTrace{
 		// consensus trace
-		Rounds:      toRounds(t.Rounds),
-		Decideds:    toDecidedTrace(t.Decideds),
-		Slot:        t.Slot,
-		Post:        toCommitteePost(t.Post),
-		CommitteeID: hex.EncodeToString(t.CommitteeID[:]),
+		Slot:          t.Slot,
+		Rounds:        toRounds(t.Rounds),
+		Decideds:      toDecidedTrace(t.Decideds),
+		SyncCommittee: toCommitteePost(t.SyncCommittee),
+		Attester:      toCommitteePost(t.Attester),
+		CommitteeID:   hex.EncodeToString(t.CommitteeID[:]),
 		// OperatorIDs: t.OperatorIDs,
 	}
 }
@@ -196,27 +190,13 @@ func toDecidedTrace(d []*model.DecidedTrace) (out []decided) {
 	return
 }
 
-func toCommitteePost(m []*model.CommitteePartialSigMessageTrace) (out []committeeMessage) {
+func toCommitteePost(m []*model.SignerData) (out []committeeMessage) {
 	for _, mt := range m {
 		out = append(out, committeeMessage{
-			Type:         qbftmsg.PartialMsgTypeToString(mt.Type),
-			Signer:       mt.Signer,
-			Messages:     toCommitteePartSigMessage(mt.Messages),
+			Signers:      mt.Signers,
 			ReceivedTime: mt.ReceivedTime,
 		})
 	}
 
 	return
 }
-
-func toCommitteePartSigMessage(m []*model.PartialSigMessage) (out []partialSigMessage) {
-	for _, mt := range m {
-		out = append(out, partialSigMessage{
-			BeaconRoot: mt.BeaconRoot,
-			Signer:     mt.Signer,
-			Validator:  mt.ValidatorIndex,
-		})
-	}
-
-	return
-}

cli/operator/node.go

@@ -345,7 +345,7 @@ var StartNodeCmd = &cobra.Command{
 		var tracer validator.DutyTracer = validator.NoOp()
 		if cfg.SSVOptions.ValidatorOptions.ExporterEnableDutyTracing {
 			logger.Info("exporter duty tracing enabled")
-			tracer = validator.NewTracer(logger)
+			tracer = validator.NewTracer(logger, consensusClient)
 		}
 		cfg.SSVOptions.ValidatorOptions.DutyTracer = tracer
 

exporter/v2/model.go

@@ -71,25 +71,19 @@ type CommitteeDutyTrace struct {
 	ConsensusTrace
 
 	Slot phase0.Slot
-	Post []*CommitteePartialSigMessageTrace `ssz-max:"13"`
 
 	CommitteeID spectypes.CommitteeID  `ssz-size:"32"`
 	OperatorIDs []spectypes.OperatorID `ssz-max:"13"`
 
+	SyncCommittee []*SignerData `ssz-max:"1512"`
+	Attester      []*SignerData `ssz-max:"1512"`
+
 	// maybe not needed
 	AttestationDataRoot      phase0.Root `ssz-size:"32"`
 	SyncCommitteeMessageRoot phase0.Root `ssz-size:"32"`
 }
 
-type CommitteePartialSigMessageTrace struct {
-	Type         spectypes.PartialSigMsgType
-	Signer       spectypes.OperatorID
-	Messages     []*PartialSigMessage `ssz-max:"1512"`
+type SignerData struct {
+	Signers      []spectypes.OperatorID `ssz-max:"13"`
 	ReceivedTime time.Time
 }
-
-type PartialSigMessage struct {
-	BeaconRoot     phase0.Root `ssz-size:"32"`
-	Signer         spectypes.OperatorID
-	ValidatorIndex phase0.ValidatorIndex
-}