Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions crates/executor/src/implementation/blockifier/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -257,21 +257,21 @@ impl<'a> BlockExecutor<'a> for StarknetVMProcessor<'a> {
match result {
Ok(exec_result) => {
match &exec_result {
ExecutionResult::Success { receipt, trace } => {
ExecutionResult::Success { receipt, .. } => {
self.stats.l1_gas_used +=
receipt.resources_used().total_gas_consumed.l1_gas as u128;
self.stats.cairo_steps_used +=
receipt.resources_used().vm_resources.n_steps as u128;

if let Some(reason) = receipt.revert_reason() {
info!(target: LOG_TARGET, hash = format!("{hash:#x}"), %reason, "Transaction reverted.");
}

if let Some((class_hash, class)) = class_decl_artifacts {
state.declared_classes.insert(class_hash, class.as_ref().clone());
}

crate::utils::log_resources(&trace.receipt.resources);
if let Some(reason) = receipt.revert_reason() {
info!(target: LOG_TARGET, hash = format!("{hash:#x}"), type = ?receipt.r#type(), revert_reason = %reason, "Transaction executed (reverted).");
} else {
info!(target: LOG_TARGET, hash = format!("{hash:#x}"), type = ?receipt.r#type(), "Transaction executed.");
}
}

ExecutionResult::Failed { error } => {
Expand Down
23 changes: 1 addition & 22 deletions crates/executor/src/utils.rs
Original file line number Diff line number Diff line change
@@ -1,32 +1,11 @@
use blockifier::fee::receipt::TransactionReceipt;
use katana_primitives::execution::{CallInfo, TransactionExecutionInfo, TransactionResources};
use katana_primitives::execution::{CallInfo, TransactionExecutionInfo};
use katana_primitives::fee::FeeInfo;
use katana_primitives::receipt::{
self, DataAvailabilityResources, DeclareTxReceipt, DeployAccountTxReceipt, Event, GasUsed,
InvokeTxReceipt, L1HandlerTxReceipt, MessageToL1, Receipt,
};
use katana_primitives::transaction::ExecutableTx;
use tracing::trace;

pub(crate) const LOG_TARGET: &str = "executor";

pub fn log_resources(resources: &TransactionResources) {
let mut mapped_strings = Vec::new();

for (builtin, count) in &resources.computation.tx_vm_resources.builtin_instance_counter {
mapped_strings.push(format!("{builtin}: {count}"));
}

// Sort the strings alphabetically
mapped_strings.sort();
mapped_strings.insert(0, format!("steps: {}", resources.computation.tx_vm_resources.n_steps));
mapped_strings.insert(
1,
format!("memory holes: {}", resources.computation.tx_vm_resources.n_memory_holes),
);

trace!(target: LOG_TARGET, usage = mapped_strings.join(" | "), "Transaction resource usage.");
}

pub(crate) fn build_receipt(
tx: &ExecutableTx,
Expand Down
Loading