Merge branch 'dev' into gossip-and-non-gossip-wording

ethereum · Dec 18, 2024 · 28cb6b4 · 28cb6b4
2 parents a58b1f5 + 287c87f
commit 28cb6b4
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 7 deletions.
diff --git a/specs/_features/whisk/beacon-chain.md b/specs/_features/whisk/beacon-chain.md
@@ -54,7 +54,7 @@ This document details the beacon chain additions and changes of to support the W
 | `WHISK_PROPOSER_TRACKERS_COUNT`    | `uint64(2**13)` (= 8,192)  | number of proposer trackers                                 |
 | `WHISK_VALIDATORS_PER_SHUFFLE`     | `uint64(2**7 - 4)` (= 124) | number of validators shuffled per shuffle step              |
 | `WHISK_MAX_SHUFFLE_PROOF_SIZE`     | `uint64(2**15)`            | max size of a shuffle proof                                 |
-| `WHISK_MAX_OPENING_PROOF_SIZE`     | `uint64(2**10)`            | max size of a opening proof                                 |
+| `WHISK_MAX_OPENING_PROOF_SIZE`     | `uint64(2**10)`            | max size of an opening proof                                |
 
 ## Configuration
 

diff --git a/specs/electra/p2p-interface.md b/specs/electra/p2p-interface.md
@@ -14,6 +14,7 @@
       - [Global topics](#global-topics)
         - [`beacon_block`](#beacon_block)
         - [`beacon_aggregate_and_proof`](#beacon_aggregate_and_proof)
+        - [`blob_sidecar_{subnet_id}`](#blob_sidecar_subnet_id)
       - [Attestation subnets](#attestation-subnets)
         - [`beacon_attestation_{subnet_id}`](#beacon_attestation_subnet_id)
   - [The Req/Resp domain](#the-reqresp-domain)
@@ -77,6 +78,14 @@ The following validations are added:
 * [REJECT] `len(committee_indices) == 1`, where `committee_indices = get_committee_indices(aggregate)`.
 * [REJECT] `aggregate.data.index == 0`
 
+###### `blob_sidecar_{subnet_id}`
+
+*[Modified in Electra:EIP7691]*
+
+The existing validations all apply as given from previous forks, with the following exceptions:
+
+* Uses of `MAX_BLOBS_PER_BLOCK` in existing validations are replaced with `MAX_BLOBS_PER_BLOCK_ELECTRA`.
+
 ##### Attestation subnets
 
 ###### `beacon_attestation_{subnet_id}`

diff --git a/tests/core/pyspec/eth2spec/gen_helpers/README.md b/tests/core/pyspec/eth2spec/gen_helpers/README.md
@@ -26,7 +26,7 @@ Options:
 
 ## `gen_from_tests`
 
-This is an util to derive tests from a tests source file.
+This is a util to derive tests from a tests source file.
 
 This requires the tests to yield test-case-part outputs. These outputs are then written to the test case directory.
 Yielding data is illegal in normal pytests, so it is only done when in "generator mode".

diff --git a/tests/formats/fork_choice/README.md b/tests/formats/fork_choice/README.md
@@ -156,10 +156,10 @@ value that Execution Layer client mock returns in responses to the following Eng
 The checks to verify the current status of `store`.
 
 ```yaml
-checks: {<store_attibute>: value}  -- the assertions.
+checks: {<store_attribute>: value}  -- the assertions.
 ```
 
-`<store_attibute>` is the field member or property of [`Store`](../../../specs/phase0/fork-choice.md#store) object that maintained by client implementation. The fields include:
+`<store_attribute>` is the field member or property of [`Store`](../../../specs/phase0/fork-choice.md#store) object that maintained by client implementation. The fields include:
 
 ```yaml
 head: {

diff --git a/tests/formats/light_client/sync.md b/tests/formats/light_client/sync.md
@@ -48,7 +48,7 @@ should be executed with the specified parameters:
 ```yaml
 {
     current_slot: int                  -- integer, decimal
-    checks: {<store_attibute>: value}  -- the assertions.
+    checks: {<store_attribute>: value}  -- the assertions.
 }
 ```
 
@@ -64,7 +64,7 @@ The function `process_light_client_update(store, update, current_slot, genesis_v
     update: string                     -- name of the `*.ssz_snappy` file to load
                                           as a `LightClientUpdate` object
     current_slot: int                  -- integer, decimal
-    checks: {<store_attibute>: value}  -- the assertions.
+    checks: {<store_attribute>: value}  -- the assertions.
 }
 ```
 
@@ -79,7 +79,7 @@ The `store` should be upgraded to reflect the new `store_fork_digest`:
 ```yaml
 {
     store_fork_digest: string          -- Encoded `ForkDigest`-context of `store`
-    checks: {<store_attibute>: value}  -- the assertions.
+    checks: {<store_attribute>: value}  -- the assertions.
 }
 ```