chore: use EvmVersion::Cancun

Cargo.toml

@@ -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

crates/config/src/lib.rs

@@ -363,12 +363,6 @@ pub struct Config {
     /// This includes what operations can be executed (read, write)
     pub fs_permissions: FsPermissions,
 
-    /// Temporary config to enable [SpecId::CANCUN]
-    ///
-    /// <https://github.com/foundry-rs/foundry/issues/5782>
-    /// Should be removed once EvmVersion Cancun is supported by solc
-    pub cancun: bool,
-
     /// Address labels
     pub labels: HashMap<Address, String>,
 
@@ -697,9 +691,6 @@ impl Config {
     /// Returns the [SpecId] derived from the configured [EvmVersion]
     #[inline]
     pub fn evm_spec_id(&self) -> SpecId {
-        if self.cancun {
-            return SpecId::CANCUN
-        }
         evm_spec_id(&self.evm_version)
     }
 
@@ -1754,7 +1745,6 @@ impl Default for Config {
         Self {
             profile: Self::DEFAULT_PROFILE,
             fs_permissions: FsPermissions::new([PathPermission::read("out")]),
-            cancun: false,
             __root: Default::default(),
             src: "src".into(),
             test: "test".into(),

crates/config/src/utils.rs

@@ -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,
     }
 }
 

crates/forge/tests/cli/config.rs

@@ -112,7 +112,6 @@ forgetest!(can_extract_config_values, |prj, cmd| {
         doc: Default::default(),
         fs_permissions: Default::default(),
         labels: Default::default(),
-        cancun: true,
         __non_exhaustive: (),
         __warnings: vec![],
     };