chore: aggregate PRs

This PR aggregates changes from the following PRs:

- Closes #12628 by @\Doryu001
- Closes #12648 by @\ANtutov
- Closes #12656 by @\Bilogweb3

Author: DaniPopes

crates/common/src/provider/mod.rs

@@ -356,10 +356,10 @@ fn resolve_path(path: &Path) -> Result<PathBuf, ()> {
 
 #[cfg(windows)]
 fn resolve_path(path: &Path) -> Result<PathBuf, ()> {
-    if let Some(s) = path.to_str() {
-        if s.starts_with(r"\\.\pipe\") {
-            return Ok(path.to_path_buf());
-        }
+    if let Some(s) = path.to_str()
+        && s.starts_with(r"\\.\pipe\")
+    {
+        return Ok(path.to_path_buf());
     }
     Err(())
 }

crates/common/src/utils.rs

@@ -82,8 +82,8 @@ pub fn strip_bytecode_placeholders(bytecode: &BytecodeObject) -> Option<Bytes> {
     match &bytecode {
         BytecodeObject::Bytecode(bytes) => Some(bytes.clone()),
         BytecodeObject::Unlinked(s) => {
-            // Replace all __$xxx$__ placeholders with 32 zero bytes
-            let s = (*BYTECODE_PLACEHOLDER_RE).replace_all(s, "00".repeat(40));
+            // Replace all __$xxx$__ placeholders with 20 zero bytes (40 hex chars)
+            let s = (*BYTECODE_PLACEHOLDER_RE).replace_all(s, "00".repeat(20));
             let bytes = hex::decode(s.as_bytes());
             Some(bytes.ok()?.into())
         }

crates/verify/src/provider.rs

@@ -81,7 +81,7 @@ impl VerificationContext {
             .find(&self.target_path, &self.target_name)
             .ok_or_eyre("failed to find target artifact when compiling for metadata")?;
 
-        artifact.metadata.clone().ok_or_eyre("target artifact does not have an ABI")
+        artifact.metadata.clone().ok_or_eyre("target artifact does not have metadata")
     }
 
     /// Returns [Vec] containing imports of the target file.