Merge remote-tracking branch 'upstream/dev' into cl-drives-blob-limit

Author: jtraglia

.github/workflows/docs.yml

@@ -3,7 +3,7 @@ name: Publish docs
 on:
   push:
     branches:
-      - master 
+      - master
 permissions:
   contents: write
 jobs:

.github/workflows/run-tests.yml

@@ -69,6 +69,18 @@ jobs:
       - name: Run linter for test generators
         run: make lint_generators
 
+  whitespace:
+    runs-on: [self-hosted-ghr-custom, size-l-x64, profile-consensusSpecs]
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Check for trailing whitespace
+        run: |
+          if git grep -n '[[:blank:]]$'; then
+            echo "Trailing whitespace found. Please fix it."
+            exit 1
+          fi
+
   pyspec-tests:
     runs-on: [self-hosted-ghr-custom, size-xl-x64, profile-consensusSpecs]
     needs: [lint,codespell,table_of_contents]
@@ -124,4 +136,10 @@ jobs:
       - name: Install pyspec requirements
         run: make install_test
       - name: Run generators with --modcheck
-        run: make generate_tests modcheck=true
+        run: make generate_tests modcheck=true 2>&1 | tee consensustestgen.log
+      - name: Check for errors
+        run: |
+          if grep -q "\[ERROR\]" consensustestgen.log; then
+            echo "There is an error in the log"
+            exit 1
+          fi

configs/README.md

@@ -1,7 +1,7 @@
 # Configurations
 
 This directory contains a set of configurations used for testing, testnets, and mainnet.
-A client binary may be compiled for a specific `PRESET_BASE`, 
+A client binary may be compiled for a specific `PRESET_BASE`,
 and then load different configurations around that preset to participate in different networks or tests.
 
 Standard configs:
@@ -24,7 +24,7 @@ In this case, the suffix on the new variable may be removed, and the old variabl
 
 A previous iteration of forking made use of "timelines", but this collides with the definitions used in the spec (variables for special forking slots, etc.), and was not integrated sufficiently in any of the spec tools or implementations.
 Instead, the config essentially doubles as fork definition now, e.g. changing the value for `ALTAIR_FORK_EPOCH` changes the fork.
- 
+
 ## Format
 
 Each preset and configuration is a key-value mapping.

configs/mainnet.yaml

@@ -161,11 +161,11 @@ WHISK_PROPOSER_SELECTION_GAP: 2
 
 # EIP7594
 NUMBER_OF_COLUMNS: 128
+NUMBER_OF_CUSTODY_GROUPS: 128
 DATA_COLUMN_SIDECAR_SUBNET_COUNT: 128
 MAX_REQUEST_DATA_COLUMN_SIDECARS: 16384
 SAMPLES_PER_SLOT: 8
 CUSTODY_REQUIREMENT: 4
-BLOB_SIDECAR_SUBNET_COUNT_EIP7594: 8
 MAX_BLOBS_PER_BLOCK_EIP7594: 8
 # `MAX_REQUEST_BLOCKS_DENEB * MAX_BLOBS_PER_BLOCK_EIP7594`
 MAX_REQUEST_BLOB_SIDECARS_EIP7594: 1024

configs/minimal.yaml

@@ -160,11 +160,11 @@ WHISK_PROPOSER_SELECTION_GAP: 1
 
 # EIP7594
 NUMBER_OF_COLUMNS: 128
+NUMBER_OF_CUSTODY_GROUPS: 128
 DATA_COLUMN_SIDECAR_SUBNET_COUNT: 128
 MAX_REQUEST_DATA_COLUMN_SIDECARS: 16384
 SAMPLES_PER_SLOT: 8
 CUSTODY_REQUIREMENT: 4
-BLOB_SIDECAR_SUBNET_COUNT_EIP7594: 8
 MAX_BLOBS_PER_BLOCK_EIP7594: 8
 # `MAX_REQUEST_BLOCKS_DENEB * MAX_BLOBS_PER_BLOCK_EIP7594`
 MAX_REQUEST_BLOB_SIDECARS_EIP7594: 1024

docs/docs/templates/beacon-chain-template.md

@@ -66,19 +66,3 @@ class CONTAINER_NAME(Container):
 
 
 ### Block processing
-
-    
-
-    
-## Testing
-
-*Note*: The function `initialize_beacon_state_from_eth1` is modified for pure <FORK_NAME> testing only.
-
-```python
-def initialize_beacon_state_from_eth1(eth1_block_hash: Hash32,
-                                      eth1_timestamp: uint64,
-                                      deposits: Sequence[Deposit],
-                                      execution_payload_header: ExecutionPayloadHeader=ExecutionPayloadHeader()
-                                      ) -> BeaconState:
-    ...
-```

mkdocs.yml

@@ -7,7 +7,7 @@ theme:
     - scheme: default
       primary: black
       toggle:
-        icon: material/brightness-7 
+        icon: material/brightness-7
         name: Switch to dark mode
     - scheme: slate
       primary: black

presets/mainnet/eip6800.yaml

@@ -2,7 +2,7 @@
 
 # Misc
 # ---------------------------------------------------------------
-# `uint64(2**16)` (= 65,536) 
+# `uint64(2**16)` (= 65,536)
 MAX_STEMS: 65536
 # `uint64(33)`
 MAX_COMMITMENTS_PER_STEM: 33

presets/mainnet/electra.yaml

@@ -29,8 +29,8 @@ WHISTLEBLOWER_REWARD_QUOTIENT_ELECTRA: 4096
 MAX_ATTESTER_SLASHINGS_ELECTRA: 1
 # `uint64(2**3)` (= 8)
 MAX_ATTESTATIONS_ELECTRA: 8
-# `uint64(2**0)` (= 1)
-MAX_CONSOLIDATION_REQUESTS_PER_PAYLOAD: 1
+# `uint64(2**1)` (= 2)
+MAX_CONSOLIDATION_REQUESTS_PER_PAYLOAD: 2
 
 # Execution
 # ---------------------------------------------------------------

presets/minimal/eip6800.yaml

@@ -2,7 +2,7 @@
 
 # Execution
 # ---------------------------------------------------------------
-# `uint64(2**16)` (= 65,536) 
+# `uint64(2**16)` (= 65,536)
 MAX_STEMS: 65536
 # `uint64(33)`
 MAX_COMMITMENTS_PER_STEM: 33