Merge branch 'master' into 2714-cairo-native

# Conflicts:
#	crates/forge/tests/e2e/fuzzing.rs
#	crates/forge/tests/e2e/running.rs

Author: cptartur

CHANGELOG.md

@@ -13,11 +13,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - `Fuzzable` trait implementations for `bool` and `ContractAddress`
 - Type aliases for `StarkCurveKeyPair`, `Secp256k1CurveKeyPair`, `Secp256r1CurveKeyPair`
+- Option to display L2 gas for each call in the debugging trace
 
 #### Changed
 
 - Updated the error message returned when calling a nonexistent method on a contract to better align with the format used by the network
 - Oracle support in `snforge` is now stable and no longer requires the `--experimental-oracles` CLI flag
+- The default tracked resource is now Sierra gas, so gas reporting results may differ compared to previous versions. For more information refer to the [documentation](https://foundry-rs.github.io/starknet-foundry/testing/gas-and-resource-estimation.html)
+- When using the `--detailed-resources` flag, the used Sierra gas key is now shown as `sierra gas` instead of `sierra_gas_consumption`
 
 ### Cast
 
@@ -28,6 +31,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Possibility to use [`starknet-devnet`](https://github.com/0xSpaceShard/starknet-devnet) predeployed accounts directly in `sncast` without needing to import them. They are available under specific names - `devnet-1`, `devnet-2`, ..., `devnet-<N>`. Read more [here](https://foundry-rs.github.io/starknet-foundry/starknet/integration_with_devnet.html#predeployed-accounts)
 - Support for `--network devnet` flag that attempts to auto-detect running `starknet-devnet` instance and connect to it.
 - Support for automatically declaring the contract when running `sncast deploy`, by providing `--contract-name` flag instead of `--class-hash`. 
+- `sncast balance` command to fetch the balance of an account for a specified token.
 
 ## [0.50.0] - 2025-09-29
 

Cargo.lock

@@ -35,7 +35,7 @@ license-file = "LICENSE"
 
 [workspace.dependencies]
 # TODO(#3770) Use blockifier directly
-blockifier = { git = "https://github.com/software-mansion-labs/sequencer.git", branch = "main-v0.14.0", features = ["testing", "tracing"] }
+blockifier = { git = "https://github.com/software-mansion-labs/sequencer.git", branch = "main-v0.14.0", features = ["testing", "tracing", "node_api"] }
 bigdecimal = "0.4.8"
 # TODO(#3770) Use starknet_api directly
 starknet_api = { git = "https://github.com/software-mansion-labs/sequencer.git", branch = "main-v0.14.0" }
@@ -95,7 +95,7 @@ snapbox = "0.4.17"
 scarb-ui = "0.1.7"
 semver = "1.0.27"
 bimap = "0.6.3"
-primitive-types = "0.13.1"
+primitive-types = {  version =  "0.13.1", features = ["serde"] }
 shellexpand = "3.1.0"
 toml = "0.8.20"
 rpassword = "7.3.1"

Cargo.toml

@@ -6,3 +6,4 @@ pub mod predeployment;
 pub mod runtime_extensions;
 pub mod state;
 pub mod sync_client;
+pub mod trace_data;

crates/cheatnet/src/lib.rs

@@ -10,7 +10,6 @@ use blockifier::execution::call_info::CallInfo;
 use blockifier::execution::entry_point::{CallEntryPoint, CallType, ExecutableCallEntryPoint};
 use blockifier::execution::errors::EntryPointExecutionError;
 use blockifier::execution::syscalls::vm_syscall_utils::SyscallUsageMap;
-use cairo_vm::vm::runners::cairo_runner::ExecutionResources;
 
 pub(crate) fn resolve_cheated_data_for_call(
     entry_point: &mut CallEntryPoint,
@@ -75,14 +74,11 @@ pub(crate) fn exit_error_call(
         CallType::Call => AddressOrClassHash::ContractAddress(entry_point.storage_address),
         CallType::Delegate => AddressOrClassHash::ClassHash(entry_point.class_hash),
     };
-    cheatnet_state.trace_data.update_and_exit_nested_call(
-        ExecutionResources::default(),
-        u64::default(),
-        SyscallUsageMap::default(),
-        SyscallUsageMap::default(),
-        CallResult::from_err(error, &identifier),
-        &[],
-        vec![],
-        vec![],
-    );
+    let trace_data = &mut cheatnet_state.trace_data;
+
+    // In case of a revert, clear all events and messages emitted by the current call.
+    trace_data.clear_current_call_events_and_messages();
+
+    trace_data.update_current_call_result(CallResult::from_err(error, &identifier));
+    trace_data.exit_nested_call();
 }

crates/cheatnet/src/runtime_extensions/call_to_blockifier_runtime_extension/execution/execution_utils.rs

@@ -17,14 +17,17 @@ use crate::runtime_extensions::{
         storage::{calculate_variable_address, load, store},
     },
 };
-use crate::state::{CallTrace, CallTraceNode};
+use crate::trace_data::{CallTrace, CallTraceNode, GasReportData};
 use anyhow::{Context, Result, anyhow};
 use blockifier::bouncer::vm_resources_to_sierra_gas;
 use blockifier::context::TransactionContext;
-use blockifier::execution::call_info::CallInfo;
+use blockifier::execution::call_info::{
+    CallInfo, CallSummary, ChargedResources, EventSummary, ExecutionSummary, OrderedEvent,
+};
 use blockifier::execution::contract_class::TrackedResource;
 use blockifier::execution::syscalls::vm_syscall_utils::{SyscallSelector, SyscallUsageMap};
 use blockifier::state::errors::StateError;
+use blockifier::utils::u64_from_usize;
 use cairo_vm::vm::runners::cairo_runner::CairoRunner;
 use cairo_vm::vm::{
     errors::hint_errors::HintError, runners::cairo_runner::ExecutionResources,
@@ -42,10 +45,11 @@ use runtime::{
 };
 use scarb_oracle_hint_service::OracleHintService;
 use starknet::signers::SigningKey;
+use starknet_api::execution_resources::GasAmount;
 use starknet_api::{contract_class::EntryPointType::L1Handler, core::ClassHash};
 use starknet_types_core::felt::Felt;
 use std::cell::RefCell;
-use std::collections::HashMap;
+use std::collections::{HashMap, HashSet};
 use std::rc::Rc;
 use std::sync::{Arc, Mutex};
 
@@ -738,6 +742,65 @@ pub fn update_top_call_vm_trace(runtime: &mut ForgeRuntime, cairo_runner: &mut C
     }
 }
 
+pub fn compute_and_store_execution_summary(trace: &Rc<RefCell<CallTrace>>) {
+    let execution_summary = if trace.borrow().nested_calls.is_empty() {
+        get_execution_summary_without_nested_calls(trace)
+    } else {
+        let mut nested_calls_summaries = vec![];
+        for nested_call in &trace.borrow().nested_calls {
+            if let CallTraceNode::EntryPointCall(nested_call) = nested_call {
+                compute_and_store_execution_summary(nested_call);
+                nested_calls_summaries.push(
+                    nested_call
+                        .borrow()
+                        .gas_report_data
+                        .as_ref()
+                        .expect("Gas report data must be set after calling `compute_and_store_execution_summary`")
+                        .execution_summary
+                        .clone());
+            }
+        }
+        let mut current_call_summary = get_execution_summary_without_nested_calls(trace)
+            + nested_calls_summaries.into_iter().sum();
+
+        // vm_resources and gas_consumed of a call already contain the resources of its inner calls.
+        current_call_summary.charged_resources.vm_resources =
+            trace.borrow().used_execution_resources.clone();
+        current_call_summary.charged_resources.gas_consumed =
+            GasAmount(trace.borrow().gas_consumed);
+        current_call_summary
+    };
+
+    trace.borrow_mut().gas_report_data = Some(GasReportData::new(execution_summary.clone()));
+}
+
+// Based on blockifier/src/execution/call_info.rs (summarize)
+fn get_execution_summary_without_nested_calls(trace: &Rc<RefCell<CallTrace>>) -> ExecutionSummary {
+    let current_call = trace.borrow();
+    ExecutionSummary {
+        charged_resources: ChargedResources {
+            vm_resources: current_call.used_execution_resources.clone(),
+            gas_consumed: GasAmount(current_call.gas_consumed),
+        },
+        l2_to_l1_payload_lengths: current_call.used_l1_resources.l2_l1_message_sizes.clone(),
+        event_summary: {
+            let mut event_summary = EventSummary {
+                n_events: current_call.events.len(),
+                ..Default::default()
+            };
+            for OrderedEvent { event, .. } in &current_call.events {
+                event_summary.total_event_data_size += u64_from_usize(event.data.0.len());
+                event_summary.total_event_keys += u64_from_usize(event.keys.len());
+            }
+            event_summary
+        },
+        // Fields below are not relevant for partial gas calculation.
+        call_summary: CallSummary::default(),
+        executed_class_hashes: HashSet::default(),
+        visited_storage_entries: HashSet::default(),
+    }
+}
+
 fn add_sierra_gas_resources(top_call: &Rc<RefCell<CallTrace>>) -> u64 {
     let mut gas_consumed = top_call.borrow().gas_consumed;
     for nested_call in &top_call.borrow().nested_calls {