Skip to content
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

fix: fix zkforge zkbuild on ubuntu #137

Merged
merged 4 commits into from
Nov 2, 2023
Merged

fix: fix zkforge zkbuild on ubuntu #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f324a5c
chore: adds latest zksolc compiler
dutterbutter Oct 30, 2023
5d8c0a8
use solc version from argument, correct linux binary for zksolc
nbaztec Nov 1, 2023
f0c3098
Merge branch 'main' into nish-fix-forge-build
nbaztec Nov 1, 2023
d898f80
merge fix
nbaztec Nov 1, 2023
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
4 changes: 2 additions & 2 deletions crates/zkforge/bin/cmd/zk_solc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ impl ZkSolc {
let sources = self.get_versioned_sources().wrap_err("Cannot get source files")?;

// Step 2: Compile Contracts for Each Source
for (solc, version) in sources {
for (_solc, version) in sources {
//configure project solc for each solc version
for (contract_path, _) in version.1 {
// Check if the contract_path is in 'sources' directory or its subdirectories
Expand All @@ -250,7 +250,7 @@ impl ZkSolc {
))?;

// Step 4: Build Compiler Arguments
let comp_args = self.build_compiler_args(&contract_path, &solc);
let comp_args = self.build_compiler_args(&contract_path, &self.project.solc);

// Step 5: Run Compiler and Handle Output
let mut cmd = Command::new(&self.compiler_path);
Expand Down
2 changes: 1 addition & 1 deletion crates/zkforge/bin/cmd/zksolc_manager.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ impl ZkSolcOS {
/// This function is used to construct the URI for downloading the zkSync compiler binary.
fn get_download_uri(&self) -> &str {
match self {
ZkSolcOS::Linux => "linux-amd64",
ZkSolcOS::Linux => "linux-amd64-musl",
ZkSolcOS::MacAMD => "macosx-amd64",
ZkSolcOS::MacARM => "macosx-arm64",
}
Expand Down