update

erigontech · Nov 9, 2024 · b0adf3f · b0adf3f
1 parent 10dbf1d
commit b0adf3f
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 15 deletions.
diff --git a/cl/cltypes/solid/attestation.go b/cl/cltypes/solid/attestation.go
@@ -198,6 +198,10 @@ func (s *SingleAttestation) Clone() clonable.Clonable {
 	return &SingleAttestation{}
 }
 
+func (s *SingleAttestation) Static() bool {
+	return true
+}
+
 func (s *SingleAttestation) ToAttestation(memberIndexInCommittee int) *Attestation {
 	committeeBits := NewBitVector(maxCommitteesPerSlot)
 	aggregationBits := NewBitList(0, aggregationBitsSizeElectra)

diff --git a/cl/cltypes/solid/bitlist.go b/cl/cltypes/solid/bitlist.go
@@ -128,27 +128,17 @@ func (u *BitList) Set(index int, v byte) {
 	u.u[index] = v
 }
 
-func (u *BitList) SetOnBit(bitIndex int) {
-	if bitIndex >= u.c {
-		return
-	}
-	// remove the last on bit if nessary
+func (u *BitList) removeMsb() {
 	for i := len(u.u) - 1; i >= 0; i-- {
 		if u.u[i] != 0 {
 			// find last bit, make a mask and clear it
 			u.u[i] &= ^(1 << uint(bits.Len8(u.u[i])-1))
 			break
 		}
 	}
-	// expand the bitlist if necessary
-	for len(u.u)*8 <= bitIndex {
-		u.u = append(u.u, 0)
-	}
-
-	// set the bit
-	u.u[bitIndex/8] |= 1 << uint(bitIndex%8)
+}
 
-	// set last bit
+func (u *BitList) addMsb() {
 	for i := len(u.u) - 1; i >= 0; i-- {
 		if u.u[i] != 0 {
 			msb := bits.Len8(u.u[i])
@@ -163,6 +153,22 @@ func (u *BitList) SetOnBit(bitIndex int) {
 			break
 		}
 	}
+}
+
+func (u *BitList) SetOnBit(bitIndex int) {
+	if bitIndex >= u.c {
+		return
+	}
+	// remove the last on bit if necessary
+	u.removeMsb()
+	// expand the bitlist if necessary
+	for len(u.u)*8 <= bitIndex {
+		u.u = append(u.u, 0)
+	}
+	// set the bit
+	u.u[bitIndex/8] |= 1 << uint(bitIndex%8)
+	// set last bit
+	u.addMsb()
 	u.l = len(u.u)
 }
 

diff --git a/cl/phase1/network/services/attestation_service.go b/cl/phase1/network/services/attestation_service.go
@@ -137,6 +137,7 @@ func (s *attestationService) ProcessMessage(ctx context.Context, subnet *uint64,
 		}
 		attestation = att.SingleAttestation.ToAttestation(memberIndexInCommittee)
 	} else {
+		// deneb and before case
 		root = att.Attestation.Data.BeaconBlockRoot
 		slot = att.Attestation.Data.Slot
 		committeeIndex = att.Attestation.Data.CommitteeIndex
@@ -350,8 +351,7 @@ func (a *attestationService) loop(ctx context.Context) {
 				return true
 			}
 
-			root := v.att.Attestation.Data.BeaconBlockRoot
-			if _, ok := a.forkchoiceStore.GetHeader(root); !ok {
+			if _, ok := a.forkchoiceStore.GetHeader(v.beaconRoot); !ok {
 				return true
 			}
 			a.ProcessMessage(ctx, &v.subnet, v.att)