Merge pull request ethereum#4157 from jtraglia/fix-test-gen

Fix some testgen issues related to computed constants

Author: jtraglia

specs/_deprecated/das/das-core.md

@@ -103,7 +103,7 @@ Implementations:
 
 ```python
 def recover_data(data: Sequence[Optional[Sequence[Point]]]) -> Sequence[Point]:
-    """Given an a subset of half or more of subgroup-aligned ranges of values, recover the None values."""
+    """Given a subset of half or more of subgroup-aligned ranges of values, recover the None values."""
     ...
 ```
 

specs/_features/eip7732/builder.md

@@ -114,7 +114,7 @@ To construct the `execution_payload_envelope` the builder must perform the follo
 2. Set the `builder_index` field to be the validator index of the builder performing these steps. This field **MUST** be `header.builder_index`.
 3. Set `beacon_block_root` to be the `hash_tree_root` of the corresponding beacon block.
 4. Set `blob_kzg_commitments` to be the `commitments` field of the blobs bundle constructed when constructing the bid. This field **MUST** have a `hash_tree_root` equal to `header.blob_kzg_commitments_root`.
-5. Set `payload_witheld` to `False`.
+5. Set `payload_withheld` to `False`.
 
 After setting these parameters, the builder should run `process_execution_payload(state, signed_envelope, verify=False)` and this function should not trigger an exception.
 

specs/_features/eip7732/fork-choice.md

@@ -47,7 +47,7 @@ This is the modification of the fork choice accompanying the EIP-7732 upgrade.
 
 | Name                 | Value       |
 | -------------------- | ----------- |
-| `PAYLOAD_TIMELY_THRESHOLD` | `PTC_SIZE / 2` (=`uint64(256)`) |
+| `PAYLOAD_TIMELY_THRESHOLD` | `PTC_SIZE // 2` (= 256) |
 | `INTERVALS_PER_SLOT` | `4` # [modified in EIP-7732] |
 | `PROPOSER_SCORE_BOOST` | `20` # [modified in EIP-7732] |
 | `PAYLOAD_WITHHOLD_BOOST` | `40` |

specs/altair/validator.md

@@ -367,7 +367,7 @@ Set `contribution.subcommittee_index` to the index for the subcommittee index co
 ###### Aggregation bits
 
 Let `contribution.aggregation_bits` be a `Bitvector[SYNC_COMMITTEE_SIZE // SYNC_COMMITTEE_SUBNET_COUNT]`, where the `index`th bit is set in the `Bitvector` for each corresponding validator included in this aggregate from the corresponding subcommittee.
-An aggregator finds the index in the sync committee (as determined by a reverse pubkey lookup on `state.current_sync_committee.pubkeys`) for a given validator referenced by `sync_committee_message.validator_index` and maps the sync committee index to an index in the subcommittee (along with the prior `subcommittee_index`). This index within the subcommittee is set in `contribution.aggegration_bits`.
+An aggregator finds the index in the sync committee (as determined by a reverse pubkey lookup on `state.current_sync_committee.pubkeys`) for a given validator referenced by `sync_committee_message.validator_index` and maps the sync committee index to an index in the subcommittee (along with the prior `subcommittee_index`). This index within the subcommittee is set in `contribution.aggregation_bits`.
 
 For example, if a validator with index `2044` is pseudo-randomly sampled to sync committee index `135`. This sync committee index maps to `subcommittee_index` `1` with position `7` in the `Bitvector` for the contribution.
 

specs/bellatrix/p2p-interface.md

@@ -76,20 +76,22 @@ In addition to the gossip validations for this topic from prior specifications,
 the following validations MUST pass before forwarding the `signed_beacon_block` on the network.
 Alias `block = signed_beacon_block.message`, `execution_payload = block.body.execution_payload`.
 
-- If the execution is enabled for the block -- i.e. `is_execution_enabled(state, block.body)`
-  then validate the following:
-    - _[REJECT]_ The block's execution payload timestamp is correct with respect to the slot
-       -- i.e. `execution_payload.timestamp == compute_timestamp_at_slot(state, block.slot)`.
-    - If `execution_payload` verification of block's parent by an execution node is *not* complete:
-    	- [REJECT] The block's parent (defined by `block.parent_root`) passes all
-    	  validation (excluding execution node verification of the `block.body.execution_payload`).
-    - otherwise:
-    	- [IGNORE] The block's parent (defined by `block.parent_root`) passes all
-    	  validation (including execution node verification of the `block.body.execution_payload`).
-
-The following gossip validation from prior specifications MUST NOT be applied if the execution is enabled for the block -- i.e. `is_execution_enabled(state, block.body)`:
-
-  - [REJECT] The block's parent (defined by `block.parent_root`) passes validation.
+If the execution is enabled for the block -- i.e. `is_execution_enabled(state, block.body)`
+then validate the following:
+
+- _[REJECT]_ The block's execution payload timestamp is correct with respect to the slot
+  -- i.e. `execution_payload.timestamp == compute_timestamp_at_slot(state, block.slot)`.
+- If `execution_payload` verification of block's parent by an execution node is *not* complete:
+    - _[REJECT]_ The block's parent (defined by `block.parent_root`) passes all
+validation (excluding execution node verification of the `block.body.execution_payload`).
+- Otherwise:
+    - _[IGNORE]_ The block's parent (defined by `block.parent_root`) passes all
+validation (including execution node verification of the `block.body.execution_payload`).
+
+The following gossip validation from prior specifications MUST NOT be applied if the execution is
+enabled for the block -- i.e. `is_execution_enabled(state, block.body)`:
+
+- _[REJECT]_ The block's parent (defined by `block.parent_root`) passes validation.
 
 #### Transitioning the gossip
 

specs/electra/validator.md

@@ -114,7 +114,7 @@ Changed the max attestations size to `MAX_ATTESTATIONS_ELECTRA`.
 
 The network attestation aggregates contain only the assigned committee attestations.
 Attestation aggregates received by the block proposer from the committee aggregators with disjoint `committee_bits` sets and equal `AttestationData` SHOULD be consolidated into a single `Attestation` object.
-The proposer should run the following function to construct an on chain final aggregate form a list of network aggregates with equal `AttestationData`:
+The proposer should run the following function to construct an on chain final aggregate from a list of network aggregates with equal `AttestationData`:
 
 ```python
 def compute_on_chain_aggregate(network_aggregates: Sequence[Attestation]) -> Attestation:

specs/fulu/peer-sampling.md

@@ -73,7 +73,7 @@ def get_extended_sample_count(allowed_failures: uint64) -> uint64:
 
 At each slot, a node needs to be able to readily sample from *any* set of columns. To this end, a node SHOULD find and maintain a set of diverse and reliable peers that can regularly satisfy their sampling demands.
 
-A node runs a background peer discovery process, maintaining peers of various custody distributions (both `custody_size` and column assignments). The combination of advertised `custody_size` size and public node-id make this readily and publicly accessible. The peer set should cover the whole column space, with some redundancy. The number of peers, or at least the redundancy implied by the custody distributions over the the peer set, should be tuned upward in the event of failed sampling.
+A node runs a background peer discovery process, maintaining peers of various custody distributions (both `custody_size` and column assignments). The combination of advertised `custody_size` size and public node-id make this readily and publicly accessible. The peer set should cover the whole column space, with some redundancy. The number of peers, or at least the redundancy implied by the custody distributions over the peer set, should be tuned upward in the event of failed sampling.
 
 *Note*: while high-capacity and super-full nodes are high value with respect to satisfying sampling requirements, a node SHOULD maintain a distribution across node capacities as to not centralize the p2p graph too much (in the extreme becomes hub/spoke) and to distribute sampling load better across all nodes.
 

tests/generators/kzg_7594/main.py

@@ -239,7 +239,7 @@ def case_verify_cell_kzg_proof_batch():
     commitments = [VALID_COMMITMENTS[1]]
     cell_indices = list(range(len(cells)))
     # Set first cell index to an invalid value
-    cell_indices[0] = spec.CELLS_PER_EXT_BLOB
+    cell_indices[0] = int(spec.CELLS_PER_EXT_BLOB)
     expect_exception(spec.verify_cell_kzg_proof_batch, commitments, cell_indices, cells, proofs)
     identifier = make_id(commitments, cell_indices, cells, proofs)
     yield f'verify_cell_kzg_proof_batch_case_invalid_cell_index_{identifier}', {
@@ -480,7 +480,7 @@ def case_recover_cells_and_kzg_proofs():
     cell_indices = list(range(spec.CELLS_PER_EXT_BLOB // 2))
     partial_cells = [cells[cell_index] for cell_index in cell_indices]
     # Replace first cell_index with an invalid value
-    cell_indices[0] = spec.CELLS_PER_EXT_BLOB
+    cell_indices[0] = int(spec.CELLS_PER_EXT_BLOB)
     expect_exception(spec.recover_cells_and_kzg_proofs, cell_indices, partial_cells)
     identifier = make_id(cell_indices, partial_cells)
     yield f'recover_cells_and_kzg_proofs_case_invalid_cell_index_{identifier}', {
@@ -513,7 +513,7 @@ def case_recover_cells_and_kzg_proofs():
     cell_indices = list(range(0, spec.CELLS_PER_EXT_BLOB, 2))
     partial_cells = [cells[cell_index] for cell_index in cell_indices]
     # Add another cell_index
-    cell_indices.append(spec.CELLS_PER_EXT_BLOB - 1)
+    cell_indices.append(int(spec.CELLS_PER_EXT_BLOB - 1))
     expect_exception(spec.recover_cells_and_kzg_proofs, cell_indices, partial_cells)
     identifier = make_id(cell_indices, partial_cells)
     yield f'recover_cells_and_kzg_proofs_case_invalid_more_cell_indices_than_cells_{identifier}', {