execution-api 7843 pr 731 implemented (#2101)

Author: felix314159

packages/testing/src/execution_testing/cli/pytest_commands/plugins/execute/rpc/chain_builder_eth_rpc.py

@@ -300,6 +300,13 @@ def generate_block(self: "ChainBuilderEthRPC") -> None:
                 )
                 else None
             ),
+            slot_number=(
+                0
+                if self.fork.engine_payload_attribute_slot_number(
+                    block_number=0, timestamp=0
+                )
+                else None
+            ),
         )
         forkchoice_updated_version = (
             self.fork.engine_forkchoice_updated_version()

packages/testing/src/execution_testing/forks/base_fork.py

@@ -799,6 +799,16 @@ def engine_payload_attribute_max_blobs_per_block(
         """
         pass
 
+    @classmethod
+    @abstractmethod
+    def engine_payload_attribute_slot_number(
+        cls, *, block_number: int = 0, timestamp: int = 0
+    ) -> bool:
+        """
+        Return true if the payload attributes include the slot number.
+        """
+        pass
+
     @classmethod
     @abstractmethod
     def engine_forkchoice_updated_version(

packages/testing/src/execution_testing/forks/forks/forks.py

@@ -1048,6 +1048,16 @@ def engine_payload_attribute_max_blobs_per_block(
         del block_number, timestamp
         return False
 
+    @classmethod
+    def engine_payload_attribute_slot_number(
+        cls, *, block_number: int = 0, timestamp: int = 0
+    ) -> bool:
+        """
+        At genesis, payload attributes do not include the slot number.
+        """
+        del block_number, timestamp
+        return False
+
     @classmethod
     def engine_forkchoice_updated_version(
         cls, *, block_number: int = 0, timestamp: int = 0
@@ -3406,3 +3416,19 @@ def header_slot_number_required(
         """Slot number in header required from Amsterdam (EIP-7843)."""
         del block_number, timestamp
         return True
+
+    @classmethod
+    def engine_forkchoice_updated_version(
+        cls, *, block_number: int = 0, timestamp: int = 0
+    ) -> Optional[int]:
+        """From Amsterdam, forkchoice updated calls must use version 4."""
+        del block_number, timestamp
+        return 4
+
+    @classmethod
+    def engine_payload_attribute_slot_number(
+        cls, *, block_number: int = 0, timestamp: int = 0
+    ) -> bool:
+        """From Amsterdam, payload attributes include the slot number."""
+        del block_number, timestamp
+        return True

packages/testing/src/execution_testing/rpc/rpc_types.py

@@ -157,6 +157,7 @@ class PayloadAttributes(CamelModel):
     parent_beacon_block_root: Hash | None = None
     target_blobs_per_block: HexNumber | None = None
     max_blobs_per_block: HexNumber | None = None
+    slot_number: HexNumber | None = None
 
 
 class BlobsBundle(CamelModel):