Skip to content

Commit

Permalink
feat(core): switch shanghaiBlock to shanghaiTime
Browse files Browse the repository at this point in the history
 * geth switched to time-based forking in
   ethereum/go-ethereum#25878, this changes the
   name of the `shanghai_block` field to `shanghaiTime` so it is
   compatible with geth.
  • Loading branch information
Rjected committed Jan 12, 2023
1 parent 0a7e742 commit 0c5a4cc
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions ethers-core/src/utils/genesis.rs
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

0 comments on commit 0c5a4cc

Please sign in to comment.