Compare commits

..

2 Commits

Author SHA1 Message Date
Michael Sproul
8d058e4040 Release v7.0.0-beta.3 2025-03-13 10:07:09 +11:00
Michael Sproul
3645d57099 Fix descent from split check (#7105) 2025-03-11 16:14:58 +11:00
7 changed files with 21 additions and 14 deletions

8
Cargo.lock generated
View File

@@ -860,7 +860,7 @@ dependencies = [
[[package]] [[package]]
name = "beacon_node" name = "beacon_node"
version = "7.0.0-beta.2" version = "7.0.0-beta.3"
dependencies = [ dependencies = [
"account_utils", "account_utils",
"beacon_chain", "beacon_chain",
@@ -1108,7 +1108,7 @@ dependencies = [
[[package]] [[package]]
name = "boot_node" name = "boot_node"
version = "7.0.0-beta.2" version = "7.0.0-beta.3"
dependencies = [ dependencies = [
"beacon_node", "beacon_node",
"bytes", "bytes",
@@ -4811,7 +4811,7 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
[[package]] [[package]]
name = "lcli" name = "lcli"
version = "7.0.0-beta.2" version = "7.0.0-beta.3"
dependencies = [ dependencies = [
"account_utils", "account_utils",
"beacon_chain", "beacon_chain",
@@ -5366,7 +5366,7 @@ dependencies = [
[[package]] [[package]]
name = "lighthouse" name = "lighthouse"
version = "7.0.0-beta.2" version = "7.0.0-beta.3"
dependencies = [ dependencies = [
"account_manager", "account_manager",
"account_utils", "account_utils",

View File

@@ -1,6 +1,6 @@
[package] [package]
name = "beacon_node" name = "beacon_node"
version = "7.0.0-beta.2" version = "7.0.0-beta.3"
authors = [ authors = [
"Paul Hauner <paul@paulhauner.com>", "Paul Hauner <paul@paulhauner.com>",
"Age Manning <Age@AgeManning.com", "Age Manning <Age@AgeManning.com",

View File

@@ -1783,10 +1783,17 @@ pub fn check_block_is_finalized_checkpoint_or_descendant<
block: B, block: B,
) -> Result<B, BlockError> { ) -> Result<B, BlockError> {
// If we have a split block newer than finalization then we also ban blocks which are not // If we have a split block newer than finalization then we also ban blocks which are not
// descended from that split block. // descended from that split block. It's important not to try checking `is_descendant` if
// finality is ahead of the split and the split block has been pruned, as `is_descendant` will
// return `false` in this case.
let finalized_slot = fork_choice
.finalized_checkpoint()
.epoch
.start_slot(T::EthSpec::slots_per_epoch());
let split = chain.store.get_split_info(); let split = chain.store.get_split_info();
let is_descendant_from_split_block = let is_descendant_from_split_block = split.slot == 0
split.slot == 0 || fork_choice.is_descendant(split.block_root, block.parent_root()); || split.slot <= finalized_slot
|| fork_choice.is_descendant(split.block_root, block.parent_root());
if fork_choice.is_finalized_checkpoint_or_descendant(block.parent_root()) if fork_choice.is_finalized_checkpoint_or_descendant(block.parent_root())
&& is_descendant_from_split_block && is_descendant_from_split_block

View File

@@ -1,6 +1,6 @@
[package] [package]
name = "boot_node" name = "boot_node"
version = "7.0.0-beta.2" version = "7.0.0-beta.3"
authors = ["Sigma Prime <contact@sigmaprime.io>"] authors = ["Sigma Prime <contact@sigmaprime.io>"]
edition = { workspace = true } edition = { workspace = true }

View File

@@ -17,8 +17,8 @@ pub const VERSION: &str = git_version!(
// NOTE: using --match instead of --exclude for compatibility with old Git // NOTE: using --match instead of --exclude for compatibility with old Git
"--match=thiswillnevermatchlol" "--match=thiswillnevermatchlol"
], ],
prefix = "Lighthouse/v7.0.0-beta.2-", prefix = "Lighthouse/v7.0.0-beta.3-",
fallback = "Lighthouse/v7.0.0-beta.2" fallback = "Lighthouse/v7.0.0-beta.3"
); );
/// Returns the first eight characters of the latest commit hash for this build. /// Returns the first eight characters of the latest commit hash for this build.
@@ -54,7 +54,7 @@ pub fn version_with_platform() -> String {
/// ///
/// `1.5.1` /// `1.5.1`
pub fn version() -> &'static str { pub fn version() -> &'static str {
"7.0.0-beta.2" "7.0.0-beta.3"
} }
/// Returns the name of the current client running. /// Returns the name of the current client running.

View File

@@ -1,7 +1,7 @@
[package] [package]
name = "lcli" name = "lcli"
description = "Lighthouse CLI (modeled after zcli)" description = "Lighthouse CLI (modeled after zcli)"
version = "7.0.0-beta.2" version = "7.0.0-beta.3"
authors = ["Paul Hauner <paul@paulhauner.com>"] authors = ["Paul Hauner <paul@paulhauner.com>"]
edition = { workspace = true } edition = { workspace = true }

View File

@@ -1,6 +1,6 @@
[package] [package]
name = "lighthouse" name = "lighthouse"
version = "7.0.0-beta.2" version = "7.0.0-beta.3"
authors = ["Sigma Prime <contact@sigmaprime.io>"] authors = ["Sigma Prime <contact@sigmaprime.io>"]
edition = { workspace = true } edition = { workspace = true }
autotests = false autotests = false