Skip to content

fix(forge): bump compilers to fix remapping sol file #11184

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 1, 2025
+15 −11
Merged

fix(forge): bump compilers to fix remapping sol file #11184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e263098
Bump compilers 0.18.2
grandizzy Aug 1, 2025
1e0273c
Add test
grandizzy Aug 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ foundry-linking = { path = "crates/linking" }

# solc & compilation utilities
foundry-block-explorers = { version = "0.20.0", default-features = false }
foundry-compilers = { version = "0.18.1", default-features = false }
foundry-compilers = { version = "0.18.2", default-features = false }
foundry-fork-db = "0.16"
solang-parser = { version = "=0.3.9", package = "foundry-solang-parser" }
solar-ast = { version = "=0.1.5", default-features = false }
Expand Down
4 changes: 4 additions & 0 deletions crates/forge/tests/cli/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -663,6 +663,8 @@ forgetest_init!(can_prioritise_closer_lib_remappings, |prj, cmd| {
// remapping.
// See <https://github.com/foundry-rs/foundry/issues/9146>
// Test that
// - single file remapping is properly added, see
// <https://github.com/foundry-rs/foundry/issues/6706> and <https://github.com/foundry-rs/foundry/issues/8499>
// - project defined `@openzeppelin/contracts` remapping is added
// - library defined `@openzeppelin/contracts-upgradeable` remapping is added
// - library defined `@openzeppelin/contracts/upgradeable` remapping is not added as it conflicts
Expand All @@ -672,6 +674,7 @@ forgetest_init!(can_prioritise_project_remappings, |prj, cmd| {
let mut config = cmd.config();
// Add `@utils/` remapping in project config.
config.remappings = vec![
Remapping::from_str("@utils/libraries/Contract.sol=src/Contract.sol").unwrap().into(),
Remapping::from_str("@utils/=src/").unwrap().into(),
Remapping::from_str("@openzeppelin/contracts=lib/openzeppelin-contracts/").unwrap().into(),
];
Expand Down Expand Up @@ -699,6 +702,7 @@ forgetest_init!(can_prioritise_project_remappings, |prj, cmd| {

cmd.args(["remappings", "--pretty"]).assert_success().stdout_eq(str![[r#"
Global:
- @utils/libraries/Contract.sol=src/Contract.sol
- @utils/=src/
- @openzeppelin/contracts/=lib/openzeppelin-contracts/
- @openzeppelin/contracts-upgradeable/=lib/dep1/lib/openzeppelin-upgradeable/
Expand Down
Loading