add use_legacy_storage flag in ModelDef

dojoengine · Mar 3, 2025 · a4a6f88 · a4a6f88
1 parent 7026e34
commit a4a6f88
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 0 deletions.
diff --git a/crates/dojo/core-cairo-test/src/tests/expanded/selector_attack.cairo b/crates/dojo/core-cairo-test/src/tests/expanded/selector_attack.cairo
@@ -58,6 +58,7 @@ pub mod attacker_model {
                 schema: DojoStoredModelImpl::schema(self),
                 packed_size: Self::packed_size(self),
                 unpacked_size: Self::unpacked_size(self),
+                use_legacy_storage: Self::use_legacy_storage(self),
             }
         }
 

diff --git a/crates/dojo/core-cairo-test/src/tests/helpers/helpers.cairo b/crates/dojo/core-cairo-test/src/tests/helpers/helpers.cairo
@@ -95,6 +95,7 @@ pub mod foo_invalid_name {
                 schema: StoredModelImpl::schema(self),
                 packed_size: Self::packed_size(self),
                 unpacked_size: Self::unpacked_size(self),
+                use_legacy_storage: Self::use_legacy_storage(self),
             }
         }
 

diff --git a/crates/dojo/core/src/model/definition.cairo b/crates/dojo/core/src/model/definition.cairo
@@ -33,4 +33,5 @@ pub struct ModelDef {
     pub schema: Struct,
     pub packed_size: Option<usize>,
     pub unpacked_size: Option<usize>,
+    pub use_legacy_storage: bool,
 }
diff --git a/crates/dojo/core/src/model/model.cairo b/crates/dojo/core/src/model/model.cairo
@@ -178,6 +178,7 @@ pub impl ModelImpl<M, +ModelParser<M>, +ModelDefinition<M>, +Serde<M>, +Drop<M>>
             schema: Self::schema(),
             packed_size: Self::packed_size(),
             unpacked_size: Self::unpacked_size(),
+            use_legacy_storage: Self::use_legacy_storage(),
         }
     }
 

diff --git a/crates/dojo/world/src/contracts/model.rs b/crates/dojo/world/src/contracts/model.rs
@@ -59,6 +59,7 @@ pub trait ModelReader<E> {
     async fn unpacked_size(&self) -> Result<u32, E>;
     async fn layout(&self) -> Result<abigen::model::Layout, E>;
     async fn use_legacy_storage(&self) -> Result<bool, E>;
+    async fn definition(&self) -> Result<abigen::model::ModelDef, E>;
 }
 
 #[derive(Debug)]
@@ -209,6 +210,10 @@ where
     async fn use_legacy_storage(&self) -> Result<bool, ModelError> {
         Ok(self.model_reader.use_legacy_storage().call().await?)
     }
+
+    async fn definition(&self) -> Result<abigen::model::ModelDef, ModelError> {
+        Ok(self.model_reader.definition().call().await?)
+    }
 }
 
 fn parse_schema(ty: &abigen::model::Ty) -> Result<Ty, ParseError> {