First round of fixes in making gossip publishing good for the validator: See comment

cl/aggregation/pool_impl.go

@@ -14,6 +14,8 @@ import (
 	"github.com/ledgerwatch/erigon/cl/utils/eth_clock"
 )
 
+var ErrIsSuperset = fmt.Errorf("attestation is superset of existing attestation")
+
 var (
 	blsAggregate = bls.AggregateSignatures
 )
@@ -55,13 +57,12 @@ func (p *aggregationPoolImpl) AddAttestation(inAtt *solid.Attestation) error {
 	defer p.aggregatesLock.Unlock()
 	att, ok := p.aggregates[hashRoot]
 	if !ok {
-		p.aggregates[hashRoot] = inAtt.Clone().(*solid.Attestation)
+		p.aggregates[hashRoot] = inAtt.Copy()
 		return nil
 	}
 
 	if utils.IsSupersetBitlist(att.AggregationBits(), inAtt.AggregationBits()) {
-		// no need to merge existing signatures
-		return nil
+		return ErrIsSuperset
 	}
 
 	// merge signature
@@ -71,7 +72,7 @@ func (p *aggregationPoolImpl) AddAttestation(inAtt *solid.Attestation) error {
 	if err != nil {
 		return err
 	}
-	if len(merged) > 96 {
+	if len(merged) != 96 {
 		return fmt.Errorf("merged signature is too long")
 	}
 	var mergedSig [96]byte
@@ -99,7 +100,7 @@ func (p *aggregationPoolImpl) GetAggregatationByRoot(root common.Hash) *solid.At
 	if att == nil {
 		return nil
 	}
-	return att.Clone().(*solid.Attestation)
+	return att.Copy()
 }
 
 func (p *aggregationPoolImpl) sweepStaleAtt(ctx context.Context) {

cl/beacon/handler/duties_sync.go

@@ -62,6 +62,9 @@ func (a *ApiHandler) getSyncDuties(w http.ResponseWriter, r *http.Request) (*bea
 
 	// Now try reading the sync committee
 	syncCommittee, _, ok := a.forkchoiceStore.GetSyncCommittees(period)
+	if !ok {
+		_, syncCommittee, ok = a.forkchoiceStore.GetSyncCommittees(period - 1)
+	}
 	// Read them from the archive node if we do not have them in the fast-access storage
 	if !ok {
 		syncCommittee, err = state_accessors.ReadCurrentSyncCommittee(tx, a.beaconChainCfg.RoundSlotToSyncCommitteePeriod(startSlotAtEpoch))

cl/beacon/handler/handler.go

@@ -82,6 +82,7 @@ type ApiHandler struct {
 	syncCommitteeMessagesService     services.SyncCommitteeMessagesService
 	syncContributionAndProofsService services.SyncContributionService
 	aggregateAndProofsService        services.AggregateAndProofService
+	attestationService               services.AttestationService
 }
 
 func NewApiHandler(
@@ -110,6 +111,7 @@ func NewApiHandler(
 	syncCommitteeMessagesService services.SyncCommitteeMessagesService,
 	syncContributionAndProofs services.SyncContributionService,
 	aggregateAndProofs services.AggregateAndProofService,
+	attestationService services.AttestationService,
 ) *ApiHandler {
 	blobBundles, err := lru.New[common.Bytes48, BlobBundle]("blobs", maxBlobBundleCacheSize)
 	if err != nil {
@@ -146,6 +148,7 @@ func NewApiHandler(
 		syncCommitteeMessagesService:     syncCommitteeMessagesService,
 		syncContributionAndProofsService: syncContributionAndProofs,
 		aggregateAndProofsService:        aggregateAndProofs,
+		attestationService:               attestationService,
 	}
 }
 

cl/beacon/handler/node.go

@@ -169,14 +169,11 @@ func (a *ApiHandler) GetEthV1NodeIdentity(w http.ResponseWriter, r *http.Request
 
 func (a *ApiHandler) GetEthV1NodeSyncing(w http.ResponseWriter, r *http.Request) {
 	currentSlot := a.ethClock.GetCurrentSlot()
-	var syncDistance uint64
-	if a.syncedData.Syncing() {
-		syncDistance = currentSlot - a.syncedData.HeadSlot()
-	}
+
 	if err := json.NewEncoder(w).Encode(map[string]interface{}{
 		"data": map[string]interface{}{
 			"head_slot":     strconv.FormatUint(a.syncedData.HeadSlot(), 10),
-			"sync_distance": strconv.FormatUint(syncDistance, 10),
+			"sync_distance": strconv.FormatUint(currentSlot-a.syncedData.HeadSlot(), 10),
 			"is_syncing":    a.syncedData.Syncing(),
 			"is_optimistic": false, // needs to change
 			"el_offline":    false,

cl/beacon/handler/pool.go

@@ -1,6 +1,7 @@
 package handler
 
 import (
+	"bytes"
 	"encoding/json"
 	"errors"
 	"net/http"
@@ -64,44 +65,44 @@ func (a *ApiHandler) PostEthV1BeaconPoolAttestations(w http.ResponseWriter, r *h
 		beaconhttp.NewEndpointError(http.StatusBadRequest, err).WriteTo(w)
 		return
 	}
+
+	headState := a.syncedData.HeadState()
+	if headState == nil {
+		beaconhttp.NewEndpointError(http.StatusServiceUnavailable, errors.New("head state not available")).WriteTo(w)
+		return
+	}
 	failures := []poolingFailure{}
 	for i, attestation := range req {
-		if err := a.forkchoiceStore.ValidateOnAttestation(attestation); err != nil {
-			failures = append(failures, poolingFailure{
-				Index:   i,
-				Message: err.Error(),
-			})
-			continue
-		}
-		if err := a.committeeSub.CheckAggregateAttestation(attestation); err != nil {
+		var (
+			slot                  = attestation.AttestantionData().Slot()
+			cIndex                = attestation.AttestantionData().CommitteeIndex()
+			committeeCountPerSlot = headState.CommitteeCount(slot / a.beaconChainCfg.SlotsPerEpoch)
+			subnet                = subnets.ComputeSubnetForAttestation(committeeCountPerSlot, slot, cIndex, a.beaconChainCfg.SlotsPerEpoch, a.netConfig.AttestationSubnetCount)
+		)
+		_ = i
+		if err := a.attestationService.ProcessMessage(r.Context(), &subnet, attestation); err != nil {
+			log.Warn("[Beacon REST] failed to process attestation", "err", err)
 			failures = append(failures, poolingFailure{
 				Index:   i,
 				Message: err.Error(),
 			})
 			continue
 		}
-		if a.sentinel != nil {
-			// broadcast
-			var (
-				slot                  = attestation.AttestantionData().Slot()
-				cIndex                = attestation.AttestantionData().CommitteeIndex()
-				committeeCountPerSlot = subnets.ComputeCommitteeCountPerSlot(a.syncedData.HeadState(), slot, a.beaconChainCfg.SlotsPerEpoch)
-				subnet                = subnets.ComputeSubnetForAttestation(committeeCountPerSlot, slot, cIndex, a.beaconChainCfg.SlotsPerEpoch, a.netConfig.AttestationSubnetCount)
-			)
-			encodedSSZ, err := attestation.EncodeSSZ(nil)
-			if err != nil {
-				beaconhttp.NewEndpointError(http.StatusInternalServerError, err).WriteTo(w)
-				return
-			}
-			if _, err := a.sentinel.PublishGossip(r.Context(), &sentinel.GossipData{
-				Data:     encodedSSZ,
-				Name:     gossip.TopicNameBeaconAttestation(subnet),
-				SubnetId: &subnet,
-			}); err != nil {
-				beaconhttp.NewEndpointError(http.StatusInternalServerError, err).WriteTo(w)
-				return
-			}
-		}
+		// if a.sentinel != nil {
+		// 	encodedSSZ, err := attestation.EncodeSSZ(nil)
+		// 	if err != nil {
+		// 		beaconhttp.NewEndpointError(http.StatusInternalServerError, err).WriteTo(w)
+		// 		return
+		// 	}
+		// 	if _, err := a.sentinel.PublishGossip(r.Context(), &sentinel.GossipData{
+		// 		Data:     encodedSSZ,
+		// 		Name:     gossip.TopicNamePrefixBeaconAttestation,
+		// 		SubnetId: &subnet,
+		// 	}); err != nil {
+		// 		beaconhttp.NewEndpointError(http.StatusInternalServerError, err).WriteTo(w)
+		// 		return
+		// 	}
+		// }
 	}
 	if len(failures) > 0 {
 		errResp := poolingError{
@@ -266,6 +267,7 @@ func (a *ApiHandler) PostEthV1ValidatorAggregatesAndProof(w http.ResponseWriter,
 	failures := []poolingFailure{}
 	for _, v := range req {
 		if err := a.aggregateAndProofsService.ProcessMessage(r.Context(), nil, v); err != nil && !errors.Is(err, services.ErrIgnore) {
+			log.Warn("[Beacon REST] failed to process bls-change", "err", err)
 			failures = append(failures, poolingFailure{Index: len(failures), Message: err.Error()})
 			continue
 		}
@@ -274,12 +276,14 @@ func (a *ApiHandler) PostEthV1ValidatorAggregatesAndProof(w http.ResponseWriter,
 			encodedSSZ, err := v.EncodeSSZ(nil)
 			if err != nil {
 				http.Error(w, err.Error(), http.StatusInternalServerError)
+				log.Warn("[Beacon REST] failed to encode aggregate and proof", "err", err)
 				return
 			}
 			if _, err := a.sentinel.PublishGossip(r.Context(), &sentinel.GossipData{
 				Data: encodedSSZ,
 				Name: gossip.TopicNameBeaconAggregateAndProof,
 			}); err != nil {
+				log.Warn("[Beacon REST] failed to publish gossip", "err", err)
 				http.Error(w, err.Error(), http.StatusInternalServerError)
 				return
 			}
@@ -308,7 +312,8 @@ func (a *ApiHandler) PostEthV1BeaconPoolSyncCommittees(w http.ResponseWriter, r
 			continue
 		}
 		for _, subnet := range publishingSubnets {
-			if err := a.syncCommitteeMessagesService.ProcessMessage(r.Context(), &subnet, v); err != nil && !errors.Is(err, services.ErrIgnore) {
+			if err = a.syncCommitteeMessagesService.ProcessMessage(r.Context(), &subnet, v); err != nil && !errors.Is(err, services.ErrIgnore) {
+				log.Warn("[Beacon REST] failed to process attestation", "err", err)
 				failures = append(failures, poolingFailure{Index: idx, Message: err.Error()})
 				break
 			}
@@ -354,8 +359,13 @@ func (a *ApiHandler) PostEthV1ValidatorContributionsAndProofs(w http.ResponseWri
 		return
 	}
 	failures := []poolingFailure{}
+	var err error
 	for idx, v := range msgs {
-		if err := a.syncContributionAndProofsService.ProcessMessage(r.Context(), nil, v); err != nil && !errors.Is(err, services.ErrIgnore) {
+		if bytes.Equal(v.Message.Contribution.AggregationBits, make([]byte, len(v.Message.Contribution.AggregationBits))) {
+			continue // skip empty contributions
+		}
+		if err = a.syncContributionAndProofsService.ProcessMessage(r.Context(), nil, v); err != nil && !errors.Is(err, services.ErrIgnore) {
+			log.Warn("[Beacon REST] failed to process sync contribution", "err", err)
 			failures = append(failures, poolingFailure{Index: idx, Message: err.Error()})
 			continue
 		}
@@ -364,12 +374,14 @@ func (a *ApiHandler) PostEthV1ValidatorContributionsAndProofs(w http.ResponseWri
 			encodedSSZ, err := v.EncodeSSZ(nil)
 			if err != nil {
 				http.Error(w, err.Error(), http.StatusInternalServerError)
+				log.Warn("[Beacon REST] failed to encode sync contribution", "err", err)
 				return
 			}
 			if _, err := a.sentinel.PublishGossip(r.Context(), &sentinel.GossipData{
 				Data: encodedSSZ,
 				Name: gossip.TopicNameSyncCommitteeContributionAndProof,
 			}); err != nil {
+				log.Warn("[Beacon REST] failed to publish gossip", "err", err)
 				http.Error(w, err.Error(), http.StatusInternalServerError)
 				return
 			}

cl/beacon/handler/pool_test.go

@@ -290,13 +290,15 @@ func TestPoolSyncCommittees(t *testing.T) {
 }
 
 func TestPoolSyncContributionAndProofs(t *testing.T) {
+	aggrBits := make([]byte, cltypes.SyncCommitteeAggregationBitsSize)
+	aggrBits[0] = 1
 	msgs := []*cltypes.SignedContributionAndProof{
 		{
 			Message: &cltypes.ContributionAndProof{
 				Contribution: &cltypes.Contribution{
 					Slot:            1,
 					BeaconBlockRoot: libcommon.Hash{1, 2, 3, 4, 5, 6, 7, 8},
-					AggregationBits: make([]byte, cltypes.SyncCommitteeAggregationBitsSize),
+					AggregationBits: aggrBits,
 				},
 			},
 		},
@@ -332,6 +334,6 @@ func TestPoolSyncContributionAndProofs(t *testing.T) {
 		Slot:              1,
 		BeaconBlockRoot:   libcommon.Hash{1, 2, 3, 4, 5, 6, 7, 8},
 		SubcommitteeIndex: 0,
-		AggregationBits:   make([]byte, cltypes.SyncCommitteeAggregationBitsSize),
+		AggregationBits:   aggrBits,
 	})
 }

cl/beacon/handler/subscription.go

@@ -64,7 +64,7 @@ func (a *ApiHandler) PostEthV1ValidatorSyncCommitteeSubscriptions(w http.Respons
 		// subscribe to subnets
 		for _, subnet := range syncnets {
 			if _, err := a.sentinel.SetSubscribeExpiry(r.Context(), &sentinel.RequestSubscribeExpiry{
-				Topic:          fmt.Sprintf(gossip.TopicNamePrefixSyncCommittee, subnet),
+				Topic:          gossip.TopicNameSyncCommittee(int(subnet)),
 				ExpiryUnixSecs: uint64(expiry.Unix()),
 			}); err != nil {
 				http.Error(w, err.Error(), http.StatusInternalServerError)

cl/beacon/handler/utils_test.go

@@ -124,7 +124,7 @@ func setupTestingHandler(t *testing.T, v clparams.StateVersion, logger log.Logge
 			Events:     true,
 			Validator:  true,
 			Lighthouse: true,
-		}, nil, blobStorage, nil, vp, nil, nil, fcu.SyncContributionPool, nil, nil, syncCommitteeMessagesService, syncContributionService, aggregateAndProofsService) // TODO: add tests
+		}, nil, blobStorage, nil, vp, nil, nil, fcu.SyncContributionPool, nil, nil, syncCommitteeMessagesService, syncContributionService, aggregateAndProofsService, nil) // TODO: add tests
 	h.Init()
 	return
 }

cl/beacon/handler/validator_test.go

@@ -53,6 +53,7 @@ func (t *validatorTestSuite) SetupTest() {
 		nil,
 		nil,
 		nil,
+		nil,
 	)
 	t.gomockCtrl = gomockCtrl
 }

cl/beacon/synced_data/synced_data.go

@@ -29,7 +29,6 @@ func (s *SyncedDataManager) OnHeadState(newState *state.CachingBeaconState) (err
 		return err
 	}
 	s.headState.Store(st)
-	//fmt.Println(newState.CurrentSyncCommittee().GetCommittee())
 
 	return
 }

cl/clparams/config.go

@@ -282,7 +282,7 @@ var CheckpointSyncEndpoints = map[NetworkType][]string{
 	},
 	SepoliaNetwork: {
 		//"https://beaconstate-sepolia.chainsafe.io/eth/v2/debug/beacon/states/finalized",
-		"https://sepolia.beaconstate.info/eth/v2/debug/beacon/states/finalized",
+		//"https://sepolia.beaconstate.info/eth/v2/debug/beacon/states/finalized",
 		"https://checkpoint-sync.sepolia.ethpandaops.io/eth/v2/debug/beacon/states/finalized",
 	},
 	GnosisNetwork: {

cl/cltypes/solid/attestation.go

@@ -34,6 +34,14 @@ func (*Attestation) Static() bool {
 	return false
 }
 
+func (a *Attestation) Copy() *Attestation {
+	new := &Attestation{}
+	copy(new.staticBuffer[:], a.staticBuffer[:])
+	new.aggregationBitsBuffer = make([]byte, len(a.aggregationBitsBuffer))
+	copy(new.aggregationBitsBuffer, a.aggregationBitsBuffer)
+	return new
+}
+
 // NewAttestionFromParameters creates a new Attestation instance using provided parameters
 func NewAttestionFromParameters(
 	aggregationBits []byte,

cl/phase1/forkchoice/fork_graph/fork_graph_disk.go

@@ -409,7 +409,6 @@ func (f *forkGraphDisk) Prune(pruneSlot uint64) (err error) {
 		f.currentJustifiedCheckpoints.Delete(root)
 		f.finalizedCheckpoints.Delete(root)
 		f.headers.Delete(root)
-		f.syncCommittees.Delete(root)
 		f.blockRewards.Delete(root)
 		f.fs.Remove(getBeaconStateFilename(root))
 		f.fs.Remove(getBeaconStateCacheFilename(root))

cl/phase1/forkchoice/forkchoice_mock.go

@@ -42,6 +42,7 @@ type ForkChoiceStorageMock struct {
 	LCUpdates                 map[uint64]*cltypes.LightClientUpdate
 	SyncContributionPool      sync_contribution_pool.SyncContributionPool
 	Headers                   map[common.Hash]*cltypes.BeaconBlockHeader
+	GetBeaconCommitteeMock    func(slot, committeeIndex uint64) ([]uint64, error)
 
 	Pool pool.OperationsPool
 }
@@ -67,6 +68,7 @@ func NewForkChoiceStorageMock() *ForkChoiceStorageMock {
 		LCUpdates:                 make(map[uint64]*cltypes.LightClientUpdate),
 		SyncContributionPool:      sync_contribution_pool.NewSyncContributionPoolMock(),
 		Headers:                   make(map[common.Hash]*cltypes.BeaconBlockHeader),
+		GetBeaconCommitteeMock:    nil,
 	}
 }
 
@@ -128,6 +130,9 @@ func (f *ForkChoiceStorageMock) GetSyncCommittees(period uint64) (*solid.SyncCom
 }
 
 func (f *ForkChoiceStorageMock) GetBeaconCommitee(slot, committeeIndex uint64) ([]uint64, error) {
+	if f.GetBeaconCommitteeMock != nil {
+		return f.GetBeaconCommitteeMock(slot, committeeIndex)
+	}
 	return []uint64{1, 2, 3, 4, 5, 6, 7, 8}, nil
 }
 

cl/phase1/network/gossip_manager.go

@@ -119,7 +119,7 @@ func (g *GossipManager) onRecv(ctx context.Context, data *sentinel.GossipData, l
 		return err
 	}
 	if _, err := g.sentinel.PublishGossip(ctx, data); err != nil {
-		log.Debug("failed publish gossip", "err", err)
+		log.Warn("failed publish gossip", "err", err)
 	}
 	return nil
 }
@@ -179,7 +179,7 @@ func (g *GossipManager) routeAndProcess(ctx context.Context, data *sentinel.Goss
 			return g.syncCommitteeMessagesService.ProcessMessage(ctx, data.SubnetId, msg)
 		case gossip.IsTopicBeaconAttestation(data.Name):
 			att := &solid.Attestation{}
-			if err := att.DecodeSSZ(common.CopyBytes(data.Data), int(version)); err != nil {
+			if err := att.DecodeSSZ(data.Data, int(version)); err != nil {
 				return err
 			}
 			return g.attestationService.ProcessMessage(ctx, data.SubnetId, att)

cl/phase1/network/services/aggregate_and_proof_service.go

@@ -119,6 +119,9 @@ func (a *aggregateAndProofServiceImpl) ProcessMessage(ctx context.Context, subne
 
 	// Add to aggregation pool
 	if err := a.aggregationPool.AddAttestation(aggregateAndProof.Message.Aggregate); err != nil {
+		if errors.Is(err, aggregation.ErrIsSuperset) {
+			return ErrIgnore
+		}
 		return errors.WithMessagef(err, "failed to add attestation to pool")
 	}