jleony/nanoreth
1
0
Fork 0
mirror of https://github.com/hl-archive-node/nanoreth.git synced 2025-12-06 19:09:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: add prague helpers to spec (#7817)

Browse Source
This commit is contained in:
Oliver Nordbjerg
2024-04-23 16:50:14 +02:00
committed by GitHub
parent b3db4cf56d
commit 00ca9cd024
1 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
crates/primitives/src/chain/spec.rs
View File

@ -813,6 +813,15 @@ impl ChainSpec {
.unwrap_or_else(|| self.is_fork_active_at_timestamp(Hardfork::Cancun, timestamp)) .unwrap_or_else(|| self.is_fork_active_at_timestamp(Hardfork::Cancun, timestamp))
} }
/// Convenience method to check if [Hardfork::Prague] is active at a given timestamp.
#[inline]
pub fn is_prague_active_at_timestamp(&self, timestamp: u64) -> bool {
self.fork_timestamps
.prague
.map(|prague| timestamp >= prague)
.unwrap_or_else(|| self.is_fork_active_at_timestamp(Hardfork::Prague, timestamp))
}
/// Convenience method to check if [Hardfork::Byzantium] is active at a given block number. /// Convenience method to check if [Hardfork::Byzantium] is active at a given block number.
#[inline] #[inline]
pub fn is_byzantium_active_at_block(&self, block_number: u64) -> bool { pub fn is_byzantium_active_at_block(&self, block_number: u64) -> bool {
@ -1055,10 +1064,12 @@ impl From<Genesis> for ChainSpec {
/// Various timestamps of forks /// Various timestamps of forks
#[derive(Debug, Clone, Default, Eq, PartialEq)] #[derive(Debug, Clone, Default, Eq, PartialEq)]
pub struct ForkTimestamps { pub struct ForkTimestamps {
/// The timestamp of the shanghai fork /// The timestamp of the Shanghai fork
pub shanghai: Option<u64>, pub shanghai: Option<u64>,
/// The timestamp of the cancun fork /// The timestamp of the Cancun fork
pub cancun: Option<u64>, pub cancun: Option<u64>,
/// The timestamp of the Prague fork
pub prague: Option<u64>,
/// The timestamp of the Regolith fork /// The timestamp of the Regolith fork
#[cfg(feature = "optimism")] #[cfg(feature = "optimism")]
pub regolith: Option<u64>, pub regolith: Option<u64>,
@ -1080,6 +1091,9 @@ impl ForkTimestamps {
if let Some(cancun) = forks.get(&Hardfork::Cancun).and_then(|f| f.as_timestamp()) { if let Some(cancun) = forks.get(&Hardfork::Cancun).and_then(|f| f.as_timestamp()) {
timestamps = timestamps.cancun(cancun); timestamps = timestamps.cancun(cancun);
} }
if let Some(prague) = forks.get(&Hardfork::Prague).and_then(|f| f.as_timestamp()) {
timestamps = timestamps.prague(prague);
}
#[cfg(feature = "optimism")] #[cfg(feature = "optimism")]
{ {
if let Some(regolith) = forks.get(&Hardfork::Regolith).and_then(|f| f.as_timestamp()) { if let Some(regolith) = forks.get(&Hardfork::Regolith).and_then(|f| f.as_timestamp()) {
@ -1095,18 +1109,24 @@ impl ForkTimestamps {
timestamps timestamps
} }
/// Sets the given shanghai timestamp /// Sets the given Shanghai timestamp
pub fn shanghai(mut self, shanghai: u64) -> Self { pub fn shanghai(mut self, shanghai: u64) -> Self {
self.shanghai = Some(shanghai); self.shanghai = Some(shanghai);
self self
} }
/// Sets the given cancun timestamp /// Sets the given Cancun timestamp
pub fn cancun(mut self, cancun: u64) -> Self { pub fn cancun(mut self, cancun: u64) -> Self {
self.cancun = Some(cancun); self.cancun = Some(cancun);
self self
} }
/// Sets the given Prague timestamp
pub fn prague(mut self, prague: u64) -> Self {
self.prague = Some(prague);
self
}
/// Sets the given regolith timestamp /// Sets the given regolith timestamp
#[cfg(feature = "optimism")] #[cfg(feature = "optimism")]
pub fn regolith(mut self, regolith: u64) -> Self { pub fn regolith(mut self, regolith: u64) -> Self {