@nomicfoundation/edr 0.6.2 → 0.6.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nomicfoundation/edr",
-  "version": "0.6.2",
+  "version": "0.6.3",
   "devDependencies": {
     "@napi-rs/cli": "^2.18.4",
     "@types/chai": "^4.2.0",
@@ -52,13 +52,13 @@
   "repository": "NomicFoundation/edr.git",
   "types": "index.d.ts",
   "dependencies": {
-    "@nomicfoundation/edr-darwin-arm64": "0.6.2",
-    "@nomicfoundation/edr-darwin-x64": "0.6.2",
-    "@nomicfoundation/edr-linux-arm64-gnu": "0.6.2",
-    "@nomicfoundation/edr-linux-arm64-musl": "0.6.2",
-    "@nomicfoundation/edr-linux-x64-gnu": "0.6.2",
-    "@nomicfoundation/edr-linux-x64-musl": "0.6.2",
-    "@nomicfoundation/edr-win32-x64-msvc": "0.6.2"
+    "@nomicfoundation/edr-darwin-arm64": "0.6.3",
+    "@nomicfoundation/edr-darwin-x64": "0.6.3",
+    "@nomicfoundation/edr-linux-arm64-gnu": "0.6.3",
+    "@nomicfoundation/edr-linux-arm64-musl": "0.6.3",
+    "@nomicfoundation/edr-linux-x64-gnu": "0.6.3",
+    "@nomicfoundation/edr-linux-x64-musl": "0.6.3",
+    "@nomicfoundation/edr-win32-x64-msvc": "0.6.3"
   },
   "scripts": {
     "artifacts": "napi artifacts",

package/src/trace/error_inferrer.rs

@@ -1302,7 +1302,9 @@ impl ErrorInferrer {
             .expect("The TS code type-checks this to always have bytecode");
         let contract = bytecode.contract.borrow();
 
-        let version = Version::parse(&bytecode.compiler_version).unwrap();
+        let version =
+            Version::parse(&bytecode.compiler_version).expect("Failed to parse SemVer version");
+
         // this only makes sense when receive functions are available
         if version < FIRST_SOLC_VERSION_RECEIVE_FUNCTION {
             return Ok(false);
@@ -1586,7 +1588,11 @@ impl ErrorInferrer {
         trace: &CallMessageTrace,
         func: &ContractFunction,
     ) -> napi::Result<bool> {
-        let last_step = trace.steps.last().unwrap();
+        let last_step = trace
+            .steps
+            .last()
+            .expect("There should at least be one step");
+
         let last_step = match last_step {
             Either4::A(step) => step,
             _ => panic!("JS code asserted this is always an EvmStep"),
@@ -2206,10 +2212,10 @@ fn format_dyn_sol_value(val: &DynSolValue) -> String {
         // surround string values with quotes
         DynSolValue::String(s) => format!("\"{s}\""),
 
-        DynSolValue::Address(address) => format!("\"0x{address}\""),
-        DynSolValue::Bytes(bytes) => format!("\"0x{}\"", hex::encode(bytes)),
+        DynSolValue::Address(address) => format!("\"{address}\""),
+        DynSolValue::Bytes(bytes) => format!("\"{}\"", hex::encode_prefixed(bytes)),
         DynSolValue::FixedBytes(word, size) => {
-            format!("\"0x{}\"", hex::encode(&word.0.as_slice()[..*size]))
+            format!("\"{}\"", hex::encode_prefixed(&word.0.as_slice()[..*size]))
         }
         DynSolValue::Bool(b) => b.to_string(),
         DynSolValue::Function(_) => "<function>".to_string(),
@@ -2217,3 +2223,33 @@ fn format_dyn_sol_value(val: &DynSolValue) -> String {
         DynSolValue::Uint(uint, _bits) => uint.to_string(),
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_sol_value_to_string() {
+        assert_eq!(
+            format_dyn_sol_value(&DynSolValue::String("hello".to_string())),
+            "\"hello\""
+        );
+        // Uniform, 0-prefixed hex strings
+        assert_eq!(
+            format_dyn_sol_value(&DynSolValue::Address([0u8; 20].into())),
+            format!(r#""0x{}""#, "0".repeat(2 * 20))
+        );
+        assert_eq!(
+            format_dyn_sol_value(&DynSolValue::Bytes(vec![0u8; 32])),
+            format!(r#""0x{}""#, "0".repeat(2 * 32))
+        );
+        assert_eq!(
+            format_dyn_sol_value(&DynSolValue::FixedBytes([0u8; 32].into(), 10)),
+            format!(r#""0x{}""#, "0".repeat(2 * 10))
+        );
+        assert_eq!(
+            format_dyn_sol_value(&DynSolValue::FixedBytes([0u8; 32].into(), 32)),
+            format!(r#""0x{}""#, "0".repeat(2 * 32))
+        );
+    }
+}