Merge remote-tracking branch 'origin/main' into grpc-integration-tests

Author: kariy

Cargo.lock

@@ -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 } => {

crates/executor/src/implementation/blockifier/mod.rs

@@ -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,

crates/executor/src/utils.rs

@@ -54,7 +54,7 @@ katana-rpc-api = { workspace = true, features = [ "client" ] }
 katana-rpc-client.workspace = true
 katana-trie.workspace = true
 katana-genesis.workspace = true
-katana-utils.workspace = true
+katana-utils = { workspace = true, features = ["node"] }
 
 alloy-contract = { workspace = true, default-features = false }
 alloy-node-bindings = "1.0.24"

crates/rpc/rpc-server/Cargo.toml

@@ -6,13 +6,7 @@ repository.workspace = true
 version.workspace = true
 
 [dependencies]
-katana-chain-spec.workspace = true
-katana-core.workspace = true
-katana-executor.workspace = true
-katana-node.workspace = true
 katana-primitives.workspace = true
-katana-provider.workspace = true
-katana-rpc-server.workspace = true
 katana-rpc-api.workspace = true
 katana-rpc-client.workspace = true
 katana-rpc-types.workspace = true
@@ -25,10 +19,29 @@ assert_matches.workspace = true
 async-trait.workspace = true
 futures.workspace = true
 rand.workspace = true
-starknet.workspace = true
 thiserror.workspace = true
 tokio = { workspace = true, features = [ "macros", "signal", "time" ], default-features = false }
 
+# node-only dependencies
+katana-chain-spec = { workspace = true, optional = true }
+katana-core = { workspace = true, optional = true }
+katana-executor = { workspace = true, optional = true }
+katana-node = { workspace = true, optional = true }
+katana-provider = { workspace = true, optional = true }
+katana-rpc-server = { workspace = true, optional = true }
+starknet = { workspace = true, optional = true }
+tempfile = { workspace = true, optional = true }
+
 [features]
-explorer = [ "katana-node/explorer" ]
 grpc = [ "katana-node/grpc" ]
+node = [
+    "katana-chain-spec",
+    "katana-core",
+    "katana-executor",
+    "katana-node",
+    "katana-provider",
+    "katana-rpc-server",
+    "starknet",
+    "tempfile",
+]
+explorer = [ "node", "katana-node/explorer" ]

crates/utils/Cargo.toml

@@ -1,10 +1,12 @@
 pub use arbitrary::{Arbitrary, Unstructured};
 pub use katana_utils_macro::mock_provider;
 
+#[cfg(feature = "node")]
 pub mod node;
 mod signal;
 mod tx_waiter;
 
+#[cfg(feature = "node")]
 pub use node::TestNode;
 pub use signal::wait_shutdown_signals;
 pub use tx_waiter::*;

crates/utils/src/lib.rs

@@ -316,10 +316,11 @@ mod tests {
     use katana_rpc_types::{ExecutionResources, FeePayment};
 
     use super::{Duration, TxWaiter};
-    use crate::{TestNode, TxWaitingError};
+    use crate::TxWaitingError;
 
-    async fn create_test_sequencer() -> TestNode {
-        TestNode::new().await
+    #[cfg(feature = "node")]
+    async fn create_test_sequencer() -> crate::TestNode {
+        crate::TestNode::new().await
     }
 
     const EXECUTION_RESOURCES: ExecutionResources =
@@ -365,6 +366,7 @@ mod tests {
         }
     }
 
+    #[cfg(feature = "node")]
     #[tokio::test]
     async fn should_timeout_on_nonexistant_transaction() {
         let sequencer = create_test_sequencer().await;