Add the affected program address to each InstructionError

Author: steveluscher

Cargo.lock

@@ -17,6 +17,7 @@ solana-frozen-abi-macro = { workspace = true, optional = true }
 solana-instruction = { workspace = true, default-features = false, features = [
     "std",
 ] }
+solana-pubkey = { workspace = true }
 solana-sanitize = { workspace = true }
 
 [features]

transaction-error/Cargo.toml

@@ -4,7 +4,10 @@
 use serde_derive::{Deserialize, Serialize};
 #[cfg(feature = "frozen-abi")]
 use solana_frozen_abi_macro::{AbiEnumVisitor, AbiExample};
-use {core::fmt, solana_instruction::error::InstructionError, solana_sanitize::SanitizeError};
+use {
+    core::fmt, solana_instruction::error::InstructionError, solana_pubkey::Pubkey,
+    solana_sanitize::SanitizeError,
+};
 
 pub type TransactionResult<T> = Result<T, TransactionError>;
 
@@ -43,8 +46,10 @@ pub enum TransactionError {
     BlockhashNotFound,
 
     /// An error occurred while processing an instruction. The first element of the tuple
-    /// indicates the instruction index in which the error occurred.
-    InstructionError(u8, InstructionError),
+    /// indicates the instruction index in which the error occurred. For avoidance of doubt, the
+    /// third element indicates the address of the program that raised the error; the error could
+    /// after all have been raised during a cross-program invocation (ie. in an inner instruction).
+    InstructionError(u8, InstructionError, Option<Pubkey>),
 
     /// Loader call chain is too deep
     CallChainTooDeep,
@@ -163,7 +168,10 @@ impl fmt::Display for TransactionError {
              => f.write_str("This transaction has already been processed"),
             Self::BlockhashNotFound
              => f.write_str("Blockhash not found"),
-            Self::InstructionError(idx, err) =>  write!(f, "Error processing Instruction {idx}: {err}"),
+            Self::InstructionError(idx, err, None)
+             => write!(f, "Error processing Instruction {idx}: {err}"),
+            Self::InstructionError(idx, err, Some(program_address))
+             => write!(f, "Error processing Instruction {idx}: {err} (from program {program_address})"),
             Self::CallChainTooDeep
              => f.write_str("Loader call chain is too deep"),
             Self::MissingSignatureForFee

transaction-error/src/lib.rs

@@ -302,6 +302,7 @@ impl SanitizedTransaction {
                 TransactionError::InstructionError(
                     index as u8,
                     solana_instruction::error::InstructionError::Custom(err as u32),
+                    Some(*program_id),
                 )
             })?;
         }