github/reth
1
1
Fork 0
mirror of https://github.com/paradigmxyz/reth.git synced 2026-01-09 07:17:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

feat: schedule fusaka (#19455)

Browse Source
This commit is contained in:
Matthias Seitz
2025-11-03 17:51:46 +01:00
committed by GitHub
parent 7438bdbdf6
commit ea69063aae
3 changed files with 51 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Cargo.lock generated
View File

@@ -290,9 +290,9 @@ dependencies = [
[[package]]
name = "alloy-hardforks"
version = "0.4.2"
version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "52ffa71f397f89c72a27d9c7e3340eed7981a18df9a257dd16b835ef7f53aef6"
checksum = "51e7f93a60ef3d867c93d43442ef3f2d8a1095450131c3d4e16bbbbf2166b9bd"
dependencies = [
"alloy-chains",
"alloy-eip2124",
@@ -388,9 +388,9 @@ dependencies = [
[[package]]
name = "alloy-op-hardforks"
version = "0.4.2"
version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b43e1c305c2f0e4b8878b943fa2f75234803bfca5cd4a4dc0a0a772842a278ea"
checksum = "d0bc135abf78cf83a460bf785d52e4fe83c3ba5fadd416e2f79f7409eec45958"
dependencies = [
"alloy-chains",
"alloy-hardforks",

4
Cargo.toml
View File

@@ -487,7 +487,7 @@ alloy-sol-macro = "1.4.1"
alloy-sol-types = { version = "1.4.1", default-features = false }
alloy-trie = { version = "0.9.1", default-features = false }
alloy-hardforks = "0.4.2"
alloy-hardforks = "0.4.3"
alloy-consensus = { version = "1.0.41", default-features = false }
alloy-contract = { version = "1.0.41", default-features = false }
@@ -519,7 +519,7 @@ alloy-transport-ws = { version = "1.0.41", default-features = false }
# op
alloy-op-evm = { version = "0.22.6", default-features = false }
alloy-op-hardforks = "0.4.2"
alloy-op-hardforks = "0.4.3"
op-alloy-rpc-types = { version = "0.22.0", default-features = false }
op-alloy-rpc-types-engine = { version = "0.22.0", default-features = false }
op-alloy-network = { version = "0.22.0", default-features = false }

62
crates/chainspec/src/spec.rs
View File

@@ -4,7 +4,7 @@ use alloy_evm::eth::spec::EthExecutorSpec;
use crate::{
constants::{MAINNET_DEPOSIT_CONTRACT, MAINNET_PRUNE_DELETE_LIMIT},
ethereum::SEPOLIA_PARIS_TTD,
holesky, hoodi,
holesky, hoodi, mainnet,
mainnet::{MAINNET_PARIS_BLOCK, MAINNET_PARIS_TTD},
sepolia,
sepolia::SEPOLIA_PARIS_BLOCK,
@@ -113,7 +113,10 @@ pub static MAINNET: LazyLock<Arc<ChainSpec>> = LazyLock::new(|| {
deposit_contract: Some(MAINNET_DEPOSIT_CONTRACT),
base_fee_params: BaseFeeParamsKind::Constant(BaseFeeParams::ethereum()),
prune_delete_limit: MAINNET_PRUNE_DELETE_LIMIT,
blob_params: BlobScheduleBlobParams::default(),
blob_params: BlobScheduleBlobParams::default().with_scheduled([
(mainnet::MAINNET_BPO1_TIMESTAMP, BlobParams::bpo1()),
(mainnet::MAINNET_BPO2_TIMESTAMP, BlobParams::bpo2()),
]),
};
spec.genesis.config.dao_fork_support = true;
spec.into()
@@ -1177,7 +1180,10 @@ Merge hard forks:
Post-merge hard forks (timestamp based):
- Shanghai @1681338455
- Cancun @1710338135 blob: (target: 3, max: 6, fraction: 3338477)
- Prague @1746612311 blob: (target: 6, max: 9, fraction: 5007716)"
- Prague @1746612311 blob: (target: 6, max: 9, fraction: 5007716)
- Osaka @1764798551 blob: (target: 6, max: 9, fraction: 5007716)
- Bpo1 @1765290071 blob: (target: 10, max: 15, fraction: 8346193)
- Bpo2 @1767747671 blob: (target: 14, max: 21, fraction: 11684671)"
);
}
@@ -1421,7 +1427,10 @@ Post-merge hard forks (timestamp based):
),
(
EthereumHardfork::Prague,
ForkId { hash: ForkHash([0xc3, 0x76, 0xcf, 0x8b]), next: 0 },
ForkId {
hash: ForkHash([0xc3, 0x76, 0xcf, 0x8b]),
next: mainnet::MAINNET_OSAKA_TIMESTAMP,
},
),
],
);
@@ -1564,13 +1573,23 @@ Post-merge hard forks (timestamp based):
),
// First Prague block
(
Head { number: 20000002, timestamp: 1746612311, ..Default::default() },
ForkId { hash: ForkHash([0xc3, 0x76, 0xcf, 0x8b]), next: 0 },
Head { number: 20000004, timestamp: 1746612311, ..Default::default() },
ForkId {
hash: ForkHash([0xc3, 0x76, 0xcf, 0x8b]),
next: mainnet::MAINNET_OSAKA_TIMESTAMP,
},
),
// Future Prague block
// Osaka block
(
Head { number: 20000002, timestamp: 2000000000, ..Default::default() },
ForkId { hash: ForkHash([0xc3, 0x76, 0xcf, 0x8b]), next: 0 },
Head {
number: 20000004,
timestamp: mainnet::MAINNET_OSAKA_TIMESTAMP,
..Default::default()
},
ForkId {
hash: ForkHash(hex!("0x5167e2a6")),
next: mainnet::MAINNET_BPO1_TIMESTAMP,
},
),
],
);
@@ -1879,11 +1898,22 @@ Post-merge hard forks (timestamp based):
), // First Prague block
(
Head { number: 20000004, timestamp: 1746612311, ..Default::default() },
ForkId { hash: ForkHash([0xc3, 0x76, 0xcf, 0x8b]), next: 0 },
), // Future Prague block
ForkId {
hash: ForkHash([0xc3, 0x76, 0xcf, 0x8b]),
next: mainnet::MAINNET_OSAKA_TIMESTAMP,
},
),
// Osaka block
(
Head { number: 20000004, timestamp: 2000000000, ..Default::default() },
ForkId { hash: ForkHash([0xc3, 0x76, 0xcf, 0x8b]), next: 0 },
Head {
number: 20000004,
timestamp: mainnet::MAINNET_OSAKA_TIMESTAMP,
..Default::default()
},
ForkId {
hash: ForkHash(hex!("0x5167e2a6")),
next: mainnet::MAINNET_BPO1_TIMESTAMP,
},
),
],
);
@@ -2540,10 +2570,8 @@ Post-merge hard forks (timestamp based):
#[test]
fn latest_eth_mainnet_fork_id() {
assert_eq!(
ForkId { hash: ForkHash([0xc3, 0x76, 0xcf, 0x8b]), next: 0 },
MAINNET.latest_fork_id()
)
// BPO2
assert_eq!(ForkId { hash: ForkHash(hex!("0x07c9462e")), next: 0 }, MAINNET.latest_fork_id())
}
#[test]