Merge branch 'main' into devnet-3

Resolve conflict: keep both is_aggregator field and pending_block_parents from main's storage refactor.
lambdaclass · MegaRedHand · Feb 27, 2026 · Feb 10, 2026 · Feb 10, 2026 · Feb 10, 2026
commit be797015eadeffd56a67f38fb4d44596a8ac7556
diff --git a/crates/blockchain/src/lib.rs b/crates/blockchain/src/lib.rs
@@ -66,6 +66,7 @@ impl BlockChain {
             key_manager,
             pending_blocks: HashMap::new(),
             is_aggregator,
+            pending_block_parents: HashMap::new(),
         }
         .start();
         let time_until_genesis = (SystemTime::UNIX_EPOCH + Duration::from_secs(genesis_time))
@@ -125,6 +126,10 @@ struct BlockChainServer {
 
     // Pending blocks waiting for their parent
     pending_blocks: HashMap<H256, Vec<SignedBlockWithAttestation>>,
+    // Maps pending block_root → its cached missing ancestor. Resolved by walking the
+    // chain at lookup time, since a cached ancestor may itself have become pending with
+    // a deeper missing parent after the entry was created.
+    pending_block_parents: HashMap<H256, H256>,
 
     /// Whether this node acts as a committee aggregator.
     is_aggregator: bool,

diff --git a/crates/storage/src/store.rs b/crates/storage/src/store.rs
@@ -13,8 +13,8 @@ use crate::types::{StoredAggregatedPayload, StoredSignature};
 use ethlambda_types::{
     attestation::AttestationData,
     block::{
-        Block, BlockBody, BlockHeader, BlockSignaturesWithAttestation,
-        BlockWithAttestation, SignedBlockWithAttestation,
+        Block, BlockBody, BlockHeader, BlockSignaturesWithAttestation, BlockWithAttestation,
+        SignedBlockWithAttestation,
     },
     primitives::{
         H256,