fix: accept 0x-prefixed value inputs (#14406)

* fix: accept 0x-prefixed value inputs

* use U256::from_str for 0x-prefixed hex parsing, add 0X support and expand tests

Amp-Thread-ID: https://ampcode.com/threads/T-019db45a-2ee1-771d-8127-2052dc6df2a3
Co-authored-by: Amp <amp@ampcode.com>

---------

Co-authored-by: zerosnacks <zerosnacks@protonmail.com>
Co-authored-by: Amp <amp@ampcode.com>

Author: 3 people

crates/cast/src/call_spec.rs

@@ -145,8 +145,8 @@ impl FromStr for CallSpec {
 /// Parse a value string that can be in ether notation (e.g., "0.1ether") or raw wei.
 fn parse_ether_or_wei(s: &str) -> Result<U256> {
     // Use alloy's DynSolType coercion which handles "1ether", "1gwei", "1000" etc.
-    if s.starts_with("0x") {
-        U256::from_str_radix(s, 16).map_err(|e| eyre!("Invalid hex value '{}': {}", s, e))
+    if s.starts_with("0x") || s.starts_with("0X") {
+        U256::from_str(s).map_err(|e| eyre!("Invalid hex value '{}': {}", s, e))
     } else {
         alloy_dyn_abi::DynSolType::coerce_str(&alloy_dyn_abi::DynSolType::Uint(256), s)
             .wrap_err_with(|| format!("Invalid value '{s}'"))?
@@ -180,6 +180,12 @@ mod tests {
         assert!(spec.sig.is_none());
     }
 
+    #[test]
+    fn test_parse_hex_value() {
+        assert_eq!(parse_ether_or_wei("0x10").unwrap(), U256::from(16));
+        assert_eq!(parse_ether_or_wei("0X10").unwrap(), U256::from(16));
+    }
+
     #[test]
     fn test_parse_with_sig() {
         let spec = CallSpec::parse(

crates/cli/src/utils/mod.rs

@@ -129,8 +129,8 @@ where
 /// If the string represents an untagged amount (e.g. "100") then
 /// it is interpreted as wei.
 pub fn parse_ether_value(value: &str) -> Result<U256> {
-    Ok(if value.starts_with("0x") {
-        U256::from_str_radix(value, 16)?
+    Ok(if value.starts_with("0x") || value.starts_with("0X") {
+        U256::from_str(value)?
     } else {
         alloy_dyn_abi::DynSolType::coerce_str(&alloy_dyn_abi::DynSolType::Uint(256), value)?
             .as_uint()
@@ -844,6 +844,16 @@ mod tests {
         assert!(!p.is_sol_test());
     }
 
+    #[test]
+    fn parse_ether_value_accepts_hex_prefixed_wei() {
+        assert_eq!(parse_ether_value("0x10").unwrap(), U256::from(16));
+        assert_eq!(parse_ether_value("0X10").unwrap(), U256::from(16));
+        assert_eq!(parse_ether_value("0x12").unwrap(), U256::from(0x12));
+        assert_eq!(parse_ether_value("0xff").unwrap(), U256::from(0xff));
+        assert_eq!(parse_ether_value("100").unwrap(), U256::from(100));
+        assert_eq!(parse_ether_value("1ether").unwrap(), U256::from(1000000000000000000u128));
+    }
+
     // loads .env from cwd and project dir, See [`find_project_root()`]
     #[test]
     fn can_load_dotenv() {