fix: ensure that the sim events are logged; improve format of main logs

cmd/soroban-cli/src/commands/contract/invoke.rs

@@ -13,7 +13,6 @@ use soroban_env_host::e2e_invoke::get_ledger_changes;
 use soroban_env_host::xdr::ReadXdr;
 use soroban_env_host::{
     budget::Budget,
-    events::HostEvent,
     storage::Storage,
     xdr::{
         self, AccountId, Error as XdrError, Hash, HostFunction, InvokeContractArgs,
@@ -320,10 +319,7 @@ impl Cmd {
             .await?;
 
         tracing::debug!(?result);
-        if !events.is_empty() {
-            tracing::debug!(?events);
-        }
-
+        crate::log::diagnostic_events(&events, false);
         let xdr::TransactionMeta::V3(xdr::TransactionMetaV3 {
             soroban_meta: Some(xdr::SorobanTransactionMeta { return_value, .. }),
             ..
@@ -421,12 +417,8 @@ impl Cmd {
         let budget = h.budget_cloned();
         let (storage, events) = h.try_finish()?;
         let footprint = &create_ledger_footprint(&storage.footprint);
-        log_events(
-            footprint,
-            &[contract_auth.try_into()?],
-            &events.0,
-            Some(&budget),
-        );
+        crate::log::host_events(&events.0);
+        log_events(footprint, &[contract_auth.try_into()?], &[], Some(&budget));
 
         let ledger_changes = get_ledger_changes(&budget, &storage, &state)?;
         let mut expiration_ledger_bumps: HashMap<LedgerKey, u32> = HashMap::new();
@@ -496,11 +488,11 @@ impl Cmd {
 fn log_events(
     footprint: &LedgerFootprint,
     auth: &[VecM<SorobanAuthorizationEntry>],
-    events: &[HostEvent],
+    events: &[xdr::DiagnosticEvent],
     budget: Option<&Budget>,
 ) {
     crate::log::auth(auth);
-    crate::log::events(events);
+    crate::log::diagnostic_events(events, true);
     crate::log::footprint(footprint);
     if let Some(budget) = budget {
         crate::log::budget(budget);

cmd/soroban-cli/src/log.rs

@@ -1,9 +1,11 @@
 pub mod auth;
 pub mod budget;
-pub mod event;
+pub mod diagnostic_event;
 pub mod footprint;
+pub mod host_event;
 
 pub use auth::*;
 pub use budget::*;
-pub use event::*;
+pub use diagnostic_event::*;
 pub use footprint::*;
+pub use host_event::*;

cmd/soroban-cli/src/log/auth.rs

@@ -2,6 +2,6 @@ use soroban_env_host::xdr::{SorobanAuthorizationEntry, VecM};
 
 pub fn auth(auth: &[VecM<SorobanAuthorizationEntry>]) {
     if !auth.is_empty() {
-        tracing::debug!(?auth);
+        tracing::debug!("{auth:#?}");
     }
 }

cmd/soroban-cli/src/log/budget.rs

@@ -1,5 +1,5 @@
 use soroban_env_host::budget::Budget;
 
 pub fn budget(budget: &Budget) {
-    tracing::debug!(?budget);
+    tracing::debug!("{budget:#?}");
 }

cmd/soroban-cli/src/log/diagnostic_event.rs

@@ -0,0 +1,11 @@
+use soroban_env_host::xdr::DiagnosticEvent;
+
+pub fn diagnostic_events(events: &[DiagnosticEvent], is_trace: bool) {
+    for (i, event) in events.iter().enumerate() {
+        if is_trace {
+            tracing::trace!("{i}: {event:#?}");
+        } else {
+            tracing::info!("{i}: {event:#?}");
+        }
+    }
+}

cmd/soroban-cli/src/log/footprint.rs

@@ -1,5 +1,5 @@
 use soroban_env_host::xdr::LedgerFootprint;
 
 pub fn footprint(footprint: &LedgerFootprint) {
-    tracing::debug!(?footprint);
+    tracing::debug!("{footprint:#?}");
 }

cmd/soroban-cli/src/log/host_event.rs

@@ -0,0 +1,7 @@
+use soroban_env_host::events::HostEvent;
+
+pub fn host_events(events: &[HostEvent]) {
+    for (i, event) in events.iter().enumerate() {
+        tracing::info!("{i}: {event:#?}");
+    }
+}

cmd/soroban-cli/src/rpc/mod.rs

@@ -7,7 +7,6 @@ use serde_aux::prelude::{deserialize_default_from_null, deserialize_number_from_
 use soroban_env_host::xdr::DepthLimitedRead;
 use soroban_env_host::{
     budget::Budget,
-    events::HostEvent,
     xdr::{
         self, AccountEntry, AccountId, ContractDataEntry, DiagnosticEvent, Error as XdrError,
         LedgerEntryData, LedgerFootprint, LedgerKey, LedgerKeyAccount, PublicKey, ReadXdr,
@@ -35,7 +34,7 @@ const VERSION: Option<&str> = option_env!("CARGO_PKG_VERSION");
 pub type LogEvents = fn(
     footprint: &LedgerFootprint,
     auth: &[VecM<SorobanAuthorizationEntry>],
-    events: &[HostEvent],
+    events: &[DiagnosticEvent],
     budget: Option<&Budget>,
 ) -> ();
 

cmd/soroban-cli/src/rpc/transaction.rs

@@ -34,9 +34,6 @@ pub fn assemble(
         .iter()
         .map(DiagnosticEvent::from_xdr_base64)
         .collect::<Result<Vec<_>, _>>()?;
-    if !events.is_empty() {
-        tracing::debug!(simulation_events=?events);
-    }
 
     let transaction_data = SorobanTransactionData::from_xdr_base64(&simulation.transaction_data)?;
 
@@ -76,7 +73,7 @@ pub fn assemble(
         _ => return Err(Error::UnsupportedOperationType),
     };
     if let Some(log) = log_events {
-        log(&transaction_data.resources.footprint, &auths, &[], None);
+        log(&transaction_data.resources.footprint, &auths, &events, None);
     }
 
     // update the fees of the actual transaction to meet the minimum resource fees.