Merge pull request #3574 from ethereum/peer-das

[WIP] EIP-7594: PeerDAS protocol
ethereum · Apr 4, 2024 · 128a273 · 128a273
2 parents 29a3cbb + 5535e6a
commit 128a273
Show file tree

Hide file tree

Showing 24 changed files with 841 additions and 44 deletions.
diff --git a/configs/mainnet.yaml b/configs/mainnet.yaml
@@ -68,6 +68,9 @@ EIP7549_FORK_EPOCH: 18446744073709551615
 # WHISK
 WHISK_FORK_VERSION: 0x08000000  # temporary stub
 WHISK_FORK_EPOCH: 18446744073709551615
+# EIP7594
+EIP7594_FORK_VERSION: 0x06000001
+EIP7594_FORK_EPOCH: 18446744073709551615
 
 
 # Time parameters
@@ -165,10 +168,10 @@ WHISK_EPOCHS_PER_SHUFFLING_PHASE: 256
 WHISK_PROPOSER_SELECTION_GAP: 2
 
 # EIP7594
-EIP7594_FORK_VERSION: 0x06000001
-EIP7594_FORK_EPOCH: 18446744073709551615
+NUMBER_OF_COLUMNS: 128
+DATA_COLUMN_SIDECAR_SUBNET_COUNT: 32
+MAX_REQUEST_DATA_COLUMN_SIDECARS: 16384
 
 # [New in EIP7251]
 MIN_PER_EPOCH_CHURN_LIMIT_EIP7251: 128000000000 # 2**7 * 10**9 (= 128,000,000,000)
 MAX_PER_EPOCH_ACTIVATION_EXIT_CHURN_LIMIT: 256000000000 # 2**8 * 10**9 (= 256,000,000,000)
-
diff --git a/configs/minimal.yaml b/configs/minimal.yaml
@@ -67,7 +67,9 @@ EIP7549_FORK_EPOCH: 18446744073709551615
 # WHISK
 WHISK_FORK_VERSION: 0x08000001
 WHISK_FORK_EPOCH: 18446744073709551615
-
+# EIP7594
+EIP7594_FORK_VERSION: 0x06000001
+EIP7594_FORK_EPOCH: 18446744073709551615
 
 # Time parameters
 # ---------------------------------------------------------------
@@ -164,8 +166,9 @@ WHISK_EPOCHS_PER_SHUFFLING_PHASE: 4
 WHISK_PROPOSER_SELECTION_GAP: 1
 
 # EIP7594
-EIP7594_FORK_VERSION: 0x06000001
-EIP7594_FORK_EPOCH: 18446744073709551615
+NUMBER_OF_COLUMNS: 128
+DATA_COLUMN_SIDECAR_SUBNET_COUNT: 32
+MAX_REQUEST_DATA_COLUMN_SIDECARS: 16384
 
 # [New in EIP7251]
 MIN_PER_EPOCH_CHURN_LIMIT_EIP7251: 64000000000 # 2**6 * 10**9 (= 64,000,000,000)

diff --git a/presets/mainnet/eip7594.yaml b/presets/mainnet/eip7594.yaml
@@ -6,3 +6,5 @@
 FIELD_ELEMENTS_PER_CELL: 64
 # `uint64(2 * 4096)` (= 8192)
 FIELD_ELEMENTS_PER_EXT_BLOB: 8192
+# uint64(floorlog2(get_generalized_index(BeaconBlockBody, 'blob_kzg_commitments'))
+KZG_COMMITMENTS_INCLUSION_PROOF_DEPTH: 4
diff --git a/presets/minimal/eip7594.yaml b/presets/minimal/eip7594.yaml
@@ -6,3 +6,5 @@
 FIELD_ELEMENTS_PER_CELL: 64
 # `uint64(2 * 4096)` (= 8192)
 FIELD_ELEMENTS_PER_EXT_BLOB: 8192
+# uint64(floorlog2(get_generalized_index(BeaconBlockBody, 'blob_kzg_commitments'))
+KZG_COMMITMENTS_INCLUSION_PROOF_DEPTH: 4
diff --git a/pysetup/helpers.py b/pysetup/helpers.py
@@ -208,8 +208,7 @@ def dependency_order_class_objects(objects: Dict[str, str], custom_types: Dict[s
             for item in [dep, key] + key_list[key_list.index(dep)+1:]:
                 objects[item] = objects.pop(item)
 
-
-def combine_ssz_objects(old_objects: Dict[str, str], new_objects: Dict[str, str], custom_types) -> Dict[str, str]:
+def combine_ssz_objects(old_objects: Dict[str, str], new_objects: Dict[str, str]) -> Dict[str, str]:
     """
     Takes in old spec and new spec ssz objects, combines them,
     and returns the newer versions of the objects in dependency order.
@@ -231,7 +230,7 @@ def combine_spec_objects(spec0: SpecObject, spec1: SpecObject) -> SpecObject:
     config_vars = combine_dicts(spec0.config_vars, spec1.config_vars)
     ssz_dep_constants = combine_dicts(spec0.ssz_dep_constants, spec1.ssz_dep_constants)
     func_dep_presets = combine_dicts(spec0.func_dep_presets, spec1.func_dep_presets)
-    ssz_objects = combine_ssz_objects(spec0.ssz_objects, spec1.ssz_objects, custom_types)
+    ssz_objects = combine_ssz_objects(spec0.ssz_objects, spec1.ssz_objects)
     dataclasses = combine_dicts(spec0.dataclasses, spec1.dataclasses)
     return SpecObject(
         functions=functions,

diff --git a/pysetup/md_doc_paths.py b/pysetup/md_doc_paths.py
@@ -39,6 +39,11 @@
     BELLATRIX: "sync/optimistic.md"
 }
 
+DEFAULT_ORDER = (
+    "beacon-chain",
+    "polynomial-commitments",
+)
+
 
 def is_post_fork(a, b) -> bool:
     """
@@ -66,15 +71,25 @@ def get_fork_directory(fork):
     raise FileNotFoundError(f"No directory found for fork: {fork}")
 
 
+def sort_key(s):
+    for index, key in enumerate(DEFAULT_ORDER):
+        if key in s:
+            return (index, s)
+    return (len(DEFAULT_ORDER), s)
+
+
 def get_md_doc_paths(spec_fork: str) -> str:
     md_doc_paths = ""
 
     for fork in ALL_FORKS:
         if is_post_fork(spec_fork, fork):
             # Append all files in fork directory recursively
-            for root, dirs, files in os.walk(get_fork_directory(fork)):
+            for root, _, files in os.walk(get_fork_directory(fork)):
+                filepaths = []
                 for filename in files:
                     filepath = os.path.join(root, filename)
+                    filepaths.append(filepath)
+                for filepath in sorted(filepaths, key=sort_key):
                     if filepath.endswith('.md') and filepath not in IGNORE_SPEC_FILES:
                         md_doc_paths += filepath + "\n"
             # Append extra files if any

diff --git a/pysetup/spec_builders/eip7594.py b/pysetup/spec_builders/eip7594.py
@@ -14,8 +14,15 @@ def imports(cls, preset_name: str):
 '''
 
     @classmethod
-    def hardcoded_custom_type_dep_constants(cls, spec_object) -> Dict[str, str]:
+    def hardcoded_custom_type_dep_constants(cls, spec_object) -> str:
         return {
             'FIELD_ELEMENTS_PER_CELL': spec_object.preset_vars['FIELD_ELEMENTS_PER_CELL'].value,
             'FIELD_ELEMENTS_PER_EXT_BLOB': spec_object.preset_vars['FIELD_ELEMENTS_PER_EXT_BLOB'].value,
+            'NUMBER_OF_COLUMNS': spec_object.config_vars['NUMBER_OF_COLUMNS'].value,
+        }
+
+    @classmethod
+    def hardcoded_func_dep_presets(cls, spec_object) -> Dict[str, str]:
+        return {
+            'KZG_COMMITMENTS_INCLUSION_PROOF_DEPTH': spec_object.preset_vars['KZG_COMMITMENTS_INCLUSION_PROOF_DEPTH'].value,
         }