fix(l1): serve GetBlockHeaders by non-canonical hash so syncing peers can fetch their head

.github/config/hive/amsterdam.yaml

@@ -1,4 +1,4 @@
 # Amsterdam (BAL) hive test configuration
-# Pinned to tests-bal@v7.3.2 (execution-specs `devnets/bal/7`)
-fixtures: https://github.com/ethereum/execution-specs/releases/download/tests-bal%40v7.3.2/fixtures_bal.tar.gz
-eels_commit: d28f7977069d1b71984ff88ed8040b671f6e6a77
+# Pinned to tests-glamsterdam-devnet@v6.1.0 (execution-specs `devnets/glamsterdam/6`)
+fixtures: https://github.com/ethereum/execution-specs/releases/download/tests-glamsterdam-devnet%40v6.1.0/fixtures_glamsterdam-devnet.tar.gz
+eels_commit: 4bc0fc6a7b69639db396a301302352f8cd9fc5be

CHANGELOG.md

@@ -34,6 +34,10 @@
 
 - Short-circuit the `KECCAK256` opcode on zero-length input by returning the precomputed `keccak256("")` constant, skipping the permutation [#6775](https://github.com/lambdaclass/ethrex/pull/6775)
 
+### 2026-05-28
+
+- Batch account-state prefetch via rocksdb `multi_get_cf` on the flat key-value table [#6712](https://github.com/lambdaclass/ethrex/pull/6712)
+
 ### 2026-05-27
 
 - Prefetch all BAL storage synchronously before execution [#6732](https://github.com/lambdaclass/ethrex/pull/6732)

Makefile

@@ -162,12 +162,12 @@ run-hive-eels-blobs: ## Run hive EELS Blobs tests
 	$(MAKE) run-hive-eels EELS_SIM=ethereum/eels/execute-blobs
 
 AMSTERDAM_FIXTURES_URL ?= $(shell cat tooling/ef_tests/blockchain/.fixtures_url_amsterdam)
-AMSTERDAM_FIXTURES_BRANCH ?= devnets/bal/7
+AMSTERDAM_FIXTURES_BRANCH ?= devnets/glamsterdam/6
 run-hive-eels-amsterdam: build-image setup-hive ## 🧪 Run hive EELS Amsterdam Engine tests
 	- cd hive && ./hive --client-file $(HIVE_CLIENT_FILE) --client ethrex --sim ethereum/eels/consume-engine --sim.limit ".*fork_Amsterdam.*" --sim.parallelism $(SIM_PARALLELISM) --sim.loglevel $(SIM_LOG_LEVEL) --sim.buildarg fixtures=$(AMSTERDAM_FIXTURES_URL) --sim.buildarg branch=$(AMSTERDAM_FIXTURES_BRANCH)
 
-run-hive-eels-bal-quick: build-image setup-hive ## 🧪 Run hive EELS BAL quick tests for EIPs 7708,7778,7843,7928,7954,8024,8037
-	- cd hive && ./hive --client-file $(HIVE_CLIENT_FILE) --client ethrex --sim ethereum/eels/consume-engine --sim.limit ".*(8024|7708|7778|7843|7928|7954|8037).*" --sim.parallelism $(SIM_PARALLELISM) --sim.loglevel $(SIM_LOG_LEVEL) --sim.buildarg fixtures=$(AMSTERDAM_FIXTURES_URL) --sim.buildarg branch=$(AMSTERDAM_FIXTURES_BRANCH)
+run-hive-eels-bal-quick: build-image setup-hive ## 🧪 Run hive EELS quick tests for the glam-6 EIPs
+	- cd hive && ./hive --client-file $(HIVE_CLIENT_FILE) --client ethrex --sim ethereum/eels/consume-engine --sim.limit ".*(8024|7708|7778|7843|7928|7954|8037|8038|2780|7997|7610|8246|8282).*" --sim.parallelism $(SIM_PARALLELISM) --sim.loglevel $(SIM_LOG_LEVEL) --sim.buildarg fixtures=$(AMSTERDAM_FIXTURES_URL) --sim.buildarg branch=$(AMSTERDAM_FIXTURES_BRANCH)
 
 clean-hive-logs: ## 🧹 Clean Hive logs
 	rm -rf ./hive/workspace/logs

cmd/ethrex/ethrex.rs

@@ -4,7 +4,7 @@ use ethrex::{
     initializers::{init_l1, init_tracing},
     utils::{NodeConfigFile, get_client_version, is_memory_datadir, store_node_config_file},
 };
-use ethrex_p2p::{peer_table::PeerTable, types::NodeRecord};
+use ethrex_p2p::{peer_table::PeerTable, types::SharedLocalNode};
 use serde::Deserialize;
 use std::{path::Path, time::Duration};
 use tokio::signal::unix::{SignalKind, signal};
@@ -49,14 +49,21 @@ async fn server_shutdown(
     datadir: &Path,
     cancel_token: &CancellationToken,
     peer_table: PeerTable,
-    local_node_record: NodeRecord,
+    shared_local_node: SharedLocalNode,
 ) {
     info!("Server shut down started...");
     cancel_token.cancel();
     if !is_memory_datadir(datadir) {
         let node_config_path = datadir.join("node_config.json");
         info!("Storing config at {:?}...", node_config_path);
-        let node_config = NodeConfigFile::new(peer_table, local_node_record).await;
+        // Clone the current (possibly updated) record out and drop the guard.
+        let record = {
+            let guard = shared_local_node
+                .read()
+                .expect("shared_local_node poisoned");
+            guard.record.clone()
+        };
+        let node_config = NodeConfigFile::new(peer_table, record).await;
         store_node_config_file(node_config, node_config_path);
         tokio::time::sleep(Duration::from_secs(1)).await;
     }
@@ -179,7 +186,7 @@ async fn main() -> eyre::Result<()> {
     info!("ethrex version: {}", get_client_version());
     tokio::spawn(periodically_check_version_update());
 
-    let (datadir, cancel_token, peer_table, local_node_record) =
+    let (datadir, cancel_token, peer_table, shared_local_node) =
         init_l1(opts, Some(log_filter_handler)).await?;
 
     let mut signal_terminate = signal(SignalKind::terminate())?;
@@ -188,10 +195,10 @@ async fn main() -> eyre::Result<()> {
 
     tokio::select! {
         _ = tokio::signal::ctrl_c() => {
-            server_shutdown(&datadir, &cancel_token, peer_table, local_node_record).await;
+            server_shutdown(&datadir, &cancel_token, peer_table, shared_local_node).await;
         }
         _ = signal_terminate.recv() => {
-            server_shutdown(&datadir, &cancel_token, peer_table, local_node_record).await;
+            server_shutdown(&datadir, &cancel_token, peer_table, shared_local_node).await;
         }
     }
 

cmd/ethrex/initializers.rs

@@ -21,7 +21,7 @@ use ethrex_p2p::{
     peer_table::{PeerTable, PeerTableServer},
     sync::SyncMode,
     sync_manager::SyncManager,
-    types::{NetworkConfig, Node, NodeRecord},
+    types::{LocalNode, NetworkConfig, Node, NodeRecord, SharedLocalNode},
     utils::public_key_from_signing_key,
 };
 use ethrex_storage::{
@@ -37,7 +37,7 @@ use std::{
     io::IsTerminal,
     net::{IpAddr, Ipv4Addr, SocketAddr},
     path::{Path, PathBuf},
-    sync::Arc,
+    sync::{Arc, RwLock},
     time::{SystemTime, UNIX_EPOCH},
 };
 use tokio_util::{sync::CancellationToken, task::TaskTracker};
@@ -228,8 +228,7 @@ pub async fn init_rpc_api(
     opts: &Options,
     datadir: &Path,
     peer_handler: PeerHandler,
-    local_p2p_node: Node,
-    local_node_record: NodeRecord,
+    shared_local_node: SharedLocalNode,
     store: Store,
     blockchain: Arc<Blockchain>,
     cancel_token: CancellationToken,
@@ -273,8 +272,7 @@ pub async fn init_rpc_api(
         store,
         blockchain,
         read_jwtsecret_file(&opts.authrpc_jwtsecret),
-        local_p2p_node,
-        local_node_record,
+        shared_local_node,
         syncer,
         peer_handler,
         get_client_version(),
@@ -296,6 +294,7 @@ pub async fn init_network(
     tracker: TaskTracker,
     blockchain: Arc<Blockchain>,
     context: P2PContext,
+    shared_local_node: SharedLocalNode,
 ) {
     #[cfg(not(feature = "l2"))]
     if opts.dev {
@@ -310,10 +309,11 @@ pub async fn init_network(
     let discovery_config = DiscoveryConfig {
         discv4_enabled: opts.discv4_enabled,
         discv5_enabled: opts.discv5_enabled,
+        nat_extip_set: opts.nat_extip.is_some(),
         ..Default::default()
     };
 
-    ethrex_p2p::start_network(context, bootnodes, discovery_config)
+    ethrex_p2p::start_network(context, bootnodes, discovery_config, shared_local_node)
         .await
         .expect("Network starts");
 
@@ -501,7 +501,17 @@ pub fn get_local_p2p_node(opts: &Options, signer: &SecretKey) -> (Node, NetworkC
         local_ipv6().ok(),
     );
 
-    let node = Node::new(external_addr, udp_port, tcp_port, local_public_key);
+    // Advertise the detected address immediately, even when it is RFC1918 private.
+    // On a flat private network (local / kurtosis devnet) the private IP is the
+    // address peers actually reach us at, and tooling such as ethereum-package
+    // snapshots `admin_nodeInfo` at startup to seed other nodes' bootnodes; an
+    // advertised `0.0.0.0` there is undiallable and breaks discovery permanently.
+    // For a genuinely NAT'd public node the IpPredictor upgrades this to the public
+    // IP once PONG votes reach quorum (see IpPredictor::finalize_ip_vote_round, which
+    // prefers a public winner and only falls back to a private one).
+    let announce_addr = external_addr;
+
+    let node = Node::new(announce_addr, udp_port, tcp_port, local_public_key);
     let network_config = NetworkConfig {
         bind_addr,
         tcp_port,
@@ -573,7 +583,7 @@ async fn set_sync_block(store: &Store) {
 pub async fn init_l1(
     opts: Options,
     log_filter_handler: Option<reload::Handle<EnvFilter, Registry>>,
-) -> eyre::Result<(PathBuf, CancellationToken, PeerTable, NodeRecord)> {
+) -> eyre::Result<(PathBuf, CancellationToken, PeerTable, SharedLocalNode)> {
     let network = get_network(&opts);
     let datadir = crate::cli::compute_effective_datadir(&opts.datadir, &network, opts.dev);
 
@@ -644,6 +654,12 @@ pub async fn init_l1(
 
     let local_node_record = get_local_node_record(&datadir, &local_p2p_node, &signer);
 
+    // Build the shared live identity Arc once; threaded into RPC, discovery, and shutdown.
+    let shared_local_node: SharedLocalNode = Arc::new(RwLock::new(LocalNode {
+        node: local_p2p_node.clone(),
+        record: local_node_record,
+    }));
+
     let peer_table =
         PeerTableServer::spawn(local_p2p_node.node_id(), opts.target_peers, store.clone());
 
@@ -675,8 +691,7 @@ pub async fn init_l1(
         &opts,
         &datadir,
         peer_handler.clone(),
-        local_p2p_node,
-        local_node_record.clone(),
+        shared_local_node.clone(),
         store.clone(),
         blockchain.clone(),
         cancel_token.clone(),
@@ -701,6 +716,7 @@ pub async fn init_l1(
             tracker.clone(),
             blockchain.clone(),
             p2p_context,
+            shared_local_node.clone(),
         )
         .await;
     } else {
@@ -711,7 +727,7 @@ pub async fn init_l1(
         datadir.clone(),
         cancel_token,
         peer_handler.peer_table,
-        local_node_record,
+        shared_local_node,
     ))
 }
 
@@ -988,4 +1004,16 @@ mod tests {
     fn family_mismatch_panics() {
         let _ = resolve_p2p_endpoints(Some("0.0.0.0"), Some("::1"), None, None);
     }
+
+    /// Regression: on a flat private network (docker / kurtosis devnet) with no
+    /// `--nat.extip` or `--p2p.addr`, the detected RFC1918 IP must be announced
+    /// as-is. Previously `get_local_p2p_node` clobbered any private IP to `0.0.0.0`,
+    /// producing an undiallable `enode://...@0.0.0.0` that broke peer discovery.
+    #[test]
+    fn no_flags_announces_detected_private_ip() {
+        let docker_ip = ip("172.16.0.10");
+        let (bind, ext) = resolve_p2p_endpoints(None, None, Some(docker_ip), None);
+        assert_eq!(bind, docker_ip);
+        assert_eq!(ext, docker_ip, "private IP must be announced, not 0.0.0.0");
+    }
 }

cmd/ethrex/l2/initializers.rs

@@ -21,7 +21,7 @@ use ethrex_p2p::{
     peer_table::PeerTableServer,
     rlpx::{initiator::RLPxInitiator, l2::l2_connection::P2PBasedContext},
     sync_manager::SyncManager,
-    types::{Node, NodeRecord},
+    types::{LocalNode, SharedLocalNode},
 };
 use ethrex_rpc::{SubscriptionManager, WebSocketConfig};
 use ethrex_storage::{Store, StoreConfig};
@@ -30,7 +30,12 @@ use eyre::OptionExt;
 use secp256k1::SecretKey;
 
 use spawned_concurrency::tasks::ActorRef;
-use std::{fs::read_to_string, path::Path, sync::Arc, time::Duration};
+use std::{
+    fs::read_to_string,
+    path::Path,
+    sync::{Arc, RwLock},
+    time::Duration,
+};
 use tokio::task::JoinSet;
 use tokio_util::{sync::CancellationToken, task::TaskTracker};
 use tracing::{info, warn};
@@ -43,8 +48,7 @@ fn init_rpc_api(
     opts: &L1Options,
     l2_opts: &L2Options,
     peer_handler: Option<PeerHandler>,
-    local_p2p_node: Node,
-    local_node_record: NodeRecord,
+    shared_local_node: SharedLocalNode,
     store: Store,
     blockchain: Arc<Blockchain>,
     syncer: Option<Arc<SyncManager>>,
@@ -65,8 +69,7 @@ fn init_rpc_api(
         store,
         blockchain,
         read_jwtsecret_file(&opts.authrpc_jwtsecret),
-        local_p2p_node,
-        local_node_record,
+        shared_local_node,
         syncer,
         peer_handler,
         get_client_version(),
@@ -247,6 +250,12 @@ pub async fn init_l2(
 
     let local_node_record = get_local_node_record(&datadir, &local_p2p_node, &signer);
 
+    // Build the shared live identity Arc once; threaded into RPC, discovery, and shutdown.
+    let shared_local_node: SharedLocalNode = Arc::new(RwLock::new(LocalNode {
+        node: local_p2p_node.clone(),
+        record: local_node_record,
+    }));
+
     // TODO: Check every module starts properly.
     let tracker = TaskTracker::new();
     let mut join_set = JoinSet::new();
@@ -318,6 +327,7 @@ pub async fn init_l2(
             tracker.clone(),
             blockchain.clone(),
             p2p_context,
+            shared_local_node.clone(),
         )
         .await;
         (Some(peer_handler), Some(Arc::new(syncer)))
@@ -348,8 +358,7 @@ pub async fn init_l2(
         &opts.node_opts,
         &opts,
         peer_handler.clone(),
-        local_p2p_node.clone(),
-        local_node_record.clone(),
+        shared_local_node.clone(),
         store.clone(),
         blockchain.clone(),
         syncer,
@@ -404,7 +413,14 @@ pub async fn init_l2(
     cancel_token.cancel();
     if !opts.node_opts.p2p_disabled {
         let peer_handler = peer_handler.ok_or_eyre("Peer handler not initialized")?;
-        let node_config = NodeConfigFile::new(peer_handler.peer_table, local_node_record).await;
+        // Clone the current (possibly updated) record out and drop the guard.
+        let record = {
+            let guard = shared_local_node
+                .read()
+                .expect("shared_local_node poisoned");
+            guard.record.clone()
+        };
+        let node_config = NodeConfigFile::new(peer_handler.peer_table, record).await;
         store_node_config_file(node_config, node_config_path);
     }
     tokio::time::sleep(Duration::from_secs(1)).await;

crates/blockchain/blockchain.rs

@@ -2789,7 +2789,7 @@ impl Blockchain {
     /// Per-block pruning only covers the head block, so stale blob txs from
     /// non-head canonical blocks leak in and are never evicted (value/nonce
     /// eviction pins low nonces). Resetting against on-chain nonces clears them.
-    pub fn remove_stale_blob_txs(&self, head_hash: BlockHash) -> Result<(), StoreError> {
+    pub async fn remove_stale_blob_txs(&self, head_hash: BlockHash) -> Result<(), StoreError> {
         let blob_txs = self.mempool.blob_txs()?;
         if blob_txs.is_empty() {
             return Ok(());
@@ -2917,7 +2917,7 @@ impl Blockchain {
         }
 
         // Check that the gas limit covers the gas needs for transaction metadata.
-        if tx.gas_limit() < mempool::transaction_intrinsic_gas(tx, &header, &config)? {
+        if tx.gas_limit() < mempool::transaction_intrinsic_gas(tx, sender, &header, &config)? {
             return Err(MempoolError::TxIntrinsicGasCostAboveLimitError);
         }
 

crates/blockchain/constants.rs

@@ -25,8 +25,8 @@ pub const TX_DATA_NON_ZERO_GAS: u64 = 68;
 
 // Max bytecode size
 pub const MAX_CODE_SIZE: u32 = 0x6000;
-// EIP-7954 (Amsterdam): increased max bytecode size
-pub const AMSTERDAM_MAX_CODE_SIZE: u32 = 0x8000;
+// EIP-7954 (Amsterdam): increase max bytecode size to 64 KiB
+pub const AMSTERDAM_MAX_CODE_SIZE: u32 = 0x10000;
 
 // === EIP-3860 constants ===
 

crates/blockchain/mempool.rs

@@ -783,13 +783,15 @@ pub struct PendingTxFilter {
 
 pub fn transaction_intrinsic_gas(
     tx: &Transaction,
+    sender: Address,
     header: &BlockHeader,
     config: &ChainConfig,
 ) -> Result<u64, MempoolError> {
-    // Amsterdam (EIP-8037): the VM splits intrinsic into (regular, state) and uses
-    // `REGULAR_GAS_CREATE = 9000` + `STATE_BYTES_PER_NEW_ACCOUNT * cpsb` for CREATE
-    // instead of the legacy `TX_CREATE_GAS_COST = 53000`. Mempool admission must
-    // match VM charge or we spuriously reject (or admit) transactions.
+    // Amsterdam (EIP-2780/8037/8038): the VM splits intrinsic into (regular, state).
+    // A CREATE tx pays `TX_BASE (12000) + CREATE_ACCESS (11000)` regular +
+    // `STATE_BYTES_PER_NEW_ACCOUNT * cpsb` state, instead of the legacy
+    // `TX_CREATE_GAS_COST = 53000`. Mempool admission must match the VM charge or we
+    // spuriously reject (or admit) transactions.
     //
     // The VM enforces `gas_limit >= max(intrinsic_regular + intrinsic_state,
     // floor)` via two separate checks in `validate_gas_allowance` +
@@ -798,7 +800,7 @@ pub fn transaction_intrinsic_gas(
     // pass mempool and then fail at block inclusion, polluting the pool.
     if config.is_amsterdam_activated(header.timestamp) {
         let fork = config.fork(header.timestamp);
-        let (regular, state) = intrinsic_gas_dimensions(tx, fork, header.gas_limit)
+        let (regular, state) = intrinsic_gas_dimensions(tx, sender, fork, header.gas_limit)
             .map_err(|_| MempoolError::TxGasOverflowError)?;
         let intrinsic = regular
             .checked_add(state)