update

Author: zjma

aptos-move/aptos-vm/src/aptos_vm.rs

@@ -1678,6 +1678,7 @@ impl AptosVM {
         let args = serialize_values(
             &block_metadata.get_prologue_move_args(account_config::reserved_vm_address()),
         );
+        debug!(epoch = block_metadata.epoch, round = block_metadata.round, "Running BlockMetadata txn.");
         session
             .execute_function_bypass_visibility(
                 &BLOCK_MODULE,
@@ -1690,6 +1691,7 @@ impl AptosVM {
             .or_else(|e| {
                 expect_only_successful_execution(e, BLOCK_PROLOGUE.as_str(), log_context)
             })?;
+        debug!(epoch = block_metadata.epoch, round = block_metadata.round, "BlockMetadata txn finished.");
         SYSTEM_TRANSACTIONS_EXECUTED.inc();
 
         let output = get_transaction_output(
@@ -1698,6 +1700,7 @@ impl AptosVM {
             ExecutionStatus::Success,
             &get_or_vm_startup_failure(&self.storage_gas_params, log_context)?.change_set_configs,
         )?;
+        debug!(epoch = block_metadata.epoch, round = block_metadata.round, "BlockMetadata txn result ok.");
         Ok((VMStatus::Executed, output))
     }
 
@@ -1753,6 +1756,7 @@ impl AptosVM {
                 .as_move_value(),
         ];
 
+        debug!(epoch = epoch, round = round, "Running BlockMetadataExt txn.");
         session
             .execute_function_bypass_visibility(
                 &BLOCK_MODULE,
@@ -1765,6 +1769,7 @@ impl AptosVM {
             .or_else(|e| {
                 expect_only_successful_execution(e, BLOCK_PROLOGUE_EXT.as_str(), log_context)
             })?;
+        debug!(epoch = epoch, round = round, "BlockMetadataExt txn finished.");
         SYSTEM_TRANSACTIONS_EXECUTED.inc();
 
         let output = get_transaction_output(
@@ -1773,7 +1778,7 @@ impl AptosVM {
             ExecutionStatus::Success,
             &get_or_vm_startup_failure(&self.storage_gas_params, log_context)?.change_set_configs,
         )?;
-
+        debug!(epoch = epoch, round = round, "BlockMetadataExt txn result ok.");
         Ok((VMStatus::Executed, output))
     }
 

aptos-move/framework/aptos-framework/sources/block.move

@@ -5,6 +5,8 @@ module aptos_framework::block {
     use std::vector;
     use std::option;
     use std::option::Option;
+    use std::string::utf8;
+    use aptos_std::debug;
     use aptos_framework::randomness;
 
     use aptos_framework::account;
@@ -172,6 +174,7 @@ module aptos_framework::block {
         let epoch_interval = block_prologue_common(&vm, hash, epoch, round, proposer, failed_proposer_indices, previous_block_votes_bitvec, timestamp);
         randomness::on_new_block(&vm, epoch, round, option::none());
         if (timestamp - reconfiguration::last_reconfiguration_time() >= epoch_interval) {
+            debug::print(&utf8(b"epoch time out"));
             reconfiguration::reconfigure();
         };
     }

aptos-move/framework/src/natives/debug.rs

@@ -32,15 +32,10 @@ fn native_print(
     debug_assert!(ty_args.is_empty());
     debug_assert!(args.len() == 1);
 
-    if cfg!(feature = "testing") {
-        let val = safely_pop_arg!(args, Struct);
-        let bytes = val.unpack()?.next().unwrap();
-
-        println!(
-            "[debug] {}",
-            std::str::from_utf8(&bytes.value_as::<Vec<u8>>()?).unwrap()
-        );
-    }
+    println!(
+        "[debug] {}",
+        std::str::from_utf8(&bytes.value_as::<Vec<u8>>()?).unwrap()
+    );
 
     Ok(smallvec![])
 }