REVM: FFI cheatcode updates (#955)

* feat: only strip 0x in ffi output if present Ports #904 * Update forge/src/executor/inspector/cheatcodes/ext.rs Co-authored-by: Georgios Konstantopoulos <[email protected]>
foundry-rs · Mar 17, 2022 · 28deb75 · 28deb75
1 parent 456b63c
commit 28deb75
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/forge/src/executor/inspector/cheatcodes/ext.rs b/forge/src/executor/inspector/cheatcodes/ext.rs
@@ -14,7 +14,8 @@ fn ffi(args: &[String]) -> Result<Bytes, Bytes> {
         .map_err(|err| err.to_string().encode())?
         .stdout;
     let output = unsafe { std::str::from_utf8_unchecked(&output) };
-    let decoded = hex::decode(&output.trim()[2..]).map_err(|err| err.to_string().encode())?;
+    let decoded = hex::decode(&output.trim().strip_prefix("0x").unwrap_or(output))
+        .map_err(|err| err.to_string().encode())?;
 
     Ok(abi::encode(&[Token::Bytes(decoded.to_vec())]).into())
 }