feat(resolc): integrate revive compiler for evm to resolc compilation #1
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Brianspha
changed the title
Brianspha
force-pushed
the
resolc-compiler
branch
from
9b66169 to
b2150f7
Compare
Brianspha
force-pushed
the
resolc-compiler
branch
from
72f27b9 to
b647eca
Compare
pkhry
reviewed
Dec 16, 2024
| pub use foundry_compilers_artifacts_solc as solc; | ||
| pub use foundry_compilers_artifacts_vyper as vyper; | ||
|
|
There was a problem hiding this comment.
Line 6? If yes nope just following integration similar to solc and vyper
| pub missing_libraries: Option<HashSet<String>>, | ||
| } | ||
|
|
||
| impl Default for ResolcContract { |
| Self { abi: c.abi.as_ref(), bin, bin_runtime } | ||
| } | ||
| } | ||
| fn create_compact_bytecode( |
There was a problem hiding this comment.
Suggested change
| fn create_compact_bytecode( | |
| impl ResolcContract { | |
| fn json_abi(&self) -> Option<JsonAbi> { | |
| self.abi.clone() | |
| } | |
| fn compact_bytecode(&self) -> Option<CompactBytecode> { | |
| self.resolc_evm.as_ref().and_then(|resolc_evm| resolc_evm.bytecode.as_ref()).map( | |
| |bytecode| CompactBytecode { | |
| object: bytecode.object.clone(), | |
| source_map: None, | |
| link_references: BTreeMap::default(), | |
| }, | |
| ) | |
| } | |
| fn compact_deployed_bytecode(&self) -> Option<CompactDeployedBytecode> { | |
| self.resolc_evm | |
| .as_ref() | |
| .and_then(|resolc_evm| resolc_evm.deployed_bytecode.as_ref()) | |
| .and_then(|item| item.bytecode.as_ref()) | |
| .map(|deployed_bytecode| { | |
| let compact_bytecode_deployed = CompactBytecode { | |
| object: deployed_bytecode.object.clone(), | |
| source_map: None, | |
| link_references: BTreeMap::default(), | |
| }; | |
| CompactDeployedBytecode { | |
| bytecode: Some(compact_bytecode_deployed), | |
| immutable_references: BTreeMap::default(), | |
| } | |
| }) | |
| .to_owned() | |
| } | |
| } |
| } | ||
| } | ||
|
|
||
| impl<'a> From<&'a ResolcContract> for CompactContractRef<'a> { |
There was a problem hiding this comment.
Suggested change
| impl<'a> From<&'a ResolcContract> for CompactContractRef<'a> { | |
| impl<'a> From<&'a ResolcContract> for CompactContractRef<'a> { | |
| fn from(c: &'a ResolcContract) -> Self { | |
| let (bin, bin_runtime) = match &c.resolc_evm { | |
| Some(evm) => { | |
| let bin = evm.bytecode.as_ref().map(|code| &code.object); | |
| let bin_runtime = evm | |
| .deployed_bytecode | |
| .as_ref() | |
| .and_then(|deployed| deployed.bytecode.as_ref().map(|code| &code.object)); | |
| (bin, bin_runtime) | |
| } | |
| _ => (None, None), | |
| }; | |
| Self { abi: c.abi.as_ref(), bin, bin_runtime } | |
| } | |
| } |
| } | ||
| } | ||
|
|
||
| impl From<ResolcContract> for CompactContractBytecode { |
There was a problem hiding this comment.
Suggested change
| impl From<ResolcContract> for CompactContractBytecode { | |
| impl From<ResolcContract> for CompactContractBytecode { | |
| fn from(value: ResolcContract) -> Self { | |
| Self { | |
| abi: value.json_abi(), | |
| bytecode: value.compact_bytecode(), | |
| deployed_bytecode: value.compact_deployed_bytecode(), | |
| } | |
| } | |
| } |
or it's intended to always return every field to None if at least one of them is None?
| "aarch64" => Ok(ResolcOS::LinuxARM64), | ||
| _ => Ok(ResolcOS::LinuxAMD64), | ||
| }, | ||
| "macos" | "darwin" => match std::env::consts::ARCH { |
There was a problem hiding this comment.
Suggested change
| "macos" | "darwin" => match std::env::consts::ARCH { | |
| "macos" => match std::env::consts::ARCH { |
| .filter(|v| uniques.insert((v.major, v.minor, v.patch))) | ||
| .map(CompilerVersion::Remote), | ||
| ); | ||
| all_versions.sort_unstable(); |
| Ok(Self::compilers_dir()?.join(format!("{}v{}", os.get_resolc_prefix(), version))) | ||
| } | ||
|
|
||
| pub fn find_installed_version(version: &Version) -> Result<Option<PathBuf>> { |
There was a problem hiding this comment.
Suggested change
| pub fn find_installed_version(version: &Version) -> Result<Option<PathBuf>> { | |
| pub fn find_installed_version(version: &Version) -> Result<Option<PathBuf>> { | |
| Self::compiler_path(version) | |
| .map(|resolc| if !resolc.is_file() { None } else { Some(resolc) }) | |
| } |
| }) | ||
| } | ||
|
|
||
| #[cfg(feature = "async")] |
There was a problem hiding this comment.
why it's marked as feature async if the api used is non async? shouldn't it be possible to use tokio API?
| "aarch64" => assert!(matches!(os, ResolcOS::LinuxARM64)), | ||
| _ => assert!(matches!(os, ResolcOS::LinuxAMD64)), | ||
| }, | ||
| "macos" | "darwin" => match std::env::consts::ARCH { |
There was a problem hiding this comment.
Suggested change
| "macos" | "darwin" => match std::env::consts::ARCH { | |
| "macos" => match std::env::consts::ARCH { |
This commit removes some omissions i made related to github releases and downloading from Github aswell as fixing tests that had flawed logic
This commit fixes the issue with mac based systems seems like resolc doesnt work but wasm does
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This PR adds the initial integration of Revive compiler with foundry-compilers to compile EVM contracts to Resolc bytecode.
Changes
Testing
Impact
Checklist