Merge branch 'main' into improve-stats

Author: itzlambda

Diff for: Cargo.lock

@@ -69,6 +69,7 @@ dojo-types = { path = "crates/dojo-types" }
 dojo-world = { path = "crates/dojo-world" }
 
 # katana
+katana-cairo = { path = "crates/katana/cairo" }
 katana-codecs = { path = "crates/katana/storage/codecs" }
 katana-codecs-derive = { path = "crates/katana/storage/codecs/derive" }
 katana-core = { path = "crates/katana/core", default-features = false }

Diff for: Cargo.toml

@@ -12,7 +12,7 @@ It is designed to significantly reduce the complexity of developing provable app
 
 ## Getting Started
 
-See the [getting started](https://book.dojoengine.org/getting-started/quick-start) section in the Dojo book to start building provable applications with Dojo.
+See the [getting started](https://book.dojoengine.org/getting-started) section in the Dojo book to start building provable applications with Dojo.
 
 You can find more detailed documentation in the Dojo Book [here](https://book.dojoengine.org/).
 

Diff for: README.md

@@ -23,8 +23,7 @@ fn main() {
     let ui = Ui::new(args.ui_verbosity(), OutputFormat::Text);
 
     if let Err(err) = cli_main(args) {
-        ui.error(format!("{err}"));
-        err.chain().skip(1).for_each(|clause| eprintln!("reason: {:?}", clause));
+        ui.anyhow(&err);
         exit(1);
     }
 }

Diff for: bin/sozo/src/main.rs

@@ -69,8 +69,13 @@ pub fn prepare_for_migration(
     target_dir: &Utf8PathBuf,
     diff: WorldDiff,
 ) -> Result<MigrationStrategy> {
-    let entries = fs::read_dir(target_dir)
-        .map_err(|err| anyhow!("Failed reading source directory: {err}"))?;
+    let entries = fs::read_dir(target_dir).with_context(|| {
+        format!(
+            "Failed trying to read target directory ({target_dir})\nNOTE: build files are profile \
+             specified so make sure to run build command with correct profile. For e.g. `sozo -P \
+             my_profile build`"
+        )
+    })?;
 
     let mut artifact_paths = HashMap::new();
     for entry in entries.flatten() {

Diff for: crates/dojo-world/src/migration/strategy.rs

@@ -0,0 +1,19 @@
+[package]
+description = "Collection of Cairo language dependencies that are used throughout Katana. Unifying the Cairo language based dependencies to avoid dependency conflict with the versions used by Dojo."
+edition.workspace = true
+license.workspace = true
+name = "katana-cairo"
+repository.workspace = true
+version.workspace = true
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+# Use from git instead of crates.io registry so that the workspace patches aren't applied.
+[dependencies]
+cairo-lang-casm = { git = "https://github.com/starkware-libs/cairo", tag = "v2.6.3" }
+cairo-lang-runner = { git = "https://github.com/starkware-libs/cairo", tag = "v2.6.3" }
+cairo-lang-sierra = { git = "https://github.com/starkware-libs/cairo", tag = "v2.6.3" }
+cairo-lang-starknet = { git = "https://github.com/starkware-libs/cairo", tag = "v2.6.3" }
+cairo-lang-starknet-classes = { git = "https://github.com/starkware-libs/cairo", tag = "v2.6.3" }
+cairo-lang-utils = { git = "https://github.com/starkware-libs/cairo", tag = "v2.6.3" }
+cairo-vm = "0.9.2"

Diff for: crates/katana/cairo/Cargo.toml

@@ -0,0 +1,13 @@
+#![warn(unused_crate_dependencies)]
+
+//! Re-export of the Cairo language crates used throughout Katana.
+
+pub mod lang {
+    pub use {
+        cairo_lang_casm as casm, cairo_lang_runner as runner, cairo_lang_sierra as sierra,
+        cairo_lang_starknet as starknet, cairo_lang_starknet_classes as starknet_classes,
+        cairo_lang_utils as utils,
+    };
+}
+
+pub use cairo_vm;

Diff for: crates/katana/cairo/src/lib.rs

@@ -22,8 +22,8 @@ tracing.workspace = true
 alloy-primitives.workspace = true
 
 # blockifier deps
-blockifier = { git = "https://github.com/dojoengine/blockifier", rev = "7d866a24", features = [ "testing" ], optional = true }
-cairo-vm = { workspace = true, optional = true }
+blockifier = { git = "https://github.com/dojoengine/blockifier", rev = "57c11586", features = [ "testing" ], optional = true }
+katana-cairo = { workspace = true, optional = true }
 
 # Disable SIR for now until they support Cairo 2.6.3
 # # starknet_in_rust deps
@@ -33,7 +33,7 @@ cairo-vm = { workspace = true, optional = true }
 
 [dev-dependencies]
 anyhow.workspace = true
-cairo-vm.workspace = true
+katana-cairo.workspace = true
 katana-provider = { workspace = true, features = [ "test-utils" ] }
 katana-rpc-types.workspace = true
 rstest.workspace = true
@@ -46,7 +46,7 @@ criterion.workspace = true
 pprof = { version = "0.13.0", features = [ "criterion", "flamegraph" ] }
 
 [features]
-blockifier = [ "dep:blockifier", "dep:cairo-vm" ]
+blockifier = [ "dep:blockifier", "dep:katana-cairo" ]
 default = [ "blockifier" ]
 # native = [ "sir", "sir/cairo-native" ]
 # sir = [ "dep:sir", "dep:starknet-types-core" ]

Diff for: crates/katana/executor/Cargo.toml

@@ -1,6 +1,6 @@
 use std::collections::HashMap;
 
-use cairo_vm::vm::runners::builtin_runner::{
+use katana_cairo::cairo_vm::vm::runners::builtin_runner::{
     BITWISE_BUILTIN_NAME, EC_OP_BUILTIN_NAME, HASH_BUILTIN_NAME, KECCAK_BUILTIN_NAME,
     OUTPUT_BUILTIN_NAME, POSEIDON_BUILTIN_NAME, RANGE_CHECK_BUILTIN_NAME,
     SEGMENT_ARENA_BUILTIN_NAME, SIGNATURE_BUILTIN_NAME,

Diff for: crates/katana/executor/benches/utils.rs

@@ -26,8 +26,8 @@ use blockifier::transaction::transactions::{
     L1HandlerTransaction,
 };
 use blockifier::versioned_constants::VersionedConstants;
-use cairo_vm::types::errors::program_errors::ProgramError;
-use cairo_vm::vm::runners::cairo_runner::ExecutionResources;
+use katana_cairo::cairo_vm::types::errors::program_errors::ProgramError;
+use katana_cairo::cairo_vm::vm::runners::cairo_runner::ExecutionResources;
 use katana_primitives::env::{BlockEnv, CfgEnv};
 use katana_primitives::fee::TxFeeInfo;
 use katana_primitives::state::{StateUpdates, StateUpdatesWithDeclaredClasses};
@@ -656,7 +656,7 @@ mod tests {
 
     use std::collections::HashSet;
 
-    use cairo_vm::vm::runners::cairo_runner::ExecutionResources;
+    use katana_cairo::cairo_vm::vm::runners::cairo_runner::ExecutionResources;
     use katana_primitives::chain::{ChainId, NamedChainId};
     use starknet_api::core::EntryPointSelector;
     use starknet_api::hash::StarkFelt;

Diff for: crates/katana/executor/src/implementation/blockifier/utils.rs

@@ -3,7 +3,7 @@ pub mod transaction;
 use std::collections::HashMap;
 
 use alloy_primitives::U256;
-use cairo_vm::vm::runners::builtin_runner::{
+use katana_cairo::cairo_vm::vm::runners::builtin_runner::{
     BITWISE_BUILTIN_NAME, EC_OP_BUILTIN_NAME, HASH_BUILTIN_NAME, KECCAK_BUILTIN_NAME,
     OUTPUT_BUILTIN_NAME, POSEIDON_BUILTIN_NAME, RANGE_CHECK_BUILTIN_NAME,
     SEGMENT_ARENA_BUILTIN_NAME, SIGNATURE_BUILTIN_NAME,

Diff for: crates/katana/executor/tests/fixtures/mod.rs

@@ -9,7 +9,6 @@ version.workspace = true
 [dependencies]
 anyhow.workspace = true
 base64.workspace = true
-cairo-vm.workspace = true
 derive_more.workspace = true
 lazy_static.workspace = true
 rand = { workspace = true, features = [ "small_rng" ] }
@@ -24,10 +23,8 @@ strum_macros.workspace = true
 thiserror.workspace = true
 
 alloy-primitives.workspace = true
-cairo-lang-sierra.workspace = true
-cairo-lang-starknet-classes.workspace = true
-cairo-lang-starknet.workspace = true
 flate2.workspace = true
+katana-cairo.workspace = true
 starknet_api.workspace = true
 
 [dev-dependencies]

Diff for: crates/katana/primitives/Cargo.toml

@@ -1,4 +1,6 @@
-use cairo_lang_starknet_classes::casm_contract_class::CasmContractClass;
+use katana_cairo::lang::sierra::program::Program;
+use katana_cairo::lang::starknet_classes::casm_contract_class::CasmContractClass;
+use katana_cairo::lang::starknet_classes::contract_class::ContractEntryPoints;
 
 use crate::FieldElement;
 
@@ -17,8 +19,8 @@ pub type DeprecatedCompiledClass = ::starknet_api::deprecated_contract_class::Co
 #[derive(Debug, Clone, Eq, PartialEq)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub struct SierraProgram {
-    pub program: cairo_lang_sierra::program::Program,
-    pub entry_points_by_type: cairo_lang_starknet_classes::contract_class::ContractEntryPoints,
+    pub program: Program,
+    pub entry_points_by_type: ContractEntryPoints,
 }
 
 #[derive(Debug, Clone, Eq, PartialEq)]

Diff for: crates/katana/primitives/src/class.rs

@@ -3,7 +3,7 @@ use std::io::{self, Read, Write};
 use std::mem;
 
 use anyhow::{Context, Result};
-use cairo_lang_starknet_classes::casm_contract_class::CasmContractClass;
+use katana_cairo::lang::starknet_classes::casm_contract_class::CasmContractClass;
 use serde::Deserialize;
 use serde_json::json;
 use serde_with::serde_as;
@@ -186,10 +186,10 @@ pub fn legacy_rpc_to_compiled_class(
 /// [ContractClass](cairo_lang_starknet::contract_class::ContractClass) type.
 fn rpc_to_cairo_contract_class(
     contract_class: &FlattenedSierraClass,
-) -> Result<cairo_lang_starknet_classes::contract_class::ContractClass, std::io::Error> {
+) -> Result<katana_cairo::lang::starknet_classes::contract_class::ContractClass, std::io::Error> {
     let value = serde_json::to_value(contract_class)?;
 
-    Ok(cairo_lang_starknet_classes::contract_class::ContractClass {
+    Ok(katana_cairo::lang::starknet_classes::contract_class::ContractClass {
         abi: serde_json::from_value(value["abi"].clone()).ok(),
         sierra_program: serde_json::from_value(value["sierra_program"].clone())?,
         entry_points_by_type: serde_json::from_value(value["entry_points_by_type"].clone())?,

Diff for: crates/katana/primitives/src/conversion/rpc.rs

@@ -12,8 +12,8 @@ use std::sync::Arc;
 
 use alloy_primitives::U256;
 use base64::prelude::*;
-use cairo_lang_starknet_classes::casm_contract_class::StarknetSierraCompilationError;
-use cairo_vm::types::errors::program_errors::ProgramError;
+use katana_cairo::cairo_vm::types::errors::program_errors::ProgramError;
+use katana_cairo::lang::starknet_classes::casm_contract_class::StarknetSierraCompilationError;
 use serde::de::value::MapAccessDeserializer;
 use serde::de::Visitor;
 use serde::{Deserialize, Serialize};

Diff for: crates/katana/primitives/src/genesis/json.rs

@@ -1,6 +1,6 @@
 use anyhow::Result;
-use cairo_lang_starknet_classes::casm_contract_class::CasmContractClass;
-use cairo_lang_starknet_classes::contract_class::ContractClass;
+use katana_cairo::lang::starknet_classes::casm_contract_class::CasmContractClass;
+use katana_cairo::lang::starknet_classes::contract_class::ContractClass;
 use serde_json::Value;
 
 use crate::class::{

Diff for: crates/katana/primitives/src/utils/class.rs

@@ -75,9 +75,8 @@ where
             |e| {
                 ui.error(e.to_string());
                 anyhow!(
-                    "\n Use `sozo clean` to clean your project, or `sozo clean --manifests-abis` \
-                     to clean manifest and abi files only.\nThen, rebuild your project with `sozo \
-                     build`.",
+                    "\n Use `sozo clean` to clean your project.\nThen, rebuild your project with \
+                     `sozo build`.",
                 )
             },
         )?;

Diff for: crates/sozo/ops/src/migration/mod.rs

@@ -1,4 +1,4 @@
-use std::collections::HashMap;
+use std::collections::BTreeMap;
 use std::time::Duration;
 
 use anyhow::Result;
@@ -207,7 +207,7 @@ impl<P: Provider + Sync> Engine<P> {
         &mut self,
         from: u64,
         to: u64,
-        mut pending_block_tx: Option<FieldElement>,
+        pending_block_tx: Option<FieldElement>,
     ) -> Result<Option<FieldElement>> {
         // Process all blocks from current to latest.
         let get_events = |token: Option<String>| {
@@ -232,10 +232,11 @@ impl<P: Provider + Sync> Engine<P> {
 
         // Transactions & blocks to process
         let mut last_block = 0_u64;
-        let mut blocks = HashMap::new();
+        let mut blocks = BTreeMap::new();
 
         // Flatten events pages and events according to the pending block cursor
         // to array of (block_number, transaction_hash)
+        let mut pending_block_tx_cursor = pending_block_tx;
         let mut transactions = vec![];
         for events_page in &events_pages {
             for event in &events_page.events {
@@ -269,14 +270,20 @@ impl<P: Provider + Sync> Engine<P> {
 
                 // Then we skip all transactions until we reach the last pending processed
                 // transaction (if any)
-                if let Some(tx) = pending_block_tx {
+                if let Some(tx) = pending_block_tx_cursor {
                     if event.transaction_hash != tx {
                         continue;
                     }
 
-                    // Then we skip that processed transaction
-                    pending_block_tx = None;
-                    continue;
+                    pending_block_tx_cursor = None;
+                }
+
+                // Skip the latest pending block transaction events
+                // * as we might have multiple events for the same transaction
+                if let Some(tx) = pending_block_tx {
+                    if event.transaction_hash == tx {
+                        continue;
+                    }
                 }
 
                 if let Some((_, last_tx_hash)) = transactions.last() {

Diff for: crates/torii/core/src/engine.rs

@@ -65,8 +65,6 @@ fn build_type_mapping(
         })
         .collect::<sqlx::Result<TypeMapping>>()?;
 
-    println!("{:#?}", type_mapping);
-
     Ok(type_mapping)
 }