From 4185c00d233e982ace4af025a06eaf7d7dc0991b Mon Sep 17 00:00:00 2001
From: Lucas Saldanha <lucascrsaldanha@gmail.com>
Date: Tue, 13 Aug 2024 20:53:44 +1200
Subject: [PATCH] Fork fix and tests

---
 specs/electra/fork.md                         | 23 +------------------
 .../eth2spec/test/helpers/electra/fork.py     |  3 ++-
 .../test/helpers/execution_payload.py         |  8 +------
 .../pyspec/eth2spec/test/helpers/genesis.py   |  4 ----
 4 files changed, 4 insertions(+), 34 deletions(-)

diff --git a/specs/electra/fork.md b/specs/electra/fork.md
index fab02ddf2..44c41ac0b 100644
--- a/specs/electra/fork.md
+++ b/specs/electra/fork.md
@@ -72,28 +72,7 @@ an irregular state change is made to upgrade to Electra.
 ```python
 def upgrade_to_electra(pre: deneb.BeaconState) -> BeaconState:
     epoch = deneb.get_current_epoch(pre)
-    latest_execution_payload_header = ExecutionPayloadHeader(
-        parent_hash=pre.latest_execution_payload_header.parent_hash,
-        fee_recipient=pre.latest_execution_payload_header.fee_recipient,
-        state_root=pre.latest_execution_payload_header.state_root,
-        receipts_root=pre.latest_execution_payload_header.receipts_root,
-        logs_bloom=pre.latest_execution_payload_header.logs_bloom,
-        prev_randao=pre.latest_execution_payload_header.prev_randao,
-        block_number=pre.latest_execution_payload_header.block_number,
-        gas_limit=pre.latest_execution_payload_header.gas_limit,
-        gas_used=pre.latest_execution_payload_header.gas_used,
-        timestamp=pre.latest_execution_payload_header.timestamp,
-        extra_data=pre.latest_execution_payload_header.extra_data,
-        base_fee_per_gas=pre.latest_execution_payload_header.base_fee_per_gas,
-        block_hash=pre.latest_execution_payload_header.block_hash,
-        transactions_root=pre.latest_execution_payload_header.transactions_root,
-        withdrawals_root=pre.latest_execution_payload_header.withdrawals_root,
-        blob_gas_used=pre.latest_execution_payload_header.blob_gas_used,
-        excess_blob_gas=pre.latest_execution_payload_header.excess_blob_gas,
-        deposit_requests_root=Root(),  # [New in Electra:EIP6110]
-        withdrawal_requests_root=Root(),  # [New in Electra:EIP7002]
-        consolidation_requests_root=Root(),  # [New in Electra:EIP7251]
-    )
+    latest_execution_payload_header = pre.latest_execution_payload_header
 
     exit_epochs = [v.exit_epoch for v in pre.validators if v.exit_epoch != FAR_FUTURE_EPOCH]
     if not exit_epochs:
diff --git a/tests/core/pyspec/eth2spec/test/helpers/electra/fork.py b/tests/core/pyspec/eth2spec/test/helpers/electra/fork.py
index 0067a8cc0..886fc7cce 100644
--- a/tests/core/pyspec/eth2spec/test/helpers/electra/fork.py
+++ b/tests/core/pyspec/eth2spec/test/helpers/electra/fork.py
@@ -38,13 +38,14 @@ def run_fork_test(post_spec, pre_state):
         'next_withdrawal_index', 'next_withdrawal_validator_index',
         # Deep history valid from Capella onwards
         'historical_summaries',
+        'latest_execution_payload_header'
 
     ]
     for field in stable_fields:
         assert getattr(pre_state, field) == getattr(post_state, field)
 
     # Modified fields
-    modified_fields = ['fork', 'latest_execution_payload_header']
+    modified_fields = ['fork']
     for field in modified_fields:
         assert getattr(pre_state, field) != getattr(post_state, field)
 
diff --git a/tests/core/pyspec/eth2spec/test/helpers/execution_payload.py b/tests/core/pyspec/eth2spec/test/helpers/execution_payload.py
index 647f6adb5..c2876133d 100644
--- a/tests/core/pyspec/eth2spec/test/helpers/execution_payload.py
+++ b/tests/core/pyspec/eth2spec/test/helpers/execution_payload.py
@@ -7,12 +7,7 @@ from eth2spec.test.helpers.keys import privkeys
 from eth2spec.utils.ssz.ssz_impl import hash_tree_root
 from eth2spec.debug.random_value import get_random_bytes_list
 from eth2spec.test.helpers.withdrawals import get_expected_withdrawals
-from eth2spec.test.helpers.forks import (
-    is_post_capella,
-    is_post_deneb,
-    is_post_electra,
-    is_post_eip7732,
-)
+from eth2spec.test.helpers.forks import is_post_capella, is_post_deneb, is_post_eip7732
 
 
 def get_execution_payload_header(spec, execution_payload):
@@ -201,7 +196,6 @@ def compute_el_block_hash(spec, payload, pre_state):
 
     withdrawals_trie_root = None
     parent_beacon_block_root = None
-    requests_trie_root = None
 
     if is_post_capella(spec):
         withdrawals_encoded = [get_withdrawal_rlp(withdrawal) for withdrawal in payload.withdrawals]
diff --git a/tests/core/pyspec/eth2spec/test/helpers/genesis.py b/tests/core/pyspec/eth2spec/test/helpers/genesis.py
index 95c1e97e5..bc7d89185 100644
--- a/tests/core/pyspec/eth2spec/test/helpers/genesis.py
+++ b/tests/core/pyspec/eth2spec/test/helpers/genesis.py
@@ -66,14 +66,11 @@ def get_sample_genesis_execution_payload_header(spec,
     transactions_trie_root = bytes.fromhex("56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421")
     withdrawals_trie_root = None
     parent_beacon_block_root = None
-    requests_trie_root = None
 
     if is_post_capella(spec):
         withdrawals_trie_root = bytes.fromhex("56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421")
     if is_post_deneb(spec):
         parent_beacon_block_root = bytes.fromhex("0000000000000000000000000000000000000000000000000000000000000000")
-    if is_post_electra(spec):
-        requests_trie_root = bytes.fromhex("56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421")
 
     payload_header.block_hash = compute_el_header_block_hash(
         spec,
@@ -81,7 +78,6 @@ def get_sample_genesis_execution_payload_header(spec,
         transactions_trie_root,
         withdrawals_trie_root,
         parent_beacon_block_root,
-        requests_trie_root,
     )
     return payload_header