Upgrade consensus-spec-tests to v1.5.0-alpha10:

- Add initial SingularAttestation plumbing
- Add custom serializer / deserializer for ExecutionRequests
- Update blob sidecar subnet calculation and subscription
- Update `/eth/v1/beacon/blob_sidecars/{block_id}` endpoint.

Co-authored-by: Povilas Liubauskas <[email protected]>

Author: Tumas

Cargo.lock

@@ -34,8 +34,8 @@ pub struct SignedBuilderBid<P: Preset> {
 #[serde(bound = "", deny_unknown_fields)]
 pub struct BlobsBundle<P: Preset> {
     pub commitments: ContiguousList<KzgCommitment, P::MaxBlobCommitmentsPerBlock>,
-    pub proofs: ContiguousList<KzgProof, P::MaxBlobsPerBlock>,
-    pub blobs: ContiguousList<Blob<P>, P::MaxBlobsPerBlock>,
+    pub proofs: ContiguousList<KzgProof, P::MaxBlobCommitmentsPerBlock>,
+    pub blobs: ContiguousList<Blob<P>, P::MaxBlobCommitmentsPerBlock>,
 }
 
 #[derive(Debug, Deserialize)]

builder_api/src/deneb/containers.rs

@@ -3,18 +3,18 @@ use sha2::{Digest as _, Sha256};
 use ssz::Uint256;
 use typenum::Unsigned as _;
 use types::{
-    eip7594::{ColumnIndex, NumberOfColumns, DATA_COLUMN_SIDECAR_SUBNET_COUNT},
+    eip7594::{CustodyIndex, NumberOfColumns, NUMBER_OF_CUSTODY_GROUPS},
     phase0::primitives::NodeId,
 };
 
 #[must_use]
-pub fn get_custody_columns(node_id: NodeId, custody_subnet_count: u64) -> Vec<ColumnIndex> {
-    assert!(custody_subnet_count <= DATA_COLUMN_SIDECAR_SUBNET_COUNT);
+pub fn get_custody_groups(node_id: NodeId, custody_group_count: u64) -> Vec<CustodyIndex> {
+    assert!(custody_group_count <= NUMBER_OF_CUSTODY_GROUPS);
 
-    let mut subnet_ids = vec![];
+    let mut custody_groups = vec![];
     let mut current_id = node_id;
 
-    while (subnet_ids.len() as u64) < custody_subnet_count {
+    while (custody_groups.len() as u64) < custody_group_count {
         let mut hasher = Sha256::new();
         let mut bytes: [u8; 32] = [0; 32];
 
@@ -28,10 +28,10 @@ pub fn get_custody_columns(node_id: NodeId, custody_subnet_count: u64) -> Vec<Co
         ];
 
         let output_prefix_u64 = u64::from_le_bytes(output_prefix);
-        let subnet_id = output_prefix_u64 % DATA_COLUMN_SIDECAR_SUBNET_COUNT;
+        let custody_group = output_prefix_u64 % NUMBER_OF_CUSTODY_GROUPS;
 
-        if !subnet_ids.contains(&subnet_id) {
-            subnet_ids.push(subnet_id);
+        if !custody_groups.contains(&custody_group) {
+            custody_groups.push(custody_group);
         }
 
         if current_id == Uint256::MAX {
@@ -41,11 +41,11 @@ pub fn get_custody_columns(node_id: NodeId, custody_subnet_count: u64) -> Vec<Co
         current_id = current_id + Uint256::one();
     }
 
-    let columns_per_subnet = NumberOfColumns::U64 / DATA_COLUMN_SIDECAR_SUBNET_COUNT;
+    let columns_per_custody_group = NumberOfColumns::U64 / NUMBER_OF_CUSTODY_GROUPS;
     let mut result = Vec::new();
-    for i in 0..columns_per_subnet {
-        for &subnet_id in &subnet_ids {
-            result.push(DATA_COLUMN_SIDECAR_SUBNET_COUNT * i + subnet_id);
+    for i in 0..columns_per_custody_group {
+        for &custody_group in &custody_groups {
+            result.push(NUMBER_OF_CUSTODY_GROUPS * i + custody_group);
         }
     }
 
@@ -60,25 +60,26 @@ mod tests {
     use spec_test_utils::Case;
     use test_generator::test_resources;
     use types::{
+        eip7594::CustodyIndex,
         phase0::primitives::NodeId,
         preset::{Mainnet, Minimal, Preset},
     };
 
-    use crate::{get_custody_columns, ColumnIndex};
+    use crate::get_custody_groups;
 
     #[derive(Deserialize)]
     #[serde(deny_unknown_fields)]
     struct Meta {
         description: Option<String>,
         node_id: NodeId,
-        custody_subnet_count: u64,
-        result: Vec<ColumnIndex>,
+        custody_group_count: u64,
+        result: Vec<CustodyIndex>,
     }
 
     #[duplicate_item(
         glob                                                                              function_name                 preset;
-        ["consensus-spec-tests/tests/mainnet/eip7594/networking/get_custody_columns/*/*"] [get_custody_columns_mainnet] [Mainnet];
-        ["consensus-spec-tests/tests/minimal/eip7594/networking/get_custody_columns/*/*"] [get_custody_columns_minimal] [Minimal];
+        ["consensus-spec-tests/tests/mainnet/fulu/networking/get_custody_columns/*/*"] [get_custody_groups_mainnet] [Mainnet];
+        ["consensus-spec-tests/tests/minimal/fulu/networking/get_custody_columns/*/*"] [get_custody_groups_minimal] [Minimal];
     )]
     #[test_resources(glob)]
     fn function_name(case: Case) {
@@ -90,10 +91,10 @@ mod tests {
         let Meta {
             description: _description,
             node_id,
-            custody_subnet_count,
+            custody_group_count,
             result,
         } = case.yaml::<Meta>("meta");
 
-        assert_eq!(get_custody_columns(node_id, custody_subnet_count), result);
+        assert_eq!(get_custody_groups(node_id, custody_group_count), result);
     }
 }

consensus-spec-tests

@@ -916,11 +916,7 @@ mod tests {
               "proofs": [],
               "blobs": []
             },
-            "executionRequests": [
-              "0x",
-              "0x",
-              "0x"
-            ],
+            "executionRequests": [],
             "shouldOverrideBuilder": false
           }
         });
@@ -1003,9 +999,7 @@ mod tests {
               "blobs": []
             },
             "executionRequests": [
-              "0x92f9fe7570a6650d030bb2227d699c744303d08a887cd2e1592e30906cd8cedf9646c1a1afd902235bb36620180eb68802000000000000000000000065d08a056c17ae13370565b04cf77d2afa1cb9fa0010a5d4e8000000a13741d65b47825c147201cfce3360438d4011fe81b455e86226c95a2669bfde14712ba36d1c2f44371a98bf28ff38370ce7d28c65872bf65ff88d6014468676029e298903c89c51c27ab5f07e178b8b14d3ca191e2ce3b24703629e3994e05b000000000000000090a58546229c585cef35f3afab904411530303d95c371e246a2e9a1ef6beb5db7a98c2fd79a388709a30ec782576a5d602000000000000000000000065d08a056c17ae13370565b04cf77d2afa1cb9fa0010a5d4e8000000b23e205d2fcfc3e9d3ae58c0f78b55b19f97f59eaf43d85113a1960ee2c38f6b4ef705302e46e0593fc41ba5632b047a14d76dc82bb2619d7c73e0d89da2eda2ea11fff9036c2d08f9d457c07f23b1411ecd13ff0e9c00eeb85d851bae2494e00100000000000000",
-              "0x",
-              "0x"
+              "0x0092f9fe7570a6650d030bb2227d699c744303d08a887cd2e1592e30906cd8cedf9646c1a1afd902235bb36620180eb68802000000000000000000000065d08a056c17ae13370565b04cf77d2afa1cb9fa0010a5d4e8000000a13741d65b47825c147201cfce3360438d4011fe81b455e86226c95a2669bfde14712ba36d1c2f44371a98bf28ff38370ce7d28c65872bf65ff88d6014468676029e298903c89c51c27ab5f07e178b8b14d3ca191e2ce3b24703629e3994e05b000000000000000090a58546229c585cef35f3afab904411530303d95c371e246a2e9a1ef6beb5db7a98c2fd79a388709a30ec782576a5d602000000000000000000000065d08a056c17ae13370565b04cf77d2afa1cb9fa0010a5d4e8000000b23e205d2fcfc3e9d3ae58c0f78b55b19f97f59eaf43d85113a1960ee2c38f6b4ef705302e46e0593fc41ba5632b047a14d76dc82bb2619d7c73e0d89da2eda2ea11fff9036c2d08f9d457c07f23b1411ecd13ff0e9c00eeb85d851bae2494e00100000000000000",
             ],
             "shouldOverrideBuilder": false
           }

eip_7594/src/lib.rs

@@ -8,9 +8,11 @@ workspace = true
 
 [dependencies]
 anyhow = { workspace = true }
+const-hex = { workspace = true }
 either = { workspace = true }
 ethereum-types = { workspace = true }
 futures = { workspace = true }
+hex = { workspace = true }
 serde = { workspace = true }
 serde_utils = { workspace = true }
 ssz = { workspace = true }

eth1_api/src/eth1_api.rs

@@ -11,5 +11,4 @@ pub use crate::{
 };
 
 mod execution_engine;
-mod ssz_as_prefixed_hex_or_bytes;
 mod types;