Update Config To Latest Value (#14352)

* Update values

* Update Spec To v1.5.0-alpha.5

* Fix Discovery Tests

* Hardcode Subnet Count For Tests

* Fix All Initial Sync Tests

* Gazelle

* Less Chaotic Service Initialization

* Gazelle

WORKSPACE

@@ -227,7 +227,7 @@ filegroup(
     url = "https://github.com/ethereum/EIPs/archive/5480440fe51742ed23342b68cf106cefd427e39d.tar.gz",
 )
 
-consensus_spec_version = "v1.5.0-alpha.4"
+consensus_spec_version = "v1.5.0-alpha.5"
 
 bls_test_version = "v0.1.1"
 
@@ -243,7 +243,7 @@ filegroup(
     visibility = ["//visibility:public"],
 )
     """,
-    integrity = "sha256-sSw6c9IR/ZiWjyk1cbfVGC/aUkId4r7+eSl3haWsq0E=",
+    integrity = "sha256-R9vG5HEL5eGMOAmbkKfJ2jfelNqL5V0xBUPiXOiGM6U=",
     url = "https://github.com/ethereum/consensus-spec-tests/releases/download/%s/general.tar.gz" % consensus_spec_version,
 )
 
@@ -259,7 +259,7 @@ filegroup(
     visibility = ["//visibility:public"],
 )
     """,
-    integrity = "sha256-OGlKhbA6TjTP0p1ojXVCJPzLEHJzewKkhAa+PQggoiU=",
+    integrity = "sha256-AEIiEOlf1XuxoRMCsN+kgJMo4LrS05+biTA1p/7Ro00=",
     url = "https://github.com/ethereum/consensus-spec-tests/releases/download/%s/minimal.tar.gz" % consensus_spec_version,
 )
 
@@ -275,7 +275,7 @@ filegroup(
     visibility = ["//visibility:public"],
 )
     """,
-    integrity = "sha256-ah2Gj4ci5hw5vQgpUWkNjEQutoBCepg5jcpTi0DKVB0=",
+    integrity = "sha256-LH/Xr20yrJRYnbpjRGupMWTIOWt3cpxZJWXgThwVDsk=",
     url = "https://github.com/ethereum/consensus-spec-tests/releases/download/%s/mainnet.tar.gz" % consensus_spec_version,
 )
 
@@ -290,7 +290,7 @@ filegroup(
     visibility = ["//visibility:public"],
 )
     """,
-    integrity = "sha256-I+llAsIF6lPP8RUtZ2DFsJqtCs4UPh+st3hFs12FWpY=",
+    integrity = "sha256-mlytz4MPjKh0DwV7FMiAtnRbJw9B6o78/x66/vmnYc8=",
     strip_prefix = "consensus-specs-" + consensus_spec_version[1:],
     url = "https://github.com/ethereum/consensus-specs/archive/refs/tags/%s.tar.gz" % consensus_spec_version,
 )

beacon-chain/p2p/discovery_test.go

@@ -237,7 +237,7 @@ func TestCreateLocalNode(t *testing.T) {
 			// Check custody_subnet_count config.
 			custodySubnetCount := new(uint64)
 			require.NoError(t, localNode.Node().Record().Load(enr.WithEntry(peerdas.CustodySubnetCountEnrKey, custodySubnetCount)))
-			require.Equal(t, uint64(1), *custodySubnetCount)
+			require.Equal(t, params.BeaconConfig().CustodyRequirement, *custodySubnetCount)
 		})
 	}
 }
@@ -565,7 +565,7 @@ func TestRefreshPersistentSubnets(t *testing.T) {
 		eip7594ForkEpoch = 10
 	)
 
-	custodySubnetCount := uint64(1)
+	custodySubnetCount := params.BeaconConfig().CustodyRequirement
 
 	// Set up epochs.
 	defaultCfg := params.BeaconConfig()

beacon-chain/p2p/testing/p2p.go

@@ -46,6 +46,7 @@ const (
 type TestP2P struct {
 	t               *testing.T
 	BHost           host.Host
+	EnodeID         enode.ID
 	pubsub          *pubsub.PubSub
 	joinedTopics    map[string]*pubsub.Topic
 	BroadcastCalled atomic.Bool
@@ -277,8 +278,8 @@ func (*TestP2P) ENR() *enr.Record {
 }
 
 // NodeID returns the node id of the local peer.
-func (*TestP2P) NodeID() enode.ID {
-	return [32]byte{}
+func (p *TestP2P) NodeID() enode.ID {
+	return p.EnodeID
 }
 
 // DiscoveryAddresses --

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

@@ -491,7 +491,7 @@ func TestGetSpec(t *testing.T) {
 			case "MAX_PER_EPOCH_ACTIVATION_EXIT_CHURN_LIMIT":
 				assert.Equal(t, "256000000000", v)
 			case "DATA_COLUMN_SIDECAR_SUBNET_COUNT":
-				assert.Equal(t, "32", v)
+				assert.Equal(t, "128", v)
 			case "MAX_REQUEST_DATA_COLUMN_SIDECARS":
 				assert.Equal(t, "16384", v)
 			case "MIN_SLASHING_PENALTY_QUOTIENT_ELECTRA":

beacon-chain/sync/data_columns_sampling_test.go

@@ -5,6 +5,7 @@ import (
 	"context"
 	"crypto/sha256"
 	"encoding/binary"
+	"fmt"
 	"testing"
 
 	"github.com/consensys/gnark-crypto/ecc/bls12-381/fr"
@@ -204,12 +205,14 @@ func TestDataColumnSampler1D_PeerManagement(t *testing.T) {
 	testCases := []struct {
 		numPeers           int
 		custodyRequirement uint64
+		subnetCount        uint64
 		expectedColumns    [][]uint64
 		prunePeers         map[int]bool // Peers to prune.
 	}{
 		{
 			numPeers:           3,
 			custodyRequirement: 1,
+			subnetCount:        32,
 			expectedColumns: [][]uint64{
 				{6, 38, 70, 102},
 				{3, 35, 67, 99},
@@ -222,6 +225,7 @@ func TestDataColumnSampler1D_PeerManagement(t *testing.T) {
 		{
 			numPeers:           3,
 			custodyRequirement: 2,
+			subnetCount:        32,
 			expectedColumns: [][]uint64{
 				{6, 16, 38, 48, 70, 80, 102, 112},
 				{3, 13, 35, 45, 67, 77, 99, 109},
@@ -233,7 +237,12 @@ func TestDataColumnSampler1D_PeerManagement(t *testing.T) {
 		},
 	}
 
+	params.SetupTestConfigCleanup(t)
 	for _, tc := range testCases {
+		cfg := params.BeaconConfig()
+		cfg.CustodyRequirement = tc.custodyRequirement
+		cfg.DataColumnSidecarSubnetCount = tc.subnetCount
+		params.OverrideBeaconConfig(cfg)
 		test, sampler := setupDataColumnSamplerTest(t, uint64(tc.numPeers))
 		for i := 0; i < tc.numPeers; i++ {
 			p := createAndConnectPeer(t, test.p2pSvc, test.chainSvc, test.dataColumnSidecars, tc.custodyRequirement, nil, i+1)
@@ -283,12 +292,14 @@ func TestDataColumnSampler1D_SampleDistribution(t *testing.T) {
 	testCases := []struct {
 		numPeers             int
 		custodyRequirement   uint64
+		subnetCount          uint64
 		columnsToDistribute  [][]uint64
 		expectedDistribution []map[int][]uint64
 	}{
 		{
 			numPeers:           3,
 			custodyRequirement: 1,
+			subnetCount:        32,
 			// peer custody maps
 			// p0: {6, 38, 70, 102},
 			// p1: {3, 35, 67, 99},
@@ -319,6 +330,7 @@ func TestDataColumnSampler1D_SampleDistribution(t *testing.T) {
 		{
 			numPeers:           3,
 			custodyRequirement: 2,
+			subnetCount:        32,
 			// peer custody maps
 			// p0: {6, 16, 38, 48, 70, 80, 102, 112},
 			// p1: {3, 13, 35, 45, 67, 77, 99, 109},
@@ -341,8 +353,12 @@ func TestDataColumnSampler1D_SampleDistribution(t *testing.T) {
 			},
 		},
 	}
-
+	params.SetupTestConfigCleanup(t)
 	for _, tc := range testCases {
+		cfg := params.BeaconConfig()
+		cfg.CustodyRequirement = tc.custodyRequirement
+		cfg.DataColumnSidecarSubnetCount = tc.subnetCount
+		params.OverrideBeaconConfig(cfg)
 		test, sampler := setupDataColumnSamplerTest(t, uint64(tc.numPeers))
 		for i := 0; i < tc.numPeers; i++ {
 			p := createAndConnectPeer(t, test.p2pSvc, test.chainSvc, test.dataColumnSidecars, tc.custodyRequirement, nil, i+1)
@@ -352,7 +368,7 @@ func TestDataColumnSampler1D_SampleDistribution(t *testing.T) {
 
 		for idx, columns := range tc.columnsToDistribute {
 			result := sampler.distributeSamplesToPeer(columns)
-			require.Equal(t, len(tc.expectedDistribution[idx]), len(result))
+			require.Equal(t, len(tc.expectedDistribution[idx]), len(result), fmt.Sprintf("%v - %v", tc.expectedDistribution[idx], result))
 
 			for peerIdx, dist := range tc.expectedDistribution[idx] {
 				for _, column := range dist {
@@ -365,6 +381,10 @@ func TestDataColumnSampler1D_SampleDistribution(t *testing.T) {
 }
 
 func TestDataColumnSampler1D_SampleDataColumns(t *testing.T) {
+	params.SetupTestConfigCleanup(t)
+	cfg := params.BeaconConfig()
+	cfg.DataColumnSidecarSubnetCount = 32
+	params.OverrideBeaconConfig(cfg)
 	test, sampler := setupDefaultDataColumnSamplerTest(t)
 	sampler.refreshPeerInfo()
 
@@ -392,6 +412,11 @@ func TestDataColumnSampler1D_SampleDataColumns(t *testing.T) {
 }
 
 func TestDataColumnSampler1D_IncrementalDAS(t *testing.T) {
+	params.SetupTestConfigCleanup(t)
+	cfg := params.BeaconConfig()
+	cfg.DataColumnSidecarSubnetCount = 32
+	params.OverrideBeaconConfig(cfg)
+
 	testCases := []struct {
 		name                     string
 		samplesCount             uint64
@@ -451,9 +476,9 @@ func TestDataColumnSampler1D_IncrementalDAS(t *testing.T) {
 
 	for _, tc := range testCases {
 		test, sampler := setupDataColumnSamplerTest(t, 3)
-		p1 := createAndConnectPeer(t, test.p2pSvc, test.chainSvc, test.dataColumnSidecars, 1, tc.columnsNotToRespond, 1)
-		p2 := createAndConnectPeer(t, test.p2pSvc, test.chainSvc, test.dataColumnSidecars, 1, tc.columnsNotToRespond, 2)
-		p3 := createAndConnectPeer(t, test.p2pSvc, test.chainSvc, test.dataColumnSidecars, 1, tc.columnsNotToRespond, 3)
+		p1 := createAndConnectPeer(t, test.p2pSvc, test.chainSvc, test.dataColumnSidecars, params.BeaconConfig().CustodyRequirement, tc.columnsNotToRespond, 1)
+		p2 := createAndConnectPeer(t, test.p2pSvc, test.chainSvc, test.dataColumnSidecars, params.BeaconConfig().CustodyRequirement, tc.columnsNotToRespond, 2)
+		p3 := createAndConnectPeer(t, test.p2pSvc, test.chainSvc, test.dataColumnSidecars, params.BeaconConfig().CustodyRequirement, tc.columnsNotToRespond, 3)
 		test.peers = []*p2ptest.TestP2P{p1, p2, p3}
 
 		sampler.refreshPeerInfo()