eip7805: rebase FOCIL onto Gloas

.github/release-drafter.yml

@@ -20,15 +20,14 @@ categories:
     labels:
       - gloas
       - eip7732
+      - eip7805
       - eip7928
 
   # Features
   - title: EIP-6110
     label: eip6110
   - title: EIP-7441
     label: eip7441
-  - title: EIP-7805
-    label: eip7805
   - title: EIP-8025
     label: eip8025
 

.github/workflows/checks.yml

@@ -96,7 +96,6 @@ jobs:
           - electra
           - fulu
           - gloas
-          - eip7805
           - eip7928
     steps:
       - name: Checkout repository

.github/workflows/nightly-tests.yml

@@ -32,7 +32,6 @@ jobs:
           - electra
           - fulu
           - gloas
-          - eip7805
           - eip7928
     steps:
       - name: Checkout repository

Makefile

@@ -13,7 +13,6 @@ ALL_EXECUTABLE_SPEC_NAMES = \
 	gloas     \
 	eip6800   \
 	eip7441   \
-	eip7805   \
 	eip7928
 
 # A list of fake targets.

configs/mainnet.yaml

@@ -61,9 +61,6 @@ GLOAS_FORK_EPOCH: 18446744073709551615
 # EIP7441
 EIP7441_FORK_VERSION: 0x08000000  # temporary stub
 EIP7441_FORK_EPOCH: 18446744073709551615
-# EIP7805
-EIP7805_FORK_VERSION: 0x0a000000  # temporary stub
-EIP7805_FORK_EPOCH: 18446744073709551615
 # EIP7928
 EIP7928_FORK_VERSION: 0x0b000000  # temporary stub
 EIP7928_FORK_EPOCH: 18446744073709551615
@@ -106,8 +103,6 @@ SYNC_MESSAGE_DUE_BPS_GLOAS: 2500
 CONTRIBUTION_DUE_BPS_GLOAS: 5000
 # 7500 basis points, 75% of SLOT_DURATION_MS
 PAYLOAD_ATTESTATION_DUE_BPS: 7500
-
-# EIP7805
 # 7500 basis points, 75% of SLOT_DURATION_MS
 VIEW_FREEZE_CUTOFF_BPS: 7500
 # 6667 basis points, ~67% of SLOT_DURATION_MS
@@ -222,19 +217,17 @@ MIN_EPOCHS_FOR_DATA_COLUMN_SIDECARS_REQUESTS: 4096
 # Gloas
 # 2**7 (= 128) payloads
 MAX_REQUEST_PAYLOADS: 128
+# 2**4 (= 16) inclusion lists
+MAX_REQUEST_INCLUSION_LIST: 16
+# 2**13 (= 8,192) bytes
+MAX_BYTES_PER_INCLUSION_LIST: 8192
 
 # EIP7441
 # 2**8 (= 256) epochs
 EPOCHS_PER_SHUFFLING_PHASE: 256
 # 2**1 (= 2) epochs
 PROPOSER_SELECTION_GAP: 2
 
-# EIP7805
-# 2**4 (= 16) inclusion lists
-MAX_REQUEST_INCLUSION_LIST: 16
-# 2**13 (= 8,192) bytes
-MAX_BYTES_PER_INCLUSION_LIST: 8192
-
 # Blob Scheduling
 # ---------------------------------------------------------------
 

configs/minimal.yaml

@@ -57,9 +57,6 @@ GLOAS_FORK_EPOCH: 18446744073709551615
 # [customized] EIP7441
 EIP7441_FORK_VERSION: 0x08000001
 EIP7441_FORK_EPOCH: 18446744073709551615
-# [customized] EIP7805
-EIP7805_FORK_VERSION: 0x0a000001
-EIP7805_FORK_EPOCH: 18446744073709551615
 # [customized] EIP7928
 EIP7928_FORK_VERSION: 0x0b000001
 EIP7928_FORK_EPOCH: 18446744073709551615
@@ -102,8 +99,6 @@ SYNC_MESSAGE_DUE_BPS_GLOAS: 2500
 CONTRIBUTION_DUE_BPS_GLOAS: 5000
 # 7500 basis points, 75% of SLOT_DURATION_MS
 PAYLOAD_ATTESTATION_DUE_BPS: 7500
-
-# EIP7805
 # 7500 basis points, 75% of SLOT_DURATION_MS
 VIEW_FREEZE_CUTOFF_BPS: 7500
 # 6667 basis points, ~67% of SLOT_DURATION_MS
@@ -219,19 +214,17 @@ MIN_EPOCHS_FOR_DATA_COLUMN_SIDECARS_REQUESTS: 4096
 # Gloas
 # 2**7 (= 128) payloads
 MAX_REQUEST_PAYLOADS: 128
+# 2**4 (= 16) inclusion lists
+MAX_REQUEST_INCLUSION_LIST: 16
+# 2**13 (= 8,192) bytes
+MAX_BYTES_PER_INCLUSION_LIST: 8192
 
 # EIP7441
 # [customized] 2**2 (= 4) epochs
 EPOCHS_PER_SHUFFLING_PHASE: 4
 # [customized] 2**0 (= 1) epochs
 PROPOSER_SELECTION_GAP: 1
 
-# EIP7805
-# 2**4 (= 16) inclusion lists
-MAX_REQUEST_INCLUSION_LIST: 16
-# 2**13 (= 8,192) bytes
-MAX_BYTES_PER_INCLUSION_LIST: 8192
-
 # Blob Scheduling
 # ---------------------------------------------------------------
 

pysetup/constants.py

@@ -9,7 +9,6 @@
 GLOAS = "gloas"
 EIP6800 = "eip6800"
 EIP7441 = "eip7441"
-EIP7805 = "eip7805"
 EIP7928 = "eip7928"
 
 

pysetup/md_doc_paths.py

@@ -7,7 +7,6 @@
     DENEB,
     EIP6800,
     EIP7441,
-    EIP7805,
     EIP7928,
     ELECTRA,
     FULU,
@@ -26,7 +25,6 @@
     GLOAS: FULU,
     EIP6800: DENEB,
     EIP7441: CAPELLA,
-    EIP7805: FULU,
     EIP7928: FULU,
 }
 

pysetup/spec_builders/__init__.py

@@ -4,7 +4,6 @@
 from .deneb import DenebSpecBuilder
 from .eip6800 import EIP6800SpecBuilder
 from .eip7441 import EIP7441SpecBuilder
-from .eip7805 import EIP7805SpecBuilder
 from .eip7928 import EIP7928SpecBuilder
 from .electra import ElectraSpecBuilder
 from .fulu import FuluSpecBuilder
@@ -24,7 +23,6 @@
         GloasSpecBuilder,
         EIP6800SpecBuilder,
         EIP7441SpecBuilder,
-        EIP7805SpecBuilder,
         EIP7928SpecBuilder,
     )
 }

pysetup/spec_builders/gloas.py

@@ -11,6 +11,60 @@ def imports(cls, preset_name: str):
 from eth2spec.fulu import {preset_name} as fulu
 """
 
+    @classmethod
+    def sundry_functions(cls) -> str:
+        return """
+def cached_or_new_inclusion_list_store() -> InclusionListStore:
+    # pylint: disable=unused-argument
+    return InclusionListStore()
+"""
+
+    @classmethod
+    def execution_engine_cls(cls) -> str:
+        return """
+class NoopExecutionEngine(ExecutionEngine):
+    def notify_new_payload(self: ExecutionEngine,
+                           execution_payload: ExecutionPayload,
+                           parent_beacon_block_root: Root,
+                           execution_requests_list: Sequence[bytes]) -> bool:
+        return True
+
+    def notify_forkchoice_updated(self: ExecutionEngine,
+                                  head_block_hash: Hash32,
+                                  safe_block_hash: Hash32,
+                                  finalized_block_hash: Hash32,
+                                  payload_attributes: Optional[PayloadAttributes]) -> Optional[PayloadId]:
+        pass
+
+    def get_payload(self: ExecutionEngine, payload_id: PayloadId) -> GetPayloadResponse:
+        # pylint: disable=unused-argument
+        raise NotImplementedError("no default block production")
+
+    def is_valid_block_hash(self: ExecutionEngine,
+                            execution_payload: ExecutionPayload,
+                            parent_beacon_block_root: Root,
+                            execution_requests_list: Sequence[bytes]) -> bool:
+        return True
+
+    def is_valid_versioned_hashes(self: ExecutionEngine, new_payload_request: NewPayloadRequest) -> bool:
+        return True
+
+    def verify_and_notify_new_payload(self: ExecutionEngine,
+                                      new_payload_request: NewPayloadRequest) -> bool:
+        return True
+
+    def get_inclusion_list(self: ExecutionEngine) -> GetInclusionListResponse:
+        # pylint: disable=unused-argument
+        raise NotImplementedError("no default inclusion list production")
+
+    def is_inclusion_list_satisfied(self: ExecutionEngine,
+                                    execution_payload: ExecutionPayload,
+                                    inclusion_list_transactions: Sequence[Transaction]) -> bool:
+        return True
+
+
+EXECUTION_ENGINE = NoopExecutionEngine()"""
+
     @classmethod
     def deprecate_constants(cls) -> set[str]:
         return set(