Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 37 additions & 37 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ members = ["crates/*"]
resolver = "2"

[workspace.package]
version = "0.14.0"
version = "0.15.0"
edition = "2024"
rust-version = "1.88"
authors = ["init4"]
Expand Down Expand Up @@ -34,34 +34,34 @@ debug = false
incremental = false

[workspace.dependencies]
signet-blobber = { version = "0.14", path = "crates/blobber" }
signet-block-processor = { version = "0.14", path = "crates/block-processor" }
signet-db = { version = "0.14", path = "crates/db" }
signet-genesis = { version = "0.14", path = "crates/genesis" }
signet-node = { version = "0.14", path = "crates/node" }
signet-node-config = { version = "0.14", path = "crates/node-config" }
signet-node-tests = { version = "0.14", path = "crates/node-tests" }
signet-node-types = { version = "0.14", path = "crates/node-types" }
signet-rpc = { version = "0.14", path = "crates/rpc" }
signet-blobber = { version = "0.15", path = "crates/blobber" }
signet-block-processor = { version = "0.15", path = "crates/block-processor" }
signet-db = { version = "0.15", path = "crates/db" }
signet-genesis = { version = "0.15", path = "crates/genesis" }
signet-node = { version = "0.15", path = "crates/node" }
signet-node-config = { version = "0.15", path = "crates/node-config" }
signet-node-tests = { version = "0.15", path = "crates/node-tests" }
signet-node-types = { version = "0.15", path = "crates/node-types" }
signet-rpc = { version = "0.15", path = "crates/rpc" }

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

signet-bundle = "0.14"
signet-constants = "0.14"
signet-evm = "0.14"
signet-extract = "0.14"
signet-test-utils = "0.14"
signet-tx-cache = "0.14"
signet-types = "0.14"
signet-zenith = "0.14"
signet-journal = "0.14"
signet-bundle = "0.15"
signet-constants = "0.15"
signet-evm = "0.15"
signet-extract = "0.15"
signet-test-utils = "0.15"
signet-tx-cache = "0.15"
signet-types = "0.15"
signet-zenith = "0.15"
signet-journal = "0.15"

# ajj
ajj = { version = "0.3.4" }

# trevm
trevm = { version = "0.29.0", features = ["full_env_cfg"] }
revm-inspectors = "0.30.0" # should be 1 more than trevm version, usually
trevm = { version = "0.31.0", features = ["full_env_cfg"] }
revm-inspectors = "0.32.0" # should be 1 more than trevm version, usually

# Alloy periphery crates
alloy = { version = "1.0.35", features = [
Expand All @@ -74,22 +74,22 @@ alloy = { version = "1.0.35", features = [
alloy-contract = { version = "1.0.35", features = ["pubsub"] }

# Reth
reth = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.3" }
reth-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.3" }
reth-chainspec = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.3" }
reth-db = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.3" }
reth-db-common = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.3" }
reth-eth-wire-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.3" }
reth-evm-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.3" }
reth-exex = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.3" }
reth-exex-test-utils = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.3" }
reth-network-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.3" }
reth-network-peers = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.3" }
reth-node-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.3" }
reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.3" }
reth-prune-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.3" }
reth-rpc-eth-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.3" }
reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.3" }
reth = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.0" }
reth-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.0" }
reth-chainspec = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.0" }
reth-db = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.0" }
reth-db-common = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.0" }
reth-eth-wire-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.0" }
reth-evm-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.0" }
reth-exex = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.0" }
reth-exex-test-utils = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.0" }
reth-network-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.0" }
reth-network-peers = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.0" }
reth-node-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.0" }
reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.0" }
reth-prune-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.0" }
reth-rpc-eth-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.0" }
reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.0" }

# Foundry periphery
foundry-blob-explorers = "0.17"
Expand Down
11 changes: 9 additions & 2 deletions crates/block-processor/src/utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,13 @@ use reth_chainspec::EthereumHardforks;
/// Equivalent to [`reth_evm_ethereum::revm_spec`], however, always starts at
/// [`SpecId::PRAGUE`] and transitions to [`SpecId::OSAKA`].
pub fn revm_spec(chain_spec: &reth::chainspec::ChainSpec, timestamp: u64) -> SpecId {
if chain_spec.is_osaka_active_at_timestamp(timestamp) { SpecId::OSAKA } else { SpecId::PRAGUE }
if chain_spec.is_amsterdam_active_at_timestamp(timestamp) {
SpecId::AMSTERDAM
} else if chain_spec.is_osaka_active_at_timestamp(timestamp) {
SpecId::OSAKA
} else {
SpecId::PRAGUE
}
}

/// This is simply a compile-time assertion to ensure that all SpecIds are
Expand Down Expand Up @@ -32,6 +38,7 @@ const fn assert_in_range(spec_id: SpecId) {
| SpecId::SHANGHAI
| SpecId::CANCUN
| SpecId::PRAGUE
| SpecId::OSAKA => {}
| SpecId::OSAKA
| SpecId::AMSTERDAM => {}
}
}
Loading
Loading