fix: rebase conflicts, reconstruction runtime error

fix(wip): resolved conflicts after rebase

fix(wip): resolved code conflicted

fix: failed kzg_commitment_inclusion_proof tests and remove usued imports

fix: subscribe data column subnets if eip7594 scheduled

fix: kzg_inclusion_proofs in deneb and electra

fix: validate block with DA checking

update snapshot-tests, eth2_libp2p

fix: missing check in spec test

chore: sort custody subnets

fix: reconstruction runtime error

Cargo.toml

@@ -353,19 +353,20 @@ jemalloc-ctl = '0.5.4'
 jemallocator = '0.5.4'
 jwt-simple = { version = '0.12.6', default-features = false, features = ['pure-rust'] }
 kzg = { git = 'https://github.com/grandinetech/rust-kzg.git', branch = 'integration-raw-2' }
-lazy_static = '1.4.0'
-libmdbx = { git = 'https://github.com/paradigmxyz/reth.git', package = 'reth-libmdbx', rev = '2d01f3608697eed05357fb847e25ad33ab59d702' }
+libmdbx = { git = 'https://github.com/paradigmxyz/reth.git', package = 'reth-libmdbx', rev = 'c228fe15808c3acbf18dc3af1a03ef5cbdcda07a' }
 libp2p = { version = '0.54', default-features = false, features = ['metrics', 'dns', 'ecdsa', 'identify', 'macros', 'noise', 'plaintext', 'secp256k1', 'serde', 'tcp', 'tokio', 'yamux', 'quic', 'upnp'] }
 libp2p-mplex = '0.42.0'
 log = '0.4.20'
 lru = '0.12.2'
+mediatype = '0.19'
 memoffset = '0.9.0'
 mime = '0.3.17'
 nonzero_ext = '0.3.0'
 num-bigint = '0.4.4'
 num-integer = '0.1.45'
 num-traits = '0.2.17'
 num_cpus = '1.16.0'
+num_threads = '0.1'
 once_cell = '1.19.0'
 openssl = '0.10.63'
 parking_lot = '0.12.1'
@@ -389,15 +390,15 @@ rc-box = '1.2.0'
 refinery = { version = '0.8.12', features = ['rusqlite']}
 regex = '1.10.3'
 replace_with = '0.1.7'
-reqwest = { version = '0.11.24', features = ['blocking', 'json', 'native-tls-vendored'] }
+reqwest = { version = '0.12', features = ['blocking', 'json', 'native-tls-vendored'] }
 rusqlite = { version = '0.30.0', features = ['bundled'] }
 rust-kzg-blst = { git = 'https://github.com/grandinetech/rust-kzg.git', branch = 'integration-raw-2' }
 scrypt = '0.11.0'
 semver = '1.0.21'
 serde = { version = '1.0.196', features = ['derive', 'rc'] }
 serde-aux = '4.4.0'
 serde_json = { version = '1.0.113', features = ['preserve_order'] }
-serde_qs = { version = '0.12.0', features = ['axum'] }
+serde_qs = { version = '0.13', features = ['axum'] }
 serde_repr = '0.1.18'
 serde_with = '3.6.0'
 serde_yaml = '0.9.31'
@@ -414,7 +415,7 @@ snap = '1.1.1'
 static_assertions = '1.1.0'
 strum = { version = '0.26.1', features = ['derive'] }
 syn = { version = '2.0.48', features = ['full'] }
-sysinfo = '0.30.5'
+sysinfo = '0.31'
 tap = '1.0.1'
 tempfile = '3.9.0'
 test-case = '3.3.1'
@@ -426,8 +427,8 @@ tokio = { version = '1.36.0', features = ['fs', 'macros', 'rt-multi-thread', 'si
 tokio-io-timeout = '1.2.0'
 tokio-stream = { version = '0.1.14', features = ['sync'] }
 tokio-util = { version = "0.7", features = ["codec", "compat", "time"] }
-tower = { version = '0.4.13', features = ['timeout'] }
-tower-http = { version = '0.4.4', features = ['cors', 'trace'] }
+tower = { version = '0.5', features = ['timeout'] }
+tower-http = { version = '0.5', features = ['cors', 'trace'] }
 tracing = '0.1.40'
 triomphe = '0.1.11'
 tynm = '0.1.9'

ad_hoc_bench/src/main.rs

@@ -245,7 +245,7 @@ impl From<Blocks> for BlockParameters {
 }
 
 fn main() -> Result<()> {
-    binary_utils::initialize_logger(module_path!(), false)?;
+    binary_utils::initialize_logger(module_path!(), false, false)?;
     binary_utils::initialize_rayon()?;
 
     print_jemalloc_stats()?;

attestation_verifier/src/attestation_verifier.rs

@@ -444,7 +444,7 @@ fn attestation_batch_triples<'a, P: Preset>(
         .map(|attestation| {
             let triple = match attestation {
                 Attestation::Phase0(attestation) => {
-                    let indexed_attestation = phase0::get_indexed_attestation(state, attestation)?;
+                    let indexed_attestation = phase0::get_indexed_attestation(state, &attestation)?;
 
                     let mut triple = Triple::default();
 
@@ -458,7 +458,8 @@ fn attestation_batch_triples<'a, P: Preset>(
                     triple
                 }
                 Attestation::Electra(attestation) => {
-                    let indexed_attestation = electra::get_indexed_attestation(state, attestation)?;
+                    let indexed_attestation =
+                        electra::get_indexed_attestation(state, &attestation)?;
 
                     let mut triple = Triple::default();
 

binary_utils/src/lib.rs

@@ -7,7 +7,11 @@ use log::LevelFilter;
 use logging::PEER_LOG_METRICS;
 use rayon::ThreadPoolBuilder;
 
-pub fn initialize_logger(module_path: &str, always_write_style: bool) -> Result<()> {
+pub fn initialize_logger(
+    module_path: &str,
+    always_write_style: bool,
+    parse_env: bool,
+) -> Result<()> {
     let mut builder = Builder::new();
 
     builder
@@ -64,6 +68,14 @@ pub fn initialize_logger(module_path: &str, always_write_style: bool) -> Result<
         builder.write_style(WriteStyle::Always);
     }
 
+    if parse_env {
+        let env = Env::new()
+            .filter("GRANDINE_LOG")
+            .write_style("GRANDINE_LOG_STYLE");
+
+        builder.parse_env(env);
+    }
+
     let env = Env::new()
         .filter("GRANDINE_LOG")
         .write_style("GRANDINE_LOG_STYLE");

block_producer/src/block_producer.rs

@@ -837,7 +837,7 @@ impl<P: Preset, W: Wait> BlockBuildContext<P, W> {
                         .filter_map(|attestation| {
                             operation_pools::convert_to_electra_attestation(attestation).ok()
                         })
-                        .chunk_by(|attestation| attestation.data);
+                        .group_by(|attestation| attestation.data);
 
                     let attestations = attestations
                         .into_iter()