fix(core): introduce DojoStore trait to handle some specific storage cases

Cargo.toml

@@ -158,9 +158,9 @@ rstest = "0.18.2"
 rstest_reuse = "0.6.0"
 salsa = "0.16.1"
 
-scarb = { git = "https://github.com/dojoengine/scarb", rev = "b2ce4fa03bed98ca44918c390df0e190b637894d" }
-scarb-metadata = { git = "https://github.com/dojoengine/scarb", rev = "b2ce4fa03bed98ca44918c390df0e190b637894d" }
-scarb-ui = { git = "https://github.com/dojoengine/scarb", rev = "b2ce4fa03bed98ca44918c390df0e190b637894d" }
+scarb = { git = "https://github.com/remybar/scarb", rev = "9c08b043997a743950eda2a9bb74c867e9114c9e" }
+scarb-metadata = { git = "https://github.com/remybar/scarb", rev = "9c08b043997a743950eda2a9bb74c867e9114c9e" }
+scarb-ui = { git = "https://github.com/remybar/scarb", rev = "9c08b043997a743950eda2a9bb74c867e9114c9e" }
 
 semver = "1.0.5"
 serde = { version = "1.0", features = [ "derive" ] }

crates/benches/contracts/src/models/character.cairo

@@ -0,0 +1,67 @@
+use starknet::{ContractAddress, get_caller_address};
+
+// TODO import all this when complex benchmarks are merged
+#[derive(Introspect, Copy, Drop)]
+#[dojo::model]
+struct Character {
+    #[key]
+    caller: ContractAddress,
+    heigth: felt252,
+    abilities: Abilities,
+    stats: Stats,
+    weapon: Weapon,
+    gold: u32,
+}
+
+#[derive(Introspect, Copy, Drop)]
+struct Abilities {
+    strength: u8,
+    dexterity: u8,
+    constitution: u8,
+    intelligence: u8,
+    wisdom: u8,
+    charisma: u8,
+}
+
+#[derive(Introspect, Copy, Drop)]
+struct Stats {
+    kills: u128,
+    deaths: u16,
+    rests: u32,
+    hits: u64,
+    blocks: u32,
+    walked: felt252,
+    runned: felt252,
+    finished: bool,
+    romances: u16,
+}
+
+#[derive(Introspect, Copy, Drop, Default)]
+enum Weapon {
+    #[default]
+    DualWield: (Sword, Sword),
+    Fists: (Sword, Sword),
+}
+
+#[derive(Introspect, Copy, Drop, Default)]
+struct Sword {
+    swordsmith: ContractAddress,
+    damage: u32,
+}
+
+#[derive(Introspect, Copy, Drop)]
+#[dojo::model]
+struct Case {
+    #[key]
+    owner: ContractAddress,
+    sword: Sword,
+    material: felt252,
+}
+
+#[derive(Introspect, Copy, Drop)]
+#[dojo::model]
+struct Alias {
+    #[key]
+    player: ContractAddress,
+    name: felt252,
+}

crates/dojo/core-cairo-test/Scarb.lock

@@ -3,7 +3,7 @@ version = 1
 
 [[package]]
 name = "dojo"
-version = "1.4.2"
+version = "1.5.0"
 dependencies = [
  "dojo_plugin",
 ]

crates/dojo/core-cairo-test/src/lib.cairo

@@ -17,6 +17,7 @@ pub use world::{
 mod tests {
     mod meta {
         mod introspect;
+        mod layout;
     }
 
     mod event {
@@ -29,8 +30,10 @@ mod tests {
 
     mod storage {
         mod database;
+        mod dojo_store;
         mod packing;
         mod storage;
+        mod layout;
     }
 
     mod contract;

crates/dojo/core-cairo-test/src/tests/expanded/selector_attack.cairo

@@ -60,5 +60,9 @@ pub mod attacker_model {
                 unpacked_size: Self::unpacked_size(self),
             }
         }
+
+        fn use_legacy_storage(self: @ContractState) -> bool {
+            false
+        }
     }
 }

crates/dojo/core-cairo-test/src/tests/helpers/event.cairo

@@ -10,7 +10,7 @@ use crate::world::{spawn_test_world, NamespaceDef, TestResource};
 /// These event contracts are used to test event upgrades in tests/event.cairo.
 
 // This event is used as a base to create the "previous" version of an event to be upgraded.
-#[derive(Introspect)]
+#[derive(Introspect, Serde)]
 struct FooBaseEvent {
     #[key]
     pub caller: ContractAddress,
@@ -63,8 +63,9 @@ struct FooEventMemberAdded {
     pub b: u128,
 }
 
-#[derive(Introspect, Copy, Drop, Serde)]
+#[derive(Introspect, Copy, Drop, Serde, Default)]
 enum MyEnum {
+    #[default]
     X: u8,
 }
 
@@ -77,8 +78,9 @@ struct FooEventMemberChanged {
     pub b: u128,
 }
 
-#[derive(Introspect, Copy, Drop, Serde)]
+#[derive(Introspect, Copy, Drop, Serde, Default)]
 enum AnotherEnum {
+    #[default]
     X: u8,
 }
 

crates/dojo/core-cairo-test/src/tests/helpers/helpers.cairo

@@ -3,6 +3,7 @@ use starknet::{ContractAddress};
 use dojo::world::{IWorldDispatcher, WorldStorage, WorldStorageTrait};
 use dojo::model::Model;
 use dojo::event::Event;
+use dojo::storage::ContractAddressDefault;
 
 use crate::world::{
     spawn_test_world, NamespaceDef, TestResource, ContractDefTrait, WorldStorageTestTrait,
@@ -37,9 +38,10 @@ pub struct NotCopiable {
     pub b: ByteArray,
 }
 
-#[derive(Drop, Serde, Debug, PartialEq, Introspect)]
+#[derive(Drop, Serde, Debug, PartialEq, Introspect, Default)]
 pub enum EnumOne {
     One,
+    #[default]
     Two: u32,
     Three: (felt252, u32),
 }
@@ -97,6 +99,10 @@ pub mod foo_invalid_name {
                 unpacked_size: Self::unpacked_size(self),
             }
         }
+
+        fn use_legacy_storage(self: @ContractState) -> bool {
+            false
+        }
     }
 }
 
@@ -129,7 +135,7 @@ pub mod test_contract_with_dojo_init_args {
     }
 }
 
-#[derive(IntrospectPacked, Copy, Drop, Serde)]
+#[derive(IntrospectPacked, Copy, Drop, Serde, Default)]
 pub struct Sword {
     pub swordsmith: ContractAddress,
     pub damage: u32,
@@ -179,8 +185,9 @@ pub struct Stats {
     pub romances: u16,
 }
 
-#[derive(IntrospectPacked, Copy, Drop, Serde)]
+#[derive(IntrospectPacked, Copy, Drop, Serde, Default)]
 pub enum Weapon {
+    #[default]
     DualWield: (Sword, Sword),
     Fists: (Sword, Sword),
 }

crates/dojo/core-cairo-test/src/tests/helpers/model.cairo

@@ -55,8 +55,9 @@ struct FooModelMemberAdded {
     pub b: u128,
 }
 
-#[derive(Introspect, Copy, Drop, Serde)]
+#[derive(Introspect, Copy, Drop, Serde, Default)]
 enum MyEnum {
+    #[default]
     X: u8,
 }
 
@@ -69,8 +70,9 @@ struct FooModelMemberChanged {
     pub b: u128,
 }
 
-#[derive(Introspect, Copy, Drop, Serde)]
+#[derive(Introspect, Copy, Drop, Serde, Default)]
 enum AnotherEnum {
+    #[default]
     X: u8,
 }