Skip to content

Commit 18ea175

Browse files
committed
chore: bump reth and update everything
1 parent 1932253 commit 18ea175

File tree

6 files changed

+101
-205
lines changed

6 files changed

+101
-205
lines changed

Cargo.toml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,15 @@ signet-rpc = { version = "0.14", path = "crates/rpc" }
4646

4747
init4-bin-base = { version = "0.13.1", features = ["alloy"] }
4848

49-
signet-bundle = "0.15"
50-
signet-constants = "0.15"
51-
signet-evm = "0.15"
52-
signet-extract = "0.15"
53-
signet-test-utils = "0.15"
54-
signet-tx-cache = "0.15"
55-
signet-types = "0.15"
56-
signet-zenith = "0.15"
57-
signet-journal = "0.15"
49+
signet-bundle = "0.14"
50+
signet-constants = "0.14"
51+
signet-evm = "0.14"
52+
signet-extract = "0.14"
53+
signet-test-utils = "0.14"
54+
signet-tx-cache = "0.14"
55+
signet-types = "0.14"
56+
signet-zenith = "0.14"
57+
signet-journal = "0.14"
5858

5959
# ajj
6060
ajj = { version = "0.3.4" }
@@ -127,7 +127,7 @@ uuid = "1.16.0"
127127
alloy-rlp = "0.3.11"
128128
tempfile = "3.17.0"
129129

130-
[patch.crates-io]
130+
# [patch.crates-io]
131131
# signet-bundle = { path = "../sdk/crates/bundle"}
132132
# signet-constants = { path = "../sdk/crates/constants"}
133133
# signet-evm = { path = "../sdk/crates/evm"}

crates/block-processor/src/utils.rs

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,13 @@ use reth_chainspec::EthereumHardforks;
44
/// Equivalent to [`reth_evm_ethereum::revm_spec`], however, always starts at
55
/// [`SpecId::PRAGUE`] and transitions to [`SpecId::OSAKA`].
66
pub fn revm_spec(chain_spec: &reth::chainspec::ChainSpec, timestamp: u64) -> SpecId {
7-
if chain_spec.is_osaka_active_at_timestamp(timestamp) { SpecId::OSAKA } else { SpecId::PRAGUE }
7+
if chain_spec.is_amsterdam_active_at_timestamp(timestamp) {
8+
SpecId::AMSTERDAM
9+
} else if chain_spec.is_osaka_active_at_timestamp(timestamp) {
10+
SpecId::OSAKA
11+
} else {
12+
SpecId::PRAGUE
13+
}
814
}
915

1016
/// This is simply a compile-time assertion to ensure that all SpecIds are
@@ -32,6 +38,7 @@ const fn assert_in_range(spec_id: SpecId) {
3238
| SpecId::SHANGHAI
3339
| SpecId::CANCUN
3440
| SpecId::PRAGUE
35-
| SpecId::OSAKA => {}
41+
| SpecId::OSAKA
42+
| SpecId::AMSTERDAM => {}
3643
}
3744
}

0 commit comments

Comments
 (0)