gloas api structs

api/server/structs/conversions_gloas.go

@@ -0,0 +1,74 @@
+package structs
+
+import (
+	"fmt"
+
+	ethpb "github.com/OffchainLabs/prysm/v7/proto/prysm/v1alpha1"
+	"github.com/ethereum/go-ethereum/common/hexutil"
+)
+
+func LatestExecutionPayloadBidFromConsensus(bid *ethpb.ExecutionPayloadBid) *ExecutionPayloadBid {
+	return &ExecutionPayloadBid{
+		ParentBlockHash:        hexutil.Encode(bid.ParentBlockHash),
+		ParentBlockRoot:        hexutil.Encode(bid.ParentBlockRoot),
+		BlockHash:              hexutil.Encode(bid.BlockHash),
+		PrevRandao:             hexutil.Encode(bid.PrevRandao),
+		FeeRecipient:           hexutil.Encode(bid.FeeRecipient),
+		GasLimit:               fmt.Sprintf("%d", bid.GasLimit),
+		BuilderIndex:           fmt.Sprintf("%d", bid.BuilderIndex),
+		Slot:                   fmt.Sprintf("%d", bid.Slot),
+		Value:                  fmt.Sprintf("%d", bid.Value),
+		ExecutionPayment:       fmt.Sprintf("%d", bid.ExecutionPayment),
+		BlobKZGCommitmentsRoot: hexutil.Encode(bid.BlobKzgCommitmentsRoot),
+	}
+}
+
+func BuildersFromConsensus(builders []*ethpb.Builder) []*Builder {
+	newBuilders := make([]*Builder, len(builders))
+	for i, b := range builders {
+		newBuilders[i] = BuilderFromConsensus(b)
+	}
+	return newBuilders
+}
+
+func BuilderFromConsensus(b *ethpb.Builder) *Builder {
+	return &Builder{
+		Pubkey:            hexutil.Encode(b.Pubkey),
+		Version:           hexutil.Encode(b.Version),
+		ExecutionAddress:  hexutil.Encode(b.ExecutionAddress),
+		Balance:           fmt.Sprintf("%d", b.Balance),
+		DepositEpoch:      fmt.Sprintf("%d", b.DepositEpoch),
+		WithdrawableEpoch: fmt.Sprintf("%d", b.WithdrawableEpoch),
+	}
+}
+
+func BuilderPendingPaymentsFromConsensus(payments []*ethpb.BuilderPendingPayment) []*BuilderPendingPayment {
+	newPayments := make([]*BuilderPendingPayment, len(payments))
+	for i, p := range payments {
+		newPayments[i] = BuilderPendingPaymentFromConsensus(p)
+	}
+	return newPayments
+}
+
+func BuilderPendingPaymentFromConsensus(p *ethpb.BuilderPendingPayment) *BuilderPendingPayment {
+	return &BuilderPendingPayment{
+		Weight:     fmt.Sprintf("%d", p.Weight),
+		Withdrawal: BuilderPendingWithdrawalFromConsensus(p.Withdrawal),
+	}
+}
+
+func BuilderPendingWithdrawalsFromConsensus(withdrawals []*ethpb.BuilderPendingWithdrawal) []*BuilderPendingWithdrawal {
+	newWithdrawals := make([]*BuilderPendingWithdrawal, len(withdrawals))
+	for i, w := range withdrawals {
+		newWithdrawals[i] = BuilderPendingWithdrawalFromConsensus(w)
+	}
+	return newWithdrawals
+}
+
+func BuilderPendingWithdrawalFromConsensus(w *ethpb.BuilderPendingWithdrawal) *BuilderPendingWithdrawal {
+	return &BuilderPendingWithdrawal{
+		FeeRecipient: hexutil.Encode(w.FeeRecipient),
+		Amount:       fmt.Sprintf("%d", w.Amount),
+		BuilderIndex: fmt.Sprintf("%d", w.BuilderIndex),
+	}
+}

api/server/structs/conversions_state.go

@@ -972,3 +972,223 @@ func BeaconStateFuluFromConsensus(st beaconState.BeaconState) (*BeaconStateFulu,
 		ProposerLookahead:             lookahead,
 	}, nil
 }
+
+// ----------------------------------------------------------------------------
+// Gloas
+// ----------------------------------------------------------------------------
+
+func BeaconStateGloasFromConsensus(st beaconState.BeaconState) (*BeaconStateGloas, error) {
+	srcBr := st.BlockRoots()
+	br := make([]string, len(srcBr))
+	for i, r := range srcBr {
+		br[i] = hexutil.Encode(r)
+	}
+	srcSr := st.StateRoots()
+	sr := make([]string, len(srcSr))
+	for i, r := range srcSr {
+		sr[i] = hexutil.Encode(r)
+	}
+	srcHr := st.HistoricalRoots()
+	hr := make([]string, len(srcHr))
+	for i, r := range srcHr {
+		hr[i] = hexutil.Encode(r)
+	}
+	srcVotes := st.Eth1DataVotes()
+	votes := make([]*Eth1Data, len(srcVotes))
+	for i, e := range srcVotes {
+		votes[i] = Eth1DataFromConsensus(e)
+	}
+	srcVals := st.Validators()
+	vals := make([]*Validator, len(srcVals))
+	for i, v := range srcVals {
+		vals[i] = ValidatorFromConsensus(v)
+	}
+	srcBals := st.Balances()
+	bals := make([]string, len(srcBals))
+	for i, b := range srcBals {
+		bals[i] = fmt.Sprintf("%d", b)
+	}
+	srcRm := st.RandaoMixes()
+	rm := make([]string, len(srcRm))
+	for i, m := range srcRm {
+		rm[i] = hexutil.Encode(m)
+	}
+	srcSlashings := st.Slashings()
+	slashings := make([]string, len(srcSlashings))
+	for i, s := range srcSlashings {
+		slashings[i] = fmt.Sprintf("%d", s)
+	}
+	srcPrevPart, err := st.PreviousEpochParticipation()
+	if err != nil {
+		return nil, err
+	}
+	prevPart := make([]string, len(srcPrevPart))
+	for i, p := range srcPrevPart {
+		prevPart[i] = fmt.Sprintf("%d", p)
+	}
+	srcCurrPart, err := st.CurrentEpochParticipation()
+	if err != nil {
+		return nil, err
+	}
+	currPart := make([]string, len(srcCurrPart))
+	for i, p := range srcCurrPart {
+		currPart[i] = fmt.Sprintf("%d", p)
+	}
+	srcIs, err := st.InactivityScores()
+	if err != nil {
+		return nil, err
+	}
+	is := make([]string, len(srcIs))
+	for i, s := range srcIs {
+		is[i] = fmt.Sprintf("%d", s)
+	}
+	currSc, err := st.CurrentSyncCommittee()
+	if err != nil {
+		return nil, err
+	}
+	nextSc, err := st.NextSyncCommittee()
+	if err != nil {
+		return nil, err
+	}
+	srcHs, err := st.HistoricalSummaries()
+	if err != nil {
+		return nil, err
+	}
+	hs := make([]*HistoricalSummary, len(srcHs))
+	for i, s := range srcHs {
+		hs[i] = HistoricalSummaryFromConsensus(s)
+	}
+	nwi, err := st.NextWithdrawalIndex()
+	if err != nil {
+		return nil, err
+	}
+	nwvi, err := st.NextWithdrawalValidatorIndex()
+	if err != nil {
+		return nil, err
+	}
+	drsi, err := st.DepositRequestsStartIndex()
+	if err != nil {
+		return nil, err
+	}
+	dbtc, err := st.DepositBalanceToConsume()
+	if err != nil {
+		return nil, err
+	}
+	ebtc, err := st.ExitBalanceToConsume()
+	if err != nil {
+		return nil, err
+	}
+	eee, err := st.EarliestExitEpoch()
+	if err != nil {
+		return nil, err
+	}
+	cbtc, err := st.ConsolidationBalanceToConsume()
+	if err != nil {
+		return nil, err
+	}
+	ece, err := st.EarliestConsolidationEpoch()
+	if err != nil {
+		return nil, err
+	}
+	pbd, err := st.PendingDeposits()
+	if err != nil {
+		return nil, err
+	}
+	ppw, err := st.PendingPartialWithdrawals()
+	if err != nil {
+		return nil, err
+	}
+	pc, err := st.PendingConsolidations()
+	if err != nil {
+		return nil, err
+	}
+	srcLookahead, err := st.ProposerLookahead()
+	if err != nil {
+		return nil, err
+	}
+	lookahead := make([]string, len(srcLookahead))
+	for i, v := range srcLookahead {
+		lookahead[i] = fmt.Sprintf("%d", uint64(v))
+	}
+	////////// TODO new ones
+	lepb, err := st.LatestExecutionPayloadBid()
+	if err != nil {
+		return nil, err
+	}
+	builders, err := st.Builders()
+	if err != nil {
+		return nil, err
+	}
+	nwbi, err := st.NextWithdrawalBuilderIndex()
+	if err != nil {
+		return nil, err
+	}
+	epa, err := st.ExecutionPayloadAvailability()
+	if err != nil {
+		return nil, err
+	}
+	bpp, err := st.BuilderPendingPayments()
+	if err != nil {
+		return nil, err
+	}
+	bpw, err := st.BuilderPendingWithdrawals()
+	if err != nil {
+		return nil, err
+	}
+	lbh, err := st.LatestBlockHash()
+	if err != nil {
+		return nil, err
+	}
+	pew, err := st.PayloadExpectedWithdrawals()
+	if err != nil {
+		return nil, err
+	}
+
+	return &BeaconStateGloas{
+		GenesisTime:                   fmt.Sprintf("%d", st.GenesisTime().Unix()),
+		GenesisValidatorsRoot:         hexutil.Encode(st.GenesisValidatorsRoot()),
+		Slot:                          fmt.Sprintf("%d", st.Slot()),
+		Fork:                          ForkFromConsensus(st.Fork()),
+		LatestBlockHeader:             BeaconBlockHeaderFromConsensus(st.LatestBlockHeader()),
+		BlockRoots:                    br,
+		StateRoots:                    sr,
+		HistoricalRoots:               hr,
+		Eth1Data:                      Eth1DataFromConsensus(st.Eth1Data()),
+		Eth1DataVotes:                 votes,
+		Eth1DepositIndex:              fmt.Sprintf("%d", st.Eth1DepositIndex()),
+		Validators:                    vals,
+		Balances:                      bals,
+		RandaoMixes:                   rm,
+		Slashings:                     slashings,
+		PreviousEpochParticipation:    prevPart,
+		CurrentEpochParticipation:     currPart,
+		JustificationBits:             hexutil.Encode(st.JustificationBits()),
+		PreviousJustifiedCheckpoint:   CheckpointFromConsensus(st.PreviousJustifiedCheckpoint()),
+		CurrentJustifiedCheckpoint:    CheckpointFromConsensus(st.CurrentJustifiedCheckpoint()),
+		FinalizedCheckpoint:           CheckpointFromConsensus(st.FinalizedCheckpoint()),
+		InactivityScores:              is,
+		CurrentSyncCommittee:          SyncCommitteeFromConsensus(currSc),
+		NextSyncCommittee:             SyncCommitteeFromConsensus(nextSc),
+		NextWithdrawalIndex:           fmt.Sprintf("%d", nwi),
+		NextWithdrawalValidatorIndex:  fmt.Sprintf("%d", nwvi),
+		HistoricalSummaries:           hs,
+		DepositRequestsStartIndex:     fmt.Sprintf("%d", drsi),
+		DepositBalanceToConsume:       fmt.Sprintf("%d", dbtc),
+		ExitBalanceToConsume:          fmt.Sprintf("%d", ebtc),
+		EarliestExitEpoch:             fmt.Sprintf("%d", eee),
+		ConsolidationBalanceToConsume: fmt.Sprintf("%d", cbtc),
+		EarliestConsolidationEpoch:    fmt.Sprintf("%d", ece),
+		PendingDeposits:               PendingDepositsFromConsensus(pbd),
+		PendingPartialWithdrawals:     PendingPartialWithdrawalsFromConsensus(ppw),
+		PendingConsolidations:         PendingConsolidationsFromConsensus(pc),
+		ProposerLookahead:             lookahead,
+		LatestExecutionPayloadBid:     LatestExecutionPayloadBidFromConsensus(lepb),
+		Builders:                      BuildersFromConsensus(builders),
+		NextWithdrawalBuilderIndex:    fmt.Sprintf("%d", nwbi),
+		ExecutionPayloadAvailability:  epa,
+		BuilderPendingPayments:        BuilderPendingPaymentsFromConsensus(bpp),
+		BuilderPendingWithdrawals:     BuilderPendingWithdrawalsFromConsensus(bpw),
+		LatestBlockHash:               hexutil.Encode(lbh[:]),
+		PayloadExpectedWithdrawals:    WithdrawalsFromConsensus(pew),
+	}, nil
+}

api/server/structs/other.go

@@ -262,3 +262,37 @@ type PendingConsolidation struct {
 	SourceIndex string `json:"source_index"`
 	TargetIndex string `json:"target_index"`
 }
+
+type ExecutionPayloadBid struct {
+	ParentBlockHash        string `json:"parent_block_hash"`
+	ParentBlockRoot        string `json:"parent_block_root"`
+	BlockHash              string `json:"block_hash"`
+	PrevRandao             string `json:"prev_rando"`
+	FeeRecipient           string `json:"fee_recipient"`
+	GasLimit               string `json:"gas_limit"`
+	BuilderIndex           string `json:"builder_index"`
+	Slot                   string `json:"slot"`
+	Value                  string `json:"value"`
+	ExecutionPayment       string `json:"execution_payment"`
+	BlobKZGCommitmentsRoot string `json:"blob_kzg_commitments_root"`
+}
+
+type Builder struct {
+	Pubkey            string `json:"pubkey"`
+	Version           string `json:"version"`
+	ExecutionAddress  string `json:"execution_address"`
+	Balance           string `json:"balance"`
+	DepositEpoch      string `json:"deposit_epoch"`
+	WithdrawableEpoch string `json:"withdrawable_epoch"`
+}
+
+type BuilderPendingPayment struct {
+	Weight     string                    `json:"weight"`
+	Withdrawal *BuilderPendingWithdrawal `json:"withdrawal"`
+}
+
+type BuilderPendingWithdrawal struct {
+	FeeRecipient string `json:"fee_recipient"`
+	Amount       string `json:"amount"`
+	BuilderIndex string `json:"builder_index"`
+}

api/server/structs/state.go

@@ -221,3 +221,51 @@ type BeaconStateFulu struct {
 	PendingConsolidations         []*PendingConsolidation      `json:"pending_consolidations"`
 	ProposerLookahead             []string                     `json:"proposer_lookahead"`
 }
+
+type BeaconStateGloas struct {
+	GenesisTime                   string                      `json:"genesis_time"`
+	GenesisValidatorsRoot         string                      `json:"genesis_validators_root"`
+	Slot                          string                      `json:"slot"`
+	Fork                          *Fork                       `json:"fork"`
+	LatestBlockHeader             *BeaconBlockHeader          `json:"latest_block_header"`
+	BlockRoots                    []string                    `json:"block_roots"`
+	StateRoots                    []string                    `json:"state_roots"`
+	HistoricalRoots               []string                    `json:"historical_roots"`
+	Eth1Data                      *Eth1Data                   `json:"eth1_data"`
+	Eth1DataVotes                 []*Eth1Data                 `json:"eth1_data_votes"`
+	Eth1DepositIndex              string                      `json:"eth1_deposit_index"`
+	Validators                    []*Validator                `json:"validators"`
+	Balances                      []string                    `json:"balances"`
+	RandaoMixes                   []string                    `json:"randao_mixes"`
+	Slashings                     []string                    `json:"slashings"`
+	PreviousEpochParticipation    []string                    `json:"previous_epoch_participation"`
+	CurrentEpochParticipation     []string                    `json:"current_epoch_participation"`
+	JustificationBits             string                      `json:"justification_bits"`
+	PreviousJustifiedCheckpoint   *Checkpoint                 `json:"previous_justified_checkpoint"`
+	CurrentJustifiedCheckpoint    *Checkpoint                 `json:"current_justified_checkpoint"`
+	FinalizedCheckpoint           *Checkpoint                 `json:"finalized_checkpoint"`
+	InactivityScores              []string                    `json:"inactivity_scores"`
+	CurrentSyncCommittee          *SyncCommittee              `json:"current_sync_committee"`
+	NextSyncCommittee             *SyncCommittee              `json:"next_sync_committee"`
+	NextWithdrawalIndex           string                      `json:"next_withdrawal_index"`
+	NextWithdrawalValidatorIndex  string                      `json:"next_withdrawal_validator_index"`
+	HistoricalSummaries           []*HistoricalSummary        `json:"historical_summaries"`
+	DepositRequestsStartIndex     string                      `json:"deposit_requests_start_index"`
+	DepositBalanceToConsume       string                      `json:"deposit_balance_to_consume"`
+	ExitBalanceToConsume          string                      `json:"exit_balance_to_consume"`
+	EarliestExitEpoch             string                      `json:"earliest_exit_epoch"`
+	ConsolidationBalanceToConsume string                      `json:"consolidation_balance_to_consume"`
+	EarliestConsolidationEpoch    string                      `json:"earliest_consolidation_epoch"`
+	PendingDeposits               []*PendingDeposit           `json:"pending_deposits"`
+	PendingPartialWithdrawals     []*PendingPartialWithdrawal `json:"pending_partial_withdrawals"`
+	PendingConsolidations         []*PendingConsolidation     `json:"pending_consolidations"`
+	ProposerLookahead             []string                    `json:"proposer_lookahead"`
+	LatestExecutionPayloadBid     *ExecutionPayloadBid        `json:"latest_execution_payload_bid"`
+	Builders                      []*Builder                  `json:"builders"`
+	NextWithdrawalBuilderIndex    string                      `json:"next_withdrawal_builder_index"`
+	ExecutionPayloadAvailability  string                      `json:"execution_payload_availability"`
+	BuilderPendingPayments        []*BuilderPendingPayment    `json:"builder_pending_payments"`
+	BuilderPendingWithdrawals     []*BuilderPendingWithdrawal `json:"builder_pending_withdrawals"`
+	LatestBlockHash               string                      `json:"latest_block_hash"`
+	PayloadExpectedWithdrawals    []*Withdrawal               `json:"payload_expected_withdrawals"`
+}

changelog/bastin_add-cmd-to-gen-log.md

@@ -1,3 +0,0 @@
-### Ignored
-
-- add `cmd` and all it's subcategories to the log.go generation process.

changelog/potuz_hashtree_builds.md

@@ -1,2 +0,0 @@
-### Fixed
-- Fix hashtree release builds.

cmd/BUILD.bazel

@@ -9,7 +9,6 @@ go_library(
         "defaults.go",
         "flags.go",
         "helpers.go",
-        "log.go",
         "password_reader.go",
         "wrap_flags.go",
     ],

cmd/beacon-chain/db/BUILD.bazel

@@ -2,10 +2,7 @@ load("@prysm//tools/go:def.bzl", "go_library")
 
 go_library(
     name = "go_default_library",
-    srcs = [
-        "db.go",
-        "log.go",
-    ],
+    srcs = ["db.go"],
     importpath = "github.com/OffchainLabs/prysm/v7/cmd/beacon-chain/db",
     visibility = ["//visibility:public"],
     deps = [

cmd/beacon-chain/db/db.go

@@ -4,9 +4,12 @@ import (
 	beacondb "github.com/OffchainLabs/prysm/v7/beacon-chain/db"
 	"github.com/OffchainLabs/prysm/v7/cmd"
 	"github.com/OffchainLabs/prysm/v7/runtime/tos"
+	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
 )
 
+var log = logrus.WithField("prefix", "db")
+
 // Commands for interacting with a beacon chain database.
 var Commands = &cli.Command{
 	Name:     "db",

cmd/beacon-chain/db/log.go

@@ -1,9 +0,0 @@
-// Code generated by hack/gen-logs.sh; DO NOT EDIT.
-// This file is created and regenerated automatically. Anything added here might get removed.
-package db
-
-import "github.com/sirupsen/logrus"
-
-// The prefix for logs from this package will be the text after the last slash in the package path.
-// If you wish to change this, you should add your desired name in the runtime/logging/logrus-prefixed-formatter/prefix-replacement.go file.
-var log = logrus.WithField("package", "cmd/beacon-chain/db")

cmd/beacon-chain/flags/log.go

@@ -1,9 +1,5 @@
-// Code generated by hack/gen-logs.sh; DO NOT EDIT.
-// This file is created and regenerated automatically. Anything added here might get removed.
 package flags
 
 import "github.com/sirupsen/logrus"
 
-// The prefix for logs from this package will be the text after the last slash in the package path.
-// If you wish to change this, you should add your desired name in the runtime/logging/logrus-prefixed-formatter/prefix-replacement.go file.
-var log = logrus.WithField("package", "cmd/beacon-chain/flags")
+var log = logrus.WithField("prefix", "flags")

cmd/beacon-chain/genesis/log.go

@@ -1,9 +1,5 @@
-// Code generated by hack/gen-logs.sh; DO NOT EDIT.
-// This file is created and regenerated automatically. Anything added here might get removed.
 package genesis
 
 import "github.com/sirupsen/logrus"
 
-// The prefix for logs from this package will be the text after the last slash in the package path.
-// If you wish to change this, you should add your desired name in the runtime/logging/logrus-prefixed-formatter/prefix-replacement.go file.
-var log = logrus.WithField("package", "cmd/beacon-chain/genesis")
+var log = logrus.WithField("prefix", "genesis")

cmd/beacon-chain/jwt/BUILD.bazel

@@ -2,10 +2,7 @@ load("@prysm//tools/go:def.bzl", "go_library", "go_test")
 
 go_library(
     name = "go_default_library",
-    srcs = [
-        "jwt.go",
-        "log.go",
-    ],
+    srcs = ["jwt.go"],
     importpath = "github.com/OffchainLabs/prysm/v7/cmd/beacon-chain/jwt",
     visibility = ["//visibility:public"],
     deps = [

cmd/beacon-chain/jwt/jwt.go

@@ -6,6 +6,7 @@ import (
 	"github.com/OffchainLabs/prysm/v7/api"
 	"github.com/OffchainLabs/prysm/v7/cmd"
 	"github.com/OffchainLabs/prysm/v7/io/file"
+	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
 )
 
@@ -22,7 +23,7 @@ var Commands = &cli.Command{
 	}),
 	Action: func(cliCtx *cli.Context) error {
 		if err := generateAuthSecretInFile(cliCtx); err != nil {
-			log.WithError(err).Fatal("Could not generate jwt")
+			logrus.WithError(err).Fatal("Could not generate jwt")
 		}
 		return nil
 	},
@@ -56,6 +57,6 @@ func generateAuthSecretInFile(c *cli.Context) error {
 	if err := file.WriteFile(fileName, []byte(secret)); err != nil {
 		return err
 	}
-	log.Infof("Successfully wrote JSON-RPC authentication secret to file %s", fileName)
+	logrus.Infof("Successfully wrote JSON-RPC authentication secret to file %s", fileName)
 	return nil
 }

cmd/beacon-chain/jwt/log.go

@@ -1,9 +0,0 @@
-// Code generated by hack/gen-logs.sh; DO NOT EDIT.
-// This file is created and regenerated automatically. Anything added here might get removed.
-package jwt
-
-import "github.com/sirupsen/logrus"
-
-// The prefix for logs from this package will be the text after the last slash in the package path.
-// If you wish to change this, you should add your desired name in the runtime/logging/logrus-prefixed-formatter/prefix-replacement.go file.
-var log = logrus.WithField("package", "cmd/beacon-chain/jwt")

cmd/beacon-chain/log.go

@@ -1,9 +1,5 @@
-// Code generated by hack/gen-logs.sh; DO NOT EDIT.
-// This file is created and regenerated automatically. Anything added here might get removed.
 package main
 
 import "github.com/sirupsen/logrus"
 
-// The prefix for logs from this package will be the text after the last slash in the package path.
-// If you wish to change this, you should add your desired name in the runtime/logging/logrus-prefixed-formatter/prefix-replacement.go file.
-var log = logrus.WithField("package", "cmd/beacon-chain")
+var log = logrus.WithField("prefix", "main")

cmd/beacon-chain/storage/BUILD.bazel

@@ -2,10 +2,7 @@ load("@prysm//tools/go:def.bzl", "go_library", "go_test")
 
 go_library(
     name = "go_default_library",
-    srcs = [
-        "log.go",
-        "options.go",
-    ],
+    srcs = ["options.go"],
     importpath = "github.com/OffchainLabs/prysm/v7/cmd/beacon-chain/storage",
     visibility = ["//visibility:public"],
     deps = [

cmd/beacon-chain/storage/log.go

@@ -1,9 +0,0 @@
-// Code generated by hack/gen-logs.sh; DO NOT EDIT.
-// This file is created and regenerated automatically. Anything added here might get removed.
-package storage
-
-import "github.com/sirupsen/logrus"
-
-// The prefix for logs from this package will be the text after the last slash in the package path.
-// If you wish to change this, you should add your desired name in the runtime/logging/logrus-prefixed-formatter/prefix-replacement.go file.
-var log = logrus.WithField("package", "cmd/beacon-chain/storage")

cmd/beacon-chain/storage/options.go

@@ -15,6 +15,7 @@ import (
 	"github.com/OffchainLabs/prysm/v7/config/params"
 	"github.com/OffchainLabs/prysm/v7/consensus-types/primitives"
 	"github.com/pkg/errors"
+	log "github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
 )
 

cmd/client-stats/log.go

@@ -1,9 +1,5 @@
-// Code generated by hack/gen-logs.sh; DO NOT EDIT.
-// This file is created and regenerated automatically. Anything added here might get removed.
 package main
 
 import "github.com/sirupsen/logrus"
 
-// The prefix for logs from this package will be the text after the last slash in the package path.
-// If you wish to change this, you should add your desired name in the runtime/logging/logrus-prefixed-formatter/prefix-replacement.go file.
-var log = logrus.WithField("package", "cmd/client-stats")
+var log = logrus.WithField("prefix", "main")

cmd/helpers.go

@@ -14,6 +14,8 @@ import (
 	"github.com/urfave/cli/v2"
 )
 
+var log = logrus.WithField("prefix", "node")
+
 // ConfirmAction uses the passed in actionText as the confirmation text displayed in the terminal.
 // The user must enter Y or N to indicate whether they confirm the action detailed in the warning text.
 // Returns a boolean representing the user's answer.

cmd/log.go

@@ -1,9 +0,0 @@
-// Code generated by hack/gen-logs.sh; DO NOT EDIT.
-// This file is created and regenerated automatically. Anything added here might get removed.
-package cmd
-
-import "github.com/sirupsen/logrus"
-
-// The prefix for logs from this package will be the text after the last slash in the package path.
-// If you wish to change this, you should add your desired name in the runtime/logging/logrus-prefixed-formatter/prefix-replacement.go file.
-var log = logrus.WithField("package", "cmd")

cmd/prysmctl/BUILD.bazel

@@ -4,10 +4,7 @@ load("//tools:prysm_image.bzl", "prysm_image_upload")
 
 go_library(
     name = "go_default_library",
-    srcs = [
-        "log.go",
-        "main.go",
-    ],
+    srcs = ["main.go"],
     importpath = "github.com/OffchainLabs/prysm/v7/cmd/prysmctl",
     visibility = ["//visibility:private"],
     deps = [

cmd/prysmctl/checkpointsync/BUILD.bazel

@@ -5,7 +5,6 @@ go_library(
     srcs = [
         "cmd.go",
         "download.go",
-        "log.go",
     ],
     importpath = "github.com/OffchainLabs/prysm/v7/cmd/prysmctl/checkpointsync",
     visibility = ["//visibility:public"],

cmd/prysmctl/checkpointsync/download.go

@@ -8,6 +8,7 @@ import (
 	"github.com/OffchainLabs/prysm/v7/api/client"
 	"github.com/OffchainLabs/prysm/v7/api/client/beacon"
 	"github.com/OffchainLabs/prysm/v7/beacon-chain/sync/checkpoint"
+	log "github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
 )
 

cmd/prysmctl/checkpointsync/log.go

@@ -1,9 +0,0 @@
-// Code generated by hack/gen-logs.sh; DO NOT EDIT.
-// This file is created and regenerated automatically. Anything added here might get removed.
-package checkpointsync
-
-import "github.com/sirupsen/logrus"
-
-// The prefix for logs from this package will be the text after the last slash in the package path.
-// If you wish to change this, you should add your desired name in the runtime/logging/logrus-prefixed-formatter/prefix-replacement.go file.
-var log = logrus.WithField("package", "cmd/prysmctl/checkpointsync")

cmd/prysmctl/db/BUILD.bazel

@@ -5,7 +5,6 @@ go_library(
     srcs = [
         "buckets.go",
         "cmd.go",
-        "log.go",
         "query.go",
         "span.go",
     ],

cmd/prysmctl/db/log.go

@@ -1,9 +0,0 @@
-// Code generated by hack/gen-logs.sh; DO NOT EDIT.
-// This file is created and regenerated automatically. Anything added here might get removed.
-package db
-
-import "github.com/sirupsen/logrus"
-
-// The prefix for logs from this package will be the text after the last slash in the package path.
-// If you wish to change this, you should add your desired name in the runtime/logging/logrus-prefixed-formatter/prefix-replacement.go file.
-var log = logrus.WithField("package", "cmd/prysmctl/db")

cmd/prysmctl/db/query.go

@@ -8,6 +8,7 @@ import (
 	"github.com/OffchainLabs/prysm/v7/config/params"
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/pkg/errors"
+	log "github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
 	bolt "go.etcd.io/bbolt"
 )

cmd/prysmctl/log.go

@@ -1,9 +0,0 @@
-// Code generated by hack/gen-logs.sh; DO NOT EDIT.
-// This file is created and regenerated automatically. Anything added here might get removed.
-package main
-
-import "github.com/sirupsen/logrus"
-
-// The prefix for logs from this package will be the text after the last slash in the package path.
-// If you wish to change this, you should add your desired name in the runtime/logging/logrus-prefixed-formatter/prefix-replacement.go file.
-var log = logrus.WithField("package", "cmd/prysmctl")

cmd/prysmctl/main.go

@@ -9,6 +9,7 @@ import (
 	"github.com/OffchainLabs/prysm/v7/cmd/prysmctl/testnet"
 	"github.com/OffchainLabs/prysm/v7/cmd/prysmctl/validator"
 	"github.com/OffchainLabs/prysm/v7/cmd/prysmctl/weaksubjectivity"
+	log "github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
 )
 

cmd/prysmctl/p2p/log.go

@@ -1,9 +1,5 @@
-// Code generated by hack/gen-logs.sh; DO NOT EDIT.
-// This file is created and regenerated automatically. Anything added here might get removed.
 package p2p
 
 import "github.com/sirupsen/logrus"
 
-// The prefix for logs from this package will be the text after the last slash in the package path.
-// If you wish to change this, you should add your desired name in the runtime/logging/logrus-prefixed-formatter/prefix-replacement.go file.
-var log = logrus.WithField("package", "cmd/prysmctl/p2p")
+var log = logrus.WithField("prefix", "prysmctl-p2p")

cmd/prysmctl/testnet/BUILD.bazel

@@ -4,7 +4,6 @@ go_library(
     name = "go_default_library",
     srcs = [
         "generate_genesis.go",
-        "log.go",
         "testnet.go",
     ],
     importpath = "github.com/OffchainLabs/prysm/v7/cmd/prysmctl/testnet",

cmd/prysmctl/testnet/generate_genesis.go

@@ -43,6 +43,7 @@ var (
 		GethGenesisJsonIn  string
 		GethGenesisJsonOut string
 	}{}
+	log           = logrus.WithField("prefix", "genesis")
 	outputSSZFlag = &cli.StringFlag{
 		Name:        "output-ssz",
 		Destination: &generateGenesisStateFlags.OutputSSZ,

cmd/prysmctl/testnet/log.go

@@ -1,9 +0,0 @@
-// Code generated by hack/gen-logs.sh; DO NOT EDIT.
-// This file is created and regenerated automatically. Anything added here might get removed.
-package testnet
-
-import "github.com/sirupsen/logrus"
-
-// The prefix for logs from this package will be the text after the last slash in the package path.
-// If you wish to change this, you should add your desired name in the runtime/logging/logrus-prefixed-formatter/prefix-replacement.go file.
-var log = logrus.WithField("package", "cmd/prysmctl/testnet")

cmd/prysmctl/validator/BUILD.bazel

@@ -5,7 +5,6 @@ go_library(
     srcs = [
         "cmd.go",
         "error.go",
-        "log.go",
         "proposer_settings.go",
         "withdraw.go",
     ],

cmd/prysmctl/validator/cmd.go

@@ -10,6 +10,7 @@ import (
 	"github.com/OffchainLabs/prysm/v7/config/features"
 	"github.com/OffchainLabs/prysm/v7/runtime/tos"
 	"github.com/logrusorgru/aurora"
+	log "github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
 )
 

cmd/prysmctl/validator/log.go

@@ -1,9 +0,0 @@
-// Code generated by hack/gen-logs.sh; DO NOT EDIT.
-// This file is created and regenerated automatically. Anything added here might get removed.
-package validator
-
-import "github.com/sirupsen/logrus"
-
-// The prefix for logs from this package will be the text after the last slash in the package path.
-// If you wish to change this, you should add your desired name in the runtime/logging/logrus-prefixed-formatter/prefix-replacement.go file.
-var log = logrus.WithField("package", "cmd/prysmctl/validator")

cmd/prysmctl/validator/proposer_settings.go

@@ -16,6 +16,7 @@ import (
 	"github.com/OffchainLabs/prysm/v7/monitoring/tracing/trace"
 	validatorpb "github.com/OffchainLabs/prysm/v7/proto/prysm/v1alpha1/validator-client"
 	"github.com/ethereum/go-ethereum/common"
+	log "github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
 )
 

cmd/prysmctl/validator/withdraw.go

@@ -18,7 +18,7 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/logrusorgru/aurora"
 	"github.com/pkg/errors"
-	"github.com/sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
 )
 
@@ -143,7 +143,7 @@ func checkIfWithdrawsAreInPool(ctx context.Context, client *beacon.Client, reque
 	}
 	if len(requestMap) != 0 {
 		for key, address := range requestMap {
-			log.WithFields(logrus.Fields{
+			log.WithFields(log.Fields{
 				"validatorIndex":    key,
 				"executionAddress:": address,
 			}).Warn("Set withdrawal address message not found in the node's operations pool.")

cmd/prysmctl/weaksubjectivity/BUILD.bazel

@@ -5,7 +5,6 @@ go_library(
     srcs = [
         "checkpoint.go",
         "cmd.go",
-        "log.go",
     ],
     importpath = "github.com/OffchainLabs/prysm/v7/cmd/prysmctl/weaksubjectivity",
     visibility = ["//visibility:public"],

cmd/prysmctl/weaksubjectivity/checkpoint.go

@@ -8,6 +8,7 @@ import (
 	"github.com/OffchainLabs/prysm/v7/api/client"
 	"github.com/OffchainLabs/prysm/v7/api/client/beacon"
 	"github.com/OffchainLabs/prysm/v7/beacon-chain/sync/checkpoint"
+	log "github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
 )
 

cmd/prysmctl/weaksubjectivity/log.go

@@ -1,9 +0,0 @@
-// Code generated by hack/gen-logs.sh; DO NOT EDIT.
-// This file is created and regenerated automatically. Anything added here might get removed.
-package weaksubjectivity
-
-import "github.com/sirupsen/logrus"
-
-// The prefix for logs from this package will be the text after the last slash in the package path.
-// If you wish to change this, you should add your desired name in the runtime/logging/logrus-prefixed-formatter/prefix-replacement.go file.
-var log = logrus.WithField("package", "cmd/prysmctl/weaksubjectivity")

cmd/validator/BUILD.bazel

@@ -5,7 +5,6 @@ load("//tools:prysm_image.bzl", "prysm_image_upload")
 go_library(
     name = "go_default_library",
     srcs = [
-        "log.go",
         "main.go",
         "usage.go",
     ],

cmd/validator/accounts/BUILD.bazel

@@ -9,7 +9,6 @@ go_library(
         "exit.go",
         "import.go",
         "list.go",
-        "log.go",
         "wallet_utils.go",
     ],
     importpath = "github.com/OffchainLabs/prysm/v7/cmd/validator/accounts",

cmd/validator/accounts/accounts.go

@@ -7,9 +7,12 @@ import (
 	"github.com/OffchainLabs/prysm/v7/cmd/validator/flags"
 	"github.com/OffchainLabs/prysm/v7/config/features"
 	"github.com/OffchainLabs/prysm/v7/runtime/tos"
+	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
 )
 
+var log = logrus.WithField("prefix", "accounts")
+
 // Commands for managing Prysm validator accounts.
 var Commands = &cli.Command{
 	Name:     "accounts",

cmd/validator/accounts/log.go

@@ -1,9 +0,0 @@
-// Code generated by hack/gen-logs.sh; DO NOT EDIT.
-// This file is created and regenerated automatically. Anything added here might get removed.
-package accounts
-
-import "github.com/sirupsen/logrus"
-
-// The prefix for logs from this package will be the text after the last slash in the package path.
-// If you wish to change this, you should add your desired name in the runtime/logging/logrus-prefixed-formatter/prefix-replacement.go file.
-var log = logrus.WithField("package", "cmd/validator/accounts")

cmd/validator/db/BUILD.bazel

@@ -2,10 +2,7 @@ load("@prysm//tools/go:def.bzl", "go_library")
 
 go_library(
     name = "go_default_library",
-    srcs = [
-        "db.go",
-        "log.go",
-    ],
+    srcs = ["db.go"],
     importpath = "github.com/OffchainLabs/prysm/v7/cmd/validator/db",
     visibility = ["//visibility:public"],
     deps = [

cmd/validator/db/db.go

@@ -4,9 +4,12 @@ import (
 	"github.com/OffchainLabs/prysm/v7/cmd"
 	"github.com/OffchainLabs/prysm/v7/runtime/tos"
 	validatordb "github.com/OffchainLabs/prysm/v7/validator/db"
+	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
 )
 
+var log = logrus.WithField("prefix", "db")
+
 var (
 	// SourceDataDirFlag defines a path on disk where source Prysm databases are stored. Used for conversion.
 	SourceDataDirFlag = &cli.StringFlag{

cmd/validator/db/log.go

@@ -1,9 +0,0 @@
-// Code generated by hack/gen-logs.sh; DO NOT EDIT.
-// This file is created and regenerated automatically. Anything added here might get removed.
-package db
-
-import "github.com/sirupsen/logrus"
-
-// The prefix for logs from this package will be the text after the last slash in the package path.
-// If you wish to change this, you should add your desired name in the runtime/logging/logrus-prefixed-formatter/prefix-replacement.go file.
-var log = logrus.WithField("package", "cmd/validator/db")

cmd/validator/log.go

@@ -1,9 +0,0 @@
-// Code generated by hack/gen-logs.sh; DO NOT EDIT.
-// This file is created and regenerated automatically. Anything added here might get removed.
-package main
-
-import "github.com/sirupsen/logrus"
-
-// The prefix for logs from this package will be the text after the last slash in the package path.
-// If you wish to change this, you should add your desired name in the runtime/logging/logrus-prefixed-formatter/prefix-replacement.go file.
-var log = logrus.WithField("package", "cmd/validator")

cmd/validator/main.go

@@ -34,6 +34,8 @@ import (
 	"github.com/urfave/cli/v2"
 )
 
+var log = logrus.WithField("prefix", "main")
+
 func startNode(ctx *cli.Context) error {
 	// Verify if ToS is accepted.
 	if err := tos.VerifyTosAcceptedOrPrompt(ctx); err != nil {

cmd/validator/slashing-protection/log.go

@@ -1,9 +1,5 @@
-// Code generated by hack/gen-logs.sh; DO NOT EDIT.
-// This file is created and regenerated automatically. Anything added here might get removed.
 package historycmd
 
 import "github.com/sirupsen/logrus"
 
-// The prefix for logs from this package will be the text after the last slash in the package path.
-// If you wish to change this, you should add your desired name in the runtime/logging/logrus-prefixed-formatter/prefix-replacement.go file.
-var log = logrus.WithField("package", "cmd/validator/slashing-protection")
+var log = logrus.WithField("prefix", "historycmd")

cmd/validator/wallet/BUILD.bazel

@@ -4,7 +4,6 @@ go_library(
     name = "go_default_library",
     srcs = [
         "create.go",
-        "log.go",
         "recover.go",
         "wallet.go",
     ],

cmd/validator/wallet/log.go

@@ -1,9 +0,0 @@
-// Code generated by hack/gen-logs.sh; DO NOT EDIT.
-// This file is created and regenerated automatically. Anything added here might get removed.
-package wallet
-
-import "github.com/sirupsen/logrus"
-
-// The prefix for logs from this package will be the text after the last slash in the package path.
-// If you wish to change this, you should add your desired name in the runtime/logging/logrus-prefixed-formatter/prefix-replacement.go file.
-var log = logrus.WithField("package", "cmd/validator/wallet")

cmd/validator/wallet/wallet.go

@@ -5,9 +5,12 @@ import (
 	"github.com/OffchainLabs/prysm/v7/cmd/validator/flags"
 	"github.com/OffchainLabs/prysm/v7/config/features"
 	"github.com/OffchainLabs/prysm/v7/runtime/tos"
+	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
 )
 
+var log = logrus.WithField("prefix", "wallet")
+
 // Commands for wallets for Prysm validators.
 var Commands = &cli.Command{
 	Name:     "wallet",

cmd/validator/web/log.go

@@ -1,9 +1,5 @@
-// Code generated by hack/gen-logs.sh; DO NOT EDIT.
-// This file is created and regenerated automatically. Anything added here might get removed.
 package web
 
 import "github.com/sirupsen/logrus"
 
-// The prefix for logs from this package will be the text after the last slash in the package path.
-// If you wish to change this, you should add your desired name in the runtime/logging/logrus-prefixed-formatter/prefix-replacement.go file.
-var log = logrus.WithField("package", "cmd/validator/web")
+var log = logrus.WithField("prefix", "web")

hack/gen-logs.sh

@@ -14,6 +14,7 @@ EXCLUDED_PATH_PREFIXES=(
   "runtime"
   "monitoring"
   "io"
+  "cmd"
   ".well-known"
   "changelog"
   "hack"

runtime/logging/logrus-prefixed-formatter/prefix-replacements.go

@@ -1,13 +1,6 @@
 package prefixed
 
 var prefixReplacements = map[string]string{
-	"cmd/beacon-chain":                                "main",
-	"cmd/client-stats":                                "main",
-	"cmd/prysmctl/p2p":                                "prysmctl-p2p",
-	"cmd/prysmctl/testnet":                            "genesis",
-	"cmd/validator/slashing-protection":               "historycmd",
-	"cmd/validator":                                   "main",
-	"cmd":                                             "node",
 	"beacon-chain/cache/depositsnapshot":              "cache",
 	"beacon-chain/core/transition":                    "state",
 	"beacon-chain/db/kv":                              "db",

testing/endtoend/evaluators/node.go

@@ -163,103 +163,80 @@ func allNodesHaveSameHead(_ *e2etypes.EvaluationContext, conns ...*grpc.ClientCo
 		return errors.Wrap(err, "failed waiting for mid-epoch")
 	}
 
-	// Retry up to 3 times with 2 second delays to handle data availability delays.
-	// With PeerDAS, non-proposer nodes may take longer to sync blocks while
-	// fetching data columns from the network.
-	const maxRetries = 3
-	const retryDelay = 2 * time.Second
-	var lastErr error
+	headEpochs := make([]primitives.Epoch, len(conns))
+	headBlockRoots := make([][]byte, len(conns))
+	justifiedRoots := make([][]byte, len(conns))
+	prevJustifiedRoots := make([][]byte, len(conns))
+	finalizedRoots := make([][]byte, len(conns))
+	chainHeads := make([]*eth.ChainHead, len(conns))
+	g, _ := errgroup.WithContext(context.Background())
 
-	for attempt := range maxRetries {
-		if attempt > 0 {
-			time.Sleep(retryDelay)
-		}
-
-		headEpochs := make([]primitives.Epoch, len(conns))
-		headBlockRoots := make([][]byte, len(conns))
-		justifiedRoots := make([][]byte, len(conns))
-		prevJustifiedRoots := make([][]byte, len(conns))
-		finalizedRoots := make([][]byte, len(conns))
-		chainHeads := make([]*eth.ChainHead, len(conns))
-		g, _ := errgroup.WithContext(context.Background())
-
-		for i, conn := range conns {
-			conIdx := i
-			currConn := conn
-			g.Go(func() error {
-				beaconClient := eth.NewBeaconChainClient(currConn)
-				chainHead, err := beaconClient.GetChainHead(context.Background(), &emptypb.Empty{})
-				if err != nil {
-					return errors.Wrapf(err, "connection number=%d", conIdx)
-				}
-				headEpochs[conIdx] = chainHead.HeadEpoch
-				headBlockRoots[conIdx] = chainHead.HeadBlockRoot
-				justifiedRoots[conIdx] = chainHead.JustifiedBlockRoot
-				prevJustifiedRoots[conIdx] = chainHead.PreviousJustifiedBlockRoot
-				finalizedRoots[conIdx] = chainHead.FinalizedBlockRoot
-				chainHeads[conIdx] = chainHead
-				return nil
-			})
-		}
-		if err := g.Wait(); err != nil {
-			return err
-		}
-
-		lastErr = nil
-		for i := range conns {
-			if headEpochs[0] != headEpochs[i] {
-				lastErr = fmt.Errorf(
-					"received conflicting head epochs on node %d, expected %d, received %d",
-					i,
-					headEpochs[0],
-					headEpochs[i],
-				)
-				break
+	for i, conn := range conns {
+		conIdx := i
+		currConn := conn
+		g.Go(func() error {
+			beaconClient := eth.NewBeaconChainClient(currConn)
+			chainHead, err := beaconClient.GetChainHead(context.Background(), &emptypb.Empty{})
+			if err != nil {
+				return errors.Wrapf(err, "connection number=%d", conIdx)
 			}
-			if !bytes.Equal(headBlockRoots[0], headBlockRoots[i]) {
-				lastErr = fmt.Errorf(
-					"received conflicting head block roots on node %d, expected %#x, received %#x",
-					i,
-					headBlockRoots[0],
-					headBlockRoots[i],
-				)
-				break
-			}
-			if !bytes.Equal(justifiedRoots[0], justifiedRoots[i]) {
-				lastErr = fmt.Errorf(
-					"received conflicting justified block roots on node %d, expected %#x, received %#x: %s and %s",
-					i,
-					justifiedRoots[0],
-					justifiedRoots[i],
-					chainHeads[0].String(),
-					chainHeads[i].String(),
-				)
-				break
-			}
-			if !bytes.Equal(prevJustifiedRoots[0], prevJustifiedRoots[i]) {
-				lastErr = fmt.Errorf(
-					"received conflicting previous justified block roots on node %d, expected %#x, received %#x",
-					i,
-					prevJustifiedRoots[0],
-					prevJustifiedRoots[i],
-				)
-				break
-			}
-			if !bytes.Equal(finalizedRoots[0], finalizedRoots[i]) {
-				lastErr = fmt.Errorf(
-					"received conflicting finalized epoch roots on node %d, expected %#x, received %#x",
-					i,
-					finalizedRoots[0],
-					finalizedRoots[i],
-				)
-				break
-			}
-		}
-
-		if lastErr == nil {
+			headEpochs[conIdx] = chainHead.HeadEpoch
+			headBlockRoots[conIdx] = chainHead.HeadBlockRoot
+			justifiedRoots[conIdx] = chainHead.JustifiedBlockRoot
+			prevJustifiedRoots[conIdx] = chainHead.PreviousJustifiedBlockRoot
+			finalizedRoots[conIdx] = chainHead.FinalizedBlockRoot
+			chainHeads[conIdx] = chainHead
 			return nil
+		})
+	}
+	if err := g.Wait(); err != nil {
+		return err
+	}
+
+	for i := range conns {
+		if headEpochs[0] != headEpochs[i] {
+			return fmt.Errorf(
+				"received conflicting head epochs on node %d, expected %d, received %d",
+				i,
+				headEpochs[0],
+				headEpochs[i],
+			)
+		}
+		if !bytes.Equal(headBlockRoots[0], headBlockRoots[i]) {
+			return fmt.Errorf(
+				"received conflicting head block roots on node %d, expected %#x, received %#x",
+				i,
+				headBlockRoots[0],
+				headBlockRoots[i],
+			)
+		}
+		if !bytes.Equal(justifiedRoots[0], justifiedRoots[i]) {
+			return fmt.Errorf(
+				"received conflicting justified block roots on node %d, expected %#x, received %#x: %s and %s",
+				i,
+				justifiedRoots[0],
+				justifiedRoots[i],
+				chainHeads[0].String(),
+				chainHeads[i].String(),
+			)
+		}
+		if !bytes.Equal(prevJustifiedRoots[0], prevJustifiedRoots[i]) {
+			return fmt.Errorf(
+				"received conflicting previous justified block roots on node %d, expected %#x, received %#x",
+				i,
+				prevJustifiedRoots[0],
+				prevJustifiedRoots[i],
+			)
+		}
+		if !bytes.Equal(finalizedRoots[0], finalizedRoots[i]) {
+			return fmt.Errorf(
+				"received conflicting finalized epoch roots on node %d, expected %#x, received %#x",
+				i,
+				finalizedRoots[0],
+				finalizedRoots[i],
+			)
 		}
 	}
 
-	return lastErr
+	return nil
 }

testing/endtoend/evaluators/validator.go

@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"net/http"
 	"strconv"
-	"time"
 
 	"github.com/OffchainLabs/prysm/v7/api/server/structs"
 	"github.com/OffchainLabs/prysm/v7/beacon-chain/core/altair"
@@ -124,25 +123,6 @@ func validatorsAreActive(ec *types.EvaluationContext, conns ...*grpc.ClientConn)
 
 // validatorsParticipating ensures the validators have an acceptable participation rate.
 func validatorsParticipating(_ *types.EvaluationContext, conns ...*grpc.ClientConn) error {
-	// Retry up to 3 times with 2 second delays to handle timing flakes where
-	// attestations haven't been fully processed yet due to block propagation delays.
-	const maxRetries = 3
-	const retryDelay = 2 * time.Second
-	var lastErr error
-
-	for attempt := range maxRetries {
-		if attempt > 0 {
-			time.Sleep(retryDelay)
-		}
-		lastErr = checkValidatorsParticipating(conns)
-		if lastErr == nil {
-			return nil
-		}
-	}
-	return lastErr
-}
-
-func checkValidatorsParticipating(conns []*grpc.ClientConn) error {
 	conn := conns[0]
 	client := ethpb.NewBeaconChainClient(conn)
 	validatorRequest := &ethpb.GetValidatorParticipationRequest{}
@@ -254,25 +234,6 @@ func checkValidatorsParticipating(conns []*grpc.ClientConn) error {
 // validatorsSyncParticipation ensures the validators have an acceptable participation rate for
 // sync committee assignments.
 func validatorsSyncParticipation(_ *types.EvaluationContext, conns ...*grpc.ClientConn) error {
-	// Retry up to 3 times with 2 second delays to handle timing flakes where
-	// sync committee messages haven't fully propagated yet.
-	const maxRetries = 3
-	const retryDelay = 2 * time.Second
-	var lastErr error
-
-	for attempt := range maxRetries {
-		if attempt > 0 {
-			time.Sleep(retryDelay)
-		}
-		lastErr = checkSyncParticipation(conns)
-		if lastErr == nil {
-			return nil
-		}
-	}
-	return lastErr
-}
-
-func checkSyncParticipation(conns []*grpc.ClientConn) error {
 	conn := conns[0]
 	client := ethpb.NewNodeClient(conn)
 	altairClient := ethpb.NewBeaconChainClient(conn)

third_party/com_github_offchainlabs_hashtree.patch

@@ -1,7 +1,7 @@
 diff -urN a/BUILD.bazel b/BUILD.bazel
 --- a/BUILD.bazel	1969-12-31 18:00:00.000000000 -0600
 +++ b/BUILD.bazel	2025-01-05 12:00:00.000000000 -0600
-@@ -0,0 +1,89 @@
+@@ -0,0 +1,86 @@
 +load("@io_bazel_rules_go//go:def.bzl", "go_library")
 +
 +go_library(
@@ -44,14 +44,14 @@ diff -urN a/BUILD.bazel b/BUILD.bazel
 +    name = "hashtree_arm64_syso",
 +    srcs = [":hashtree_arm64"],
 +    outs = ["hashtree_arm64.syso"],
-+    cmd = "cp $$(echo $(locations :hashtree_arm64) | tr ' ' '\\n' | grep -v '\\.pic\\.' | head -1) $@",
++    cmd = "cp $(location :hashtree_arm64) $@",
 +)
 +
 +genrule(
 +    name = "hashtree_amd64_syso",
 +    srcs = [":hashtree_amd64"],
 +    outs = ["hashtree_amd64.syso"],
-+    cmd = "cp $$(echo $(locations :hashtree_amd64) | tr ' ' '\\n' | grep -v '\\.pic\\.' | head -1) $@",
++    cmd = "cp $(location :hashtree_amd64) $@",
 +)
 +
 +cc_library(
@@ -83,10 +83,7 @@ diff -urN a/BUILD.bazel b/BUILD.bazel
 +        "src/sha256_sse_x1.S",
 +    ],
 +    hdrs = ["src/hashtree.h"],
-+    copts = ["-O3", "-Wall"] + select({
-+        "@platforms//os:windows": [],
-+        "//conditions:default": ["-fno-integrated-as"],
-+    }),
++    copts = ["-O3", "-Wall", "-fno-integrated-as"],
 +    linkstatic = True,
 +    strip_include_prefix = "src",
 +    visibility = ["//visibility:public"],