use lib

matter-labs · Jun 18, 2024 · 3a75be7 · 3a75be7
1 parent 8d1bd85
commit 3a75be7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/core/lib/contract_verifier/Cargo.toml b/core/lib/contract_verifier/Cargo.toml
@@ -31,3 +31,4 @@ lazy_static.workspace = true
 tempfile.workspace = true
 regex.workspace = true
 tracing.workspace = true
+semver.workspace = true
diff --git a/core/lib/contract_verifier/src/zksolc_utils.rs b/core/lib/contract_verifier/src/zksolc_utils.rs
@@ -1,6 +1,6 @@
 use std::{collections::HashMap, io::Write, path::PathBuf, process::Stdio};
 
-use regex::Regex;
+use semver::Version;
 use serde::{Deserialize, Serialize};
 
 use crate::error::ContractVerifierError;
@@ -200,18 +200,18 @@ impl ZkSolc {
     }
 
     pub fn is_post_1_5_0(&self) -> bool {
+        // Special case
         if &self.zksolc_version == "vm-1.5.0-a167aa3" {
             false
-        } else {
-            let re =
-                Regex::new(r"^v(?<MAJOR>(?:0|(?:[1-9]\d*)))\.(?<MINOR>(?:0|(?:[1-9]\d*)))\.(?<PATCH>(?:0|(?:[1-9]\d*)))")
-                    .unwrap();
-            if let Some(caps) = re.captures(&self.zksolc_version) {
-                (caps["MAJOR"].len() > 1 || &caps["MAJOR"] > "1")
-                    || (&caps["MAJOR"] == "1" && (caps["MINOR"].len() > 1 || &caps["MINOR"] >= "5"))
+        } else if let Some(version) = self.zksolc_version.strip_prefix("v") {
+            if let Ok(semver) = Version::parse(version) {
+                let target = Version::new(1, 5, 0);
+                semver >= target
             } else {
                 true
             }
+        } else {
+            true
         }
     }
 }