Add all the fixes from pre-commit (#14846)

* precommit fixes

* fix remaining

.github/CODEOWNERS

@@ -5,4 +5,4 @@
 *.bzl @prestonvanloon
 
 # Anyone on prylabs team can approve dependency updates.
-deps.bzl @prysmaticlabs/core-team
+deps.bzl @prysmaticlabs/core-team

.github/workflows/horusec.yaml

@@ -19,4 +19,4 @@ jobs:
     - name: Running Security Scan
       run: |
         curl -fsSL https://raw.githubusercontent.com/ZupIT/horusec/main/deployments/scripts/install.sh | bash -s latest
-        horusec start -t="10000" -p="./" -e="true" -i="**/crypto/bls/herumi/**, **/**/*_test.go, **/third_party/afl/**, **/crypto/keystore/key.go"
+        horusec start -t="10000" -p="./" -e="true" -i="**/crypto/bls/herumi/**, **/**/*_test.go, **/third_party/afl/**, **/crypto/keystore/key.go"

.pre-commit-config.yaml

@@ -0,0 +1,34 @@
+repos:
+  # First run code formatters
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.1.0
+    hooks:
+      - id: end-of-file-fixer # ensures that a file is either empty, or ends with one newline
+        exclude_types: ["proto"]
+      - id: mixed-line-ending # ensures that a file doesn't contain a mix of LF and CRLF
+      - id: no-commit-to-branch # Protect specific branches (default: main/master) from direct checkins
+
+  - repo: local
+    hooks:
+      - id: gci
+        name: goimports
+        entry: bash -c 'command -v gci >/dev/null 2>&1 || go install github.com/daixiang0/gci@latest; gci write --skip-generated -s standard -s default "$@"; goimports -w "$@"' --
+        language: golang
+        files: \.go$
+
+  - repo: https://github.com/dnephin/pre-commit-golang
+    rev: v0.4.0
+    hooks:
+      - id: go-fmt
+        args: [ -w, -s ] # simplify code and write result to (source) file instead of stdout
+      - id: go-mod-tidy
+        files: go.mod
+      - id: golangci-lint
+
+  # Fix bazel build files
+  - repo: local
+    hooks:
+      - id: gazelle
+        name: bazel-fix
+        entry: .pre-commit/fixbazel.sh
+        language: system

.pre-commit/fixbazel.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+bazel run //:gazelle -- fix

CONTRIBUTING.md

@@ -175,6 +175,23 @@ $ git push myrepo feature-in-progress-branch -f
 
 **22.  Finally, again leave a comment to the Core Contributors on the pull request to let them know that the pull request has been updated.**
 
+### Git hooks and linters.
+
+Prysm is configured with [pre-commit](https://pre-commit.com) **githooks** that ensures pull
+requests adhere to a minimum standard and are consistent. It is highly recommended running the githooks locally while developing for faster feedback.
+
+To install githooks:
+- Follow installation instructions [here](https://pre-commit.com/#installation) to install the `pre-commit` tool.
+- Once installed, run `pre-commit install` in the project's root directory. This will set up the hooks.
+- Note you can skip the hooks by committing with `-n`: `git commit -n -m "look mom no githooks"`
+
+To update githooks:
+```sh
+pre-commit clean
+```
+
+The **linter** used is [golangci-lint](https://golangci-lint.run/). It runs as part of the githooks and is configured in [.golangci.yml](.golangci.yml)
+
 ## Maintaining CHANGELOG.md
 
 This project follows the changelog guidelines from [keepachangelog.com](https://keepachangelog.com/en/1.1.0/). In order to minimize conflicts and workflow headaches, we chose to implement a changelog management

LICENSE.md

@@ -672,4 +672,3 @@ may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
 <http://www.gnu.org/philosophy/why-not-lgpl.html>.
-

TERMS_OF_SERVICE.md

@@ -50,4 +50,3 @@ We reserve the right to revise these Terms, and your rights and obligations are
 These Terms constitute the entire agreement between you and Offchain Labs regarding use of Prysm and will supersede all prior agreements whether, written or oral. No usage of trade or other regular practice or method of dealing between the parties will be used to modify, interpret, supplement, or alter the terms of these Terms.
 
 If any portion of these Terms is held invalid or unenforceable, such invalidity or enforceability will not affect the other provisions of these Terms, which will remain in full force and effect, and the invalid or unenforceable portion will be given effect to the greatest extent possible. The failure of a party to require performance of any provision will not affect that party’s right to require performance at any time thereafter, nor will a waiver of any breach or default of these Terms or any provision of these Terms constitute a waiver of any subsequent breach or default or a waiver of the provision itself.
-

api/server/httprest/options.go

@@ -1,9 +1,8 @@
 package httprest
 
 import (
-	"time"
-
 	"net/http"
+	"time"
 
 	"github.com/prysmaticlabs/prysm/v5/api/server/middleware"
 )

beacon-chain/blockchain/kzg/trusted_setup.json

@@ -4164,4 +4164,4 @@
     "0xa92039a08b5502d5b211a7744099c9f93fa8c90cedcb1d05e92f01886219dd464eb5fb0337496ad96ed09c987da4e5f019035c5b01cc09b2a18b8a8dd419bc5895388a07e26958f6bd26751929c25f89b8eb4a299d822e2d26fec9ef350e0d3c",
     "0x92dcc5a1c8c3e1b28b1524e3dd6dbecd63017c9201da9dbe077f1b82adc08c50169f56fc7b5a3b28ec6b89254de3e2fd12838a761053437883c3e01ba616670cea843754548ef84bcc397de2369adcca2ab54cd73c55dc68d87aec3fc2fe4f10"
   ]
-}
+}

beacon-chain/blockchain/process_block_helpers.go

@@ -7,13 +7,12 @@ import (
 	"strings"
 	"time"
 
-	"github.com/prysmaticlabs/prysm/v5/beacon-chain/core/helpers"
-	lightclient "github.com/prysmaticlabs/prysm/v5/beacon-chain/core/light-client"
-
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/pkg/errors"
 	"github.com/prysmaticlabs/prysm/v5/beacon-chain/core/feed"
 	statefeed "github.com/prysmaticlabs/prysm/v5/beacon-chain/core/feed/state"
+	"github.com/prysmaticlabs/prysm/v5/beacon-chain/core/helpers"
+	lightclient "github.com/prysmaticlabs/prysm/v5/beacon-chain/core/light-client"
 	"github.com/prysmaticlabs/prysm/v5/beacon-chain/core/transition"
 	doublylinkedtree "github.com/prysmaticlabs/prysm/v5/beacon-chain/forkchoice/doubly-linked-tree"
 	forkchoicetypes "github.com/prysmaticlabs/prysm/v5/beacon-chain/forkchoice/types"

beacon-chain/core/light-client/lightclient_test.go

@@ -5,15 +5,14 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/prysmaticlabs/prysm/v5/config/params"
-	light_client "github.com/prysmaticlabs/prysm/v5/consensus-types/light-client"
-	"github.com/prysmaticlabs/prysm/v5/consensus-types/primitives"
-
 	"github.com/pkg/errors"
 	lightClient "github.com/prysmaticlabs/prysm/v5/beacon-chain/core/light-client"
 	fieldparams "github.com/prysmaticlabs/prysm/v5/config/fieldparams"
+	"github.com/prysmaticlabs/prysm/v5/config/params"
 	consensustypes "github.com/prysmaticlabs/prysm/v5/consensus-types"
 	"github.com/prysmaticlabs/prysm/v5/consensus-types/blocks"
+	light_client "github.com/prysmaticlabs/prysm/v5/consensus-types/light-client"
+	"github.com/prysmaticlabs/prysm/v5/consensus-types/primitives"
 	"github.com/prysmaticlabs/prysm/v5/encoding/ssz"
 	v11 "github.com/prysmaticlabs/prysm/v5/proto/engine/v1"
 	pb "github.com/prysmaticlabs/prysm/v5/proto/prysm/v1alpha1"

beacon-chain/db/kv/blocks.go

@@ -30,32 +30,22 @@ var errInvalidSlotRange = errors.New("invalid end slot and start slot provided")
 func (s *Store) Block(ctx context.Context, blockRoot [32]byte) (interfaces.ReadOnlySignedBeaconBlock, error) {
 	ctx, span := trace.StartSpan(ctx, "BeaconDB.Block")
 	defer span.End()
-	blk, err := s.getBlock(ctx, blockRoot, nil)
-	if errors.Is(err, ErrNotFound) {
-		return nil, nil
-	}
-	return blk, err
-}
-
-func (s *Store) getBlock(ctx context.Context, blockRoot [32]byte, tx *bolt.Tx) (interfaces.ReadOnlySignedBeaconBlock, error) {
+	// Return block from cache if it exists.
 	if v, ok := s.blockCache.Get(string(blockRoot[:])); v != nil && ok {
 		return v.(interfaces.ReadOnlySignedBeaconBlock), nil
 	}
-	// This method allows the caller to pass in its tx if one is already open.
-	// Or if a nil value is used, a transaction will be managed intenally.
-	if tx == nil {
-		var err error
-		tx, err = s.db.Begin(false)
-		if err != nil {
-			return nil, err
+	var blk interfaces.ReadOnlySignedBeaconBlock
+	err := s.db.View(func(tx *bolt.Tx) error {
+		bkt := tx.Bucket(blocksBucket)
+		enc := bkt.Get(blockRoot[:])
+		if enc == nil {
+			return nil
 		}
-		defer func() {
-			if err := tx.Rollback(); err != nil {
-				log.WithError(err).Error("could not rollback read-only getBlock transaction")
-			}
-		}()
-	}
-	return unmarshalBlock(ctx, tx.Bucket(blocksBucket).Get(blockRoot[:]))
+		var err error
+		blk, err = unmarshalBlock(ctx, enc)
+		return err
+	})
+	return blk, err
 }
 
 // OriginCheckpointBlockRoot returns the value written to the db in SaveOriginCheckpointBlockRoot
@@ -237,21 +227,6 @@ func (s *Store) DeleteBlock(ctx context.Context, root [32]byte) error {
 			return ErrDeleteJustifiedAndFinalized
 		}
 
-		// Look up the block to find its slot; needed to remove the slot index entry.
-		blk, err := s.getBlock(ctx, root, tx)
-		if err != nil {
-			// getBlock can return ErrNotFound, in which case we won't even try to delete it.
-			if errors.Is(err, ErrNotFound) {
-				return nil
-			}
-			return err
-		}
-		if err := s.deleteSlotIndexEntry(tx, blk.Block().Slot(), root); err != nil {
-			return err
-		}
-		if err := s.deleteMatchingParentIndex(tx, blk.Block().ParentRoot(), root); err != nil {
-			return err
-		}
 		if err := s.deleteBlock(tx, root[:]); err != nil {
 			return err
 		}
@@ -924,9 +899,6 @@ func createBlockIndicesFromFilters(ctx context.Context, f *filters.QueryFilter)
 
 // unmarshal block from marshaled proto beacon block bytes to versioned beacon block struct type.
 func unmarshalBlock(_ context.Context, enc []byte) (interfaces.ReadOnlySignedBeaconBlock, error) {
-	if len(enc) == 0 {
-		return nil, errors.Wrap(ErrNotFound, "empty block bytes in db")
-	}
 	var err error
 	enc, err = snappy.Decode(nil, enc)
 	if err != nil {
@@ -1078,47 +1050,6 @@ func (s *Store) deleteBlock(tx *bolt.Tx, root []byte) error {
 	return nil
 }
 
-func (s *Store) deleteMatchingParentIndex(tx *bolt.Tx, parent, child [32]byte) error {
-	bkt := tx.Bucket(blockParentRootIndicesBucket)
-	if err := deleteRootIndexEntry(bkt, parent[:], child); err != nil {
-		return errors.Wrap(err, "could not delete parent root index entry")
-	}
-	return nil
-}
-
-func (s *Store) deleteSlotIndexEntry(tx *bolt.Tx, slot primitives.Slot, root [32]byte) error {
-	key := bytesutil.SlotToBytesBigEndian(slot)
-	bkt := tx.Bucket(blockSlotIndicesBucket)
-	if err := deleteRootIndexEntry(bkt, key, root); err != nil {
-		return errors.Wrap(err, "could not delete slot index entry")
-	}
-	return nil
-}
-
-func deleteRootIndexEntry(bkt *bolt.Bucket, key []byte, root [32]byte) error {
-	packed := bkt.Get(key)
-	if len(packed) == 0 {
-		return nil
-	}
-	updated, err := removeRoot(packed, root)
-	if err != nil {
-		return err
-	}
-	// Don't update the value if the root was not found.
-	if bytes.Equal(updated, packed) {
-		return nil
-	}
-	// If there are no other roots in the key, just delete it.
-	if len(updated) == 0 {
-		if err := bkt.Delete(key); err != nil {
-			return err
-		}
-		return nil
-	}
-	// Update the key with the root removed.
-	return bkt.Put(key, updated)
-}
-
 func (s *Store) deleteValidatorHashes(tx *bolt.Tx, root []byte) error {
 	ok, err := s.isStateValidatorMigrationOver()
 	if err != nil {

beacon-chain/db/kv/blocks_test.go

@@ -196,13 +196,9 @@ func TestStore_BlocksCRUD(t *testing.T) {
 			blockRoot, err := blk.Block().HashTreeRoot()
 			require.NoError(t, err)
 
-			_, err = db.getBlock(ctx, blockRoot, nil)
-			require.ErrorIs(t, err, ErrNotFound)
 			retrievedBlock, err := db.Block(ctx, blockRoot)
 			require.NoError(t, err)
 			assert.DeepEqual(t, nil, retrievedBlock, "Expected nil block")
-			_, err = db.getBlock(ctx, blockRoot, nil)
-			require.ErrorIs(t, err, ErrNotFound)
 
 			require.NoError(t, db.SaveBlock(ctx, blk))
 			assert.Equal(t, true, db.HasBlock(ctx, blockRoot), "Expected block to exist in the db")
@@ -218,34 +214,10 @@ func TestStore_BlocksCRUD(t *testing.T) {
 			retrievedPb, err := retrievedBlock.Proto()
 			require.NoError(t, err)
 			assert.Equal(t, true, proto.Equal(wantedPb, retrievedPb), "Wanted: %v, received: %v", wanted, retrievedBlock)
-			// Check that the block is in the slot->block index
-			found, roots, err := db.BlockRootsBySlot(ctx, blk.Block().Slot())
-			require.NoError(t, err)
-			require.Equal(t, true, found)
-			require.Equal(t, 1, len(roots))
-			require.Equal(t, blockRoot, roots[0])
-			// Delete the block, then check that it is no longer in the index.
-
-			parent := blk.Block().ParentRoot()
-			testCheckParentIndices(t, db.db, parent, true)
-			require.NoError(t, db.DeleteBlock(ctx, blockRoot))
-			require.NoError(t, err)
-			testCheckParentIndices(t, db.db, parent, false)
-			found, roots, err = db.BlockRootsBySlot(ctx, blk.Block().Slot())
-			require.NoError(t, err)
-			require.Equal(t, false, found)
-			require.Equal(t, 0, len(roots))
 		})
 	}
 }
 
-func testCheckParentIndices(t *testing.T, db *bolt.DB, parent [32]byte, expected bool) {
-	require.NoError(t, db.View(func(tx *bolt.Tx) error {
-		require.Equal(t, expected, tx.Bucket(blockParentRootIndicesBucket).Get(parent[:]) != nil)
-		return nil
-	}))
-}
-
 func TestStore_BlocksHandleZeroCase(t *testing.T) {
 	for _, tt := range blockTests {
 		t.Run(tt.name, func(t *testing.T) {

beacon-chain/db/kv/utils.go

@@ -114,27 +114,3 @@ func splitRoots(b []byte) ([][32]byte, error) {
 	}
 	return rl, nil
 }
-
-func removeRoot(roots []byte, root [32]byte) ([]byte, error) {
-	if len(roots) == 0 {
-		return []byte{}, nil
-	}
-	if len(roots) == 32 && bytes.Equal(roots, root[:]) {
-		return []byte{}, nil
-	}
-	if len(roots)%32 != 0 {
-		return nil, errors.Wrapf(errMisalignedRootList, "root list len=%d", len(roots))
-	}
-
-	search := root[:]
-	for i := 0; i <= len(roots)-32; i += 32 {
-		if bytes.Equal(roots[i:i+32], search) {
-			result := make([]byte, len(roots)-32)
-			copy(result, roots[:i])
-			copy(result[i:], roots[i+32:])
-			return result, nil
-		}
-	}
-
-	return roots, nil
-}

beacon-chain/db/kv/utils_test.go

@@ -1,7 +1,6 @@
 package kv
 
 import (
-	"bytes"
 	"context"
 	"crypto/rand"
 	"testing"
@@ -196,85 +195,3 @@ func TestSplitRoots(t *testing.T) {
 		})
 	}
 }
-
-func tPad(p ...[]byte) []byte {
-	r := make([]byte, 32*len(p))
-	for i, b := range p {
-		copy(r[i*32:], b)
-	}
-	return r
-}
-
-func TestRemoveRoot(t *testing.T) {
-	cases := []struct {
-		name   string
-		roots  []byte
-		root   [32]byte
-		expect []byte
-		err    error
-	}{
-		{
-			name:   "empty",
-			roots:  []byte{},
-			root:   [32]byte{0xde, 0xad, 0xbe, 0xef},
-			expect: []byte{},
-		},
-		{
-			name:   "single",
-			roots:  tPad([]byte{0xde, 0xad, 0xbe, 0xef}),
-			root:   [32]byte{0xde, 0xad, 0xbe, 0xef},
-			expect: []byte{},
-		},
-		{
-			name:   "single, different",
-			roots:  tPad([]byte{0xde, 0xad, 0xbe, 0xef}),
-			root:   [32]byte{0xde, 0xad, 0xbe, 0xee},
-			expect: tPad([]byte{0xde, 0xad, 0xbe, 0xef}),
-		},
-		{
-			name:   "multi",
-			roots:  tPad([]byte{0xde, 0xad, 0xbe, 0xef}, []byte{0xac, 0x1d, 0xfa, 0xce}),
-			root:   [32]byte{0xac, 0x1d, 0xfa, 0xce},
-			expect: tPad([]byte{0xde, 0xad, 0xbe, 0xef}),
-		},
-		{
-			name:   "multi, reordered",
-			roots:  tPad([]byte{0xac, 0x1d, 0xfa, 0xce}, []byte{0xde, 0xad, 0xbe, 0xef}),
-			root:   [32]byte{0xac, 0x1d, 0xfa, 0xce},
-			expect: tPad([]byte{0xde, 0xad, 0xbe, 0xef}),
-		},
-		{
-			name:   "multi, 3",
-			roots:  tPad([]byte{0xac, 0x1d, 0xfa, 0xce}, []byte{0xbe, 0xef, 0xca, 0xb5}, []byte{0xde, 0xad, 0xbe, 0xef}),
-			root:   [32]byte{0xac, 0x1d, 0xfa, 0xce},
-			expect: tPad([]byte{0xbe, 0xef, 0xca, 0xb5}, []byte{0xde, 0xad, 0xbe, 0xef}),
-		},
-		{
-			name:   "multi, different",
-			roots:  tPad([]byte{0xde, 0xad, 0xbe, 0xef}, []byte{0xac, 0x1d, 0xfa, 0xce}),
-			root:   [32]byte{0xac, 0x1d, 0xbe, 0xa7},
-			expect: tPad([]byte{0xde, 0xad, 0xbe, 0xef}, []byte{0xac, 0x1d, 0xfa, 0xce}),
-		},
-		{
-			name:  "misaligned",
-			roots: make([]byte, 61),
-			root:  [32]byte{0xac, 0x1d, 0xbe, 0xa7},
-			err:   errMisalignedRootList,
-		},
-	}
-	for _, c := range cases {
-		t.Run(c.name, func(t *testing.T) {
-			before := make([]byte, len(c.roots))
-			copy(before, c.roots)
-			r, err := removeRoot(c.roots, c.root)
-			if c.err != nil {
-				require.ErrorIs(t, err, c.err)
-				return
-			}
-			require.NoError(t, err)
-			require.Equal(t, len(c.expect), len(r))
-			require.Equal(t, true, bytes.Equal(c.expect, r))
-			require.Equal(t, true, bytes.Equal(before, c.roots))
-		})
-	}
-}

beacon-chain/db/pruner/pruner_test.go

@@ -5,17 +5,15 @@ import (
 	"testing"
 	"time"
 
+	dbtest "github.com/prysmaticlabs/prysm/v5/beacon-chain/db/testing"
 	"github.com/prysmaticlabs/prysm/v5/config/params"
 	"github.com/prysmaticlabs/prysm/v5/consensus-types/blocks"
+	"github.com/prysmaticlabs/prysm/v5/consensus-types/primitives"
 	eth "github.com/prysmaticlabs/prysm/v5/proto/prysm/v1alpha1"
-
+	"github.com/prysmaticlabs/prysm/v5/testing/require"
 	"github.com/prysmaticlabs/prysm/v5/testing/util"
 	slottest "github.com/prysmaticlabs/prysm/v5/time/slots/testing"
 	"github.com/sirupsen/logrus"
-
-	dbtest "github.com/prysmaticlabs/prysm/v5/beacon-chain/db/testing"
-	"github.com/prysmaticlabs/prysm/v5/consensus-types/primitives"
-	"github.com/prysmaticlabs/prysm/v5/testing/require"
 	logTest "github.com/sirupsen/logrus/hooks/test"
 )
 

beacon-chain/execution/testdata/fuzz/FuzzExecutionBlock/4448e6f5eccdfd2f5acea73e8b44f817a0161a6a

@@ -1,2 +1,2 @@
 go test fuzz v1
-[]byte("{\"baseFeePerGas\":\"0x7fffffffffffffff\",\"difficulty\":\"0x7fffffffffffffff\",\"extraData\":\"0x\",\"gasLimit\":\"0xffffffffffffffff\",\"gasUsed\":\"0xffffffffffffffff\",\"hash\":\"0xff01ff01ff01ff01ff01ff01ff01ff0100000000000000000000000000000000\",\"logsBloom\":\"0x6a756e6b000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\",\"miner\":\"0x0000000000000000000000000000000000000000\",\"mixHash\":\"0x0000000000000000000000000000000000000000000000000000000000000000\",\"nonce\":\"0x0000000000000000\",\"number\":\"0x7fffffffffffffff\",\"parentHash\":\"0xff01ff01ff01ff01ff01ff01ff01ff0100000000000000000000000000000000\",\"receiptsRoot\":\"0xff01ff01ff01ff01ff01ff01ff01ff0100000000000000000000000000000000\",\"sha3Uncles\":\"0x0000000000000000000000000000000000000000000000000000000000000000\",\"stateRoot\":\"0xff01ff01ff01ff01ff01ff01ff01ff0100000000000000000000000000000000\",\"timestamp\":\"0x64\",\"totalDifficulty\":\"999999999999999999999999999999999999999\",\"transactions\":[{\"type\":\"0x2\",\"nonce\":\"0xffffffffffffffff\",\"gasPrice\":null,\"maxPriorityFeePerGas\":\"0x7fffffffffffffff\",\"maxFeePerGas\":\"0x7fffffffffffffff\",\"gas\":\"0xffffffffffffffff\",\"value\":\"0x7fffffffffffffff\",\"input\":\"0x72616e646f6d\",\"v\":\"0x0\",\"r\":\"0x7fffffffffffffff\",\"s\":\"0x7fffffffffffffff\",\"to\":\"0x095e7baea6a6c7c4c2dfeb977efac326af552d87\",\"chainId\":\"0x7fffffffffffffff\",\"accessList\":[],\"hash\":\"0x26db3ef2c0e5945b24088d6a4165d0bb2959abd848b57891aa041b72518548ab\"},{\"type\":\"0x2\",\"nonce\":\"0xffffffffffffffff\",\"gasPrice\":null,\"maxPriorityFeePerGas\":\"0x7fffffffffffffff\",\"maxFeePerGas\":\"0x7fffffffffffffff\",\"gas\":\"0xfffffffffffaffff\",\"value\":\"0x7fffffffffffffff\",\"input\":\"0x72616e646f6d\",\"v\":\"0x0\",\"r\":\"0x7fffffffffffffff\",\"s\":\"0x7fffffffffffffff\",\"to\":\"0x095e7baea6a6c7c4c2dfeb977efac326af552d87\",\"chainId\":\"0x7fffffffffffffff\",\"accessList\":[],\"hash\":\"0x26db3ef2c0e5945b24088d6a4165d0bb2959abd848b57891aa041b72518548ab\"}],\"transactionsRoot\":\"0x0000000000000000000000000000000000000000000000000000000000000000\"}")
+[]byte("{\"baseFeePerGas\":\"0x7fffffffffffffff\",\"difficulty\":\"0x7fffffffffffffff\",\"extraData\":\"0x\",\"gasLimit\":\"0xffffffffffffffff\",\"gasUsed\":\"0xffffffffffffffff\",\"hash\":\"0xff01ff01ff01ff01ff01ff01ff01ff0100000000000000000000000000000000\",\"logsBloom\":\"0x6a756e6b000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\",\"miner\":\"0x0000000000000000000000000000000000000000\",\"mixHash\":\"0x0000000000000000000000000000000000000000000000000000000000000000\",\"nonce\":\"0x0000000000000000\",\"number\":\"0x7fffffffffffffff\",\"parentHash\":\"0xff01ff01ff01ff01ff01ff01ff01ff0100000000000000000000000000000000\",\"receiptsRoot\":\"0xff01ff01ff01ff01ff01ff01ff01ff0100000000000000000000000000000000\",\"sha3Uncles\":\"0x0000000000000000000000000000000000000000000000000000000000000000\",\"stateRoot\":\"0xff01ff01ff01ff01ff01ff01ff01ff0100000000000000000000000000000000\",\"timestamp\":\"0x64\",\"totalDifficulty\":\"999999999999999999999999999999999999999\",\"transactions\":[{\"type\":\"0x2\",\"nonce\":\"0xffffffffffffffff\",\"gasPrice\":null,\"maxPriorityFeePerGas\":\"0x7fffffffffffffff\",\"maxFeePerGas\":\"0x7fffffffffffffff\",\"gas\":\"0xffffffffffffffff\",\"value\":\"0x7fffffffffffffff\",\"input\":\"0x72616e646f6d\",\"v\":\"0x0\",\"r\":\"0x7fffffffffffffff\",\"s\":\"0x7fffffffffffffff\",\"to\":\"0x095e7baea6a6c7c4c2dfeb977efac326af552d87\",\"chainId\":\"0x7fffffffffffffff\",\"accessList\":[],\"hash\":\"0x26db3ef2c0e5945b24088d6a4165d0bb2959abd848b57891aa041b72518548ab\"},{\"type\":\"0x2\",\"nonce\":\"0xffffffffffffffff\",\"gasPrice\":null,\"maxPriorityFeePerGas\":\"0x7fffffffffffffff\",\"maxFeePerGas\":\"0x7fffffffffffffff\",\"gas\":\"0xfffffffffffaffff\",\"value\":\"0x7fffffffffffffff\",\"input\":\"0x72616e646f6d\",\"v\":\"0x0\",\"r\":\"0x7fffffffffffffff\",\"s\":\"0x7fffffffffffffff\",\"to\":\"0x095e7baea6a6c7c4c2dfeb977efac326af552d87\",\"chainId\":\"0x7fffffffffffffff\",\"accessList\":[],\"hash\":\"0x26db3ef2c0e5945b24088d6a4165d0bb2959abd848b57891aa041b72518548ab\"}],\"transactionsRoot\":\"0x0000000000000000000000000000000000000000000000000000000000000000\"}")

beacon-chain/execution/testdata/fuzz/FuzzForkChoiceResponse/2d0486b744e252db538db5a44bfd6e6e22ff2723

@@ -1,2 +1,2 @@
 go test fuzz v1
-[]byte("{\"0000000000000\":{},\"pAYloAdId\":\"\"}")
+[]byte("{\"0000000000000\":{},\"pAYloAdId\":\"\"}")

beacon-chain/package/postinst.sh

@@ -2,4 +2,4 @@
 
 set -e
 
-chown prysm-beacon:prysm-beacon /etc/prysm/beacon-chain.yaml
+chown prysm-beacon:prysm-beacon /etc/prysm/beacon-chain.yaml

beacon-chain/package/preinst.sh

@@ -10,4 +10,4 @@ getent passwd $SERVICE_USER > /dev/null || useradd -s /bin/false --no-create-hom
 # Create directories
 mkdir -p /etc/prysm
 mkdir -p /var/lib/prysm
-install -d -m 0700 -o $SERVICE_USER -g $SERVICE_USER /var/lib/prysm/beacon-chain
+install -d -m 0700 -o $SERVICE_USER -g $SERVICE_USER /var/lib/prysm/beacon-chain

beacon-chain/package/prysm-beacon-chain.service

@@ -34,4 +34,4 @@ RestrictSUIDSGID=yes
 RestrictAddressFamilies=AF_INET AF_INET6 AF_UNIX AF_NETLINK
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target

beacon-chain/rpc/eth/beacon/handlers.go

@@ -1158,10 +1158,11 @@ func (s *Server) GetBlockRoot(w http.ResponseWriter, r *http.Request) {
 			}
 		}
 	}
+
 	b32Root := bytesutil.ToBytes32(root)
-	isOptimistic, err := s.OptimisticModeFetcher.IsOptimistic(ctx)
+	isOptimistic, err := s.OptimisticModeFetcher.IsOptimisticForRoot(ctx, b32Root)
 	if err != nil {
-		httputil.HandleError(w, "Could not retrieve optimistic status: "+err.Error(), http.StatusInternalServerError)
+		httputil.HandleError(w, "Could not check if block is optimistic: "+err.Error(), http.StatusInternalServerError)
 		return
 	}
 	response := &structs.BlockRootResponse{

beacon-chain/rpc/eth/beacon/handlers_pool.go

@@ -633,7 +633,7 @@ func (s *Server) SubmitBLSToExecutionChanges(w http.ResponseWriter, r *http.Requ
 			toBroadcast = append(toBroadcast, sbls)
 		}
 	}
-	go s.broadcastBLSChanges(context.Background(), toBroadcast)
+	go s.broadcastBLSChanges(ctx, toBroadcast)
 	if len(failures) > 0 {
 		failuresErr := &server.IndexedVerificationFailureError{
 			Code:     http.StatusBadRequest,

beacon-chain/rpc/eth/config/handlers_test.go

@@ -160,8 +160,6 @@ func TestGetSpec(t *testing.T) {
 	config.MaxTransactionsPerPayload = 99
 	config.FieldElementsPerBlob = 100
 	config.KzgCommitmentInclusionProofDepth = 101
-	config.BlobsidecarSubnetCount = 102
-	config.BlobsidecarSubnetCountElectra = 103
 
 	var dbp [4]byte
 	copy(dbp[:], []byte{'0', '0', '0', '1'})
@@ -200,7 +198,7 @@ func TestGetSpec(t *testing.T) {
 	data, ok := resp.Data.(map[string]interface{})
 	require.Equal(t, true, ok)
 
-	assert.Equal(t, 170, len(data))
+	assert.Equal(t, 168, len(data))
 	for k, v := range data {
 		t.Run(k, func(t *testing.T) {
 			switch k {
@@ -561,10 +559,6 @@ func TestGetSpec(t *testing.T) {
 				assert.Equal(t, "100", v)
 			case "KZG_COMMITMENT_INCLUSION_PROOF_DEPTH":
 				assert.Equal(t, "101", v)
-			case "BLOB_SIDECAR_SUBNET_COUNT":
-				assert.Equal(t, "102", v)
-			case "BLOB_SIDECAR_SUBNET_COUNT_ELECTRA":
-				assert.Equal(t, "103", v)
 			default:
 				t.Errorf("Incorrect key: %s", k)
 			}

beacon-chain/rpc/eth/validator/handlers.go

@@ -636,15 +636,6 @@ func (s *Server) ProduceSyncCommitteeContribution(w http.ResponseWriter, r *http
 	ctx, span := trace.StartSpan(r.Context(), "validator.ProduceSyncCommitteeContribution")
 	defer span.End()
 
-	isOptimistic, err := s.OptimisticModeFetcher.IsOptimistic(ctx)
-	if err != nil {
-		httputil.HandleError(w, err.Error(), http.StatusInternalServerError)
-		return
-	}
-	if isOptimistic {
-		httputil.HandleError(w, "Beacon node is currently syncing and not serving request on that endpoint", http.StatusServiceUnavailable)
-		return
-	}
 	_, index, ok := shared.UintFromQuery(w, r, "subcommittee_index", true)
 	if !ok {
 		return

beacon-chain/rpc/eth/validator/handlers_test.go

@@ -1584,8 +1584,7 @@ func TestProduceSyncCommitteeContribution(t *testing.T) {
 				SyncCommitteeIndices: []primitives.CommitteeIndex{0},
 			},
 		},
-		SyncCommitteePool:     syncCommitteePool,
-		OptimisticModeFetcher: &mockChain.ChainService{},
+		SyncCommitteePool: syncCommitteePool,
 	}
 	t.Run("ok", func(t *testing.T) {
 		url := "http://example.com?slot=1&subcommittee_index=1&beacon_block_root=0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"
@@ -1673,8 +1672,7 @@ func TestProduceSyncCommitteeContribution(t *testing.T) {
 					SyncCommitteeIndices: []primitives.CommitteeIndex{0},
 				},
 			},
-			SyncCommitteePool:     syncCommitteePool,
-			OptimisticModeFetcher: &mockChain.ChainService{},
+			SyncCommitteePool: syncCommitteePool,
 		}
 		server.ProduceSyncCommitteeContribution(writer, request)
 		assert.Equal(t, http.StatusNotFound, writer.Code)

beacon-chain/state/state-native/README.md

@@ -21,4 +21,4 @@ between states.
 `finalizerCleanup()` (applies only to multi-value slice fields).
 - If the field is a slice, add it to the field map in `types.go`.
 - If the field is a slice, update the `fieldConverters()` function in `/beacon-chain/state/fieldtrie/field_trie_helpers.go`. The exact implementation will vary
-depending on a few factors (is the field similar to an existing one, is it a multi-value slice etc.)
+depending on a few factors (is the field similar to an existing one, is it a multi-value slice etc.)

beacon-chain/sync/rate_limiter.go

@@ -7,13 +7,12 @@ import (
 
 	"github.com/libp2p/go-libp2p/core/network"
 	"github.com/pkg/errors"
-	"github.com/sirupsen/logrus"
-	"github.com/trailofbits/go-mutexasserts"
-
 	"github.com/prysmaticlabs/prysm/v5/beacon-chain/p2p"
 	p2ptypes "github.com/prysmaticlabs/prysm/v5/beacon-chain/p2p/types"
 	"github.com/prysmaticlabs/prysm/v5/cmd/beacon-chain/flags"
 	leakybucket "github.com/prysmaticlabs/prysm/v5/container/leaky-bucket"
+	"github.com/sirupsen/logrus"
+	"github.com/trailofbits/go-mutexasserts"
 )
 
 const defaultBurstLimit = 5

beacon-chain/sync/service.go

@@ -15,8 +15,6 @@ import (
 	"github.com/libp2p/go-libp2p/core/peer"
 	gcache "github.com/patrickmn/go-cache"
 	"github.com/pkg/errors"
-	"github.com/trailofbits/go-mutexasserts"
-
 	"github.com/prysmaticlabs/prysm/v5/async"
 	"github.com/prysmaticlabs/prysm/v5/async/abool"
 	"github.com/prysmaticlabs/prysm/v5/async/event"
@@ -47,6 +45,7 @@ import (
 	"github.com/prysmaticlabs/prysm/v5/runtime"
 	prysmTime "github.com/prysmaticlabs/prysm/v5/time"
 	"github.com/prysmaticlabs/prysm/v5/time/slots"
+	"github.com/trailofbits/go-mutexasserts"
 )
 
 var _ runtime.Service = (*Service)(nil)

changelog/bastin_lightclient-finality-optimistic-ssz.md

@@ -1,3 +1,3 @@
 ### Added
 
-- Add SSZ support to light client finality and optimistic APIs. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14836)
+- Add SSZ support to light client finality and optimistic APIs. [[PR]](https://github.com/prysmaticlabs/prysm/pull/14836)

changelog/dB2510_precommit.md

@@ -0,0 +1,3 @@
+### Added
+
+- Add pre-commit hooks for faster feedback loop

changelog/james-prysm_attestation-cleanup-suggestions.md

@@ -1,4 +1,3 @@
 ### Ignored
 
 - Cleanup single attestation code for readability.
-

changelog/james-prysm_blockv2-cognit.md

@@ -1,4 +1,4 @@
 ### Fixed
 
 - refactored publish block and block ssz functions to fix gocognit 
-- refactored publish blinded block and blinded block ssz to correctly deal with version headers and sent blocks
+- refactored publish blinded block and blinded block ssz to correctly deal with version headers and sent blocks

changelog/james-prysm_cleanup-payload-conversions.md

@@ -4,4 +4,4 @@
 
 ### Fixed
 
-- fixed gocognit in block conversions between json and proto types
+- fixed gocognit in block conversions between json and proto types

changelog/james-prysm_committee-index-log.md

@@ -1,3 +1,3 @@
 ### Added
 
-- add log to committee index when committeebits are not the expected length of 1
+- add log to committee index when committeebits are not the expected length of 1

changelog/james-prysm_deprecate-apis-for-electra.md

@@ -1,3 +1,3 @@
 ### Changed
 
-- deprecate beacon api endpoints based on [3.0.0 release](https://github.com/ethereum/beacon-APIs/pull/506) for electra
+- deprecate beacon api endpoints based on [3.0.0 release](https://github.com/ethereum/beacon-APIs/pull/506) for electra

changelog/james-prysm_dynamic-max-blobs.md

@@ -1,3 +1,3 @@
 ### Fixed
 
-- fixed max and target blob per block from static to dynamic values
+- fixed max and target blob per block from static to dynamic values

changelog/james-prysm_fix-blobl-subnet-config.md

@@ -1,3 +0,0 @@
-### Fixed
-
-- fixed /eth/v1/config/spec displays BLOB_SIDECAR_SUBNET_COUNT,BLOB_SIDECAR_SUBNET_COUNT_ELECTRA

changelog/james-prysm_fix-builder-post-header.md

@@ -1,3 +1,3 @@
 ### Fixed
 
-- adding in content type and accept headers for builder API call on registration
+- adding in content type and accept headers for builder API call on registration

changelog/james-prysm_fix-electra-committee-log.md

@@ -1,3 +1,3 @@
 ### Fixed
 
-- cosmetic fix for post electra validator logs displaying attestation committee information correctly.
+- cosmetic fix for post electra validator logs displaying attestation committee information correctly.

changelog/james-prysm_fix-optimistic-check.md

@@ -1,3 +0,0 @@
-### Fixed
-
-- fixes e2e introduced by PR#14997 by changing the optimistic check in getblockroot for rest APIs.

changelog/james-prysm_fix-wrong-committee-seen.md

@@ -1,3 +1,3 @@
 ### Fixed
 
-- fix inserting the wrong committee index into the seen cache for electra attestations
+- fix inserting the wrong committee index into the seen cache for electra attestations

changelog/james-prysm_improve-execution-request-errors.md

@@ -1,3 +1,3 @@
 ### Changed
 
-- execution requests errors on ssz length have been improved
+- execution requests errors on ssz length have been improved

changelog/james-prysm_web3signer-electra-e2e.md

@@ -1,3 +1,3 @@
 ### Added
 
-- enable web3signer E2E for electra 
+- enable web3signer E2E for electra 

changelog/kasey_delete-block-idx.md

@@ -1,2 +0,0 @@
-### Fixed
-- Ensure that deleting a block from the database clears its entry in the slot->root db index.

changelog/manu_fix_dependencies_doc.md

@@ -1,2 +1,2 @@
 ### Fixed
-- Fixed the `bazel run //:gazelle` command in `DEPENDENCIES.md`.
+- Fixed the `bazel run //:gazelle` command in `DEPENDENCIES.md`.

changelog/manu_remove_fulu_state_block.md

@@ -1,3 +1,3 @@
 ### Removed
 
-- Remove Fulu state and block
+- Remove Fulu state and block

changelog/manu_services_start_log_removal.md

@@ -1,2 +1,2 @@
 ### Removed
-- Removed the log summarizing all started services.
+- Removed the log summarizing all started services.

changelog/manu_tracked_validators_ttl.md

@@ -5,4 +5,4 @@
 
 ### Changed
 
-- Tracked validators cache: Remove validators from the cache if not seen after 1 hour.
+- Tracked validators cache: Remove validators from the cache if not seen after 1 hour.

changelog/manu_validators_registration_default_batch.md

@@ -1,3 +1,3 @@
 ## Changed
 
-- `--validators-registration-batch-size`: Change default value from `0` to `200`.
+- `--validators-registration-batch-size`: Change default value from `0` to `200`.

changelog/nisdas_add_deposit_request_testing.md

@@ -1,3 +1,3 @@
 ### Added
 
-- Added deposit request testing for electra.
+- Added deposit request testing for electra.

changelog/nisdas_enable_multiclient_e2e_electra.md

@@ -1,4 +1,4 @@
 ### Added
 
 - Enable multiclient E2E for electra
-- Enable Scenario E2E tests with electra
+- Enable Scenario E2E tests with electra

changelog/nisdas_fix_attester_slashing_validation.md

@@ -1,3 +1,3 @@
 ### Fixed
 
-- Check for the correct attester slashing type during gossip validation.
+- Check for the correct attester slashing type during gossip validation.

changelog/nisdas_fix_block_decoding.md

@@ -1,3 +1,3 @@
 ### Fixed
 
-- Allow any block type to be unmarshaled rather than only phase0 blocks in `slotByBlockRoot`. 
+- Allow any block type to be unmarshaled rather than only phase0 blocks in `slotByBlockRoot`. 

changelog/nisdas_fix_capabilites.md

@@ -1,3 +1,3 @@
 ### Fixed
 
-- Only check for electra related engine methods if electra is active.
+- Only check for electra related engine methods if electra is active.

changelog/nisdas_fix_deposit_active_evaluator.md

@@ -1,3 +1,3 @@
 ### Fixed
 
-- Fix E2E Deposit Activation Evaluator for Electra.
+- Fix E2E Deposit Activation Evaluator for Electra.

changelog/nisdas_fix_process_deposit_evaluator.md

@@ -1,3 +1,3 @@
 ### Fixed
 
-- Fix E2E Process Deposit Evaluator for Electra.
+- Fix E2E Process Deposit Evaluator for Electra.

changelog/nisdas_log_execution_requests.md

@@ -1,3 +1,3 @@
 ### Added
 
-- Log execution requests in each block.
+- Log execution requests in each block.

changelog/nisdas_update_blst.md

@@ -1,3 +1,3 @@
 ### Changed
 
-- Updates blst to v3.14.0 and fixes the references in our deps.bzl file.
+- Updates blst to v3.14.0 and fixes the references in our deps.bzl file.

changelog/potuz_rpc_handler_log.md

@@ -1,3 +1,3 @@
 ### Ignored
 
-- Add logs for RPC handlers added/removed at forks. 
+- Add logs for RPC handlers added/removed at forks. 

changelog/pvl_bls-ctx.md

@@ -1,3 +0,0 @@
-### Fixed
-
-- Broadcasting BLS to execution changes should not use the request context in a go routine. Use context.Background() for the broadcasting go routine.

changelog/radek_electra-packing-fix.md

@@ -1,3 +1,3 @@
 ### Fixed
 
-- Decompose Electra block attestations to prevent redundant packing.
+- Decompose Electra block attestations to prevent redundant packing.

changelog/radek_monitor-single-atts.md

@@ -1,3 +1,3 @@
 ### Fixed
 
-- Dedicated processing of `SingleAttestation` in the monitor service.
+- Dedicated processing of `SingleAttestation` in the monitor service.

changelog/radek_no-maxcover-for-electra.md

@@ -1,3 +1,3 @@
 ### Changed
 
-- Don't use MaxCover for Electra on-chain attestations.
+- Don't use MaxCover for Electra on-chain attestations.

changelog/radek_rename-slashing-files.md

@@ -1,3 +1,3 @@
 ### Ignored
 
-- Rename files in `beacon-chain/operations/slashings`.
+- Rename files in `beacon-chain/operations/slashings`.

changelog/saolyn_add-GetPendingDeposits.md

@@ -1,3 +1,3 @@
 ### Added
 
-- Add endpoint for getting pending deposits.
+- Add endpoint for getting pending deposits.

changelog/syjn99_cli-peer-address-format.md

@@ -1,3 +1,3 @@
 ### Added
 
-- Add acceptable address types for static peers
+- Add acceptable address types for static peers

changelog/tt_add_block_hash.md

@@ -1,3 +1,3 @@
 ### Added
 
-- Add request hash to header for builder: executable data to block
+- Add request hash to header for builder: executable data to block

changelog/tt_blob_by_range_electra_test.md

@@ -1,3 +1,3 @@
 ### Ignored
 
-- Add blobs by range electra test
+- Add blobs by range electra test

changelog/tt_fork_digest.md

@@ -1,3 +1,3 @@
 ### Ignored
 
-- Add more debugging information to mismatch fork digest error message
+- Add more debugging information to mismatch fork digest error message

changelog/tt_validate_block.md

@@ -1,3 +1,3 @@
 ### Changed
 
-- Validate blob sidecar re-order signature and bad parent block.
+- Validate blob sidecar re-order signature and bad parent block.

changelog/tt_validate_range.md

@@ -1,3 +1,3 @@
 ### Ignored
 
-- Add more debugging information to validate range debug message
+- Add more debugging information to validate range debug message

cmd/prysmctl/validator/testdata/change-operations-multiple.json

@@ -1 +1 @@
-[{"message":{"validator_index":"0","from_bls_pubkey":"0xa99a76ed7796f7be22d5b7e85deeb7c5677e88e511e0b337618f8c4eb61349b4bf2d153f649f7b53359fe8b94a38e44c","to_execution_address":"0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"},"signature":"0xb6e640f0fc58e9f22585dbf434b6a0e8fc36b98e2f2a963e158716cfc84034141289f7898027de1ec56754937f1a837e01c7b066a6a56af7a379f8aec823d050788a5ecc799e9bc39f73d45b7c389c961cbaace61823e4c7bf2f93bd06c03127"},{"message":{"validator_index":"1","from_bls_pubkey":"0xb89bebc699769726a318c8e9971bd3171297c61aea4a6578a7a4f94b547dcba5bac16a89108b6b6a1fe3695d1a874a0b","to_execution_address":"0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"},"signature":"0xa97103e15d3dbdaa75fb15cea782e4a11329eea77d155864ec682d7907b3b70c7771960bef7be1b1c4e08fe735888b950c1a22053f6049b35736f48e6dd018392efa3896c9e427ea4e100e86e9131b5ea2673388a4bf188407a630ba405b7dc5"}]
+[{"message":{"validator_index":"0","from_bls_pubkey":"0xa99a76ed7796f7be22d5b7e85deeb7c5677e88e511e0b337618f8c4eb61349b4bf2d153f649f7b53359fe8b94a38e44c","to_execution_address":"0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"},"signature":"0xb6e640f0fc58e9f22585dbf434b6a0e8fc36b98e2f2a963e158716cfc84034141289f7898027de1ec56754937f1a837e01c7b066a6a56af7a379f8aec823d050788a5ecc799e9bc39f73d45b7c389c961cbaace61823e4c7bf2f93bd06c03127"},{"message":{"validator_index":"1","from_bls_pubkey":"0xb89bebc699769726a318c8e9971bd3171297c61aea4a6578a7a4f94b547dcba5bac16a89108b6b6a1fe3695d1a874a0b","to_execution_address":"0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"},"signature":"0xa97103e15d3dbdaa75fb15cea782e4a11329eea77d155864ec682d7907b3b70c7771960bef7be1b1c4e08fe735888b950c1a22053f6049b35736f48e6dd018392efa3896c9e427ea4e100e86e9131b5ea2673388a4bf188407a630ba405b7dc5"}]

cmd/prysmctl/validator/testdata/change-operations-multiple_notfound.json

@@ -1 +1 @@
-[{"message":{"validator_index":"3","from_bls_pubkey":"0xa99a76ed7796f7be22d5b7e85deeb7c5677e88e511e0b337618f8c4eb61349b4bf2d153f649f7b53359fe8b94a38e44c","to_execution_address":"0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"},"signature":"0xb6e640f0fc58e9f22585dbf434b6a0e8fc36b98e2f2a963e158716cfc84034141289f7898027de1ec56754937f1a837e01c7b066a6a56af7a379f8aec823d050788a5ecc799e9bc39f73d45b7c389c961cbaace61823e4c7bf2f93bd06c03127"},{"message":{"validator_index":"5","from_bls_pubkey":"0xb89bebc699769726a318c8e9971bd3171297c61aea4a6578a7a4f94b547dcba5bac16a89108b6b6a1fe3695d1a874a0b","to_execution_address":"0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"},"signature":"0xa97103e15d3dbdaa75fb15cea782e4a11329eea77d155864ec682d7907b3b70c7771960bef7be1b1c4e08fe735888b950c1a22053f6049b35736f48e6dd018392efa3896c9e427ea4e100e86e9131b5ea2673388a4bf188407a630ba405b7dc5"}]
+[{"message":{"validator_index":"3","from_bls_pubkey":"0xa99a76ed7796f7be22d5b7e85deeb7c5677e88e511e0b337618f8c4eb61349b4bf2d153f649f7b53359fe8b94a38e44c","to_execution_address":"0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"},"signature":"0xb6e640f0fc58e9f22585dbf434b6a0e8fc36b98e2f2a963e158716cfc84034141289f7898027de1ec56754937f1a837e01c7b066a6a56af7a379f8aec823d050788a5ecc799e9bc39f73d45b7c389c961cbaace61823e4c7bf2f93bd06c03127"},{"message":{"validator_index":"5","from_bls_pubkey":"0xb89bebc699769726a318c8e9971bd3171297c61aea4a6578a7a4f94b547dcba5bac16a89108b6b6a1fe3695d1a874a0b","to_execution_address":"0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"},"signature":"0xa97103e15d3dbdaa75fb15cea782e4a11329eea77d155864ec682d7907b3b70c7771960bef7be1b1c4e08fe735888b950c1a22053f6049b35736f48e6dd018392efa3896c9e427ea4e100e86e9131b5ea2673388a4bf188407a630ba405b7dc5"}]

cmd/prysmctl/validator/testdata/change-operations.json

@@ -1 +1 @@
-[{"message":{"validator_index":"1","from_bls_pubkey":"0xb89bebc699769726a318c8e9971bd3171297c61aea4a6578a7a4f94b547dcba5bac16a89108b6b6a1fe3695d1a874a0b","to_execution_address":"0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"},"signature":"0xa97103e15d3dbdaa75fb15cea782e4a11329eea77d155864ec682d7907b3b70c7771960bef7be1b1c4e08fe735888b950c1a22053f6049b35736f48e6dd018392efa3896c9e427ea4e100e86e9131b5ea2673388a4bf188407a630ba405b7dc5"}]
+[{"message":{"validator_index":"1","from_bls_pubkey":"0xb89bebc699769726a318c8e9971bd3171297c61aea4a6578a7a4f94b547dcba5bac16a89108b6b6a1fe3695d1a874a0b","to_execution_address":"0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"},"signature":"0xa97103e15d3dbdaa75fb15cea782e4a11329eea77d155864ec682d7907b3b70c7771960bef7be1b1c4e08fe735888b950c1a22053f6049b35736f48e6dd018392efa3896c9e427ea4e100e86e9131b5ea2673388a4bf188407a630ba405b7dc5"}]

cmd/prysmctl/validator/testdata/staking-cli-change-operations-multiple.json

@@ -1 +1 @@
-[{"message":{"validator_index":"0","from_bls_pubkey":"a99a76ed7796f7be22d5b7e85deeb7c5677e88e511e0b337618f8c4eb61349b4bf2d153f649f7b53359fe8b94a38e44c","to_execution_address":"a94f5374fce5edbc8e2a8697c15331677e6ebf0b"},"signature":"b6e640f0fc58e9f22585dbf434b6a0e8fc36b98e2f2a963e158716cfc84034141289f7898027de1ec56754937f1a837e01c7b066a6a56af7a379f8aec823d050788a5ecc799e9bc39f73d45b7c389c961cbaace61823e4c7bf2f93bd06c03127", "metadata":{ "network_name": "mainnet", "genesis_validators_root": "4b363db94e286120d76eb905340fdd4e54bfe9f06bf33ff6cf5ad27f511bfe95", "deposit_cli_version": "2.4.0"}},{"message":{"validator_index":"1","from_bls_pubkey":"b89bebc699769726a318c8e9971bd3171297c61aea4a6578a7a4f94b547dcba5bac16a89108b6b6a1fe3695d1a874a0b","to_execution_address":"a94f5374fce5edbc8e2a8697c15331677e6ebf0b"},"signature":"a97103e15d3dbdaa75fb15cea782e4a11329eea77d155864ec682d7907b3b70c7771960bef7be1b1c4e08fe735888b950c1a22053f6049b35736f48e6dd018392efa3896c9e427ea4e100e86e9131b5ea2673388a4bf188407a630ba405b7dc5", "metadata":{ "network_name": "mainnet", "genesis_validators_root": "4b363db94e286120d76eb905340fdd4e54bfe9f06bf33ff6cf5ad27f511bfe95", "deposit_cli_version": "2.4.0"}}]
+[{"message":{"validator_index":"0","from_bls_pubkey":"a99a76ed7796f7be22d5b7e85deeb7c5677e88e511e0b337618f8c4eb61349b4bf2d153f649f7b53359fe8b94a38e44c","to_execution_address":"a94f5374fce5edbc8e2a8697c15331677e6ebf0b"},"signature":"b6e640f0fc58e9f22585dbf434b6a0e8fc36b98e2f2a963e158716cfc84034141289f7898027de1ec56754937f1a837e01c7b066a6a56af7a379f8aec823d050788a5ecc799e9bc39f73d45b7c389c961cbaace61823e4c7bf2f93bd06c03127", "metadata":{ "network_name": "mainnet", "genesis_validators_root": "4b363db94e286120d76eb905340fdd4e54bfe9f06bf33ff6cf5ad27f511bfe95", "deposit_cli_version": "2.4.0"}},{"message":{"validator_index":"1","from_bls_pubkey":"b89bebc699769726a318c8e9971bd3171297c61aea4a6578a7a4f94b547dcba5bac16a89108b6b6a1fe3695d1a874a0b","to_execution_address":"a94f5374fce5edbc8e2a8697c15331677e6ebf0b"},"signature":"a97103e15d3dbdaa75fb15cea782e4a11329eea77d155864ec682d7907b3b70c7771960bef7be1b1c4e08fe735888b950c1a22053f6049b35736f48e6dd018392efa3896c9e427ea4e100e86e9131b5ea2673388a4bf188407a630ba405b7dc5", "metadata":{ "network_name": "mainnet", "genesis_validators_root": "4b363db94e286120d76eb905340fdd4e54bfe9f06bf33ff6cf5ad27f511bfe95", "deposit_cli_version": "2.4.0"}}]

config/params/config.go

@@ -235,8 +235,8 @@ type BeaconChainConfig struct {
 	ExecutionEngineTimeoutValue uint64 // ExecutionEngineTimeoutValue defines the seconds to wait before timing out engine endpoints with execution payload execution semantics (newPayload, forkchoiceUpdated).
 
 	// Subnet value
-	BlobsidecarSubnetCount        uint64 `yaml:"BLOB_SIDECAR_SUBNET_COUNT" spec:"true"`         // BlobsidecarSubnetCount is the number of blobsidecar subnets used in the gossipsub protocol.
-	BlobsidecarSubnetCountElectra uint64 `yaml:"BLOB_SIDECAR_SUBNET_COUNT_ELECTRA" spec:"true"` // BlobsidecarSubnetCountElectra is the number of blobsidecar subnets used in the gossipsub protocol post Electra hard fork.
+	BlobsidecarSubnetCount        uint64 `yaml:"BLOB_SIDECAR_SUBNET_COUNT"`         // BlobsidecarSubnetCount is the number of blobsidecar subnets used in the gossipsub protocol.
+	BlobsidecarSubnetCountElectra uint64 `yaml:"BLOB_SIDECAR_SUBNET_COUNT_ELECTRA"` // BlobsidecarSubnetCountElectra is the number of blobsidecar subnets used in the gossipsub protocol post Electra hard fork.
 
 	// Values introduced in Deneb hard fork
 	MaxPerEpochActivationChurnLimit  uint64           `yaml:"MAX_PER_EPOCH_ACTIVATION_CHURN_LIMIT" spec:"true"`  // MaxPerEpochActivationChurnLimit is the maximum amount of churn allotted for validator activation.

config/params/testdata/e2e_config.yaml

@@ -123,5 +123,3 @@ CONFIG_NAME: "end-to-end"
 SLOTS_PER_EPOCH: 6
 EPOCHS_PER_ETH1_VOTING_PERIOD: 2
 MAX_SEED_LOOKAHEAD: 1
-
-

config/proposer/loader/testdata/bad-gas-value-proposer-settings.json

@@ -16,4 +16,3 @@
     }
   }
 }
-

config/proposer/loader/testdata/bad-prepare-beacon-proposer-config.json

@@ -1,4 +1,3 @@
 {
   "proposer_config": {
     "0xa057816155ad77931185101128655c0191bd0214c201ca48ed887f6c4c6adf334070efcd75140eada5ac83a92506dd7a": {
-

config/proposer/loader/testdata/default-only-proposer-config.json

@@ -3,4 +3,4 @@
     "fee_recipient": "0xAe967917c465db8578ca9024c205720b1a3651A9",
     "builder": {"enabled": true}
   }
-}
+}

config/proposer/loader/testdata/good-graffiti-settings.json

@@ -16,4 +16,4 @@
       "gas_limit": 40000000
     }
   }
-}
+}

config/proposer/loader/testdata/good-prepare-beacon-proposer-config.yaml

@@ -9,4 +9,4 @@ default_config:
   fee_recipient: '0x6e35733c5af9B61374A128e6F85f553aF09ff89A'
   builder:
     enabled: false
-    gas_limit: '30000000'
+    gas_limit: '30000000'

config/proposer/loader/testdata/someotherfile.json

@@ -1,3 +1,3 @@
 {
   "test": "123441"
-}
+}

contracts/deposit/abi.json

@@ -1 +1 @@
-[{"inputs":[],"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"bytes","name":"pubkey","type":"bytes"},{"indexed":false,"internalType":"bytes","name":"withdrawal_credentials","type":"bytes"},{"indexed":false,"internalType":"bytes","name":"amount","type":"bytes"},{"indexed":false,"internalType":"bytes","name":"signature","type":"bytes"},{"indexed":false,"internalType":"bytes","name":"index","type":"bytes"}],"name":"DepositEvent","type":"event"},{"inputs":[{"internalType":"bytes","name":"pubkey","type":"bytes"},{"internalType":"bytes","name":"withdrawal_credentials","type":"bytes"},{"internalType":"bytes","name":"signature","type":"bytes"},{"internalType":"bytes32","name":"deposit_data_root","type":"bytes32"}],"name":"deposit","outputs":[],"stateMutability":"payable","type":"function"},{"inputs":[],"name":"get_deposit_count","outputs":[{"internalType":"bytes","name":"","type":"bytes"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"get_deposit_root","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes4","name":"interfaceId","type":"bytes4"}],"name":"supportsInterface","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"pure","type":"function"}]
+[{"inputs":[],"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"bytes","name":"pubkey","type":"bytes"},{"indexed":false,"internalType":"bytes","name":"withdrawal_credentials","type":"bytes"},{"indexed":false,"internalType":"bytes","name":"amount","type":"bytes"},{"indexed":false,"internalType":"bytes","name":"signature","type":"bytes"},{"indexed":false,"internalType":"bytes","name":"index","type":"bytes"}],"name":"DepositEvent","type":"event"},{"inputs":[{"internalType":"bytes","name":"pubkey","type":"bytes"},{"internalType":"bytes","name":"withdrawal_credentials","type":"bytes"},{"internalType":"bytes","name":"signature","type":"bytes"},{"internalType":"bytes32","name":"deposit_data_root","type":"bytes32"}],"name":"deposit","outputs":[],"stateMutability":"payable","type":"function"},{"inputs":[],"name":"get_deposit_count","outputs":[{"internalType":"bytes","name":"","type":"bytes"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"get_deposit_root","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes4","name":"interfaceId","type":"bytes4"}],"name":"supportsInterface","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"pure","type":"function"}]

contracts/deposit/deposit_contract.sol

@@ -175,4 +175,4 @@ contract DepositContract is IDepositContract, ERC165 {
         ret[6] = bytesValue[1];
         ret[7] = bytesValue[0];
     }
-}
+}

distroless_deps.bzl

@@ -14,4 +14,3 @@ def distroless_deps():
         sum = "h1:9B623Cfs+mclYK6dsae7gLSwuIBHvlgmEup87qpqsAQ=",
         version = "v0.3.1-0.20230104082527-d6f58551be3f",
     )
-

hack/README.md

@@ -7,4 +7,4 @@ This subproject contains useful bash scripts for working with our repository. We
 
 This script generates the *.pb.go files from the *.proto files.
 After running `update-go-pbs.sh` keep only the *.pb.go for the protos that have changed before checking in.
-*Note*: the generated files may not have imports correctly linted and will need to be fixed to remote associated errors. 
+*Note*: the generated files may not have imports correctly linted and will need to be fixed to remote associated errors. 

hack/keymanager-api/README.md

@@ -22,4 +22,3 @@ Our keymanager API requires a valid bearer token to run the keymanager.
 You can retrieve this bearer token from the URL displayed when running `validator --web`
 i.e. `http://127.0.0.1:7500/initialize?token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.e30.BEuFWr-FpKIlJEIjgmujTQJlJF2aJRaUfFiuTBYVL3k`
 The token can be copied and pasted into the authorization tab of each Postman request to authenticate.
-

hack/keymanager-api/keymanager-api.postman_collection.json

@@ -234,4 +234,4 @@
 			"response": []
 		}
 	]
-}
+}

hack/latest_version_tag.sh

@@ -5,4 +5,3 @@ set -e
 git tag -l 'v*' --sort=creatordate |
     perl -nle 'if (/^v\d+\.\d+\.\d+$/) { print $_ }' |
     tail -n1
-

proto/eth/LICENSE

@@ -198,4 +198,4 @@
    distributed under the License is distributed on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
-   limitations under the License.
+   limitations under the License.

prysm.ps1

@@ -124,4 +124,4 @@ do {
     }
     
     $restart = (Test-Path env:PRYSM_AUTORESTART) -and $env:PRYSM_AUTORESTART -eq $TRUE -and $process.ExitCode -ne 0;
-} while ($restart)
+} while ($restart)

testing/benchmark/README.md

@@ -46,4 +46,4 @@ BenchmarkExecuteStateTransition_FullBlock-4           20	  2031438030 ns/op
 BenchmarkExecuteStateTransition_WithCache-4   	      20	  1857290454 ns/op
 BenchmarkHashTreeRoot_FullState-4   	              50	   297655834 ns/op
 BenchmarkHashTreeRootState_FullState-4                50           155535883 ns/op
-```
+```

testing/endtoend/lighthouse.BUILD

@@ -4,4 +4,4 @@ sh_binary(
         "lighthouse",
     ],
     visibility = ["//visibility:public"],
-)
+)

testing/endtoend/static-files/eth1/UTC--2021-12-22T19-14-08.590377700Z--878705ba3f8bc32fcf7f4caa1a35e72af65cf766

@@ -1 +1 @@
-{"address":"878705ba3f8bc32fcf7f4caa1a35e72af65cf766","crypto":{"cipher":"aes-128-ctr","ciphertext":"f02daebbf456faf787c5cd61a33ce780857c1ca10b00972aa451f0e9688e4ead","cipherparams":{"iv":"ef1668814155862f0653f15dae845e58"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":262144,"p":1,"r":8,"salt":"55e5ee70d3e882d2f00a073eda252ff01437abf51d7bfa76c06dcc73f7e8f1a3"},"mac":"d8d04625d0769fe286756734f946c78663961b74f0caaff1d768f0d255632f04"},"id":"5fb9083a-a221-412b-b0e0-921e22cc9645","version":3}
+{"address":"878705ba3f8bc32fcf7f4caa1a35e72af65cf766","crypto":{"cipher":"aes-128-ctr","ciphertext":"f02daebbf456faf787c5cd61a33ce780857c1ca10b00972aa451f0e9688e4ead","cipherparams":{"iv":"ef1668814155862f0653f15dae845e58"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":262144,"p":1,"r":8,"salt":"55e5ee70d3e882d2f00a073eda252ff01437abf51d7bfa76c06dcc73f7e8f1a3"},"mac":"d8d04625d0769fe286756734f946c78663961b74f0caaff1d768f0d255632f04"},"id":"5fb9083a-a221-412b-b0e0-921e22cc9645","version":3}

testing/spectest/exclusions.txt

@@ -118,4 +118,4 @@ tests/minimal/whisk/ssz_static/SyncCommitteeMessage
 tests/minimal/whisk/ssz_static/Validator
 tests/minimal/whisk/ssz_static/VoluntaryExit
 tests/minimal/whisk/ssz_static/WhiskTracker
-tests/minimal/whisk/ssz_static/Withdrawal
+tests/minimal/whisk/ssz_static/Withdrawal

third_party/hid/README.md

@@ -3,4 +3,4 @@
 This is a copy of github.com/karalabe/usb, except that it is fully disabled.
 
 The current karalabe/usb library requires a bit of handwritten cc_library targets. 
-This library isn't used in Prysm anyway, so it is disabled for now.
+This library isn't used in Prysm anyway, so it is disabled for now.

tools/analyzers/README.md

@@ -4,4 +4,4 @@ Analyzers' unit tests are ignored in bazel's build files, and therefore are not
 pipeline. Because of this they should be invoked manually when writing a new analyzer or making changes to an existing
 one. Otherwise, any issues will go unnoticed during the CI build.
 
-The easiest way to run all unit tests for all analyzers is  `go test ./tools/analyzers/...`
+The easiest way to run all unit tests for all analyzers is  `go test ./tools/analyzers/...`