Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: use EvmVersion::Cancun #6906

Merged
merged 4 commits into from
Jan 27, 2024
Merged

chore: use EvmVersion::Cancun #6906

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5470fea
chore: deprecate cancun key
mattsse Jan 26, 2024
80dbcac
rustfmt
mattsse Jan 26, 2024
162ec82
use const entries
mattsse Jan 26, 2024
b4930d7
Update crates/config/src/lib.rs
mattsse Jan 26, 2024
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
4 changes: 2 additions & 2 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ foundry-test-utils = { path = "crates/test-utils" }

# solc & compilation utilities
foundry-block-explorers = { version = "0.2.0", default-features = false }
foundry-compilers = { version = "0.2.2", default-features = false }
foundry-compilers = { version = "0.2.3", default-features = false }

## revm
# no default features to avoid c-kzg
Expand Down
8 changes: 6 additions & 2 deletions crates/config/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ use std::{
fs,
path::{Path, PathBuf},
str::FromStr,
string::ToString,
};

// Macros useful for creating a figment.
Expand Down Expand Up @@ -399,8 +400,11 @@ pub struct Config {
pub static STANDALONE_FALLBACK_SECTIONS: Lazy<HashMap<&'static str, &'static str>> =
Lazy::new(|| HashMap::from([("invariant", "fuzz")]));

/// Deprecated keys.
pub static DEPRECATIONS: Lazy<HashMap<String, String>> = Lazy::new(|| HashMap::from([]));
/// Deprecated keys and their replacements.
///
/// See [Warning::DeprecatedKey]
pub static DEPRECATIONS: Lazy<HashMap<String, String>> =
Copy link
Member

@DaniPopes DaniPopes Jan 26, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since there aren't / there won't be many, this should just be a &[(&str, &str)] with a linear search where it's used. Same for STANDALONE_FALLBACK_SECTIONS

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

right, unrelated to this pr but might as well just fix that here

Lazy::new(|| HashMap::from([("cancun".to_string(), "evm_version = Cancun".to_string())]));

impl Config {
/// The default profile: "default"
Expand Down
1 change: 1 addition & 0 deletions crates/config/src/utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,7 @@ pub fn evm_spec_id(evm_version: &EvmVersion) -> SpecId {
EvmVersion::London => SpecId::LONDON,
EvmVersion::Paris => SpecId::MERGE,
EvmVersion::Shanghai => SpecId::SHANGHAI,
EvmVersion::Cancun => SpecId::CANCUN,
}
}

Expand Down
Loading