fix(dojo-lang): bump to cairo 2.7.0-rc.3

Cargo.toml

@@ -115,30 +115,30 @@ auto_impl = "1.2.0"
 base64 = "0.21.2"
 bigdecimal = "0.4.1"
 bytes = "1.6"
-cairo-lang-compiler = { git = "https://github.com/starkware-libs/cairo", rev = "43cf361d9b6b26ec8cd5ee076dd15341bde7577c" }
-cairo-lang-debug = { git = "https://github.com/starkware-libs/cairo", rev = "43cf361d9b6b26ec8cd5ee076dd15341bde7577c" }
-cairo-lang-defs = { git = "https://github.com/starkware-libs/cairo", rev = "43cf361d9b6b26ec8cd5ee076dd15341bde7577c" }
-cairo-lang-diagnostics = { git = "https://github.com/starkware-libs/cairo", rev = "43cf361d9b6b26ec8cd5ee076dd15341bde7577c" }
-cairo-lang-filesystem = { git = "https://github.com/starkware-libs/cairo", rev = "43cf361d9b6b26ec8cd5ee076dd15341bde7577c" }
-cairo-lang-formatter = { git = "https://github.com/starkware-libs/cairo", rev = "43cf361d9b6b26ec8cd5ee076dd15341bde7577c" }
-cairo-lang-language-server = { git = "https://github.com/starkware-libs/cairo", rev = "43cf361d9b6b26ec8cd5ee076dd15341bde7577c" }
-cairo-lang-lowering = { git = "https://github.com/starkware-libs/cairo", rev = "43cf361d9b6b26ec8cd5ee076dd15341bde7577c" }
-cairo-lang-parser = { git = "https://github.com/starkware-libs/cairo", rev = "43cf361d9b6b26ec8cd5ee076dd15341bde7577c" }
-cairo-lang-plugins = { git = "https://github.com/starkware-libs/cairo", rev = "43cf361d9b6b26ec8cd5ee076dd15341bde7577c", features = [ "testing" ] }
-cairo-lang-project = { git = "https://github.com/starkware-libs/cairo", rev = "43cf361d9b6b26ec8cd5ee076dd15341bde7577c" }
-cairo-lang-semantic = { git = "https://github.com/starkware-libs/cairo", rev = "43cf361d9b6b26ec8cd5ee076dd15341bde7577c", features = [ "testing" ] }
-cairo-lang-sierra = { git = "https://github.com/starkware-libs/cairo", rev = "43cf361d9b6b26ec8cd5ee076dd15341bde7577c" }
-cairo-lang-sierra-generator = { git = "https://github.com/starkware-libs/cairo", rev = "43cf361d9b6b26ec8cd5ee076dd15341bde7577c" }
-cairo-lang-sierra-to-casm = { git = "https://github.com/starkware-libs/cairo", rev = "43cf361d9b6b26ec8cd5ee076dd15341bde7577c" }
-cairo-lang-starknet = { git = "https://github.com/starkware-libs/cairo", rev = "43cf361d9b6b26ec8cd5ee076dd15341bde7577c" }
-cairo-lang-starknet-classes = { git = "https://github.com/starkware-libs/cairo", rev = "43cf361d9b6b26ec8cd5ee076dd15341bde7577c" }
-cairo-lang-syntax = { git = "https://github.com/starkware-libs/cairo", rev = "43cf361d9b6b26ec8cd5ee076dd15341bde7577c" }
-cairo-lang-test-plugin = { git = "https://github.com/starkware-libs/cairo", rev = "43cf361d9b6b26ec8cd5ee076dd15341bde7577c" }
-cairo-lang-test-runner = { git = "https://github.com/starkware-libs/cairo", rev = "43cf361d9b6b26ec8cd5ee076dd15341bde7577c" }
-cairo-lang-test-utils = { git = "https://github.com/starkware-libs/cairo", rev = "43cf361d9b6b26ec8cd5ee076dd15341bde7577c" }
-cairo-lang-utils = { git = "https://github.com/starkware-libs/cairo", rev = "43cf361d9b6b26ec8cd5ee076dd15341bde7577c" }
+cairo-lang-compiler = "2.7.0-rc.3"
+cairo-lang-debug = "2.7.0-rc.3"
+cairo-lang-defs = "2.7.0-rc.3"
+cairo-lang-diagnostics = "2.7.0-rc.3"
+cairo-lang-filesystem = "2.7.0-rc.3"
+cairo-lang-formatter = "2.7.0-rc.3"
+cairo-lang-language-server = "2.7.0-rc.3"
+cairo-lang-lowering = "2.7.0-rc.3"
+cairo-lang-parser = "2.7.0-rc.3"
+cairo-lang-plugins = { version = "2.7.0-rc.3", features = [ "testing" ] }
+cairo-lang-project = "2.7.0-rc.3"
+cairo-lang-semantic = "2.7.0-rc.3"
+cairo-lang-sierra = "2.7.0-rc.3"
+cairo-lang-sierra-generator = "2.7.0-rc.3"
+cairo-lang-sierra-to-casm = "2.7.0-rc.3"
+cairo-lang-starknet = "2.7.0-rc.3"
+cairo-lang-starknet-classes = "2.7.0-rc.3"
+cairo-lang-syntax = "2.7.0-rc.3"
+cairo-lang-test-plugin = "2.7.0-rc.3"
+cairo-lang-test-runner = "2.7.0-rc.3"
+cairo-lang-test-utils = "2.7.0-rc.3"
+cairo-lang-utils = "2.7.0-rc.3"
 cairo-proof-parser = { git = "https://github.com/cartridge-gg/cairo-proof-parser", branch = "v0.3.0/new-felt" }
-cairo-vm = "0.9.2"
+cairo-vm = "1.0.0-rc4"
 camino = { version = "1.1.2", features = [ "serde1" ] }
 chrono = { version = "0.4.24", features = [ "serde" ] }
 clap = { version = "4.5.4", features = [ "derive" ] }
@@ -172,8 +172,8 @@ rpassword = "7.2.0"
 rstest = "0.18.2"
 rstest_reuse = "0.6.0"
 salsa = "0.16.1"
-scarb = { git = "https://github.com/software-mansion/scarb", rev = "4b75f435f68248a7c096ec0fa5939ecdd92e2d79" }
-scarb-ui = { git = "https://github.com/software-mansion/scarb", rev = "4b75f435f68248a7c096ec0fa5939ecdd92e2d79" }
+scarb = { git = "https://github.com/software-mansion/scarb", rev = "be95601" }
+scarb-ui = { git = "https://github.com/software-mansion/scarb", rev = "be95601" }
 semver = "1.0.5"
 serde = { version = "1.0", features = [ "derive" ] }
 serde_json = { version = "1.0", features = [ "arbitrary_precision" ] }
@@ -236,12 +236,9 @@ alloy-provider = { version = "0.2", default-features = false, features = [
 ] }
 alloy-rpc-types-eth = { version = "0.2", default-features = false }
 alloy-signer = { version = "0.2", default-features = false }
-alloy-transport = { version = "0.2" }
+alloy-transport = { version = "0.2", default-features = false }
 
 [patch.crates-io]
-cairo-felt = { git = "https://github.com/dojoengine/cairo-rs.git", rev = "1031381" }
-cairo-vm = { git = "https://github.com/dojoengine/cairo-rs.git", rev = "1031381" }
-
 # Remove this patch once the following PR is merged: <https://github.com/xJonathanLEI/starknet-rs/pull/615>
 #
 # To enable std feature on `starknet-types-core`.

crates/dojo-core/Scarb.lock

@@ -10,5 +10,5 @@ dependencies = [
 
 [[package]]
 name = "dojo_plugin"
-version = "0.7.2"
-source = "git+https://github.com/dojoengine/dojo?tag=v0.7.3#e8539d5b199efbd51c89c75da32f6592de5d9262"
+version = "0.7.3"
+source = "git+https://github.com/dojoengine/dojo?branch=bump-cairo-2.7#17bc842f2f87b6ac0472d196efc11f01a5e55add"

crates/dojo-core/Scarb.toml

@@ -1,13 +1,13 @@
 [package]
-cairo-version = "=2.6.4"
+cairo-version = "2.7.0-rc.3"
 edition = "2023_11"
 description = "The Dojo Core library for autonomous worlds."
 name = "dojo"
 version = "0.7.3"
 
 [dependencies]
-dojo_plugin = { git = "https://github.com/dojoengine/dojo", tag = "v0.7.3" }
-starknet = "=2.6.4"
+dojo_plugin = { git = "https://github.com/dojoengine/dojo", branch = "bump-cairo-2.7" }
+starknet = "=2.7.0-rc.3"
 
 # Dojo core is tested with sozo, hence we need a namespace for the test
 # command to work.

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

@@ -54,9 +54,12 @@ pub fn get_many(
             break SyscallResult::<Span<felt252>>::Ok(packed.span());
         }
 
-        index_in_chunk = match core::integer::u8_overflowing_add(index_in_chunk, 1) {
-            Result::Ok(x) => x,
-            Result::Err(_) => {
+        let (sum, has_overflowed) = core::num::traits::OverflowingAdd::overflowing_add(
+            index_in_chunk, 1
+        );
+        index_in_chunk = match has_overflowed {
+            false => sum,
+            true => {
                 // After reading 256 `felt`s, `index_in_chunk` will overflow and we move to the
                 // next chunk.
                 chunk += 1;
@@ -119,9 +122,12 @@ pub fn set_many(
             Result::Err(err) => { break Result::Err(err); },
         };
 
-        index_in_chunk = match core::integer::u8_overflowing_add(index_in_chunk, 1) {
-            Result::Ok(x) => x,
-            Result::Err(_) => {
+        let (sum, has_overflowed) = core::num::traits::OverflowingAdd::overflowing_add(
+            index_in_chunk, 1
+        );
+        index_in_chunk = match has_overflowed {
+            false => sum,
+            true => {
                 // After writing 256 `felt`s, `index_in_chunk` will overflow and we move to the
                 // next chunk which will be stored in an other storage segment.
                 chunk += 1;
@@ -164,9 +170,12 @@ pub fn set_packed_array(
             Result::Err(err) => { break Result::Err(err); },
         };
 
-        index_in_chunk = match core::integer::u8_overflowing_add(index_in_chunk, 1) {
-            Result::Ok(x) => x,
-            Result::Err(_) => {
+        let (sum, has_overflowed) = core::num::traits::OverflowingAdd::overflowing_add(
+            index_in_chunk, 1
+        );
+        index_in_chunk = match has_overflowed {
+            false => sum,
+            true => {
                 // After writing 256 `felt`s, `index_in_chunk` will overflow and we move to the
                 // next chunk which will be stored in an other storage segment.
                 chunk += 1;
@@ -217,9 +226,12 @@ pub fn get_packed_array(
             break Result::Ok(packed.span());
         }
 
-        index_in_chunk = match core::integer::u8_overflowing_add(index_in_chunk, 1) {
-            Result::Ok(x) => x,
-            Result::Err(_) => {
+        let (sum, has_overflowed) = core::num::traits::OverflowingAdd::overflowing_add(
+            index_in_chunk, 1
+        );
+        index_in_chunk = match has_overflowed {
+            false => sum,
+            true => {
                 // After reading 256 `felt`s, `index_in_chunk` will overflow and we move to the
                 // next chunk.
                 chunk += 1;

crates/dojo-lang/Scarb.toml

@@ -1,5 +1,5 @@
 [package]
 name = "dojo_plugin"
-version = "0.7.2"
+version = "0.7.3"
 
 [cairo-plugin]

crates/dojo-lang/src/compiler.rs

@@ -290,7 +290,8 @@ fn update_files(
 
     for crate_id in crate_ids {
         for module_id in db.crate_modules(crate_id).as_ref() {
-            let file_infos = db.module_generated_file_infos(*module_id).unwrap_or_default();
+            let file_infos =
+                db.module_generated_file_infos(*module_id).unwrap_or(std::sync::Arc::new([]));
             for aux_data in file_infos
                 .iter()
                 .skip(1)

crates/dojo-lang/src/inline_macros/delete.rs

@@ -2,7 +2,8 @@ use std::collections::HashMap;
 
 use cairo_lang_defs::patcher::PatchBuilder;
 use cairo_lang_defs::plugin::{
-    InlineMacroExprPlugin, InlinePluginResult, NamedPlugin, PluginDiagnostic, PluginGeneratedFile,
+    InlineMacroExprPlugin, InlinePluginResult, MacroPluginMetadata, NamedPlugin, PluginDiagnostic,
+    PluginGeneratedFile,
 };
 use cairo_lang_defs::plugin_utils::unsupported_bracket_diagnostic;
 use cairo_lang_diagnostics::Severity;
@@ -25,6 +26,7 @@ impl InlineMacroExprPlugin for DeleteMacro {
         &self,
         db: &dyn cairo_lang_syntax::node::db::SyntaxGroup,
         syntax: &ast::ExprInlineMacro,
+        _metadata: &MacroPluginMetadata<'_>,
     ) -> InlinePluginResult {
         let ast::WrappedArgList::ParenthesizedArgList(arg_list) = syntax.arguments(db) else {
             return unsupported_bracket_diagnostic(db, syntax);

crates/dojo-lang/src/inline_macros/emit.rs

@@ -1,6 +1,7 @@
 use cairo_lang_defs::patcher::PatchBuilder;
 use cairo_lang_defs::plugin::{
-    InlineMacroExprPlugin, InlinePluginResult, NamedPlugin, PluginDiagnostic, PluginGeneratedFile,
+    InlineMacroExprPlugin, InlinePluginResult, MacroPluginMetadata, NamedPlugin, PluginDiagnostic,
+    PluginGeneratedFile,
 };
 use cairo_lang_defs::plugin_utils::unsupported_bracket_diagnostic;
 use cairo_lang_diagnostics::Severity;
@@ -21,6 +22,7 @@ impl InlineMacroExprPlugin for EmitMacro {
         &self,
         db: &dyn cairo_lang_syntax::node::db::SyntaxGroup,
         syntax: &ast::ExprInlineMacro,
+        _metadata: &MacroPluginMetadata<'_>,
     ) -> InlinePluginResult {
         let ast::WrappedArgList::ParenthesizedArgList(arg_list) = syntax.arguments(db) else {
             return unsupported_bracket_diagnostic(db, syntax);

crates/dojo-lang/src/inline_macros/get.rs

@@ -1,6 +1,7 @@
 use cairo_lang_defs::patcher::PatchBuilder;
 use cairo_lang_defs::plugin::{
-    InlineMacroExprPlugin, InlinePluginResult, NamedPlugin, PluginDiagnostic, PluginGeneratedFile,
+    InlineMacroExprPlugin, InlinePluginResult, MacroPluginMetadata, NamedPlugin, PluginDiagnostic,
+    PluginGeneratedFile,
 };
 use cairo_lang_defs::plugin_utils::unsupported_bracket_diagnostic;
 use cairo_lang_diagnostics::Severity;
@@ -24,6 +25,7 @@ impl InlineMacroExprPlugin for GetMacro {
         &self,
         db: &dyn cairo_lang_syntax::node::db::SyntaxGroup,
         syntax: &ast::ExprInlineMacro,
+        _metadata: &MacroPluginMetadata<'_>,
     ) -> InlinePluginResult {
         let ast::WrappedArgList::ParenthesizedArgList(arg_list) = syntax.arguments(db) else {
             return unsupported_bracket_diagnostic(db, syntax);

crates/dojo-lang/src/inline_macros/selector_from_tag.rs

@@ -1,6 +1,7 @@
 use cairo_lang_defs::patcher::PatchBuilder;
 use cairo_lang_defs::plugin::{
-    InlineMacroExprPlugin, InlinePluginResult, NamedPlugin, PluginDiagnostic, PluginGeneratedFile,
+    InlineMacroExprPlugin, InlinePluginResult, MacroPluginMetadata, NamedPlugin, PluginDiagnostic,
+    PluginGeneratedFile,
 };
 use cairo_lang_defs::plugin_utils::unsupported_bracket_diagnostic;
 use cairo_lang_diagnostics::Severity;
@@ -19,6 +20,7 @@ impl InlineMacroExprPlugin for SelectorFromTagMacro {
         &self,
         db: &dyn cairo_lang_syntax::node::db::SyntaxGroup,
         syntax: &ast::ExprInlineMacro,
+        _metadata: &MacroPluginMetadata<'_>,
     ) -> InlinePluginResult {
         let ast::WrappedArgList::ParenthesizedArgList(arg_list) = syntax.arguments(db) else {
             return unsupported_bracket_diagnostic(db, syntax);

crates/dojo-lang/src/inline_macros/set.rs

@@ -2,7 +2,8 @@ use std::collections::HashMap;
 
 use cairo_lang_defs::patcher::PatchBuilder;
 use cairo_lang_defs::plugin::{
-    InlineMacroExprPlugin, InlinePluginResult, NamedPlugin, PluginDiagnostic, PluginGeneratedFile,
+    InlineMacroExprPlugin, InlinePluginResult, MacroPluginMetadata, NamedPlugin, PluginDiagnostic,
+    PluginGeneratedFile,
 };
 use cairo_lang_defs::plugin_utils::unsupported_bracket_diagnostic;
 use cairo_lang_diagnostics::Severity;
@@ -39,6 +40,7 @@ impl InlineMacroExprPlugin for SetMacro {
         &self,
         db: &dyn cairo_lang_syntax::node::db::SyntaxGroup,
         syntax: &ast::ExprInlineMacro,
+        _metadata: &MacroPluginMetadata<'_>,
     ) -> InlinePluginResult {
         let ast::WrappedArgList::ParenthesizedArgList(arg_list) = syntax.arguments(db) else {
             return unsupported_bracket_diagnostic(db, syntax);

crates/dojo-lang/src/manifest_test_data/compiler_cairo/Scarb.lock

@@ -17,5 +17,5 @@ dependencies = [
 
 [[package]]
 name = "dojo_plugin"
-version = "0.7.2"
-source = "git+https://github.com/dojoengine/dojo?tag=v0.7.3#e8539d5b199efbd51c89c75da32f6592de5d9262"
+version = "0.7.3"
+source = "git+https://github.com/dojoengine/dojo?branch=bump-cairo-2.7#17bc842f2f87b6ac0472d196efc11f01a5e55add"

crates/dojo-lang/src/manifest_test_data/compiler_cairo/Scarb.toml

@@ -2,7 +2,7 @@
 name = "compiler_cairo"
 version = "0.1.0"
 edition = "2023_11"
-cairo-version = "2.6.3"
+cairo-version = "2.7.0-rc.3"
 
 # See more keys and their definitions at https://docs.swmansion.com/scarb/docs/reference/manifest.html
 

crates/dojo-lang/src/manifest_test_data/compiler_cairo/manifests/dev/base/contracts/ccf-cairo_v240-8d921297.toml

@@ -1,6 +1,6 @@
 kind = "DojoContract"
-class_hash = "0x1b29f38120f222120acf9b3d66f7015d47c0b11d4e9acdfefa243958c60909d"
-original_class_hash = "0x1b29f38120f222120acf9b3d66f7015d47c0b11d4e9acdfefa243958c60909d"
+class_hash = "0x3cbec4e257fe1b070d7d8c6d61855e228451007784c2282accdaf195489ef36"
+original_class_hash = "0x3cbec4e257fe1b070d7d8c6d61855e228451007784c2282accdaf195489ef36"
 base_class_hash = "0x0"
 abi = "manifests/dev/base/abis/contracts/ccf-cairo_v240-8d921297.json"
 reads = []

crates/dojo-lang/src/manifest_test_data/compiler_cairo/manifests/dev/base/contracts/ccf-cairo_v260-465ec7fe.toml

@@ -1,6 +1,6 @@
 kind = "DojoContract"
-class_hash = "0x412449a631f6652b3bbe27841fb6776639e493baad1a5894daeb9260d1b0a63"
-original_class_hash = "0x412449a631f6652b3bbe27841fb6776639e493baad1a5894daeb9260d1b0a63"
+class_hash = "0x171abbdda00eb24da5e9322702dedceb6c4e007706f7764b959cbf031ebda9e"
+original_class_hash = "0x171abbdda00eb24da5e9322702dedceb6c4e007706f7764b959cbf031ebda9e"
 base_class_hash = "0x0"
 abi = "manifests/dev/base/abis/contracts/ccf-cairo_v260-465ec7fe.json"
 reads = []

crates/dojo-lang/src/manifest_test_data/compiler_cairo/manifests/dev/base/dojo-base.toml

@@ -1,6 +1,6 @@
 kind = "Class"
-class_hash = "0x26a4f5d2d9638877a2648297339275df5eaab0adb3cdf0010887c2dbf2be4"
-original_class_hash = "0x26a4f5d2d9638877a2648297339275df5eaab0adb3cdf0010887c2dbf2be4"
+class_hash = "0x6178b645cecd0c483994e4e592dea2c71ed26b2083de2a3e0af55fcf62cb31b"
+original_class_hash = "0x6178b645cecd0c483994e4e592dea2c71ed26b2083de2a3e0af55fcf62cb31b"
 abi = "manifests/dev/base/abis/dojo-base.json"
 tag = "dojo-base"
 manifest_name = "dojo-base"

crates/dojo-lang/src/manifest_test_data/compiler_cairo/manifests/dev/base/dojo-world.toml

@@ -1,6 +1,6 @@
 kind = "Class"
-class_hash = "0x71819175fb1971b65368cdbc486b7044ea1a15fe499296181c574e90d91adcd"
-original_class_hash = "0x71819175fb1971b65368cdbc486b7044ea1a15fe499296181c574e90d91adcd"
+class_hash = "0x564a2ff36752ddda913033318645e313928c7c96dc02efc82f597a66a9c6e58"
+original_class_hash = "0x564a2ff36752ddda913033318645e313928c7c96dc02efc82f597a66a9c6e58"
 abi = "manifests/dev/base/abis/dojo-world.json"
 tag = "dojo-world"
 manifest_name = "dojo-world"

crates/dojo-lang/src/manifest_test_data/compiler_cairo/src/cairo_24.cairo

@@ -52,6 +52,6 @@ mod cairo_v240 {
 
         let first = MyStruct { a: 1, b: 2 };
         let second = MyStruct { a: 1, b: 2 };
-        assert_eq!(first, second, "{:?},{:?} should be equal", first, second);
+        assert!(first == second, "should be equal");
     }
 }

crates/dojo-lang/src/semantics/test_utils.rs

@@ -144,8 +144,8 @@
     let file_id = db.intern_file(FileLongId::Virtual(VirtualFile {
         parent: None,
         name: "lib.cairo".into(),
-        content: Arc::new(content.into()),
-        code_mappings: Default::default(),
+        content: content.into(),
+        code_mappings: Arc::new([]),
         kind: FileKind::Module,
     }));
 

crates/dojo-world/abigen/src/main.rs

@@ -104,13 +104,13 @@
         file,
         r#"
 [package]
-cairo-version = "=2.6.4"
+cairo-version = "2.7.0-rc.3"
 edition = "2023_11"
 name = "dojo"
 version = "0.7.3"
 
 [dependencies]
-starknet = "=2.6.4"
+starknet = "2.7.0-rc.3"
 
 [[target.starknet-contract]]
 sierra = true

crates/dojo-world/src/contracts/model_test.rs

@@ -77,7 +77,7 @@ async fn test_model() {
 
     assert_eq!(
         position.class_hash(),
-        felt!("0x7104c882f56f62ef1f2453319bf6a1f5784b5f33b63b65506c38d62c3e3fd40")
+        felt!("0x2b530adc12f28cdb03e7c9c0b69556b18c4775faedf826879aee9f6113c8c66")
     );
 
     let moves = world.model_reader("dojo_examples", "Moves").await.unwrap();

crates/katana/storage/db/Cargo.toml

@@ -7,7 +7,6 @@ version.workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-katana-cairo = { workspace = true }
 katana-primitives = { workspace = true }
 
 anyhow.workspace = true
@@ -18,7 +17,6 @@ serde_json.workspace = true
 tempfile = { workspace = true, optional = true }
 thiserror.workspace = true
 
-cairo-vm.workspace = true
 roaring = { version = "0.10.3", features = [ "serde" ] }
 
 # codecs

crates/katana/storage/db/src/lib.rs

@@ -1,5 +1,7 @@
 //! Code adapted from Paradigm's [`reth`](https://github.com/paradigmxyz/reth/tree/main/crates/storage/db) DB implementation.
 
+#![cfg_attr(not(test), warn(unused_crate_dependencies))]
+
 use std::fs;
 use std::path::Path;