From 26355768a010206dd256758b6a4c1967033d7918 Mon Sep 17 00:00:00 2001
From: Preston Van Loon <pvanloon@offchainlabs.com>
Date: Fri, 3 May 2024 13:53:46 -0500
Subject: [PATCH] Spectest: v1.5.0-alpha.1 (#13934)

* Update spectests to v1.5.0-alpha.1

* Add PeerDAS config change
---
 WORKSPACE                                    | 10 +++++-----
 beacon-chain/rpc/eth/config/handlers_test.go |  5 ++++-
 config/params/config.go                      |  3 ++-
 config/params/mainnet_config.go              |  3 ++-
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/WORKSPACE b/WORKSPACE
index a5ef0bb3039a..da7bd4d6f0a8 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -227,7 +227,7 @@ filegroup(
     url = "https://github.com/ethereum/EIPs/archive/5480440fe51742ed23342b68cf106cefd427e39d.tar.gz",
 )
 
-consensus_spec_version = "v1.5.0-alpha.0"
+consensus_spec_version = "v1.5.0-alpha.1"
 
 bls_test_version = "v0.1.1"
 
@@ -243,7 +243,7 @@ filegroup(
     visibility = ["//visibility:public"],
 )
     """,
-    sha256 = "33c5547772b6d8d6f041dff7e7d26b0358c2392daed34394a3aa81147812a81c",
+    integrity = "sha256-bvbgNjfVVsqt3oGjfdsxXyfn33wq1Xwv1OlrVBXEea4=",
     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"],
 )
     """,
-    sha256 = "06f286199cf2fedd4700487fb8feb0904e0ae18daaa4b3f70ea430ca9c388167",
+    integrity = "sha256-6yhbVIiyE0GiLci9jYRFbq1dHhLxYiS4xnw+ZLE3XQ0=",
     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"],
 )
     """,
-    sha256 = "5f2a4452b323075eba6bf950003f7d91fd04ebcbde5bd087beafb5d6f6325ad4",
+    integrity = "sha256-Z3OBOudJhD1C1/1lpCu5ShiaLxq1QgXKs5ncLz537SY=",
     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"],
 )
     """,
-    sha256 = "fd7e83e8cbeb3e297f2aeb93776305f7d606272c97834d8d9be673984501ed36",
+    integrity = "sha256-+uaqIfJ7c2Uu+vQU5eYSzacEEWe1AixWWISycDU5ak4=",
     strip_prefix = "consensus-specs-" + consensus_spec_version[1:],
     url = "https://github.com/ethereum/consensus-specs/archive/refs/tags/%s.tar.gz" % consensus_spec_version,
 )
diff --git a/beacon-chain/rpc/eth/config/handlers_test.go b/beacon-chain/rpc/eth/config/handlers_test.go
index b269349c3960..813cc7de5aae 100644
--- a/beacon-chain/rpc/eth/config/handlers_test.go
+++ b/beacon-chain/rpc/eth/config/handlers_test.go
@@ -148,6 +148,7 @@ func TestGetSpec(t *testing.T) {
 	config.MaxAttesterSlashingsElectra = 88
 	config.MaxAttestationsElectra = 89
 	config.MaxWithdrawalRequestsPerPayload = 90
+	config.MaxCellsInExtendedMatrix = 91
 
 	var dbp [4]byte
 	copy(dbp[:], []byte{'0', '0', '0', '1'})
@@ -190,7 +191,7 @@ func TestGetSpec(t *testing.T) {
 	data, ok := resp.Data.(map[string]interface{})
 	require.Equal(t, true, ok)
 
-	assert.Equal(t, 152, len(data))
+	assert.Equal(t, 153, len(data))
 	for k, v := range data {
 		t.Run(k, func(t *testing.T) {
 			switch k {
@@ -521,6 +522,8 @@ func TestGetSpec(t *testing.T) {
 				assert.Equal(t, "89", v)
 			case "MAX_WITHDRAWAL_REQUESTS_PER_PAYLOAD":
 				assert.Equal(t, "90", v)
+			case "MAX_CELLS_IN_EXTENDED_MATRIX":
+				assert.Equal(t, "91", v)
 			default:
 				t.Errorf("Incorrect key: %s", k)
 			}
diff --git a/config/params/config.go b/config/params/config.go
index 6b3a07b64ec1..552ac2b9c603 100644
--- a/config/params/config.go
+++ b/config/params/config.go
@@ -270,7 +270,8 @@ type BeaconChainConfig struct {
 	NodeIdBits                      uint64          `yaml:"NODE_ID_BITS" spec:"true"`                       // NodeIdBits defines the bit length of a node id.
 
 	// PeerDAS
-	NumberOfColumns uint64 `yaml:"NUMBER_OF_COLUMNS" spec:"true"` // NumberOfColumns in the extended data matrix.
+	NumberOfColumns          uint64 `yaml:"NUMBER_OF_COLUMNS" spec:"true"`            // NumberOfColumns in the extended data matrix.
+	MaxCellsInExtendedMatrix uint64 `yaml:"MAX_CELLS_IN_EXTENDED_MATRIX" spec:"true"` // MaxCellsInExtendedMatrix is the full data of one-dimensional erasure coding extended blobs (in row major format).
 }
 
 // InitializeForkSchedule initializes the schedules forks baked into the config.
diff --git a/config/params/mainnet_config.go b/config/params/mainnet_config.go
index c7ba47f71812..098ceb5c7dea 100644
--- a/config/params/mainnet_config.go
+++ b/config/params/mainnet_config.go
@@ -310,7 +310,8 @@ var mainnetBeaconConfig = &BeaconChainConfig{
 	NodeIdBits:                      256,
 
 	// PeerDAS
-	NumberOfColumns: 128,
+	NumberOfColumns:          128,
+	MaxCellsInExtendedMatrix: 768,
 }
 
 // MainnetTestConfig provides a version of the mainnet config that has a different name