Feature: Add corelib types

contracts/.gitignore

@@ -1,2 +1,3 @@
 /target
 /abi
+/generated

contracts/Makefile

@@ -9,6 +9,7 @@ generate_artifacts:
 	scarb build
 	mkdir -p ${artifacts}
 
+	jq .abi ${scarb_build}basic${sierra} > ${artifacts}basic.abi.json
 	jq .abi ${scarb_build}simple_events${sierra} > ${artifacts}events.abi.json
 	jq .abi ${scarb_build}simple_get_set${sierra} > ${artifacts}simple_get_set.abi.json
 	jq .abi ${scarb_build}simple_types${sierra} > ${artifacts}simple_types.abi.json
@@ -19,6 +20,10 @@ generate_artifacts:
 	jq .abi ${scarb_build}structs${sierra} > ${artifacts}structs.abi.json
 	jq .abi ${scarb_build}byte_array${sierra} > ${artifacts}byte_array.abi.json
 
+generate_rust:
+	scarb build
+	mkdir -p generated
+	cargo run --all-features -- --artifacts-path target/dev --output-dir generated --rust
 
 setup: setup_simple_get_set
 

contracts/src/basic.cairo

@@ -2,19 +2,19 @@
 mod basic {
     #[storage]
     struct Storage {
-        v1: felt252,
+        v1: NonZero<felt252>,
         v2: u256,
         v3: felt252,
     }
 
     #[external(v0)]
-    fn set_storage(ref self: ContractState, v1: felt252, v2: u256) {
+    fn set_storage(ref self: ContractState, v1: NonZero<felt252>, v2: u256) {
         self.v1.write(v1);
         self.v2.write(v2);
     }
 
     #[external(v0)]
-    fn read_storage_tuple(self: @ContractState) -> (felt252, u256) {
+    fn read_storage_tuple(self: @ContractState) -> (NonZero<felt252>, u256) {
         (self.v1.read(), self.v2.read())
     }
 }

contracts/src/lib.cairo

@@ -10,3 +10,4 @@ mod abicov {
 }
 
 mod simple_get_set;
+mod basic;

crates/cairo-serde/README.md

@@ -8,7 +8,14 @@ By implementing this trait, the Rust type becomes (de)serializable from / into a
 The types considered built-in by Cairo Serde are the following:
 
 ```rust
-pub const CAIRO_BASIC_STRUCTS: [&str; 4] = ["Span", "ClassHash", "ContractAddress", "EthAddress"];
+pub const CAIRO_BASIC_STRUCTS: [&str; 6] = [
+    "Span",
+    "ClassHash",
+    "ContractAddress",
+    "EthAddress",
+    "NonZero",
+    "U256",
+];
 
 pub const CAIRO_BASIC_ENUMS: [&str; 3] = ["Option", "Result", "bool"];
 ```
@@ -29,6 +36,8 @@ Cairo Serde provides serialization support for the following types:
 - `ClassHash` -> Custom type in this crate `ClassHash`.
 - `Array/Span` -> `Vec`.
 - `Tuple` -> native tuples + the unit `()` type.
+- `NonZero` -> Custom type in this crate `NonZero`.
+- `u256` -> Custom type in this crate `U256`.
 
 ## `CairoSerde` trait
 

crates/cairo-serde/src/error.rs

@@ -19,6 +19,8 @@ pub enum Error {
     Provider(#[from] ProviderError),
     #[error("Bytes31 out of range.")]
     Bytes31OutOfRange,
+    #[error("NonZero that is zero")]
+    ZeroedNonZero,
 }
 
 impl CairoSerde for Error {

crates/cairo-serde/src/lib.rs

@@ -13,14 +13,23 @@ pub mod call;
 pub mod types;
 pub use types::array_legacy::*;
 pub use types::byte_array::*;
+pub use types::non_zero::*;
 pub use types::starknet::*;
+pub use types::u256::*;
 pub use types::*;
 
 use ::starknet::core::types::FieldElement;
 
 /// Basic cairo structs that are already implemented inside
 /// this crate and hence skipped during ABI generation.
-pub const CAIRO_BASIC_STRUCTS: [&str; 4] = ["Span", "ClassHash", "ContractAddress", "EthAddress"];
+pub const CAIRO_BASIC_STRUCTS: [&str; 6] = [
+    "Span",
+    "ClassHash",
+    "ContractAddress",
+    "EthAddress",
+    "NonZero",
+    "U256",
+];
 
 /// Same as `CAIRO_BASIC_STRUCTS`, but for enums.
 pub const CAIRO_BASIC_ENUMS: [&str; 3] = ["Option", "Result", "bool"];

crates/cairo-serde/src/types/integers.rs

@@ -64,6 +64,7 @@ implement_trait_for_signed!(i16);
 implement_trait_for_signed!(i32);
 implement_trait_for_signed!(i64);
 implement_trait_for_signed!(i128);
+implement_trait_for_signed!(isize);
 
 #[cfg(test)]
 mod tests {

crates/cairo-serde/src/types/mod.rs

@@ -4,10 +4,12 @@ pub mod boolean;
 pub mod byte_array;
 pub mod felt;
 pub mod integers;
+pub mod non_zero;
 pub mod option;
 pub mod result;
 pub mod starknet;
 pub mod tuple;
+pub mod u256;
 
 #[cfg(test)]
 mod tests {

crates/cairo-serde/src/types/non_zero.rs

@@ -0,0 +1,143 @@
+//! CairoSerde implementation for NonZero.
+//!
+//! NonZero serializes with zero ( hehe :) ) overhead as the inner value
+//!
+//! https://github.com/starkware-libs/cairo/blob/main/corelib/src/zeroable.cairo#L38
+use crate::{CairoSerde, ContractAddress, Result, U256};
+use starknet::core::types::FieldElement;
+
+#[derive(Debug, PartialEq, PartialOrd, Clone)]
+pub struct NonZero<T: Zeroable>(T);
+
+impl<T: Zeroable> NonZero<T> {
+    pub fn new(value: T) -> Option<Self> {
+        if value.is_zero() {
+            None
+        } else {
+            Some(NonZero(value))
+        }
+    }
+
+    pub fn inner(&self) -> &T {
+        &self.0
+    }
+
+    pub fn inner_mut(&mut self) -> &mut T {
+        &mut self.0
+    }
+
+    pub fn into_inner(self) -> T {
+        self.0
+    }
+}
+
+impl<T, RT> CairoSerde for NonZero<T>
+where
+    T: CairoSerde<RustType = RT>,
+    T: Zeroable,
+    RT: Zeroable,
+{
+    type RustType = NonZero<RT>;
+
+    const SERIALIZED_SIZE: Option<usize> = T::SERIALIZED_SIZE;
+    const DYNAMIC: bool = T::DYNAMIC;
+
+    #[inline]
+    fn cairo_serialized_size(rust: &Self::RustType) -> usize {
+        T::cairo_serialized_size(&rust.0)
+    }
+
+    fn cairo_serialize(rust: &Self::RustType) -> Vec<FieldElement> {
+        T::cairo_serialize(&rust.0)
+    }
+
+    fn cairo_deserialize(felts: &[FieldElement], offset: usize) -> Result<Self::RustType> {
+        NonZero::new(T::cairo_deserialize(felts, offset)?).ok_or(crate::Error::ZeroedNonZero)
+    }
+}
+
+pub trait Zeroable {
+    fn is_zero(&self) -> bool;
+}
+
+macro_rules! implement_nonzeroable_for_integer {
+    ($type:ty) => {
+        impl Zeroable for $type {
+            fn is_zero(&self) -> bool {
+                *self == 0 as $type
+            }
+        }
+    };
+}
+
+implement_nonzeroable_for_integer!(u8);
+implement_nonzeroable_for_integer!(u16);
+implement_nonzeroable_for_integer!(u32);
+implement_nonzeroable_for_integer!(u64);
+implement_nonzeroable_for_integer!(u128);
+implement_nonzeroable_for_integer!(usize);
+implement_nonzeroable_for_integer!(i8);
+implement_nonzeroable_for_integer!(i16);
+implement_nonzeroable_for_integer!(i32);
+implement_nonzeroable_for_integer!(i64);
+implement_nonzeroable_for_integer!(i128);
+implement_nonzeroable_for_integer!(isize);
+
+impl Zeroable for U256 {
+    fn is_zero(&self) -> bool {
+        self.low.is_zero() && self.high.is_zero()
+    }
+}
+
+impl Zeroable for FieldElement {
+    fn is_zero(&self) -> bool {
+        *self == FieldElement::ZERO
+    }
+}
+
+impl Zeroable for ContractAddress {
+    fn is_zero(&self) -> bool {
+        self.0 == FieldElement::ZERO
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::Error;
+
+    use super::*;
+
+    #[test]
+    fn test_non_zero_cairo_serialize() {
+        let non_zero = NonZero(1_u32);
+        let felts = NonZero::<u32>::cairo_serialize(&non_zero);
+        assert_eq!(felts.len(), 1);
+        assert_eq!(felts[0], FieldElement::from(1_u32));
+    }
+
+    #[test]
+    fn test_non_zero_cairo_deserialize() {
+        let felts = vec![FieldElement::from(1_u32)];
+        let non_zero = NonZero::<u32>::cairo_deserialize(&felts, 0).unwrap();
+        assert_eq!(non_zero, NonZero(1_u32))
+    }
+
+    #[test]
+    fn test_non_zero_cairo_deserialize_zero() {
+        let felts = vec![FieldElement::ZERO, FieldElement::ZERO];
+        let non_zero = NonZero::<U256>::cairo_deserialize(&felts, 0);
+        match non_zero {
+            Err(Error::ZeroedNonZero) => (),
+            _ => panic!("Expected ZeroedNonZero error"),
+        }
+    }
+
+    #[test]
+    fn test_non_zero_const_size() {
+        assert_eq!(NonZero::<u32>::SERIALIZED_SIZE, Some(1));
+        assert_eq!(NonZero::<U256>::SERIALIZED_SIZE, Some(2));
+
+        let is_dynamic = NonZero::<i8>::DYNAMIC;
+        assert!(!is_dynamic);
+    }
+}

crates/cairo-serde/src/types/starknet.rs

@@ -77,7 +77,7 @@ impl CairoSerde for ClassHash {
 }
 
 /// EthAddress.
-#[derive(Debug, Copy, Clone, PartialEq)]
+#[derive(Debug, Copy, Clone, PartialEq, PartialOrd)]
 pub struct EthAddress(pub FieldElement);
 
 impl From<FieldElement> for EthAddress {