Skip to content

feat: detect Vyper compiler in etherscan_project #12505

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: detect Vyper compiler in etherscan_project #12505

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
35 changes: 27 additions & 8 deletions crates/common/src/compile.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ use foundry_compilers::{
compilers::{
Compiler,
solc::{Solc, SolcCompiler},
vyper::{Vyper, VyperSettings},
},
info::ContractInfo as CompilerContractInfo,
multi::{MultiCompiler, MultiCompilerSettings},
Expand Down Expand Up @@ -533,20 +534,38 @@ pub fn etherscan_project(metadata: &Metadata, target_path: &Path) -> Result<Proj
.remappings(settings.remappings.clone())
.build_with_root(sources_path);

// TODO: detect vyper
let v = metadata.compiler_version()?;
let solc = Solc::find_or_install(&v)?;
// Detect if contract is compiled with Vyper
let is_vyper = metadata.compiler_version.starts_with("vyper:");

let compiler = MultiCompiler { solc: Some(SolcCompiler::Specific(solc)), vyper: None };
let compiler = if is_vyper {
// For Vyper contracts, try to find Vyper compiler in PATH
let vyper = Vyper::new("vyper")
.map_err(|e| eyre::eyre!("Failed to find Vyper compiler: {e}. Please ensure Vyper is installed and available in PATH"))?;
MultiCompiler { solc: None, vyper: Some(vyper) }
} else {
// For Solidity contracts, use Solc
let v = metadata.compiler_version()?;
let solc = Solc::find_or_install(&v)?;
MultiCompiler { solc: Some(SolcCompiler::Specific(solc)), vyper: None }
};

Ok(ProjectBuilder::<MultiCompiler>::default()
.settings(MultiCompilerSettings {
let compiler_settings = if is_vyper {
// For Vyper, use default VyperSettings
// Note: metadata.settings() returns Solidity settings, so we use defaults for Vyper
MultiCompilerSettings { solc: Default::default(), vyper: VyperSettings::default() }
} else {
// For Solidity, use the settings from metadata
MultiCompilerSettings {
solc: SolcSettings {
settings: SolcConfig::builder().settings(settings).build(),
..Default::default()
},
..Default::default()
})
vyper: Default::default(),
}
};

Ok(ProjectBuilder::<MultiCompiler>::default()
.settings(compiler_settings)
.paths(paths)
.ephemeral()
.no_artifacts()
Expand Down
Loading