fix(cheatcodes): fallback to string if invalid 0x hex (#8290)

Author: DaniPopes

crates/cheatcodes/src/json.rs

@@ -448,15 +448,15 @@ pub(super) fn json_value_to_token(value: &Value) -> Result<DynSolValue> {
                     s = format!("0{val}");
                     val = &s[..];
                 }
-                let bytes = hex::decode(val)?;
-                Ok(match bytes.len() {
-                    20 => DynSolValue::Address(Address::from_slice(&bytes)),
-                    32 => DynSolValue::FixedBytes(B256::from_slice(&bytes), 32),
-                    _ => DynSolValue::Bytes(bytes),
-                })
-            } else {
-                Ok(DynSolValue::String(string.to_owned()))
+                if let Ok(bytes) = hex::decode(val) {
+                    return Ok(match bytes.len() {
+                        20 => DynSolValue::Address(Address::from_slice(&bytes)),
+                        32 => DynSolValue::FixedBytes(B256::from_slice(&bytes), 32),
+                        _ => DynSolValue::Bytes(bytes),
+                    });
+                }
             }
+            Ok(DynSolValue::String(string.to_owned()))
         }
     }
 }

crates/forge/tests/it/repros.rs

@@ -343,5 +343,8 @@ test_repro!(2851, false, None, |res| {
 // https://github.com/foundry-rs/foundry/issues/8006
 test_repro!(8006);
 
+// https://github.com/foundry-rs/foundry/issues/8277
+test_repro!(8277);
+
 // https://github.com/foundry-rs/foundry/issues/8287
 test_repro!(8287);

testdata/default/repros/Issue8277.t.sol

@@ -0,0 +1,28 @@
+// SPDX-License-Identifier: MIT OR Apache-2.0
+pragma solidity 0.8.18;
+
+import "ds-test/test.sol";
+import "cheats/Vm.sol";
+
+// https://github.com/foundry-rs/foundry/issues/8277
+contract Issue8277Test is DSTest {
+    Vm constant vm = Vm(HEVM_ADDRESS);
+
+    struct MyJson {
+        string s;
+    }
+
+    function test_hexprefixednonhexstring() public {
+        {
+            bytes memory b = vm.parseJson("{\"a\": \"0x834629f473876e5f0d3d9d269af3dabcb0d7d520-identifier-0\"}");
+            MyJson memory decoded = abi.decode(b, (MyJson));
+            assertEq(decoded.s, "0x834629f473876e5f0d3d9d269af3dabcb0d7d520-identifier-0");
+        }
+
+        {
+            bytes memory b = vm.parseJson("{\"b\": \"0xBTC\"}");
+            MyJson memory decoded = abi.decode(b, (MyJson));
+            assertEq(decoded.s, "0xBTC");
+        }
+    }
+}