feat(core): switch shanghaiBlock to shanghaiTime (#2049)

* geth switched to time-based forking in
   https://github.com/ethereum/go-ethereum/pull/25878, this changes the
   name of the `shanghai_block` field to `shanghaiTime` so it is
   compatible with geth.
This commit is contained in:
Dan Cline 2023-01-13 13:19:25 -05:00 committed by GitHub
parent 5edcd3765c
commit 3a01682edf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions

View File

@ -130,11 +130,13 @@ pub struct ChainConfig {
#[serde(skip_serializing_if = "Option::is_none")] #[serde(skip_serializing_if = "Option::is_none")]
pub merge_netsplit_block: Option<u64>, pub merge_netsplit_block: Option<u64>,
/// The Shanghai hard fork block. /// Shanghai switch time.
#[serde(skip_serializing_if = "Option::is_none")] #[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")] #[serde(skip_serializing_if = "Option::is_none")]
pub cancun_block: Option<u64>, pub cancun_block: Option<u64>,