gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-05-07 08:52:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

enable 4844 at epoch 3

Browse Source
This commit is contained in:
Marius van der Wijden
2022-09-18 12:13:03 +02:00
parent 257087b010
commit 6f7d21c542
3 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
consensus/types/src/chain_spec.rs
View File

@@ -236,13 +236,17 @@ impl ChainSpec {
/// Returns the name of the fork which is active at `epoch`.
pub fn fork_name_at_epoch(&self, epoch: Epoch) -> ForkName {
match self.bellatrix_fork_epoch {
Some(fork_epoch) if epoch >= fork_epoch => ForkName::Merge,
_ => match self.altair_fork_epoch {
Some(fork_epoch) if epoch >= fork_epoch => ForkName::Altair,
_ => ForkName::Base,
},
match self.eip4844_fork_epoch {
Some(fork_epoch) if epoch >= fork_epoch => ForkName::Eip4844,
_ => match self.bellatrix_fork_epoch {
Some(fork_epoch) if epoch >= fork_epoch => ForkName::Merge,
_ => match self.altair_fork_epoch {
Some(fork_epoch) if epoch >= fork_epoch => ForkName::Altair,
_ => ForkName::Base,
},
}
}
}
/// Returns the fork version for a named fork.
@@ -582,7 +586,7 @@ impl ChainSpec {
/*
* Eip4844 hard fork params
*/
eip4844_fork_epoch: None,
eip4844_fork_epoch: Some(Epoch::new(3)),
eip4844_fork_version: [0x83, 0x00, 0x0f, 0xfd],
/*

3
consensus/types/src/fork_name.rs
View File

@@ -42,7 +42,7 @@ impl ForkName {
ForkName::Eip4844 => {
spec.altair_fork_epoch = Some(Epoch::new(0));
spec.bellatrix_fork_epoch = Some(Epoch::new(0));
spec.eip4844_fork_epoch = Some(Epoch::new(0));
spec.eip4844_fork_epoch = Some(Epoch::new(3));
spec
}
}
@@ -126,6 +126,7 @@ impl FromStr for ForkName {
"phase0" | "base" => ForkName::Base,
"altair" => ForkName::Altair,
"bellatrix" | "merge" => ForkName::Merge,
"eip4844" => ForkName::Eip4844,
_ => return Err(format!("unknown fork name: {}", fork_name)),
})
}