Merge pull request #3828 from potuz/epbs_cl_repo

EIP-7732: Enshrined Proposer-Builder Separation

Author: hwwhww

.gitignore

@@ -25,6 +25,7 @@ tests/core/pyspec/eth2spec/electra/
 tests/core/pyspec/eth2spec/whisk/
 tests/core/pyspec/eth2spec/eip7594/
 tests/core/pyspec/eth2spec/eip6800/
+tests/core/pyspec/eth2spec/eip7732/
 
 # coverage reports
 .htmlcov

Makefile

@@ -34,7 +34,7 @@ MARKDOWN_FILES = $(wildcard $(SPEC_DIR)/*/*.md) \
                  $(wildcard $(SPEC_DIR)/_features/*/*/*.md) \
                  $(wildcard $(SSZ_DIR)/*.md)
 
-ALL_EXECUTABLE_SPEC_NAMES = phase0 altair bellatrix capella deneb electra whisk eip6800
+ALL_EXECUTABLE_SPEC_NAMES = phase0 altair bellatrix capella deneb electra whisk eip6800 eip7732
 # The parameters for commands. Use `foreach` to avoid listing specs again.
 COVERAGE_SCOPE := $(foreach S,$(ALL_EXECUTABLE_SPEC_NAMES), --cov=eth2spec.$S.$(TEST_PRESET_TYPE))
 PYLINT_SCOPE := $(foreach S,$(ALL_EXECUTABLE_SPEC_NAMES), ./eth2spec/$S)

configs/mainnet.yaml

@@ -59,6 +59,9 @@ EIP7594_FORK_EPOCH: 18446744073709551615
 # WHISK
 WHISK_FORK_VERSION: 0x08000000  # temporary stub
 WHISK_FORK_EPOCH: 18446744073709551615
+# EIP7732
+EIP7732_FORK_VERSION: 0x09000000  # temporary stub
+EIP7732_FORK_EPOCH: 18446744073709551615
 
 # Time parameters
 # ---------------------------------------------------------------

configs/minimal.yaml

@@ -58,6 +58,9 @@ EIP7594_FORK_EPOCH: 18446744073709551615
 # WHISK
 WHISK_FORK_VERSION: 0x08000001
 WHISK_FORK_EPOCH: 18446744073709551615
+# EIP7732
+EIP7732_FORK_VERSION: 0x09000001
+EIP7732_FORK_EPOCH: 18446744073709551615
 
 # Time parameters
 # ---------------------------------------------------------------

presets/mainnet/eip-7732.yaml

@@ -0,0 +1,9 @@
+# Mainnet preset - EIP7732
+
+# Execution
+# ---------------------------------------------------------------
+# 2**9 (= 512)
+PTC_SIZE: 512
+# 2**2 (= 4)
+MAX_PAYLOAD_ATTESTATIONS: 4
+KZG_COMMITMENT_INCLUSION_PROOF_DEPTH_EIP7732: 13

presets/minimal/eip-7732.yaml

@@ -0,0 +1,9 @@
+# Minimal preset - EIP7732
+
+# Execution
+# ---------------------------------------------------------------
+# 2**1(= 2)
+PTC_SIZE: 2
+# 2**2 (= 4)
+MAX_PAYLOAD_ATTESTATIONS: 4
+KZG_COMMITMENT_INCLUSION_PROOF_DEPTH_EIP7732: 13

pysetup/constants.py

@@ -8,6 +8,7 @@
 EIP7594 = 'eip7594'
 EIP6800 = 'eip6800'
 WHISK = 'whisk'
+EIP7732 = 'eip7732'
 
 
 # The helper functions that are used when defining constants

pysetup/helpers.py

@@ -124,13 +124,22 @@ def format_constant(name: str, vardef: VariableDefinition) -> str:
     # Keep engine from the most recent fork
     execution_engine_cls = reduce(lambda txt, builder: builder.execution_engine_cls() or txt, builders, "")
 
+    # Remove deprecated constants
+    deprecate_constants = reduce(lambda obj, builder: obj.union(builder.deprecate_constants()), builders, set())
+    # constant_vars = {k: v for k, v in spec_object.constant_vars.items() if k not in deprecate_constants}
+    filtered_ssz_dep_constants = {k: v for k, v in hardcoded_ssz_dep_constants.items() if k not in deprecate_constants}
+    # Remove deprecated presets
+    deprecate_presets = reduce(lambda obj, builder: obj.union(builder.deprecate_presets()), builders, set())
+    # preset_vars = {k: v for k, v in spec_object.constant_vars.items() if k not in deprecate_constants}
+    filtered_hardcoded_func_dep_presets = {k: v for k, v in hardcoded_func_dep_presets.items() if k not in deprecate_presets}
+
     constant_vars_spec = '# Constant vars\n' + '\n'.join(format_constant(k, v) for k, v in spec_object.constant_vars.items())
     preset_vars_spec = '# Preset vars\n' + '\n'.join(format_constant(k, v) for k, v in spec_object.preset_vars.items())
     ordered_class_objects_spec = '\n\n\n'.join(ordered_class_objects.values())
     ssz_dep_constants = '\n'.join(map(lambda x: '%s = %s' % (x, hardcoded_ssz_dep_constants[x]), hardcoded_ssz_dep_constants))
-    ssz_dep_constants_verification = '\n'.join(map(lambda x: 'assert %s == %s' % (x, spec_object.ssz_dep_constants[x]), hardcoded_ssz_dep_constants))
+    ssz_dep_constants_verification = '\n'.join(map(lambda x: 'assert %s == %s' % (x, spec_object.ssz_dep_constants[x]), filtered_ssz_dep_constants))
     custom_type_dep_constants = '\n'.join(map(lambda x: '%s = %s' % (x, hardcoded_custom_type_dep_constants[x]), hardcoded_custom_type_dep_constants))
-    func_dep_presets_verification = '\n'.join(map(lambda x: 'assert %s == %s  # noqa: E501' % (x, spec_object.func_dep_presets[x]), hardcoded_func_dep_presets))
+    func_dep_presets_verification = '\n'.join(map(lambda x: 'assert %s == %s  # noqa: E501' % (x, spec_object.func_dep_presets[x]), filtered_hardcoded_func_dep_presets))
     spec_strs = [
         imports,
         preparations,

pysetup/md_doc_paths.py

@@ -10,6 +10,7 @@
     WHISK,
     EIP7594,
     EIP6800,
+    EIP7732,
 )
 
 
@@ -23,6 +24,7 @@
     WHISK: CAPELLA,
     EIP7594: DENEB,
     EIP6800: DENEB,
+    EIP7732: ELECTRA,
 }
 
 ALL_FORKS = list(PREVIOUS_FORK_OF.keys())

pysetup/spec_builders/__init__.py

@@ -7,12 +7,13 @@
 from .whisk import WhiskSpecBuilder
 from .eip7594 import EIP7594SpecBuilder
 from .eip6800 import EIP6800SpecBuilder
+from .eip7732 import EIP7732SpecBuilder
 
 
 spec_builders = {
     builder.fork: builder
     for builder in (
         Phase0SpecBuilder, AltairSpecBuilder, BellatrixSpecBuilder, CapellaSpecBuilder, DenebSpecBuilder,
-        ElectraSpecBuilder, WhiskSpecBuilder, EIP7594SpecBuilder, EIP6800SpecBuilder,
+        ElectraSpecBuilder, WhiskSpecBuilder, EIP7594SpecBuilder, EIP6800SpecBuilder, EIP7732SpecBuilder,
     )
 }