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.

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

feat(contract-verifier): Adjust contract verifier for zksolc 1.5.0 #2255

Merged
merged 6 commits into from
Jun 18, 2024
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Fix
perekopskiy committed Jun 18, 2024
commit 921cb810c810a608434ee2609fed195a40f5f026
6 changes: 5 additions & 1 deletion core/lib/contract_verifier/src/zksolc_utils.rs
Original file line number Diff line number Diff line change
@@ -102,7 +102,6 @@ impl ZkSolc {
let mut command = tokio::process::Command::new(&self.zksolc_path);
command.stdout(Stdio::piped()).stderr(Stdio::piped());

dbg!(&input);
match &input {
ZkSolcInput::StandardJson(input) => {
if !self.is_post_1_5_0() {
@@ -113,6 +112,8 @@ impl ZkSolc {
command.arg("--force-evmla");
}
}

command.arg("--solc").arg(self.solc_path.to_str().unwrap())
}
ZkSolcInput::YulSingleFile { is_system, .. } => {
if self.is_post_1_5_0() {
@@ -240,6 +241,9 @@ mod tests {
zksolc.zksolc_version = "v1.4.15".to_string();
assert!(!zksolc.is_post_1_5_0(), "v1.4.15");

zksolc.zksolc_version = "v1.3.21".to_string();
assert!(!zksolc.is_post_1_5_0(), "v1.3.21");

zksolc.zksolc_version = "v0.5.1".to_string();
assert!(!zksolc.is_post_1_5_0(), "v0.5.1");
}