Merge branch 'main' into feat/deserialize

Author: jbcaron

crates/starknet-types-core/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "starknet-types-core"
-version = "0.1.3"
+version = "0.1.4"
 edition = "2021"
 license = "MIT"
 homepage = "https://github.com/starknet-io/types-rs"

crates/starknet-types-core/src/felt/mod.rs

@@ -2,6 +2,7 @@
 mod felt_arbitrary;
 
 use core::ops::{Add, Mul, Neg};
+use core::str::FromStr;
 
 use num_bigint::{BigInt, BigUint, Sign};
 use num_integer::Integer;
@@ -615,6 +616,20 @@ impl_from!(i32, i128);
 impl_from!(i64, i128);
 impl_from!(isize, i128);
 
+impl FromStr for Felt {
+    type Err = FromStrError;
+
+    /// Converts a hex (0x-prefixed) or decimal string to a [Felt].
+    /// e.g., '0x123abc' or '1337'.
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        if s.starts_with("0x") {
+            Felt::from_hex(s)
+        } else {
+            Felt::from_dec_str(s)
+        }
+    }
+}
+
 impl Add<&Felt> for u64 {
     type Output = Option<u64>;
 

crates/starknet-types-core/src/felt/num_traits_impl.rs

@@ -1,6 +1,25 @@
 use super::Felt;
+use num_bigint::{ToBigInt, ToBigUint};
 use num_traits::{FromPrimitive, Inv, One, Pow, ToPrimitive, Zero};
 
+impl ToBigInt for Felt {
+    /// Converts the value of `self` to a [`BigInt`].
+    ///
+    /// Safe to unwrap, will always return `Some`.
+    fn to_bigint(&self) -> Option<num_bigint::BigInt> {
+        Some(self.to_bigint())
+    }
+}
+
+impl ToBigUint for Felt {
+    /// Converts the value of `self` to a [`BigUint`].
+    ///
+    /// Safe to unwrap, will always return `Some`.
+    fn to_biguint(&self) -> Option<num_bigint::BigUint> {
+        Some(self.to_biguint())
+    }
+}
+
 impl FromPrimitive for Felt {
     fn from_i64(value: i64) -> Option<Self> {
         Some(value.into())