Skip to content
This repository was archived by the owner on Oct 19, 2024. It is now read-only.

feat(core): switch shanghaiBlock to shanghaiTime #2049

Merged
merged 1 commit into from
Jan 13, 2023
Merged

feat(core): switch shanghaiBlock to shanghaiTime #2049

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions ethers-core/src/utils/genesis.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,11 +130,13 @@ pub struct ChainConfig {
#[serde(skip_serializing_if = "Option::is_none")]
pub merge_netsplit_block: Option<u64>,

/// The Shanghai hard fork block.
/// Shanghai switch time.
#[serde(skip_serializing_if = "Option::is_none")]
pub shanghai_block: Option<u64>,
pub shanghai_time: Option<u64>,

/// The Cancun hard fork block.
// TODO: change to cancunTime when <https://github.com/ethereum/go-ethereum/pull/26481> is
// merged in geth
/// Cancun hard fork block.
#[serde(skip_serializing_if = "Option::is_none")]
pub cancun_block: Option<u64>,

Expand Down