From 349fcdd22d672fedc59a893e6ebb65349c3dfcdf Mon Sep 17 00:00:00 2001
From: Gealber Morales <48373523+Gealber@users.noreply.github.com>
Date: Sun, 9 Jun 2024 22:47:51 +0200
Subject: [PATCH 1/3] p2p/discover: add missing lock when calling
 tab.handleAddNode (#29960)

---
 p2p/discover/table.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/p2p/discover/table.go b/p2p/discover/table.go
index bb5ab4f3fc..8045f1389e 100644
--- a/p2p/discover/table.go
+++ b/p2p/discover/table.go
@@ -452,7 +452,9 @@ func (tab *Table) loadSeedNodes() {
 			addr, _ := seed.UDPEndpoint()
 			tab.log.Trace("Found seed node in database", "id", seed.ID(), "addr", addr, "age", age)
 		}
+		tab.mutex.Lock()
 		tab.handleAddNode(addNodeOp{node: seed, isInbound: false})
+		tab.mutex.Unlock()
 	}
 }
 

From 8bda6429637c6219be5e0965fab15810fed3dced Mon Sep 17 00:00:00 2001
From: Gealber Morales <48373523+Gealber@users.noreply.github.com>
Date: Sun, 9 Jun 2024 22:50:22 +0200
Subject: [PATCH 2/3] p2p: use package slices to sort in PeersInfo (#29957)

---
 p2p/server.go | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/p2p/server.go b/p2p/server.go
index 22e5f6cb94..172f0667eb 100644
--- a/p2p/server.go
+++ b/p2p/server.go
@@ -19,6 +19,7 @@ package p2p
 
 import (
 	"bytes"
+	"cmp"
 	"crypto/ecdsa"
 	"encoding/hex"
 	"errors"
@@ -1140,12 +1141,9 @@ func (srv *Server) PeersInfo() []*PeerInfo {
 		}
 	}
 	// Sort the result array alphabetically by node identifier
-	for i := 0; i < len(infos); i++ {
-		for j := i + 1; j < len(infos); j++ {
-			if infos[i].ID > infos[j].ID {
-				infos[i], infos[j] = infos[j], infos[i]
-			}
-		}
-	}
+	slices.SortFunc(infos, func(a, b *PeerInfo) int {
+		return cmp.Compare(a.ID, b.ID)
+	})
+
 	return infos
 }

From db273c8733309d415b0c1296aa8630e67930d16d Mon Sep 17 00:00:00 2001
From: jwasinger <j-wasinger@hotmail.com>
Date: Sun, 9 Jun 2024 22:58:50 -0700
Subject: [PATCH 3/3] core: initialize developer genesis beacon root contract
 with 0 balance (#29963)

---
 core/genesis.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/genesis.go b/core/genesis.go
index f1b4490f2e..4ca24807fc 100644
--- a/core/genesis.go
+++ b/core/genesis.go
@@ -594,7 +594,7 @@ func DeveloperGenesisBlock(gasLimit uint64, faucet *common.Address) *Genesis {
 			common.BytesToAddress([]byte{8}): {Balance: big.NewInt(1)}, // ECPairing
 			common.BytesToAddress([]byte{9}): {Balance: big.NewInt(1)}, // BLAKE2b
 			// Pre-deploy EIP-4788 system contract
-			params.BeaconRootsAddress: {Nonce: 1, Code: params.BeaconRootsCode},
+			params.BeaconRootsAddress: {Nonce: 1, Code: params.BeaconRootsCode, Balance: common.Big0},
 		},
 	}
 	if faucet != nil {