Merge branch 'main' into query_optimization

Cargo.toml

@@ -34,27 +34,28 @@ anyhow = "1.0.75"
 assert_matches = "1.5.0"
 async-trait = "0.1.68"
 blockifier = { git = "https://github.com/starkware-libs/blockifier" }
-cairo-lang-casm = "2.2.0"
-cairo-lang-compiler = "2.2.0"
-cairo-lang-debug = "2.2.0"
-cairo-lang-defs = "2.2.0"
-cairo-lang-diagnostics = "2.2.0"
-cairo-lang-filesystem = "2.2.0"
-cairo-lang-formatter = "2.2.0"
-cairo-lang-language-server = "2.2.0"
-cairo-lang-lowering = "2.2.0"
-cairo-lang-parser = "2.2.0"
-cairo-lang-plugins = "2.2.0"
-cairo-lang-project = "2.2.0"
-cairo-lang-semantic = { version = "2.2.0", features = [ "testing" ] }
-cairo-lang-sierra = "2.2.0"
-cairo-lang-sierra-generator = "2.2.0"
-cairo-lang-sierra-to-casm = "2.2.0"
-cairo-lang-starknet = "2.2.0"
-cairo-lang-syntax = "2.2.0"
-cairo-lang-test-runner = "2.2.0"
-cairo-lang-test-utils = "2.2.0"
-cairo-lang-utils = "2.2.0"
+cairo-lang-casm = "2.3.0"
+cairo-lang-compiler = "2.3.0"
+cairo-lang-debug = "2.3.0"
+cairo-lang-defs = "2.3.0"
+cairo-lang-diagnostics = "2.3.0"
+cairo-lang-filesystem = "2.3.0"
+cairo-lang-formatter = "2.3.0"
+cairo-lang-language-server = "2.3.0"
+cairo-lang-lowering = "2.3.0"
+cairo-lang-parser = "2.3.0"
+cairo-lang-plugins = "2.3.0"
+cairo-lang-project = "2.3.0"
+cairo-lang-semantic = { version = "2.3.0", features = [ "testing" ] }
+cairo-lang-sierra = "2.3.0"
+cairo-lang-sierra-generator = "2.3.0"
+cairo-lang-sierra-to-casm = "2.3.0"
+cairo-lang-starknet = "2.3.0"
+cairo-lang-syntax = "2.3.0"
+cairo-lang-test-plugin = "2.3.0"
+cairo-lang-test-runner = "2.3.0"
+cairo-lang-test-utils = "2.3.0"
+cairo-lang-utils = "2.3.0"
 cairo-vm = "0.8.2"
 camino = { version = "1.1.2", features = [ "serde1" ] }
 chrono = { version = "0.4.24", features = [ "serde" ] }
@@ -76,8 +77,8 @@ parking_lot = "0.12.1"
 pretty_assertions = "1.2.1"
 rayon = "1.8.0"
 salsa = "0.16.1"
-scarb = { git = "https://github.com/software-mansion/scarb", rev = "7adb7fd" }
-scarb-ui = { git = "https://github.com/software-mansion/scarb", rev = "7adb7fd" }
+scarb = { git = "https://github.com/software-mansion/scarb", rev = "f306f9a" }
+scarb-ui = { git = "https://github.com/software-mansion/scarb", rev = "f306f9a" }
 semver = "1.0.5"
 serde = { version = "1.0.156", features = [ "derive" ] }
 serde_json = "1.0"
@@ -113,7 +114,7 @@ wasm-tonic = { version = "0.9.2", default-features = false, features = [ "codege
 wasm-tonic-build = { version = "0.9.2", default-features = false, features = [ "prost" ], package = "tonic-build" }
 
 [patch."https://github.com/starkware-libs/blockifier"]
-blockifier = { git = "https://github.com/dojoengine/blockifier", rev = "f7df9ba" }
+blockifier = { git = "https://github.com/dojoengine/blockifier", rev = "3357e69" }
 
 [patch.crates-io]
 cairo-felt = { git = "https://github.com/dojoengine/cairo-rs.git", rev = "262b7eb4b11ab165a2a936a5f914e78aa732d4a2" }

crates/dojo-core/Scarb.lock

@@ -0,0 +1,13 @@
+# Code generated by scarb DO NOT EDIT.
+version = 1
+
+[[package]]
+name = "dojo"
+version = "0.3.1"
+dependencies = [
+ "dojo_plugin",
+]
+
+[[package]]
+name = "dojo_plugin"
+version = "0.3.1"

crates/dojo-core/Scarb.toml

@@ -1,9 +1,9 @@
 [package]
-cairo-version = "2.2.0"
+cairo-version = "2.3.0"
 description = "The Dojo Core library for autonomous worlds."
 name = "dojo"
 version = "0.3.1"
 
 [dependencies]
-dojo_plugin = { git = "https://github.com/dojoengine/dojo", tag = "v0.3.1" }
-starknet = "2.2.0"
+dojo_plugin = "0.3.1"
+starknet = "2.3.0"

crates/dojo-core/src/lib.cairo

@@ -19,4 +19,5 @@ mod upgradable;
 #[cfg(test)]
 mod test_utils;
 
+#[cfg(test)]
 mod benchmarks;

crates/dojo-core/src/world.cairo

@@ -52,6 +52,7 @@ mod world {
     use traits::Into;
     use option::OptionTrait;
     use box::BoxTrait;
+    use starknet::event::EventEmitter;
     use serde::Serde;
     use core::hash::{HashStateExTrait, HashStateTrait};
     use pedersen::{PedersenTrait, HashStateImpl, PedersenImpl};

crates/dojo-defi/Scarb.toml

@@ -1,5 +1,5 @@
 [package]
-cairo-version = "2.2.0"
+cairo-version = "2.3.0"
 description = "Implementations of a defi primitives for the Dojo framework"
 name = "dojo_defi"
 version = "0.3.1"

crates/dojo-erc/Scarb.toml

@@ -1,5 +1,5 @@
 [package]
-cairo-version = "2.2.0"
+cairo-version = "2.3.0"
 description = "Implementations of ERC standards for the Dojo framework"
 name = "dojo_erc"
 version = "0.3.1"

crates/dojo-lang/Cargo.toml

@@ -27,10 +27,12 @@ cairo-lang-syntax.workspace = true
 cairo-lang-utils.workspace = true
 camino.workspace = true
 convert_case.workspace = true
+directories = "5"
 dojo-types = { path = "../dojo-types" }
 dojo-world = { path = "../dojo-world", features = [ "manifest" ] }
 indoc.workspace = true
 itertools.workspace = true
+lazy_static.workspace = true
 once_cell.workspace = true
 salsa.workspace = true
 scarb.workspace = true