Enable tracing in the execution layer

Cargo.toml

@@ -44,6 +44,7 @@ exclude = [
     "external-crates/move/crates/move-stdlib-natives",
     "external-crates/move/crates/move-symbol-pool",
     "external-crates/move/crates/move-transactional-test-runner",
+    "external-crates/move/crates/move-trace-format",    
     "external-crates/move/crates/move-unit-test",
     "external-crates/move/crates/move-vm-config",
     "external-crates/move/crates/move-vm-integration-tests",
@@ -584,6 +585,9 @@ move-symbol-pool = { path = "external-crates/move/crates/move-symbol-pool" }
 move-abstract-interpreter = { path = "external-crates/move/crates/move-abstract-interpreter" }
 move-abstract-stack = { path = "external-crates/move/crates/move-abstract-stack" }
 move-analyzer = { path = "external-crates/move/crates/move-analyzer" }
+move-trace-format = { path = "external-crates/move/crates/move-trace-format" }
+move-proc-macros = { path = "external-crates/move/crates/move-proc-macros" }
+enum-compat-util = { path = "external-crates/move/crates/enum-compat-util" }
 
 fastcrypto = { git = "https://github.com/MystenLabs/fastcrypto", rev = "69d496c71fb37e3d22fe85e5bbfd4256d61422b9" }
 fastcrypto-tbls = { git = "https://github.com/MystenLabs/fastcrypto", rev = "69d496c71fb37e3d22fe85e5bbfd4256d61422b9" }

crates/simulacrum/src/epoch_state.rs

@@ -150,6 +150,7 @@ impl EpochState {
                 kind,
                 signer,
                 tx_digest,
+                &mut None,
             );
         Ok((inner_temp_store, gas_status, effects, result))
     }

crates/sui-core/src/authority.rs

@@ -1688,6 +1688,7 @@ impl AuthorityState {
                 kind,
                 signer,
                 tx_digest,
+                &mut None,
             );
 
         fail_point_if!("cp_execution_nondeterminism", || {
@@ -1880,6 +1881,7 @@ impl AuthorityState {
                 kind,
                 signer,
                 transaction_digest,
+                &mut None,
             );
         let tx_digest = *effects.transaction_digest();
 
@@ -2070,6 +2072,7 @@ impl AuthorityState {
                 kind,
                 signer,
                 transaction.digest(),
+                &mut None,
             );
 
         Ok(SimulateTransactionResult {

crates/sui-genesis-builder/src/lib.rs

@@ -940,6 +940,7 @@ fn create_genesis_transaction(
                 kind,
                 signer,
                 genesis_digest,
+                &mut None,
             );
         assert!(inner_temp_store.input_objects.is_empty());
         assert!(inner_temp_store.mutable_inputs.is_empty());

crates/sui-replay/src/replay.rs

@@ -779,6 +779,7 @@ impl LocalExec {
                 transaction_kind.clone(),
                 tx_info.sender,
                 *tx_digest,
+                &mut None,
             );
 
         if let Err(err) = self.pretty_print_for_tracing(
@@ -939,6 +940,7 @@ impl LocalExec {
             kind,
             signer,
             *executable.digest(),
+            &mut None,
         );
 
         let effects =

crates/sui-single-node-benchmark/src/single_node.rs

@@ -220,6 +220,7 @@ impl SingleValidator {
                 kind,
                 signer,
                 *executable.digest(),
+                &mut None,
             );
         assert!(effects.status().is_ok());
         store.commit_objects(inner_temp_store);

crates/sui-swarm-config/src/network_config_builder.rs

@@ -617,6 +617,7 @@ mod test {
                 kind,
                 signer,
                 genesis_digest,
+                &mut None,
             );
 
         assert_eq!(&effects, genesis.effects());

external-crates/move/crates/move-trace-format/Cargo.toml

@@ -4,6 +4,7 @@ version = "0.0.1"
 authors = ["Move Core Contributors"]
 description = "Move Trace Format"
 license = "Apache-2.0"
+publish = false
 edition = "2021"
 
 [dependencies]

external-crates/move/crates/move-trace-format/src/format.rs

@@ -217,6 +217,12 @@ impl MoveTrace {
     }
 }
 
+impl Default for MoveTrace {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 impl MoveTraceBuilder {
     /// Create a new `MoveTraceBuilder` with no additional tracing.
     pub fn new() -> Self {
@@ -314,6 +320,12 @@ impl MoveTraceBuilder {
     }
 }
 
+impl Default for MoveTraceBuilder {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 impl Display for TraceValue {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {

external-crates/move/crates/move-trace-format/src/memory_tracer.rs

@@ -138,6 +138,12 @@ impl TraceState {
     }
 }
 
+impl Default for TraceState {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 impl Tracer for TraceState {
     fn notify(&mut self, event: &TraceEvent, mut write: Writer<'_>) {
         self.apply_event(event);

sui-execution/Cargo.toml

@@ -13,6 +13,7 @@ sui-types.workspace = true
 
 move-binary-format.workspace = true
 move-bytecode-verifier-meter.workspace = true
+move-trace-format.workspace = true
 move-vm-config.workspace = true
 
 sui-adapter-latest = { path = "latest/sui-adapter" }

sui-execution/latest/sui-adapter/Cargo.toml

@@ -21,6 +21,7 @@ move-binary-format.workspace = true
 move-bytecode-utils.workspace = true
 move-bytecode-verifier-meter.workspace = true
 move-core-types.workspace = true
+move-trace-format.workspace = true
 move-vm-config.workspace = true
 move-vm-types.workspace = true
 mysten-metrics.workspace = true

sui-execution/latest/sui-adapter/src/execution_engine.rs

@@ -8,6 +8,7 @@ mod checked {
 
     use crate::execution_mode::{self, ExecutionMode};
     use move_binary_format::CompiledModule;
+    use move_trace_format::format::MoveTraceBuilder;
     use move_vm_runtime::move_vm::MoveVM;
     use std::{collections::HashSet, sync::Arc};
     use sui_types::balance::{
@@ -92,6 +93,7 @@ mod checked {
         metrics: Arc<LimitsMetrics>,
         enable_expensive_checks: bool,
         certificate_deny_set: &HashSet<TransactionDigest>,
+        trace_builder_opt: &mut Option<MoveTraceBuilder>,
     ) -> (
         InnerTemporaryStore,
         SuiGasStatus,
@@ -145,6 +147,7 @@ mod checked {
             deny_cert,
             contains_deleted_input,
             cancelled_objects,
+            trace_builder_opt,
         );
 
         let status = if let Err(error) = &execution_result {
@@ -262,6 +265,7 @@ mod checked {
             tx_context,
             &mut gas_charger,
             pt,
+            &mut None,
         )
         .map_err(|(e, _)| e)?;
         temporary_store.update_object_version_and_prev_tx();
@@ -281,6 +285,7 @@ mod checked {
         deny_cert: bool,
         contains_deleted_input: bool,
         cancelled_objects: Option<(Vec<ObjectID>, SequenceNumber)>,
+        trace_builder_opt: &mut Option<MoveTraceBuilder>,
     ) -> (
         GasCostSummary,
         Result<Mode::ExecutionResults, ExecutionError>,
@@ -340,6 +345,7 @@ mod checked {
                             gas_charger,
                             protocol_config,
                             metrics.clone(),
+                            trace_builder_opt,
                         )
                     };
 
@@ -566,6 +572,7 @@ mod checked {
         gas_charger: &mut GasCharger,
         protocol_config: &ProtocolConfig,
         metrics: Arc<LimitsMetrics>,
+        trace_builder_opt: &mut Option<MoveTraceBuilder>,
     ) -> ResultWithTimings<Mode::ExecutionResults, ExecutionError> {
         let result = match transaction_kind {
             TransactionKind::ChangeEpoch(change_epoch) => {
@@ -579,6 +586,7 @@ mod checked {
                     gas_charger,
                     protocol_config,
                     metrics,
+                    trace_builder_opt,
                 )
                 .map_err(|e| (e, vec![]))?;
                 Ok((Mode::empty_results(), vec![]))
@@ -612,6 +620,7 @@ mod checked {
                     gas_charger,
                     protocol_config,
                     metrics,
+                    trace_builder_opt,
                 )
                 .expect("ConsensusCommitPrologue cannot fail");
                 Ok((Mode::empty_results(), vec![]))
@@ -625,6 +634,7 @@ mod checked {
                     gas_charger,
                     protocol_config,
                     metrics,
+                    trace_builder_opt,
                 )
                 .expect("ConsensusCommitPrologueV2 cannot fail");
                 Ok((Mode::empty_results(), vec![]))
@@ -638,6 +648,7 @@ mod checked {
                     gas_charger,
                     protocol_config,
                     metrics,
+                    trace_builder_opt,
                 )
                 .expect("ConsensusCommitPrologueV3 cannot fail");
                 Ok((Mode::empty_results(), vec![]))
@@ -651,6 +662,7 @@ mod checked {
                     tx_ctx,
                     gas_charger,
                     pt,
+                    trace_builder_opt,
                 )
             }
             TransactionKind::EndOfEpochTransaction(txns) => {
@@ -669,6 +681,7 @@ mod checked {
                                 gas_charger,
                                 protocol_config,
                                 metrics,
+                                trace_builder_opt,
                             )
                             .map_err(|e| (e, vec![]))?;
                             return Ok((Mode::empty_results(), vec![]));
@@ -714,6 +727,7 @@ mod checked {
                     gas_charger,
                     protocol_config,
                     metrics,
+                    trace_builder_opt,
                 )
                 .map_err(|e| (e, vec![]))?;
                 Ok((Mode::empty_results(), vec![]))
@@ -727,6 +741,7 @@ mod checked {
                     gas_charger,
                     protocol_config,
                     metrics,
+                    trace_builder_opt,
                 )
                 .map_err(|e| (e, vec![]))?;
                 Ok((Mode::empty_results(), vec![]))
@@ -882,6 +897,7 @@ mod checked {
         gas_charger: &mut GasCharger,
         protocol_config: &ProtocolConfig,
         metrics: Arc<LimitsMetrics>,
+        trace_builder_opt: &mut Option<MoveTraceBuilder>,
     ) -> Result<(), ExecutionError> {
         let params = AdvanceEpochParams {
             epoch: change_epoch.epoch,
@@ -903,6 +919,7 @@ mod checked {
             tx_ctx,
             gas_charger,
             advance_epoch_pt,
+            trace_builder_opt,
         );
 
         #[cfg(msim)]
@@ -932,6 +949,7 @@ mod checked {
                     tx_ctx,
                     gas_charger,
                     advance_epoch_safe_mode_pt,
+                    trace_builder_opt,
                 )
                 .map_err(|(e, _)| e)
                 .expect("Advance epoch with safe mode must succeed");
@@ -953,6 +971,7 @@ mod checked {
                 gas_charger,
                 protocol_config,
                 metrics,
+                trace_builder_opt,
             );
         } else {
             process_system_packages(
@@ -963,6 +982,7 @@ mod checked {
                 gas_charger,
                 protocol_config,
                 metrics,
+                trace_builder_opt,
             );
         }
         Ok(())
@@ -976,6 +996,7 @@ mod checked {
         gas_charger: &mut GasCharger,
         protocol_config: &ProtocolConfig,
         metrics: Arc<LimitsMetrics>,
+        trace_builder_opt: &mut Option<MoveTraceBuilder>,
     ) {
         let binary_config = to_binary_config(protocol_config);
         for (version, modules, dependencies) in change_epoch.system_packages.into_iter() {
@@ -1002,6 +1023,7 @@ mod checked {
                     tx_ctx,
                     gas_charger,
                     publish_pt,
+                    trace_builder_opt,
                 )
                 .map_err(|(e, _)| e)
                 .expect("System Package Publish must succeed");
@@ -1044,6 +1066,7 @@ mod checked {
         gas_charger: &mut GasCharger,
         protocol_config: &ProtocolConfig,
         metrics: Arc<LimitsMetrics>,
+        trace_builder_opt: &mut Option<MoveTraceBuilder>,
     ) -> Result<(), ExecutionError> {
         let pt = {
             let mut builder = ProgrammableTransactionBuilder::new();
@@ -1071,6 +1094,7 @@ mod checked {
             tx_ctx,
             gas_charger,
             pt,
+            trace_builder_opt,
         )
         .map_err(|(e, _)| e)?;
         Ok(())
@@ -1183,6 +1207,7 @@ mod checked {
         gas_charger: &mut GasCharger,
         protocol_config: &ProtocolConfig,
         metrics: Arc<LimitsMetrics>,
+        trace_builder_opt: &mut Option<MoveTraceBuilder>,
     ) -> Result<(), ExecutionError> {
         let pt = {
             let mut builder = ProgrammableTransactionBuilder::new();
@@ -1214,6 +1239,7 @@ mod checked {
             tx_ctx,
             gas_charger,
             pt,
+            trace_builder_opt,
         )
         .map_err(|(e, _)| e)?;
         Ok(())
@@ -1250,6 +1276,7 @@ mod checked {
         gas_charger: &mut GasCharger,
         protocol_config: &ProtocolConfig,
         metrics: Arc<LimitsMetrics>,
+        trace_builder_opt: &mut Option<MoveTraceBuilder>,
     ) -> Result<(), ExecutionError> {
         let pt = {
             let mut builder = ProgrammableTransactionBuilder::new();
@@ -1282,6 +1309,7 @@ mod checked {
             tx_ctx,
             gas_charger,
             pt,
+            trace_builder_opt,
         )
         .map_err(|(e, _)| e)?;
         Ok(())