gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-05-31 21:27:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge conflicts

Browse Source
This commit is contained in:
Eitan Seri-Levi
2025-05-27 14:56:02 -07:00
parent c464a54ba2 e21b578073
commit 30f28784ee
358 changed files with 11552 additions and 6768 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
beacon_node/beacon_chain/src/test_utils.rs
View File

@@ -38,8 +38,7 @@ use kzg::{Kzg, TrustedSetup};
use logging::create_test_tracing_subscriber;
use merkle_proof::MerkleTree;
use operation_pool::ReceivedPreCapella;
use parking_lot::Mutex;
use parking_lot::RwLockWriteGuard;
use parking_lot::{Mutex, RwLockWriteGuard};
use rand::rngs::StdRng;
use rand::Rng;
use rand::SeedableRng;
@@ -592,7 +591,8 @@ where
.chain_config(chain_config)
.import_all_data_columns(self.import_all_data_columns)
.event_handler(Some(ServerSentEventHandler::new_with_capacity(5)))
.validator_monitor_config(validator_monitor_config);
.validator_monitor_config(validator_monitor_config)
.rng(Box::new(StdRng::seed_from_u64(42)));
builder = if let Some(mutator) = self.initial_mutator {
mutator(builder)
@@ -901,6 +901,28 @@ where
state.get_block_root(slot).unwrap() == state.get_block_root(slot - 1).unwrap()
}
pub fn knows_head(&self, block_hash: &SignedBeaconBlockHash) -> bool {
self.chain
.heads()
.iter()
.any(|(head, _)| *head == Hash256::from(*block_hash))
}
pub fn assert_knows_head(&self, head_block_root: Hash256) {
let heads = self.chain.heads();
if !heads.iter().any(|(head, _)| *head == head_block_root) {
let fork_choice = self.chain.canonical_head.fork_choice_read_lock();
if heads.is_empty() {
let nodes = &fork_choice.proto_array().core_proto_array().nodes;
panic!("Expected to know head block root {head_block_root:?}, but heads is empty. Nodes: {nodes:#?}");
} else {
panic!(
"Expected to know head block root {head_block_root:?}, known heads {heads:#?}"
);
}
}
}
pub async fn make_blinded_block(
&self,
state: BeaconState<E>,
@@ -2419,7 +2441,7 @@ where
.blob_kzg_commitments()
.is_ok_and(|c| !c.is_empty());
if !has_blobs {
return RpcBlock::new_without_blobs(Some(block_root), block);
return RpcBlock::new_without_blobs(Some(block_root), block, 0);
}
// Blobs are stored as data columns from Fulu (PeerDAS)
@@ -2470,7 +2492,7 @@ where
&self.spec,
)?
} else {
RpcBlock::new_without_blobs(Some(block_root), block)
RpcBlock::new_without_blobs(Some(block_root), block, 0)
}
} else {
let blobs = blob_items
@@ -3247,7 +3269,7 @@ pub fn generate_rand_block_and_blobs<E: EthSpec>(
NumBlobs::None => 0,
};
let (bundle, transactions) =
execution_layer::test_utils::generate_blobs::<E>(num_blobs).unwrap();
execution_layer::test_utils::generate_blobs::<E>(num_blobs, fork_name).unwrap();
payload.execution_payload.transactions = <_>::default();
for tx in Vec::from(transactions) {
@@ -3267,7 +3289,7 @@ pub fn generate_rand_block_and_blobs<E: EthSpec>(
NumBlobs::None => 0,
};
let (bundle, transactions) =
execution_layer::test_utils::generate_blobs::<E>(num_blobs).unwrap();
execution_layer::test_utils::generate_blobs::<E>(num_blobs, fork_name).unwrap();
payload.execution_payload.transactions = <_>::default();
for tx in Vec::from(transactions) {
payload.execution_payload.transactions.push(tx).unwrap();
@@ -3286,7 +3308,7 @@ pub fn generate_rand_block_and_blobs<E: EthSpec>(
NumBlobs::None => 0,
};
let (bundle, transactions) =
execution_layer::test_utils::generate_blobs::<E>(num_blobs).unwrap();
execution_layer::test_utils::generate_blobs::<E>(num_blobs, fork_name).unwrap();
payload.execution_payload.transactions = <_>::default();
for tx in Vec::from(transactions) {
payload.execution_payload.transactions.push(tx).unwrap();