Display strings in disassembler

MystenLabs · Sep 25, 2023 · dd11fb1 · dd11fb1
1 parent 64df54b
commit dd11fb1
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 1 deletion.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/external-crates/move/Cargo.lock b/external-crates/move/Cargo.lock
diff --git a/external-crates/move/tools/move-disassembler/Cargo.toml b/external-crates/move/tools/move-disassembler/Cargo.toml
@@ -19,6 +19,7 @@ move-binary-format = { path = "../../move-binary-format" }
 move-coverage = { path = "../move-coverage" }
 move-compiler = { path = "../../move-compiler" }
 
+bcs.workspace = true
 clap.workspace = true
 hex = "0.4.3"
 

diff --git a/external-crates/move/tools/move-disassembler/src/disassembler.rs b/external-crates/move/tools/move-disassembler/src/disassembler.rs
@@ -1260,8 +1260,19 @@ impl<'a> Disassembler<'a> {
         constant_index: usize,
         Constant { type_, data }: &Constant,
     ) -> Result<String> {
+        let data_str = match type_ {
+            SignatureToken::Vector(x) if x.as_ref() == &SignatureToken::U8 => {
+                match bcs::from_bytes::<Vec<u8>>(data)
+                    .ok()
+                    .and_then(|data| String::from_utf8(data).ok())
+                {
+                    Some(str) => "\"".to_owned() + &str + "\" // interpreted as UTF8 string",
+                    None => hex::encode(data),
+                }
+            }
+            _ => hex::encode(data),
+        };
         let type_str = self.disassemble_sig_tok(type_.clone(), &[])?;
-        let data_str = hex::encode(data);
         Ok(format!("\t{constant_index} => {}: {}", type_str, data_str))
     }