Merge branch 'gloas-containers' into gloas-envelope-processing

consensus/types/Cargo.toml

@@ -25,7 +25,7 @@ portable = ["bls/supranational-portable"]
 
 [dependencies]
 alloy-primitives = { workspace = true }
-alloy-rlp = { version = "0.3.4", features = ["derive"] }
+alloy-rlp = { workspace = true, features = ["derive"] }
 arbitrary = { workspace = true, features = ["derive"], optional = true }
 bls = { workspace = true }
 compare_fields = { workspace = true }

consensus/types/src/data_column_custody_group.rs

@@ -42,7 +42,7 @@ pub fn get_custody_groups(
 ///
 /// # Returns
 /// Vector of custody group indices in computation order or error if parameters are invalid
-pub fn get_custody_groups_ordered(
+fn get_custody_groups_ordered(
     raw_node_id: [u8; 32],
     custody_group_count: u64,
     spec: &ChainSpec,
@@ -76,6 +76,27 @@ pub fn get_custody_groups_ordered(
     Ok(custody_groups)
 }
 
+/// Returns a deterministically ordered list of custody columns assigned to a node,
+/// preserving the order in which they were computed during iteration.
+///
+/// # Arguments
+/// * `raw_node_id` - 32-byte node identifier
+/// * `spec` - Chain specification containing custody parameters
+pub fn compute_ordered_custody_column_indices<E: EthSpec>(
+    raw_node_id: [u8; 32],
+    spec: &ChainSpec,
+) -> Result<Vec<ColumnIndex>, DataColumnCustodyGroupError> {
+    let all_custody_groups_ordered =
+        get_custody_groups_ordered(raw_node_id, spec.number_of_custody_groups, spec)?;
+
+    let mut ordered_custody_columns = vec![];
+    for custody_index in all_custody_groups_ordered {
+        let columns = compute_columns_for_custody_group::<E>(custody_index, spec)?;
+        ordered_custody_columns.extend(columns);
+    }
+    Ok(ordered_custody_columns)
+}
+
 /// Returns the columns that are associated with a given custody group.
 ///
 /// spec: https://github.com/ethereum/consensus-specs/blob/8e0d0d48e81d6c7c5a8253ab61340f5ea5bac66a/specs/fulu/das-core.md#compute_columns_for_custody_group

consensus/types/src/signed_beacon_block.rs

@@ -8,6 +8,7 @@ use ssz_derive::{Decode, Encode};
 use std::fmt;
 use superstruct::superstruct;
 use test_random_derive::TestRandom;
+use tracing::instrument;
 use tree_hash::TreeHash;
 use tree_hash_derive::TreeHash;
 
@@ -253,6 +254,7 @@ impl<E: EthSpec, Payload: AbstractExecPayload<E>> SignedBeaconBlock<E, Payload>
     }
 
     /// Produce a signed beacon block header corresponding to this block.
+    #[instrument(level = "debug", skip_all)]
     pub fn signed_block_header(&self) -> SignedBeaconBlockHeader {
         SignedBeaconBlockHeader {
             message: self.message().block_header(),