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

Author: grandizzy

CHANGELOG.md

@@ -5,6 +5,30 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.13.5](https://github.com/foundry-rs/compilers/releases/tag/v0.13.5) - 2025-03-14
+
+### Bug Fixes
+
+- Missing check for normalization ([#257](https://github.com/foundry-rs/compilers/issues/257))
+
+## [0.13.4](https://github.com/foundry-rs/compilers/releases/tag/v0.13.4) - 2025-03-14
+
+### Bug Fixes
+
+- Update normalization ([#256](https://github.com/foundry-rs/compilers/issues/256))
+
+### Features
+
+- Add osaka evm version ([#254](https://github.com/foundry-rs/compilers/issues/254))
+
+### Miscellaneous Tasks
+
+- Release 0.13.4
+
+### Other
+
+- Allow unmaintained paste ([#255](https://github.com/foundry-rs/compilers/issues/255))
+
 ## [0.13.3](https://github.com/foundry-rs/compilers/releases/tag/v0.13.3) - 2025-02-14
 
 ### Bug Fixes
@@ -15,6 +39,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Impl `.path(&self)` for `ContractInfo` ([#250](https://github.com/foundry-rs/compilers/issues/250))
 
+### Miscellaneous Tasks
+
+- Release 0.13.3
+
 ## [0.13.2](https://github.com/foundry-rs/compilers/releases/tag/v0.13.2) - 2025-02-06
 
 ### Bug Fixes

Cargo.toml

@@ -4,7 +4,7 @@ resolver = "2"
 
 [workspace.package]
 authors = ["Foundry Maintainers"]
-version = "0.13.3"
+version = "0.13.5"
 rust-version = "1.83"
 readme = "README.md"
 license = "MIT OR Apache-2.0"
@@ -35,11 +35,11 @@ redundant-lifetimes = "warn"
 all = "warn"
 
 [workspace.dependencies]
-foundry-compilers = { path = "crates/compilers", version = "0.13.3" }
-foundry-compilers-artifacts = { path = "crates/artifacts/artifacts", version = "0.13.3" }
-foundry-compilers-artifacts-solc = { path = "crates/artifacts/solc", version = "0.13.3" }
-foundry-compilers-artifacts-vyper = { path = "crates/artifacts/vyper", version = "0.13.3" }
-foundry-compilers-core = { path = "crates/core", version = "0.13.3" }
+foundry-compilers = { path = "crates/compilers", version = "0.13.5" }
+foundry-compilers-artifacts = { path = "crates/artifacts/artifacts", version = "0.13.5" }
+foundry-compilers-artifacts-solc = { path = "crates/artifacts/solc", version = "0.13.5" }
+foundry-compilers-artifacts-vyper = { path = "crates/artifacts/vyper", version = "0.13.5" }
+foundry-compilers-core = { path = "crates/core", version = "0.13.5" }
 
 alloy-json-abi = { version = "0.8", features = ["serde_json"] }
 alloy-primitives = { version = "0.8", features = ["serde", "rand"] }

crates/artifacts/solc/src/lib.rs

@@ -39,7 +39,8 @@ use foundry_compilers_core::{
     error::SolcError,
     utils::{
         strip_prefix_owned, BERLIN_SOLC, BYZANTIUM_SOLC, CANCUN_SOLC, CONSTANTINOPLE_SOLC,
-        ISTANBUL_SOLC, LONDON_SOLC, PARIS_SOLC, PETERSBURG_SOLC, PRAGUE_SOLC, SHANGHAI_SOLC,
+        ISTANBUL_SOLC, LONDON_SOLC, OSAKA_SOLC, PARIS_SOLC, PETERSBURG_SOLC, PRAGUE_SOLC,
+        SHANGHAI_SOLC,
     },
 };
 pub use serde_helpers::{deserialize_bytes, deserialize_opt_bytes};
@@ -856,8 +857,10 @@ impl EvmVersion {
         if *version >= BYZANTIUM_SOLC {
             // If the Solc version is the latest, it supports all EVM versions.
             // For all other cases, cap at the at-the-time highest possible fork.
-            let normalized = if *version >= PRAGUE_SOLC {
+            let normalized = if *version >= OSAKA_SOLC {
                 self
+            } else if self >= Self::Prague && *version >= PRAGUE_SOLC {
+                Self::Prague
             } else if self >= Self::Cancun && *version >= CANCUN_SOLC {
                 Self::Cancun
             } else if self >= Self::Shanghai && *version >= SHANGHAI_SOLC {
@@ -2021,6 +2024,7 @@ mod tests {
             ("0.8.26", EvmVersion::Cancun, Some(EvmVersion::Cancun)),
             ("0.8.26", EvmVersion::Prague, Some(EvmVersion::Cancun)),
             ("0.8.27", EvmVersion::Prague, Some(EvmVersion::Prague)),
+            ("0.8.29", EvmVersion::Osaka, Some(EvmVersion::Osaka)),
         ] {
             let version = Version::from_str(solc_version).unwrap();
             assert_eq!(