From bc16a37a45778958fb42b21f7cb881cefdd93d6f Mon Sep 17 00:00:00 2001
From: Matthias Seitz <matthias.seitz@outlook.de>
Date: Fri, 26 Jan 2024 13:53:32 +0100
Subject: [PATCH] chore: use EvmVersion::Cancun

---
 Cargo.lock                 |  4 ++--
 Cargo.toml                 |  2 +-
 crates/config/src/lib.rs   | 10 ----------
 crates/config/src/utils.rs |  1 +
 4 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8c7748906188d..7e6b03d7ef0b6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3105,9 +3105,9 @@ dependencies = [
 
 [[package]]
 name = "foundry-compilers"
-version = "0.2.2"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5409d75d032836be70c1786c20cd135e3c4ae21e397db97f2cd0a321d3e41c37"
+checksum = "343530a6efe3786d26e1357f15605bb5cd28bd1133e6aab812126508a064bca7"
 dependencies = [
  "alloy-json-abi",
  "alloy-primitives",
diff --git a/Cargo.toml b/Cargo.toml
index 077fb93f10b55..03a39d96f8b49 100644
--- a/Cargo.toml
+++ b/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
diff --git a/crates/config/src/lib.rs b/crates/config/src/lib.rs
index 618f55a1e8632..36f433a80bd45 100644
--- a/crates/config/src/lib.rs
+++ b/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(),
diff --git a/crates/config/src/utils.rs b/crates/config/src/utils.rs
index da067a1ed8cd0..d0d6f8e06663f 100644
--- a/crates/config/src/utils.rs
+++ b/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,
     }
 }