Merge branch 'main' into klkvr/pp-test-rebase

Author: grandizzy

crates/artifacts/solc/src/lib.rs

@@ -818,6 +818,7 @@ pub enum EvmVersion {
     #[default]
     Cancun,
     Prague,
+    Osaka,
 }
 
 impl EvmVersion {
@@ -900,6 +901,7 @@ impl EvmVersion {
             Self::Shanghai => "shanghai",
             Self::Cancun => "cancun",
             Self::Prague => "prague",
+            Self::Osaka => "osaka",
         }
     }
 
@@ -969,6 +971,7 @@ impl FromStr for EvmVersion {
             "shanghai" => Ok(Self::Shanghai),
             "cancun" => Ok(Self::Cancun),
             "prague" => Ok(Self::Prague),
+            "osaka" => Ok(Self::Osaka),
             s => Err(format!("Unknown evm version: {s}")),
         }
     }

crates/core/src/utils/mod.rs

@@ -66,6 +66,10 @@ pub const CANCUN_SOLC: Version = Version::new(0, 8, 24);
 /// <https://soliditylang.org/blog/2024/09/04/solidity-0.8.27-release-announcement>
 pub const PRAGUE_SOLC: Version = Version::new(0, 8, 27);
 
+/// Osaka support
+/// <https://soliditylang.org/blog/2025/03/12/solidity-0.8.29-release-announcement>
+pub const OSAKA_SOLC: Version = Version::new(0, 8, 29);
+
 // `--base-path` was introduced in 0.6.9 <https://github.com/ethereum/solidity/releases/tag/v0.6.9>
 pub static SUPPORTS_BASE_PATH: Lazy<VersionReq> =
     Lazy::new(|| VersionReq::parse(">=0.6.9").unwrap());

deny.toml

@@ -1,7 +1,10 @@
 [advisories]
 version = 2
 yanked = "warn"
-ignore = []
+ignore = [
+    # https://rustsec.org/advisories/RUSTSEC-2024-0436 paste! is unmaintained
+    "RUSTSEC-2024-0436",
+]
 
 [bans]
 multiple-versions = "warn"