resolve merge conflicts

2026-03-23 23:04:53 +00:00 · 2026-02-03 20:47:42 -08:00
parent 1c1e6dda10 1dd0f7bcbb
commit 1e69734e18
19 changed files with 109 additions and 55 deletions
--- a/beacon_node/beacon_chain/src/builder.rs
+++ b/beacon_node/beacon_chain/src/builder.rs
@@ -1218,7 +1218,6 @@ fn build_data_columns_from_blobs<E: EthSpec>(

        if block.fork_name_unchecked().gloas_enabled() {
            build_data_column_sidecars_gloas(
-                kzg_commitments,
                block.message().tree_hash_root(),
                block.slot(),
                blob_cells_and_proofs_vec,