move to edition 2024_07

.github/workflows/ci.yml

@@ -105,7 +105,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: software-mansion/setup-scarb@v1
         with:
-          scarb-version: "2.6.3"
+          scarb-version: "2.7.0-rc.3"
       - run: |
           scarb --manifest-path examples/spawn-and-move/Scarb.toml fmt --check
           scarb --manifest-path crates/dojo-core/Scarb.toml fmt --check

.tool-versions

@@ -1 +1 @@
-scarb 2.6.4
+scarb 2.7.0-rc.3

crates/dojo-core/Scarb.toml

@@ -1,6 +1,6 @@
 [package]
 cairo-version = "2.7.0-rc.3"
-edition = "2023_11"
+edition = "2024_07"
 description = "The Dojo Core library for autonomous worlds."
 name = "dojo"
 version = "0.7.3"

crates/dojo-core/src/contract/base_contract.cairo

@@ -1,6 +1,7 @@
 #[starknet::contract]
 pub mod base {
-    use starknet::{ClassHash, get_caller_address};
+    use starknet::{ClassHash, ContractAddress, get_caller_address};
+    use starknet::storage::{StoragePointerReadAccess, StoragePointerWriteAccess};
 
     use dojo::contract::upgradeable::upgradeable as upgradeable_component;
     use dojo::world::{IWorldProvider, IWorldDispatcher, IWorldDispatcherTrait};

crates/dojo-core/src/contract/upgradeable.cairo

@@ -16,7 +16,7 @@ pub mod upgradeable {
     use dojo::world::{IWorldProvider, IWorldProviderDispatcher, IWorldDispatcher};
 
     #[storage]
-    struct Storage {}
+    pub struct Storage {}
 
     #[event]
     #[derive(Drop, starknet::Event)]

crates/dojo-core/src/model/layout.cairo

@@ -22,7 +22,9 @@ pub enum Layout {
     Enum: Span<FieldLayout>,
 }
 
-// TODO RBA
+/// Compute the full size in bytes of a layout, when all the fields
+/// are bit-packed.
+/// Could be None if at least a field has a dynamic size.
 pub fn compute_packed_size(layout: Layout) -> Option<usize> {
     if let Layout::Fixed(layout) = layout {
         let mut span_layout = layout;

crates/dojo-core/src/storage/database.cairo

@@ -31,7 +31,7 @@ fn fill_with_zeroes(ref values: Array<felt252>, size: u32) {
 }
 
 /// Compute the internal storage key from a table selector and a key.
-/// 
+///
 /// # Arguments
 ///   * `table` - the table selector
 ///   * `key` - a key to identify a record in the table

crates/dojo-core/src/storage/packing.cairo

@@ -80,9 +80,11 @@ pub fn pack_inner(
     assert(packing_offset <= PACKING_MAX_BITS, 'Invalid packing offset');
     assert(size <= PACKING_MAX_BITS, 'Invalid layout size');
 
-    // Cannot use all 252 bits because some bit arrangements (eg. 11111...11111) are not valid felt252 values. 
+    // Cannot use all 252 bits because some bit arrangements (eg. 11111...11111) are not valid
+    // felt252 values.
     // Thus only 251 bits are used.                               ^-252 times-^
-    // One could optimize by some conditional alligment mechanism, but it would be an at most 1/252 space-wise improvement.
+    // One could optimize by some conditional alligment mechanism, but it would be an at most 1/252
+    // space-wise improvement.
     let remaining_bits: u8 = (PACKING_MAX_BITS - packing_offset).into();
 
     // If we have less remaining bits than the current item size,

crates/dojo-core/src/tests/world.cairo

@@ -306,7 +306,7 @@ trait Ibar<TContractState> {
 mod bar {
     use core::traits::Into;
     use starknet::{get_caller_address, ContractAddress};
-
+    use starknet::storage::{StoragePointerReadAccess, StoragePointerWriteAccess};
     use dojo::model::{Model, ModelIndex};
 
     use super::{Foo, IWorldDispatcher, IWorldDispatcherTrait, Introspect};
@@ -855,6 +855,7 @@ trait IWorldUpgrade<TContractState> {
 #[starknet::contract]
 mod worldupgrade {
     use super::{IWorldUpgrade, IWorldDispatcher, ContractAddress};
+    use starknet::storage::{StoragePointerReadAccess, StoragePointerWriteAccess};
 
     #[storage]
     struct Storage {

crates/dojo-core/src/utils/utils.cairo

@@ -26,7 +26,7 @@ pub fn entity_id_from_keys(keys: Span<felt252>) -> felt252 {
     poseidon_hash_span(keys)
 }
 
-/// TODO RBA
+/// find a field with its selector in a list of layouts
 pub fn find_field_layout(
     field_selector: felt252, field_layouts: Span<FieldLayout>
 ) -> Option<Layout> {
@@ -48,14 +48,14 @@ pub fn find_field_layout(
 }
 
 /// Find the layout of a model field based on its selector.
-/// 
+///
 /// # Arguments
-/// 
+///
 /// * `model_layout` - The full model layout (must be a Layout::Struct).
 /// *  `member_selector` - The model field selector.
-/// 
+///
 /// # Returns
-/// Some(Layout) if the field layout has been found, None otherwise. 
+/// Some(Layout) if the field layout has been found, None otherwise.
 pub fn find_model_field_layout(model_layout: Layout, member_selector: felt252) -> Option<Layout> {
     match model_layout {
         Layout::Struct(field_layouts) => { find_field_layout(member_selector, field_layouts) },

crates/dojo-core/src/world/config.cairo

@@ -48,6 +48,7 @@ pub mod Config {
     use starknet::ContractAddress;
     use starknet::get_caller_address;
     use starknet::event::EventEmitter;
+    use starknet::storage::{StoragePointerReadAccess, StoragePointerWriteAccess};
 
     use super::errors;
     use super::IConfig;
@@ -76,7 +77,7 @@ pub mod Config {
     }
 
     #[storage]
-    struct Storage {
+    pub struct Storage {
         differ_program_hash: felt252,
         merger_program_hash: felt252,
         facts_registry: ContractAddress,