Merge branch 'develop' into close-test-host

beacon-chain/db/kv/archived_point.go

@@ -29,13 +29,10 @@ func (s *Store) LastArchivedRoot(ctx context.Context) [32]byte {
 	_, span := trace.StartSpan(ctx, "BeaconDB.LastArchivedRoot")
 	defer span.End()
 
-	blockRoot := make([]byte, 0, 32)
+	var blockRoot []byte
 	if err := s.db.View(func(tx *bolt.Tx) error {
 		bkt := tx.Bucket(stateSlotIndicesBucket)
-		_, br := bkt.Cursor().Last()
-		if len(br) > 0 {
-			copy(blockRoot, br)
-		}
+		_, blockRoot = bkt.Cursor().Last()
 		return nil
 	}); err != nil { // This view never returns an error, but we'll handle anyway for sanity.
 		panic(err) // lint:nopanic -- View never returns an error.
@@ -50,13 +47,10 @@ func (s *Store) ArchivedPointRoot(ctx context.Context, slot primitives.Slot) [32
 	_, span := trace.StartSpan(ctx, "BeaconDB.ArchivedPointRoot")
 	defer span.End()
 
-	blockRoot := make([]byte, 0, 32)
+	var blockRoot []byte
 	if err := s.db.View(func(tx *bolt.Tx) error {
 		bucket := tx.Bucket(stateSlotIndicesBucket)
-		br := bucket.Get(bytesutil.SlotToBytesBigEndian(slot))
-		if len(br) > 0 {
-			copy(blockRoot, br)
-		}
+		blockRoot = bucket.Get(bytesutil.SlotToBytesBigEndian(slot))
 		return nil
 	}); err != nil { // This view never returns an error, but we'll handle anyway for sanity.
 		panic(err) // lint:nopanic -- View never returns an error.

beacon-chain/db/kv/blocks.go

@@ -809,17 +809,14 @@ func (s *Store) HighestRootsBelowSlot(ctx context.Context, slot primitives.Slot)
 func (s *Store) FeeRecipientByValidatorID(ctx context.Context, id primitives.ValidatorIndex) (common.Address, error) {
 	ctx, span := trace.StartSpan(ctx, "BeaconDB.FeeRecipientByValidatorID")
 	defer span.End()
-	addr := make([]byte, 0, 20)
+	var addr []byte
 	err := s.db.View(func(tx *bolt.Tx) error {
 		bkt := tx.Bucket(feeRecipientBucket)
-		stored := bkt.Get(bytesutil.Uint64ToBytesBigEndian(uint64(id)))
-		if len(stored) > 0 {
-			copy(addr, stored)
-		}
+		addr = bkt.Get(bytesutil.Uint64ToBytesBigEndian(uint64(id)))
 		// IF the fee recipient is not found in the standard fee recipient bucket, then
 		// check the registration bucket. The fee recipient may be there.
 		// This is to resolve imcompatility until we fully migrate to the registration bucket.
-		if len(addr) == 0 {
+		if addr == nil {
 			bkt = tx.Bucket(registrationBucket)
 			enc := bkt.Get(bytesutil.Uint64ToBytesBigEndian(uint64(id)))
 			if enc == nil {
@@ -829,7 +826,7 @@ func (s *Store) FeeRecipientByValidatorID(ctx context.Context, id primitives.Val
 			if err := decode(ctx, enc, reg); err != nil {
 				return err
 			}
-			copy(addr, reg.FeeRecipient)
+			addr = reg.FeeRecipient
 		}
 		return nil
 	})

beacon-chain/db/kv/deposit_contract.go

@@ -14,13 +14,10 @@ import (
 func (s *Store) DepositContractAddress(ctx context.Context) ([]byte, error) {
 	_, span := trace.StartSpan(ctx, "BeaconDB.DepositContractAddress")
 	defer span.End()
-	addr := make([]byte, 0, 20)
+	var addr []byte
 	if err := s.db.View(func(tx *bolt.Tx) error {
 		chainInfo := tx.Bucket(chainMetadataBucket)
-		stored := chainInfo.Get(depositContractAddressKey)
-		if len(stored) > 0 {
-			copy(addr, stored)
-		}
+		addr = chainInfo.Get(depositContractAddressKey)
 		return nil
 	}); err != nil { // This view never returns an error, but we'll handle anyway for sanity.
 		panic(err) // lint:nopanic -- View never returns an error.

beacon-chain/db/kv/migration_state_validators.go

@@ -199,8 +199,7 @@ func performValidatorStateMigration(ctx context.Context, bar *progressbar.Progre
 func stateBucketKeys(stateBucket *bolt.Bucket) ([][]byte, error) {
 	var keys [][]byte
 	if err := stateBucket.ForEach(func(pubKey, v []byte) error {
-		keyCopy := bytes.Clone(pubKey)
-		keys = append(keys, keyCopy)
+		keys = append(keys, pubKey)
 		return nil
 	}); err != nil {
 		return nil, err

beacon-chain/db/kv/state_diff.go

@@ -2,7 +2,6 @@ package kv
 
 import (
 	"context"
-	"slices"
 
 	"github.com/OffchainLabs/prysm/v7/beacon-chain/state"
 	"github.com/OffchainLabs/prysm/v7/cmd/beacon-chain/flags"
@@ -188,23 +187,20 @@ func (s *Store) getDiff(lvl int, slot uint64) (hdiff.HdiffBytes, error) {
 			return bolt.ErrBucketNotFound
 		}
 		buf := append(key, stateSuffix...)
-		rawStateDiff := bucket.Get(buf)
-		if len(rawStateDiff) == 0 {
+		stateDiff = bucket.Get(buf)
+		if stateDiff == nil {
 			return errors.New("state diff not found")
 		}
-		stateDiff = slices.Clone(rawStateDiff)
 		buf = append(key, validatorSuffix...)
-		rawValidatorDiff := bucket.Get(buf)
-		if len(rawValidatorDiff) == 0 {
+		validatorDiff = bucket.Get(buf)
+		if validatorDiff == nil {
 			return errors.New("validator diff not found")
 		}
-		validatorDiff = slices.Clone(rawValidatorDiff)
 		buf = append(key, balancesSuffix...)
-		rawBalancesDiff := bucket.Get(buf)
-		if len(rawBalancesDiff) == 0 {
+		balancesDiff = bucket.Get(buf)
+		if balancesDiff == nil {
 			return errors.New("balances diff not found")
 		}
-		balancesDiff = slices.Clone(rawBalancesDiff)
 		return nil
 	})
 
@@ -228,11 +224,10 @@ func (s *Store) getFullSnapshot(slot uint64) (state.BeaconState, error) {
 		if bucket == nil {
 			return bolt.ErrBucketNotFound
 		}
-		rawEnc := bucket.Get(key)
-		if rawEnc == nil {
+		enc = bucket.Get(key)
+		if enc == nil {
 			return errors.New("state not found")
 		}
-		enc = slices.Clone(rawEnc)
 		return nil
 	})
 

beacon-chain/db/kv/state_summary.go

@@ -2,7 +2,6 @@ package kv
 
 import (
 	"context"
-	"slices"
 
 	"github.com/OffchainLabs/prysm/v7/encoding/bytesutil"
 	"github.com/OffchainLabs/prysm/v7/monitoring/tracing/trace"
@@ -48,11 +47,7 @@ func (s *Store) StateSummary(ctx context.Context, blockRoot [32]byte) (*ethpb.St
 	}
 	var enc []byte
 	if err := s.db.View(func(tx *bolt.Tx) error {
-		rawEnc := tx.Bucket(stateSummaryBucket).Get(blockRoot[:])
-		if len(rawEnc) == 0 {
-			return nil
-		}
-		enc = slices.Clone(rawEnc)
+		enc = tx.Bucket(stateSummaryBucket).Get(blockRoot[:])
 		return nil
 	}); err != nil {
 		return nil, err

beacon-chain/p2p/testing/p2p.go

@@ -138,6 +138,9 @@ func connect(a, b host.Host) error {
 func (p *TestP2P) ReceiveRPC(topic string, msg proto.Message) {
 	h, err := libp2p.New(libp2p.ResourceManager(&network.NullResourceManager{}))
 	require.NoError(p.t, err)
+	defer func() {
+		require.NoError(p.t, h.Close())
+	}()
 	if err := connect(h, p.BHost); err != nil {
 		p.t.Fatalf("Failed to connect two peers for RPC: %v", err)
 	}
@@ -169,6 +172,9 @@ func (p *TestP2P) ReceiveRPC(topic string, msg proto.Message) {
 func (p *TestP2P) ReceivePubSub(topic string, msg proto.Message) {
 	h, err := libp2p.New(libp2p.ResourceManager(&network.NullResourceManager{}))
 	require.NoError(p.t, err)
+	defer func() {
+		require.NoError(p.t, h.Close())
+	}()
 	ps, err := pubsub.NewFloodSub(context.Background(), h,
 		pubsub.WithMessageSigning(false),
 		pubsub.WithStrictSignatureVerification(false),

changelog/satushh-close-host.md

@@ -0,0 +1,2 @@
+### Added
+- Close opened host in test helpers