Merge pull request #3725 from ethereum/dev

release v1.5.0-alpha.1
ethereum · Apr 27, 2024 · 594daf4 · 594daf4
2 parents 7bf43d1 + 3c96d41
commit 594daf4
Show file tree

Hide file tree

Showing 55 changed files with 2,203 additions and 506 deletions.
diff --git a/configs/mainnet.yaml b/configs/mainnet.yaml
@@ -52,14 +52,13 @@ DENEB_FORK_VERSION: 0x04000000
 DENEB_FORK_EPOCH: 269568  # March 13, 2024, 01:55:35pm UTC
 # Electra
 ELECTRA_FORK_VERSION: 0x05000000
-ELECTRA_FORK_EPOCH: 18446744073709551615
+ELECTRA_FORK_EPOCH: 18446744073709551615  # temporary stub
+# EIP7594
+EIP7594_FORK_VERSION: 0x06000000  # temporary stub
+EIP7594_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
 # ---------------------------------------------------------------
@@ -157,6 +156,7 @@ WHISK_PROPOSER_SELECTION_GAP: 2
 
 # EIP7594
 NUMBER_OF_COLUMNS: 128
+MAX_CELLS_IN_EXTENDED_MATRIX: 768
 DATA_COLUMN_SIDECAR_SUBNET_COUNT: 32
 MAX_REQUEST_DATA_COLUMN_SIDECARS: 16384
 

diff --git a/configs/minimal.yaml b/configs/minimal.yaml
@@ -52,12 +52,12 @@ DENEB_FORK_EPOCH: 18446744073709551615
 # Electra
 ELECTRA_FORK_VERSION: 0x05000001
 ELECTRA_FORK_EPOCH: 18446744073709551615
-# WHISK
-WHISK_FORK_VERSION: 0x08000001
-WHISK_FORK_EPOCH: 18446744073709551615
 # EIP7594
 EIP7594_FORK_VERSION: 0x06000001
 EIP7594_FORK_EPOCH: 18446744073709551615
+# WHISK
+WHISK_FORK_VERSION: 0x08000001
+WHISK_FORK_EPOCH: 18446744073709551615
 
 # Time parameters
 # ---------------------------------------------------------------
@@ -155,6 +155,7 @@ WHISK_PROPOSER_SELECTION_GAP: 1
 
 # EIP7594
 NUMBER_OF_COLUMNS: 128
+MAX_CELLS_IN_EXTENDED_MATRIX: 768
 DATA_COLUMN_SIDECAR_SUBNET_COUNT: 32
 MAX_REQUEST_DATA_COLUMN_SIDECARS: 16384
 

diff --git a/pysetup/spec_builders/deneb.py b/pysetup/spec_builders/deneb.py
@@ -17,6 +17,7 @@ def imports(cls, preset_name: str):
     def preparations(cls):
         return '''
 T = TypeVar('T')  # For generic function
+TPoint = TypeVar('TPoint')  # For generic function. G1 or G2 point.
 '''
 
     @classmethod

diff --git a/pysetup/spec_builders/eip7594.py b/pysetup/spec_builders/eip7594.py
@@ -19,6 +19,7 @@ def hardcoded_custom_type_dep_constants(cls, spec_object) -> str:
             '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,
+            'MAX_CELLS_IN_EXTENDED_MATRIX': spec_object.config_vars['MAX_CELLS_IN_EXTENDED_MATRIX'].value,
         }
 
     @classmethod

diff --git a/specs/_features/eip7594/das-core.md b/specs/_features/eip7594/das-core.md
@@ -8,6 +8,8 @@
 <!-- START doctoc generated TOC please keep comment here to allow auto update -->
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
 
+- [Constants](#constants)
+  - [Misc](#misc)
 - [Custom types](#custom-types)
 - [Configuration](#configuration)
   - [Data size](#data-size)
@@ -39,22 +41,33 @@
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 <!-- /TOC -->
 
+## Constants
+
+The following values are (non-configurable) constants used throughout the specification.
+
+### Misc
+
+| Name | Value |
+| - | - |
+| `UINT256_MAX` | `uint256(2**256 - 1)` |
+
 ## Custom types
 
 We define the following Python custom types for type hinting and readability:
 
 | Name | SSZ equivalent | Description |
 | - | - | - |
 | `DataColumn` | `List[Cell, MAX_BLOB_COMMITMENTS_PER_BLOCK]` | The data of each column in EIP-7594 |
-| `ExtendedMatrix` | `List[Cell, MAX_BLOBS_PER_BLOCK * NUMBER_OF_COLUMNS]` | The full data of one-dimensional erasure coding extended blobs (in row major format) |
+| `ExtendedMatrix` | `List[Cell, MAX_CELLS_IN_EXTENDED_MATRIX]` | The full data of one-dimensional erasure coding extended blobs (in row major format). |
 
 ## Configuration
 
 ### Data size
 
 | Name | Value | Description |
 | - | - | - |
-| `NUMBER_OF_COLUMNS` | `uint64(FIELD_ELEMENTS_PER_EXT_BLOB // FIELD_ELEMENTS_PER_CELL)` (= 128) | Number of columns in the extended data matrix. |
+| `NUMBER_OF_COLUMNS` | `uint64(CELLS_PER_EXT_BLOB)` (= 128) | Number of columns in the extended data matrix. |
+| `MAX_CELLS_IN_EXTENDED_MATRIX` | `uint64(MAX_BLOBS_PER_BLOCK * NUMBER_OF_COLUMNS)` (= 768) | The data size of `ExtendedMatrix`. |
 
 ### Networking
 
@@ -95,8 +108,11 @@ def get_custody_columns(node_id: NodeID, custody_subnet_count: uint64) -> Sequen
     subnet_ids = []
     i = 0
     while len(subnet_ids) < custody_subnet_count:
+        if node_id == UINT256_MAX:
+            node_id = 0
+
         subnet_id = (
-            bytes_to_uint64(hash(uint_to_bytes(uint64(node_id + i)))[0:8])
+            bytes_to_uint64(hash(uint_to_bytes(uint256(node_id + i)))[0:8])
             % DATA_COLUMN_SIDECAR_SUBNET_COUNT
         )
         if subnet_id not in subnet_ids:
@@ -105,11 +121,11 @@ def get_custody_columns(node_id: NodeID, custody_subnet_count: uint64) -> Sequen
     assert len(subnet_ids) == len(set(subnet_ids))
 
     columns_per_subnet = NUMBER_OF_COLUMNS // DATA_COLUMN_SIDECAR_SUBNET_COUNT
-    return [
+    return sorted([
         ColumnIndex(DATA_COLUMN_SIDECAR_SUBNET_COUNT * i + subnet_id)
         for i in range(columns_per_subnet)
         for subnet_id in subnet_ids
-    ]
+    ])
 ```
 
 #### `compute_extended_matrix`
@@ -135,21 +151,16 @@ def recover_matrix(cells_dict: Dict[Tuple[BlobIndex, CellID], Cell], blob_count:
     """
     Return the recovered ``ExtendedMatrix``.
 
-    This helper demonstrates how to apply ``recover_polynomial``.
+    This helper demonstrates how to apply ``recover_all_cells``.
     The data structure for storing cells is implementation-dependent.
     """
     extended_matrix = []
     for blob_index in range(blob_count):
         cell_ids = [cell_id for b_index, cell_id in cells_dict.keys() if b_index == blob_index]
         cells = [cells_dict[(blob_index, cell_id)] for cell_id in cell_ids]
-        cells_bytes = [[bls_field_to_bytes(element) for element in cell] for cell in cells]
-
-        full_polynomial = recover_polynomial(cell_ids, cells_bytes)
-        cells_from_full_polynomial = [
-            full_polynomial[i * FIELD_ELEMENTS_PER_CELL:(i + 1) * FIELD_ELEMENTS_PER_CELL]
-            for i in range(CELLS_PER_BLOB)
-        ]
-        extended_matrix.extend(cells_from_full_polynomial)
+
+        all_cells_for_row = recover_all_cells(cell_ids, cells)
+        extended_matrix.extend(all_cells_for_row)
     return ExtendedMatrix(extended_matrix)
 ```
 
@@ -164,7 +175,7 @@ def get_data_column_sidecars(signed_block: SignedBeaconBlock,
         block.body,
         get_generalized_index(BeaconBlockBody, 'blob_kzg_commitments'),
     )
-    cells_and_proofs = [compute_cells_and_proofs(blob) for blob in blobs]
+    cells_and_proofs = [compute_cells_and_kzg_proofs(blob) for blob in blobs]
     blob_count = len(blobs)
     cells = [cells_and_proofs[i][0] for i in range(blob_count)]
     proofs = [cells_and_proofs[i][1] for i in range(blob_count)]

diff --git a/specs/_features/eip7594/fork.md b/specs/_features/eip7594/fork.md
@@ -28,7 +28,7 @@ Warning: this configuration is not definitive.
 
 | Name | Value |
 | - | - |
-| `EIP7594_FORK_VERSION` | `Version('0x05000000')` |
+| `EIP7594_FORK_VERSION` | `Version('0x06000000')` |
 | `EIP7594_FORK_EPOCH` | `Epoch(18446744073709551615)` **TBD** |
 
 ## Helper functions

diff --git a/specs/_features/eip7594/p2p-interface.md b/specs/_features/eip7594/p2p-interface.md
@@ -74,7 +74,7 @@ def verify_data_column_sidecar_kzg_proofs(sidecar: DataColumnSidecar) -> bool:
     row_ids = [RowIndex(i) for i in range(len(sidecar.column))]
 
     # KZG batch verifies that the cells match the corresponding commitments and proofs
-    return verify_cell_proof_batch(
+    return verify_cell_kzg_proof_batch(
         row_commitments=sidecar.kzg_commitments,
         row_indices=row_ids,  # all rows
         column_indices=[sidecar.index],