Misc bugfix for electra (#13679)

Also fix #13658 by copy validator data before processing it. scan: ``` https://dora.pectra-devnet-6.ethpandaops.io/ ``` run: ``` wget https://github.com/ethpandaops/pectra-devnets/raw/refs/heads/master/network-configs/devnet-6/metadata/genesis.ssz wget https://raw.githubusercontent.com/ethpandaops/pectra-devnets/refs/heads/master/network-configs/devnet-6/metadata/genesis.json wget https://raw.githubusercontent.com/ethpandaops/pectra-devnets/refs/heads/master/network-configs/devnet-6/metadata/config.yaml ```
erigontech · Feb 4, 2025 · 2e6edb4 · 2e6edb4
1 parent 3efe70a
commit 2e6edb4
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/cl/cltypes/solid/attestation.go b/cl/cltypes/solid/attestation.go
@@ -208,6 +208,7 @@ func (s *SingleAttestation) Static() bool {
 
 func (s *SingleAttestation) ToAttestation(memberIndexInCommittee int) *Attestation {
 	committeeBits := NewBitVector(maxCommitteesPerSlot)
+	committeeBits.SetBitAt(int(s.CommitteeIndex), true)
 	aggregationBits := NewBitList(0, aggregationBitsSizeElectra)
 	aggregationBits.SetOnBit(maxValidatorsPerCommittee*int(s.CommitteeIndex) + memberIndexInCommittee)
 	return &Attestation{

diff --git a/cl/phase1/network/services/aggregate_and_proof_service.go b/cl/phase1/network/services/aggregate_and_proof_service.go
@@ -29,6 +29,7 @@ import (
 	sentinel "github.com/erigontech/erigon-lib/gointerfaces/sentinelproto"
 	"github.com/erigontech/erigon-lib/log/v3"
 
+	libcommon "github.com/erigontech/erigon-lib/common"
 	"github.com/erigontech/erigon/cl/beacon/synced_data"
 	"github.com/erigontech/erigon/cl/clparams"
 	"github.com/erigontech/erigon/cl/cltypes"
@@ -348,7 +349,7 @@ func AggregateMessageSignature(
 			return err
 		}
 		pk := val.PublicKeyBytes()
-		pks = append(pks, pk)
+		pks = append(pks, libcommon.CopyBytes(pk))
 		return nil
 	}); err != nil {
 		return nil, nil, nil, err

diff --git a/cl/phase1/network/services/sync_contribution_service.go b/cl/phase1/network/services/sync_contribution_service.go
@@ -26,7 +26,6 @@ import (
 
 	"github.com/Giulio2002/bls"
 
-	"github.com/erigontech/erigon-lib/common"
 	libcommon "github.com/erigontech/erigon-lib/common"
 	sentinel "github.com/erigontech/erigon-lib/gointerfaces/sentinelproto"
 	"github.com/erigontech/erigon/cl/beacon/beaconevents"
@@ -297,7 +296,7 @@ func verifySyncContributionProofAggregatedSignature(s *state.CachingBeaconState,
 	subCommitteePubsKeys := make([][]byte, 0, len(subCommitteeKeys))
 	for i, key := range subCommitteeKeys {
 		if utils.IsBitOn(contribution.AggregationBits, i) {
-			subCommitteePubsKeys = append(subCommitteePubsKeys, common.Copy(key[:]))
+			subCommitteePubsKeys = append(subCommitteePubsKeys, libcommon.CopyBytes(key[:]))
 		}
 	}
 

diff --git a/cl/spectest/Makefile b/cl/spectest/Makefile
@@ -2,7 +2,7 @@
 
 
 tests:
-	wget https://github.com/ethereum/consensus-spec-tests/releases/download/v1.5.0-beta.0/mainnet.tar.gz
+	wget https://github.com/ethereum/consensus-spec-tests/releases/download/v1.5.0-beta.1/mainnet.tar.gz
 	tar xf mainnet.tar.gz
 	rm mainnet.tar.gz
 	# not needed for now

diff --git a/cl/transition/impl/eth2/operations.go b/cl/transition/impl/eth2/operations.go
@@ -1077,7 +1077,7 @@ func (I *impl) ProcessWithdrawalRequest(s abstract.BeaconState, req *solid.Withd
 	// Verify pubkey exists
 	vindex, exist := s.ValidatorIndexByPubkey(reqPubkey)
 	if !exist {
-		log.Warn("ProcessWithdrawalRequest: validator index not found for pubkey %v", common.Bytes2Hex(reqPubkey[:]))
+		log.Warn("ProcessWithdrawalRequest: validator index not found", "pubkey", common.Bytes2Hex(reqPubkey[:]))
 		return nil
 	}
 	validator, err := s.ValidatorForValidatorIndex(int(vindex))