Add stable program logging for BPF and native programs

runtime/src/builtins.rs

@@ -2,7 +2,50 @@ use crate::{
     bank::{Builtin, Builtins},
     system_instruction_processor,
 };
-use solana_sdk::{feature_set, pubkey::Pubkey, system_program};
+use solana_sdk::{
+    feature_set,
+    instruction::InstructionError,
+    keyed_account::KeyedAccount,
+    process_instruction::{stable_log, InvokeContext, ProcessInstructionWithContext},
+    pubkey::Pubkey,
+    system_program,
+};
+
+fn process_instruction_with_program_logging(
+    process_instruction: ProcessInstructionWithContext,
+    program_id: &Pubkey,
+    keyed_accounts: &[KeyedAccount],
+    instruction_data: &[u8],
+    invoke_context: &mut dyn InvokeContext,
+) -> Result<(), InstructionError> {
+    let logger = invoke_context.get_logger();
+    stable_log::program_invoke(&logger, program_id, invoke_context.invoke_depth());
+
+    let result = process_instruction(program_id, keyed_accounts, instruction_data, invoke_context);
+
+    match &result {
+        Ok(()) => stable_log::program_success(&logger, program_id),
+        Err(err) => stable_log::program_failure(&logger, program_id, err),
+    }
+    result
+}
+
+macro_rules! with_program_logging {
+    ($process_instruction:expr) => {
+        |program_id: &Pubkey,
+         keyed_accounts: &[KeyedAccount],
+         instruction_data: &[u8],
+         invoke_context: &mut dyn InvokeContext| {
+            process_instruction_with_program_logging(
+                $process_instruction,
+                program_id,
+                keyed_accounts,
+                instruction_data,
+                invoke_context,
+            )
+        }
+    };
+}
 
 /// Builtin programs that are always available
 fn genesis_builtins() -> Vec<Builtin> {
@@ -10,24 +53,26 @@ fn genesis_builtins() -> Vec<Builtin> {
         Builtin::new(
             "system_program",
             system_program::id(),
-            system_instruction_processor::process_instruction,
+            with_program_logging!(system_instruction_processor::process_instruction),
         ),
         Builtin::new(
             "vote_program",
             solana_vote_program::id(),
-            solana_vote_program::vote_instruction::process_instruction,
+            with_program_logging!(solana_vote_program::vote_instruction::process_instruction),
         ),
         // Remove legacy_stake_processor and move stake_instruction::process_instruction back to
         // genesis_builtins around the v1.6 timeframe
         Builtin::new(
             "stake_program",
             solana_stake_program::id(),
-            solana_stake_program::legacy_stake_processor::process_instruction,
+            with_program_logging!(
+                solana_stake_program::legacy_stake_processor::process_instruction
+            ),
         ),
         Builtin::new(
             "config_program",
             solana_config_program::id(),
-            solana_config_program::config_processor::process_instruction,
+            with_program_logging!(solana_config_program::config_processor::process_instruction),
         ),
     ]
 }

runtime/src/message_processor.rs

@@ -256,6 +256,9 @@ impl<'a> InvokeContext for ThisInvokeContext<'a> {
     fn pop(&mut self) {
         self.program_ids.pop();
     }
+    fn invoke_depth(&self) -> usize {
+        self.program_ids.len()
+    }
     fn verify_and_update(
         &mut self,
         message: &Message,
@@ -314,7 +317,7 @@ impl Logger for ThisLogger {
         log_enabled!(log::Level::Info) || self.log_collector.is_some()
     }
     fn log(&self, message: &str) {
-        info!("{}", message);
+        debug!("{}", message);
         if let Some(log_collector) = &self.log_collector {
             log_collector.log(message);
         }