Merge branch 'main' into klkvr/settings-profiles

Author: klkvr

CHANGELOG.md

@@ -5,54 +5,82 @@ 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.11.0](https://github.com/foundry-rs/compilers/releases/tag/v0.11.0) - 2024-09-02
+## [0.11.6](https://github.com/foundry-rs/compilers/releases/tag/v0.11.6) - 2024-10-16
 
-### Dependencies
+### Bug Fixes
 
-- [deps] Bump alloy ([#193](https://github.com/foundry-rs/compilers/issues/193))
+- Correctly handle b as pre-release in Vyper version ([#213](https://github.com/foundry-rs/compilers/issues/213))
+- Accept partial first sourcemap element ([#209](https://github.com/foundry-rs/compilers/issues/209))
 
-## [0.10.3](https://github.com/foundry-rs/compilers/releases/tag/v0.10.3) - 2024-08-26
+### Miscellaneous Tasks
+
+- Release 0.11.5
+- Allow adding vyper sources with `add_raw_source` w/ `.vy` / `.vyi` extension ([#211](https://github.com/foundry-rs/compilers/issues/211))
+- [`ci`] Fix deny (add `ZLib` exception) ([#212](https://github.com/foundry-rs/compilers/issues/212))
+
+## [0.11.4](https://github.com/foundry-rs/compilers/releases/tag/v0.11.4) - 2024-10-02
 
 ### Bug Fixes
 
-- [flatten] Update license handling logic ([#184](https://github.com/foundry-rs/compilers/issues/184))
+- Include `evm.legacyAssembly` output ([#206](https://github.com/foundry-rs/compilers/issues/206))
+- Ast Node Bindings ([#199](https://github.com/foundry-rs/compilers/issues/199))
+- Actualize output selection options ([#196](https://github.com/foundry-rs/compilers/issues/196))
+
+### Dependencies
+
+- [deps] Bump alloy ([#193](https://github.com/foundry-rs/compilers/issues/193))
 
 ### Documentation
 
-- Docs fix spelling issues ([#190](https://github.com/foundry-rs/compilers/issues/190))
+- Fix typos ([#202](https://github.com/foundry-rs/compilers/issues/202))
 
 ### Features
 
-- Always provide `Default` for `MultiCompiler` ([#188](https://github.com/foundry-rs/compilers/issues/188))
-- [vyper] Add experimental codegen to settings ([#186](https://github.com/foundry-rs/compilers/issues/186))
-- More user-friendly error when no compiler is available ([#185](https://github.com/foundry-rs/compilers/issues/185))
+- Better extra_args handling ([#208](https://github.com/foundry-rs/compilers/issues/208))
+- Better error messages for incompatible versions ([#200](https://github.com/foundry-rs/compilers/issues/200))
 
 ### Miscellaneous Tasks
 
-- Release 0.10.3
-
-### Other
-
-- Incorrect Default EVM Version for Solidity Compiler 0.4.21-0.5.4 ([#189](https://github.com/foundry-rs/compilers/issues/189))
+- Release 0.11.4
+- Release 0.11.3
+- Proper generate legacy asm extra output file ([#207](https://github.com/foundry-rs/compilers/issues/207))
+- Release 0.11.2
+- Clippy ([#204](https://github.com/foundry-rs/compilers/issues/204))
+- Use serde_json::from_str ([#203](https://github.com/foundry-rs/compilers/issues/203))
+- Release 0.11.1
+- Improve error handling in source map parsing ([#201](https://github.com/foundry-rs/compilers/issues/201))
+- Clippy happy ([#195](https://github.com/foundry-rs/compilers/issues/195))
+- Fix up the README example ([#194](https://github.com/foundry-rs/compilers/issues/194))
+- Release 0.11.0
 
-## [0.10.2](https://github.com/foundry-rs/compilers/releases/tag/v0.10.2) - 2024-08-01
+## [0.10.3](https://github.com/foundry-rs/compilers/releases/tag/v0.10.3) - 2024-08-26
 
 ### Bug Fixes
 
+- [flatten] Update license handling logic ([#184](https://github.com/foundry-rs/compilers/issues/184))
 - Unify logic for ignored warnings ([#179](https://github.com/foundry-rs/compilers/issues/179))
 - Remove outdated build infos ([#177](https://github.com/foundry-rs/compilers/issues/177))
 - Make remappings resolution more deterministic ([#176](https://github.com/foundry-rs/compilers/issues/176))
 
+### Documentation
+
+- Docs fix spelling issues ([#190](https://github.com/foundry-rs/compilers/issues/190))
+
 ### Features
 
+- Always provide `Default` for `MultiCompiler` ([#188](https://github.com/foundry-rs/compilers/issues/188))
+- [vyper] Add experimental codegen to settings ([#186](https://github.com/foundry-rs/compilers/issues/186))
+- More user-friendly error when no compiler is available ([#185](https://github.com/foundry-rs/compilers/issues/185))
 - Sanitize EVM version for vyper ([#181](https://github.com/foundry-rs/compilers/issues/181))
 
 ### Miscellaneous Tasks
 
+- Release 0.10.3
 - Release 0.10.2
 
 ### Other
 
+- Incorrect Default EVM Version for Solidity Compiler 0.4.21-0.5.4 ([#189](https://github.com/foundry-rs/compilers/issues/189))
 - Update README to link docs and update install instructions ([#180](https://github.com/foundry-rs/compilers/issues/180))
 
 ## [0.10.1](https://github.com/foundry-rs/compilers/releases/tag/v0.10.1) - 2024-07-26

Cargo.toml

@@ -4,7 +4,7 @@ resolver = "2"
 
 [workspace.package]
 authors = ["Foundry Maintainers"]
-version = "0.11.0"
+version = "0.11.6"
 rust-version = "1.70"
 readme = "README.md"
 license = "MIT OR Apache-2.0"
@@ -31,11 +31,11 @@ unused-must-use = "deny"
 all = "warn"
 
 [workspace.dependencies]
-foundry-compilers = { path = "crates/compilers", version = "0.11.0" }
-foundry-compilers-artifacts = { path = "crates/artifacts/artifacts", version = "0.11.0" }
-foundry-compilers-artifacts-solc = { path = "crates/artifacts/solc", version = "0.11.0" }
-foundry-compilers-artifacts-vyper = { path = "crates/artifacts/vyper", version = "0.11.0" }
-foundry-compilers-core = { path = "crates/core", version = "0.11.0" }
+foundry-compilers = { path = "crates/compilers", version = "0.11.6" }
+foundry-compilers-artifacts = { path = "crates/artifacts/artifacts", version = "0.11.6" }
+foundry-compilers-artifacts-solc = { path = "crates/artifacts/solc", version = "0.11.6" }
+foundry-compilers-artifacts-vyper = { path = "crates/artifacts/vyper", version = "0.11.6" }
+foundry-compilers-core = { path = "crates/core", version = "0.11.6" }
 
 alloy-json-abi = { version = "0.8", features = ["serde_json"] }
 alloy-primitives = { version = "0.8", features = ["serde", "rand"] }
@@ -62,3 +62,5 @@ yansi = "1.0"
 # async
 futures-util = "0.3"
 tokio = { version = "1.35", features = ["rt-multi-thread"] }
+
+snapbox = "0.6.9"

crates/artifacts/solc/src/ast/mod.rs

@@ -257,7 +257,7 @@ pub enum AssignmentOperator {
     ShlAssign,
 }
 
-ast_node!(
+expr_node!(
     /// A binary operation.
     struct BinaryOperation {
         common_type: TypeDescriptions,
@@ -938,7 +938,7 @@ stmt_node!(
     /// A return statement.
     struct Return {
         expression: Option<Expression>,
-        function_return_parameters: usize,
+        function_return_parameters: Option<usize>,
     }
 );
 

crates/artifacts/solc/src/configurable.rs

@@ -23,6 +23,8 @@ pub struct ConfigurableContractArtifact {
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub assembly: Option<String>,
     #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub legacy_assembly: Option<serde_json::Value>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
     pub opcodes: Option<String>,
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub method_identifiers: Option<BTreeMap<String, String>>,

crates/artifacts/solc/src/contract.rs

@@ -455,7 +455,7 @@ pub struct CompactContractRefSome<'a> {
     pub bin_runtime: &'a BytecodeObject,
 }
 
-impl<'a> CompactContractRefSome<'a> {
+impl CompactContractRefSome<'_> {
     /// Returns the individual parts of this contract.
     ///
     /// If the values are `None`, then `Default` is returned.

crates/artifacts/solc/src/lib.rs

@@ -1150,7 +1150,7 @@ impl<'de> Deserialize<'de> for LosslessMetadata {
     {
         struct LosslessMetadataVisitor;
 
-        impl<'de> Visitor<'de> for LosslessMetadataVisitor {
+        impl Visitor<'_> for LosslessMetadataVisitor {
             type Value = LosslessMetadata;
 
             fn expecting(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {

crates/artifacts/solc/src/output_selection.rs

@@ -6,7 +6,8 @@ use std::{collections::BTreeMap, fmt, str::FromStr};
 /// Represents the desired outputs based on a File `(file -> (contract -> [outputs]))`
 pub type FileOutputSelection = BTreeMap<String, Vec<String>>;
 
-/// Represents the selected output of files and contracts
+/// Represents the selected output of files and contracts.
+///
 /// The first level key is the file name and the second level key is the
 /// contract name. An empty contract name is used for outputs that are
 /// not tied to a contract but to the whole source file like the AST.
@@ -378,7 +379,7 @@ impl FromStr for EvmOutputSelection {
         match s {
             "evm" => Ok(Self::All),
             "asm" | "evm.assembly" => Ok(Self::Assembly),
-            "evm.legacyAssembly" => Ok(Self::LegacyAssembly),
+            "legacyAssembly" | "evm.legacyAssembly" => Ok(Self::LegacyAssembly),
             "methodidentifiers" | "evm.methodIdentifiers" | "evm.methodidentifiers" => {
                 Ok(Self::MethodIdentifiers)
             }

crates/artifacts/solc/src/remappings.rs

@@ -723,7 +723,7 @@ fn find_remapping_candidates(
 
     // need to find the actual next window in the event `open` is a lib dir
     let window_start = next_nested_window(open, current_dir);
-    // finally, we need to merge, adjust candidates from the same level and opening window
+    // finally, we need to merge, adjust candidates from the same level and open window
     if is_candidate
         || candidates
             .iter()
@@ -771,8 +771,8 @@ fn dir_distance(root: &Path, current: &Path) -> usize {
 }
 
 /// This finds the next window between `root` and `current`
-/// If `root` ends with a `lib` component then start join components from `current` until no valid
-/// window opener is found
+/// If `root` ends with a `lib` component then start joining components from `current` until no
+/// valid window opener is found
 fn next_nested_window(root: &Path, current: &Path) -> PathBuf {
     if !is_lib_dir(root) || root == current {
         return root.to_path_buf();