Merge pull request #3418 from ethereum/dev

release 1.4.0-alpha.3

configs/mainnet.yaml

@@ -132,3 +132,5 @@ MAX_REQUEST_BLOCKS_DENEB: 128
 MAX_REQUEST_BLOB_SIDECARS: 768
 # `2**12` (= 4096 epochs, ~18 days)
 MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS: 4096
+# `6`
+BLOB_SIDECAR_SUBNET_COUNT: 6

configs/minimal.yaml

@@ -133,3 +133,5 @@ MAX_REQUEST_BLOCKS_DENEB: 128
 MAX_REQUEST_BLOB_SIDECARS: 768
 # `2**12` (= 4096 epochs, ~18 days)
 MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS: 4096
+# `6`
+BLOB_SIDECAR_SUBNET_COUNT: 6

setup.py

@@ -50,6 +50,25 @@ def installPackage(package: str):
 EIP6110 = 'eip6110'
 WHISK = 'whisk'
 
+PREVIOUS_FORK_OF = {
+    PHASE0: None,
+    ALTAIR: PHASE0,
+    BELLATRIX: ALTAIR,
+    CAPELLA: BELLATRIX,
+    DENEB: CAPELLA,
+    EIP6110: DENEB,
+    WHISK: CAPELLA,
+}
+
+ALL_FORKS = list(PREVIOUS_FORK_OF.keys())
+
+IGNORE_SPEC_FILES = [
+    "specs/phase0/deposit-contract.md"
+]
+
+EXTRA_SPEC_FILES = {
+    BELLATRIX: "sync/optimistic.md"
+}
 
 # The helper functions that are used when defining constants
 CONSTANT_DEP_SUNDRY_CONSTANTS_FUNCTIONS = '''
@@ -96,6 +115,30 @@ class SpecObject(NamedTuple):
     dataclasses: Dict[str, str]
 
 
+def is_post_fork(a, b) -> bool:
+    """
+    Returns true if fork a is after b, or if a == b
+    """
+    if a == b:
+        return True
+
+    prev_fork = PREVIOUS_FORK_OF[a]
+    if prev_fork == b:
+        return True
+    elif prev_fork == None:
+        return False
+    else:
+        return is_post_fork(prev_fork, b)
+
+def get_fork_directory(fork):
+    dir1 = f'specs/{fork}'
+    if os.path.exists(dir1):
+        return dir1
+    dir2 = f'specs/_features/{fork}'
+    if os.path.exists(dir2):
+        return dir2
+    raise FileNotFoundError(f"No directory found for fork: {fork}")
+
 def _get_name_from_heading(heading: Heading) -> Optional[str]:
     last_child = heading.children[-1]
     if isinstance(last_child, CodeSpan):
@@ -1068,70 +1111,20 @@ def finalize_options(self):
         if len(self.md_doc_paths) == 0:
             print("no paths were specified, using default markdown file paths for pyspec"
                   " build (spec fork: %s)" % self.spec_fork)
-            if self.spec_fork in (PHASE0, ALTAIR, BELLATRIX, CAPELLA, DENEB, EIP6110, WHISK):
-                self.md_doc_paths = """
-                    specs/phase0/beacon-chain.md
-                    specs/phase0/fork-choice.md
-                    specs/phase0/validator.md
-                    specs/phase0/weak-subjectivity.md
-                    specs/phase0/p2p-interface.md
-                """
-            if self.spec_fork in (ALTAIR, BELLATRIX, CAPELLA, DENEB, EIP6110, WHISK):
-                self.md_doc_paths += """
-                    specs/altair/light-client/full-node.md
-                    specs/altair/light-client/light-client.md
-                    specs/altair/light-client/p2p-interface.md
-                    specs/altair/light-client/sync-protocol.md
-                    specs/altair/beacon-chain.md
-                    specs/altair/bls.md
-                    specs/altair/fork.md
-                    specs/altair/validator.md
-                    specs/altair/p2p-interface.md
-                """
-            if self.spec_fork in (BELLATRIX, CAPELLA, DENEB, EIP6110, WHISK):
-                self.md_doc_paths += """
-                    specs/bellatrix/beacon-chain.md
-                    specs/bellatrix/fork.md
-                    specs/bellatrix/fork-choice.md
-                    specs/bellatrix/validator.md
-                    specs/bellatrix/p2p-interface.md
-                    sync/optimistic.md
-                """
-            if self.spec_fork in (CAPELLA, DENEB, EIP6110, WHISK):
-                self.md_doc_paths += """
-                    specs/capella/light-client/fork.md
-                    specs/capella/light-client/full-node.md
-                    specs/capella/light-client/p2p-interface.md
-                    specs/capella/light-client/sync-protocol.md
-                    specs/capella/beacon-chain.md
-                    specs/capella/fork.md
-                    specs/capella/fork-choice.md
-                    specs/capella/validator.md
-                    specs/capella/p2p-interface.md
-                """
-            if self.spec_fork in (DENEB, EIP6110):
-                self.md_doc_paths += """
-                    specs/deneb/light-client/fork.md
-                    specs/deneb/light-client/full-node.md
-                    specs/deneb/light-client/p2p-interface.md
-                    specs/deneb/light-client/sync-protocol.md
-                    specs/deneb/beacon-chain.md
-                    specs/deneb/fork.md
-                    specs/deneb/fork-choice.md
-                    specs/deneb/polynomial-commitments.md
-                    specs/deneb/p2p-interface.md
-                    specs/deneb/validator.md
-                """
-            if self.spec_fork == EIP6110:
-                self.md_doc_paths += """
-                    specs/_features/eip6110/beacon-chain.md
-                    specs/_features/eip6110/fork.md
-                """
-            if self.spec_fork == WHISK:
-                self.md_doc_paths += """
-                    specs/_features/whisk/beacon-chain.md
-                    specs/_features/whisk/fork.md
-                """
+            self.md_doc_paths = ""
+
+            for fork in ALL_FORKS:
+                if is_post_fork(self.spec_fork, fork):
+                    # Append all files in fork directory recursively
+                    for root, dirs, files in os.walk(get_fork_directory(fork)):
+                        for filename in files:
+                            filepath = os.path.join(root, filename)
+                            if filepath.endswith('.md') and filepath not in IGNORE_SPEC_FILES:
+                                self.md_doc_paths += filepath + "\n"
+                    # Append extra files if any
+                    if fork in EXTRA_SPEC_FILES:
+                        self.md_doc_paths += EXTRA_SPEC_FILES[fork] + "\n"
+
             if len(self.md_doc_paths) == 0:
                 raise Exception('no markdown files specified, and spec fork "%s" is unknown', self.spec_fork)
 
@@ -1284,9 +1277,9 @@ def run(self):
         "remerkleable==0.1.27",
         "trie==2.0.2",
         RUAMEL_YAML_VERSION,
-        "lru-dict==1.1.8",
+        "lru-dict==1.2.0",
         MARKO_VERSION,
         "py_arkworks_bls12381==0.3.4",
-        "curdleproofs @ git+https://github.com/nalinbhardwaj/curdleproofs.pie@master#egg=curdleproofs&subdirectory=curdleproofs",
+        "curdleproofs @ git+https://github.com/nalinbhardwaj/curdleproofs.pie@805d06785b6ff35fde7148762277dd1ae678beeb#egg=curdleproofs&subdirectory=curdleproofs",
     ]
 )

specs/deneb/p2p-interface.md

@@ -40,11 +40,14 @@ The specification of these changes continues in the same format as the network s
 
 ### Configuration
 
+*[New in Deneb:EIP4844]*
+
 | Name                                     | Value                             | Description                                                         |
 |------------------------------------------|-----------------------------------|---------------------------------------------------------------------|
 | `MAX_REQUEST_BLOCKS_DENEB`               | `2**7` (= 128)                    | Maximum number of blocks in a single request                        |
-| `MAX_REQUEST_BLOB_SIDECARS`              | `MAX_REQUEST_BLOCKS_DENEB * MAX_BLOBS_PER_BLOCK`      | Maximum number of blob sidecars in a single request                 |
-| `MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS` | `2**12` (= 4096 epochs, ~18 days) | The minimum epoch range over which a node must serve blob sidecars |
+| `MAX_REQUEST_BLOB_SIDECARS`              | `MAX_REQUEST_BLOCKS_DENEB * MAX_BLOBS_PER_BLOCK` | Maximum number of blob sidecars in a single request  |
+| `MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS`  | `2**12` (= 4096 epochs, ~18 days) | The minimum epoch range over which a node must serve blob sidecars  |
+| `BLOB_SIDECAR_SUBNET_COUNT`              | `6`                               | The number of blob sidecar subnets used in the gossipsub protocol.  |
 
 ### Containers
 

specs/deneb/validator.md

@@ -10,8 +10,6 @@
 
 - [Introduction](#introduction)
 - [Prerequisites](#prerequisites)
-- [Constants](#constants)
-  - [Misc](#misc)
 - [Helpers](#helpers)
   - [`BlobsBundle`](#blobsbundle)
   - [Modified `GetPayloadResponse`](#modified-getpayloadresponse)
@@ -40,14 +38,6 @@ All behaviors and definitions defined in this document, and documents it extends
 All terminology, constants, functions, and protocol mechanics defined in the updated [Beacon Chain doc of Deneb](./beacon-chain.md) are requisite for this document and used throughout.
 Please see related Beacon Chain doc before continuing and use them as a reference throughout.
 
-## Constants
-
-### Misc
-
-| Name | Value | Unit |
-| - | - | :-: |
-| `BLOB_SIDECAR_SUBNET_COUNT` | `4` | *[New in Deneb:EIP4844]* The number of blob sidecar subnets used in the gossipsub protocol. |
-
 ## Helpers
 
 ### `BlobsBundle`

tests/core/pyspec/eth2spec/VERSION.txt

@@ -1 +1 @@
-1.4.0-alpha.2
+1.4.0-alpha.3

tests/core/pyspec/eth2spec/test/deneb/unittests/test_config_invariants.py

@@ -18,3 +18,5 @@ def test_length(spec):
 def test_networking(spec):
     assert spec.MAX_BLOBS_PER_BLOCK < spec.MAX_BLOB_COMMITMENTS_PER_BLOCK
     assert spec.config.MAX_REQUEST_BLOB_SIDECARS == spec.config.MAX_REQUEST_BLOCKS_DENEB * spec.MAX_BLOBS_PER_BLOCK
+    # Start with the same size, but `BLOB_SIDECAR_SUBNET_COUNT` could potentially increase later.
+    assert spec.config.BLOB_SIDECAR_SUBNET_COUNT == spec.MAX_BLOBS_PER_BLOCK