eip7805: rebase spec onto fulu (#4502)

This PR sets EIP7805's previous fork to Fulu & makes other necessary
changes.

PS: It also makes the `is_data_available` comment consistent across all
specs.

Author: jtraglia

pysetup/md_doc_paths.py

@@ -25,7 +25,7 @@
     EIP6800: DENEB,
     EIP7441: CAPELLA,
     EIP7732: ELECTRA,
-    EIP7805: ELECTRA,
+    EIP7805: FULU,
 }
 
 ALL_FORKS = list(PREVIOUS_FORK_OF.keys())

pysetup/spec_builders/eip7805.py

@@ -8,7 +8,7 @@ class EIP7805SpecBuilder(BaseSpecBuilder):
     @classmethod
     def imports(cls, preset_name: str):
         return f"""
-from eth2spec.electra import {preset_name} as electra
+from eth2spec.fulu import {preset_name} as fulu
 """
 
     @classmethod

specs/_features/eip7805/beacon-chain.md

@@ -27,8 +27,8 @@ inclusion. Refers to the following posts:
 
 - [Fork-Choice enforced Inclusion Lists (FOCIL): A simple committee-based inclusion list proposal](https://ethresear.ch/t/fork-choice-enforced-inclusion-lists-focil-a-simple-committee-based-inclusion-list-proposal/19870/1)
 - [FOCIL CL & EL workflow](https://ethresear.ch/t/focil-cl-el-workflow/20526)
-  *Note*: This specification is built upon
-  [Electra](../../electra/beacon-chain.md) and is under active development.
+  *Note*: This specification is built upon [Fulu](../../fulu/beacon-chain.md)
+  and is under active development.
 
 ## Constants
 

specs/_features/eip7805/fork-choice.md

@@ -307,10 +307,8 @@ def on_block(store: Store, signed_block: SignedBeaconBlock) -> None:
     assert store.finalized_checkpoint.root == finalized_checkpoint_block
 
     # Check if blob data is available
-    # If not, this block MAY be queued and subsequently considered when blob data becomes available
-    # *Note*: Extraneous or invalid Blobs (in addition to the expected/referenced valid blobs)
-    # received on the p2p network MUST NOT invalidate a block that is otherwise valid and available
-    assert is_data_available(hash_tree_root(block), block.body.blob_kzg_commitments)
+    # If not, this payload MAY be queued and subsequently considered when blob data becomes available
+    assert is_data_available(hash_tree_root(block))
 
     # Check the block is valid and compute the post-state
     # Make a copy of the state to avoid mutability issues

specs/_features/eip7805/fork.md

@@ -40,6 +40,8 @@ def compute_fork_version(epoch: Epoch) -> Version:
     """
     if epoch >= EIP7805_FORK_EPOCH:
         return EIP7805_FORK_VERSION
+    if epoch >= FULU_FORK_EPOCH:
+        return FULU_FORK_VERSION
     if epoch >= ELECTRA_FORK_EPOCH:
         return ELECTRA_FORK_VERSION
     if epoch >= DENEB_FORK_EPOCH:
@@ -62,8 +64,8 @@ If `state.slot % SLOTS_PER_EPOCH == 0` and
 change is made to upgrade to EIP-7805.
 
 ```python
-def upgrade_to_eip7805(pre: electra.BeaconState) -> BeaconState:
-    epoch = electra.get_current_epoch(pre)
+def upgrade_to_eip7805(pre: fulu.BeaconState) -> BeaconState:
+    epoch = fulu.get_current_epoch(pre)
 
     post = BeaconState(
         genesis_time=pre.genesis_time,
@@ -108,6 +110,7 @@ def upgrade_to_eip7805(pre: electra.BeaconState) -> BeaconState:
         pending_deposits=pre.pending_deposits,
         pending_partial_withdrawals=pre.pending_partial_withdrawals,
         pending_consolidations=pre.pending_consolidations,
+        proposer_lookahead=pre.proposer_lookahead,
     )
 
     return post

specs/_features/eip7805/validator.md

@@ -37,8 +37,8 @@ validator" to implement EIP-7805.
 ## Prerequisites
 
 This document is an extension of the
-[Electra -- Honest Validator](../../electra/validator.md) guide. All behaviors
-and definitions defined in this document, and documents it extends, carry over
+[Fulu -- Honest Validator](../../fulu/validator.md) guide. All behaviors and
+definitions defined in this document, and documents it extends, carry over
 unless explicitly noted or overridden.
 
 All terminology, constants, functions, and protocol mechanics defined in the
@@ -137,8 +137,6 @@ committee slot.
 
 ##### ExecutionPayload
 
-`prepare_execution_payload` is updated from the Electra specs.
-
 *Note*: In this section, `state` is the state of the slot for the block proposal
 _without_ the block yet applied. That is, `state` is the `previous_state`
 processed through any empty slots up to the assigned slot using

specs/deneb/fork-choice.md

@@ -94,9 +94,7 @@ def on_block(store: Store, signed_block: SignedBeaconBlock) -> None:
 
     # [New in Deneb:EIP4844]
     # Check if blob data is available
-    # If not, this block MAY be queued and subsequently considered when blob data becomes available
-    # *Note*: Extraneous or invalid Blobs (in addition to the expected/referenced valid blobs)
-    # received on the p2p network MUST NOT invalidate a block that is otherwise valid and available
+    # If not, this payload MAY be queued and subsequently considered when blob data becomes available
     assert is_data_available(hash_tree_root(block), block.body.blob_kzg_commitments)
 
     # Check the block is valid and compute the post-state

specs/fulu/fork-choice.md

@@ -67,6 +67,8 @@ def on_block(store: Store, signed_block: SignedBeaconBlock) -> None:
     assert store.finalized_checkpoint.root == finalized_checkpoint_block
 
     # [Modified in Fulu:EIP7594]
+    # Check if blob data is available
+    # If not, this payload MAY be queued and subsequently considered when blob data becomes available
     assert is_data_available(hash_tree_root(block))
 
     # Check the block is valid and compute the post-state

tests/core/pyspec/eth2spec/test/context.py

@@ -512,6 +512,8 @@ def decorator(fn):
             ]
         )(fn)
 
+    return decorator
+
 
 def with_all_phases_except(exclusion_phases):
     """

tests/core/pyspec/eth2spec/test/deneb/fork_choice/test_on_block.py

@@ -2,7 +2,7 @@
 
 from eth2spec.test.context import (
     spec_state_test,
-    with_all_phases_from_except,
+    with_all_phases_from_to_except,
 )
 from eth2spec.test.helpers.blob import get_block_with_blob
 from eth2spec.test.helpers.constants import (
@@ -21,11 +21,12 @@
 )
 
 
-# TODO(jtraglia): Use with_all_phases_from_to_except after EIP7732 is based on Fulu.
+# TODO(jtraglia): Use with_all_phases_from_to after EIP7732 is rebased on Fulu.
 # This applies to every other test in this file too.
-@with_all_phases_from_except(DENEB, [FULU, EIP7732])
+@with_all_phases_from_to_except(DENEB, FULU, [EIP7732])
 @spec_state_test
 def test_simple_blob_data(spec, state):
+    print(spec)
     rng = Random(1234)
 
     test_steps = []
@@ -58,7 +59,7 @@ def test_simple_blob_data(spec, state):
     yield "steps", test_steps
 
 
-@with_all_phases_from_except(DENEB, [FULU, EIP7732])
+@with_all_phases_from_to_except(DENEB, FULU, [EIP7732])
 @spec_state_test
 def test_invalid_incorrect_proof(spec, state):
     rng = Random(1234)
@@ -88,7 +89,7 @@ def test_invalid_incorrect_proof(spec, state):
     yield "steps", test_steps
 
 
-@with_all_phases_from_except(DENEB, [FULU, EIP7732])
+@with_all_phases_from_to_except(DENEB, FULU, [EIP7732])
 @spec_state_test
 def test_invalid_data_unavailable(spec, state):
     rng = Random(1234)
@@ -118,7 +119,7 @@ def test_invalid_data_unavailable(spec, state):
     yield "steps", test_steps
 
 
-@with_all_phases_from_except(DENEB, [FULU, EIP7732])
+@with_all_phases_from_to_except(DENEB, FULU, [EIP7732])
 @spec_state_test
 def test_invalid_wrong_proofs_length(spec, state):
     rng = Random(1234)
@@ -148,7 +149,7 @@ def test_invalid_wrong_proofs_length(spec, state):
     yield "steps", test_steps
 
 
-@with_all_phases_from_except(DENEB, [FULU, EIP7732])
+@with_all_phases_from_to_except(DENEB, FULU, [EIP7732])
 @spec_state_test
 def test_invalid_wrong_blobs_length(spec, state):
     rng = Random(1234)