fix: change "bytes memory" to "bytes" in json abi output (#418)

* fix json abi formatting * overwrite bytes memory only in abi output * corrected print --------- Co-authored-by: Jonathan Becker <[email protected]>
Jon-Becker · May 30, 2024 · e68c8f4 · e68c8f4
1 parent b3a6a2f
commit e68c8f4
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 4 deletions.
diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml
@@ -25,7 +25,7 @@ thiserror = "1.0.50"
 tracing = "0.1.40"
 tracing-subscriber = "0.3.18"
 eyre = "0.6.12"
-alloy-json-abi = "0.7.0"
+alloy-json-abi = "0.7.4"
 
 [[bin]]
 name = "heimdall"

diff --git a/crates/common/src/ether/signatures.rs b/crates/common/src/ether/signatures.rs
@@ -226,7 +226,7 @@ impl ResolveSelector for ResolvedFunction {
             None => selector,
         };
 
-        trace!("resolving event selector {}", &selector);
+        trace!("resolving function selector {}", &selector);
 
         // get cached results
         if let Some(cached_results) =

diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml
@@ -31,6 +31,7 @@ derive_builder = "0.12.0"
 async-convert = "1.0.0"
 futures = "0.3.28"
 tracing = "0.1.40"
+alloy-json-abi = { version = "0.7.4", features = ["serde_json"]}
 
 # modules
 heimdall-cfg = { workspace = true }

diff --git a/crates/core/tests/test_decompile.rs b/crates/core/tests/test_decompile.rs
@@ -126,6 +126,7 @@ mod benchmark {
 
 #[cfg(test)]
 mod integration_tests {
+    use alloy_json_abi::JsonAbi;
     use heimdall_common::utils::io::file::delete_path;
     use heimdall_decompiler::{decompile, DecompilerArgs};
 
@@ -391,6 +392,10 @@ mod integration_tests {
             if output.contains("error CustomError_") {
                 is_error_covered = true;
             }
+
+            let abi_serialized = serde_json::to_string(&result.abi).unwrap();
+            let abi_deserialized = JsonAbi::from_json_str(&abi_serialized);
+            assert!(abi_deserialized.is_ok());
         }
 
         // assert that all flags are true

diff --git a/crates/decompile/Cargo.toml b/crates/decompile/Cargo.toml
@@ -17,7 +17,7 @@ heimdall-cache = { workspace = true }
 thiserror = "1.0.50"
 clap = { workspace = true, features = ["derive"] }
 derive_builder = "0.12.0"
-alloy-json-abi = "0.7.0"
+alloy-json-abi = "0.7.4"
 tracing = "0.1.40"
 eyre = "0.6.12"
 ethers = "2.0.4"

diff --git a/crates/decompile/src/core/out/abi.rs b/crates/decompile/src/core/out/abi.rs
@@ -68,7 +68,7 @@ pub fn build_abi(
                     vec![Param {
                         name: "".to_string(),
                         internal_type: None,
-                        ty: r.clone(),
+                        ty: if r == "bytes memory" { "bytes".to_string() } else { r.clone() },
                         components: vec![],
                     }]
                 })