Skip to content

Commit 0c5a4cc

Browse files
committed
feat(core): switch shanghaiBlock to shanghaiTime
* 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.
1 parent 0a7e742 commit 0c5a4cc

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

ethers-core/src/utils/genesis.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,11 +130,13 @@ pub struct ChainConfig {
130130
#[serde(skip_serializing_if = "Option::is_none")]
131131
pub merge_netsplit_block: Option<u64>,
132132

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

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

0 commit comments

Comments
 (0)