gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-04-29 02:33:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/release-v8.0' into unstable

Browse Source
This commit is contained in:
Michael Sproul
2025-11-03 09:28:48 +11:00
parent af9cae4d3e 55588f7789
commit c46cb0b5b0
13 changed files with 28 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
beacon_node/beacon_chain/src/attestation_verification.rs
View File

@@ -1371,7 +1371,7 @@ pub fn verify_signed_aggregate_signatures<T: BeaconChainTypes>(
.spec
.fork_at_epoch(indexed_attestation.data().target.epoch);
let signature_sets = vec![
let signature_sets = [
signed_aggregate_selection_proof_signature_set(
|validator_index| pubkey_cache.get(validator_index).map(Cow::Borrowed),
signed_aggregate,

2
beacon_node/beacon_chain/src/sync_committee_verification.rs
View File

@@ -628,7 +628,7 @@ pub fn verify_signed_aggregate_signatures<T: BeaconChainTypes>(
(signed_aggregate.message.contribution.slot + 1).epoch(T::EthSpec::slots_per_epoch());
let fork = chain.spec.fork_at_epoch(next_slot_epoch);
let signature_sets = vec![
let signature_sets = [
signed_sync_aggregate_selection_proof_signature_set(
|validator_index| pubkey_cache.get(validator_index).map(Cow::Borrowed),
signed_aggregate,

26
beacon_node/client/src/notifier.rs
View File

@@ -298,28 +298,28 @@ pub fn spawn_notifier<T: BeaconChainTypes>(
let speed = speedo.slots_per_second();
let display_speed = speed.is_some_and(|speed| speed != 0.0);
let est_time_in_secs = if let (Some(da_boundary_epoch), Some(original_slot)) = (
beacon_chain.get_column_da_boundary(),
original_earliest_data_column_slot,
) {
let target = original_slot.saturating_sub(
da_boundary_epoch.start_slot(T::EthSpec::slots_per_epoch()),
);
speedo.estimated_time_till_slot(target)
} else {
None
};
if display_speed {
info!(
distance,
speed = sync_speed_pretty(speed),
est_time =
estimated_time_pretty(beacon_chain.get_column_da_boundary().and_then(
|da_boundary| speedo.estimated_time_till_slot(
da_boundary.start_slot(T::EthSpec::slots_per_epoch())
)
)),
est_time = estimated_time_pretty(est_time_in_secs),
"Downloading historical data columns"
);
} else {
info!(
distance,
est_time =
estimated_time_pretty(beacon_chain.get_column_da_boundary().and_then(
|da_boundary| speedo.estimated_time_till_slot(
da_boundary.start_slot(T::EthSpec::slots_per_epoch())
)
)),
est_time = estimated_time_pretty(est_time_in_secs),
"Downloading historical data columns"
);
}

2
beacon_node/execution_layer/src/test_utils/execution_block_generator.rs
View File

@@ -29,7 +29,7 @@ use super::DEFAULT_TERMINAL_BLOCK;
const TEST_BLOB_BUNDLE: &[u8] = include_bytes!("fixtures/mainnet/test_blobs_bundle.ssz");
const TEST_BLOB_BUNDLE_V2: &[u8] = include_bytes!("fixtures/mainnet/test_blobs_bundle_v2.ssz");
pub const DEFAULT_GAS_LIMIT: u64 = 45_000_000;
pub const DEFAULT_GAS_LIMIT: u64 = 60_000_000;
const GAS_USED: u64 = DEFAULT_GAS_LIMIT - 1;
#[derive(Clone, Debug, PartialEq)]

2
beacon_node/execution_layer/src/test_utils/mock_builder.rs
View File

@@ -40,7 +40,7 @@ use warp::reply::{self, Reply};
use warp::{Filter, Rejection};
pub const DEFAULT_FEE_RECIPIENT: Address = Address::repeat_byte(42);
pub const DEFAULT_GAS_LIMIT: u64 = 45_000_000;
pub const DEFAULT_GAS_LIMIT: u64 = 60_000_000;
pub const DEFAULT_BUILDER_PRIVATE_KEY: &str =
"607a11b45a7219cc61a3d9c5fd08c7eebd602a6a19a977f8d3771d5711a550f2";