Implement u256 support torii grpc (starkware-libs#1345)

reilabs · Dec 30, 2023 · f5d6ea0 · f5d6ea0
1 parent bc5dd6f
commit f5d6ea0
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/crates/torii/grpc/src/types/schema.rs b/crates/torii/grpc/src/types/schema.rs
@@ -1,3 +1,4 @@
+use crypto_bigint::{Encoding, U256};
 use dojo_types::primitive::Primitive;
 use dojo_types::schema::{Enum, EnumOption, Member, Struct, Ty};
 use serde::{Deserialize, Serialize};
@@ -198,14 +199,8 @@ impl TryFrom<proto::types::Primitive> for Primitive {
                                 .map_err(ClientError::SliceError)?,
                         ))
                     }
-                    _ => return Err(ClientError::UnsupportedType),
-                }
-            }
-            proto::types::value::ValueType::StringValue(_string) => {
-                match proto::types::PrimitiveType::from_i32(primitive_type) {
                     Some(proto::types::PrimitiveType::U256) => {
-                        // TODO: Handle u256
-                        Primitive::U256(None)
+                        Primitive::U256(Some(U256::from_be_slice(bytes)))
                     }
                     _ => return Err(ClientError::UnsupportedType),
                 }
@@ -234,7 +229,9 @@ impl TryFrom<Primitive> for proto::types::Primitive {
             Primitive::U128(u128) => {
                 u128.map(|val| ValueType::ByteValue(val.to_be_bytes().to_vec()))
             }
-            Primitive::U256(u256) => u256.map(|val| ValueType::StringValue(val.to_string())),
+            Primitive::U256(u256) => {
+                u256.map(|val| ValueType::ByteValue(val.to_be_bytes().to_vec()))
+            }
             Primitive::Felt252(felt) => {
                 felt.map(|val| ValueType::ByteValue(val.to_bytes_be().to_vec()))
             }

diff --git a/crates/torii/types-test/src/contracts.cairo b/crates/torii/types-test/src/contracts.cairo
@@ -40,14 +40,18 @@ mod records {
                 }
 
                 let type_felt: felt252 = record_idx.into();
-                let random_u8: u8 = random(pedersen::pedersen(seed(), record_idx.into()), 0, 100)
+                let random_u8 = random(pedersen::pedersen(seed(), record_idx.into()), 0, 100)
                     .try_into()
                     .unwrap();
                 let random_u128 = random(
                     pedersen::pedersen(seed(), record_idx.into()),
                     0,
                     0xffffffffffffffffffffffffffffffff_u128
                 );
+                let composite_u256 = u256 {
+                    low: random_u128,
+                    high: random_u128
+                };
 
                 let record_id = world.uuid();
                 let subrecord_id = world.uuid();
@@ -98,7 +102,8 @@ mod records {
                                 type_string: 2,
                             },
                             random_u8,
-                            random_u128
+                            random_u128,
+                            composite_u256
                         },
                         RecordSibling {
                             record_id, random_u8

diff --git a/crates/torii/types-test/src/models.cairo b/crates/torii/types-test/src/models.cairo
@@ -21,6 +21,7 @@ struct Record {
     type_nested_two: NestedMost,
     random_u8: u8,
     random_u128: u128,
+    composite_u256: u256,
 }
 
 #[derive(Model, Copy, Drop, Serde)]