Add the index of the inner instruction to TransactionError::InstructionError

Author: steveluscher

cli/src/cli.rs

@@ -1768,7 +1768,7 @@ where
     match result {
         Err(err) => {
             let maybe_tx_err = err.get_transaction_error();
-            if let Some(TransactionError::InstructionError(_, ix_error, _)) = maybe_tx_err {
+            if let Some(TransactionError::InstructionError(_, ix_error, _, _)) = maybe_tx_err {
                 if let Some(specific_error) = error_adapter(&ix_error) {
                     return Err(specific_error.into());
                 }

cli/src/program.rs

@@ -2215,13 +2215,15 @@ fn close(
             _,
             InstructionError::InvalidInstructionData,
             _,
+            _,
         )) = err.kind()
         {
             return Err("Closing a buffer account is not supported by the cluster".into());
         } else if let ClientErrorKind::TransactionError(TransactionError::InstructionError(
             _,
             InstructionError::InvalidArgument,
             _,
+            _,
         )) = err.kind()
         {
             return Err("Closing a program account is not supported by the cluster".into());
@@ -2440,6 +2442,7 @@ fn process_extend_program(
             _,
             InstructionError::InvalidInstructionData,
             _,
+            _,
         )) = err.kind()
         {
             return Err("Extending a program is not supported by the cluster".into());
@@ -2536,6 +2539,7 @@ fn process_migrate_program(
             _,
             InstructionError::InvalidInstructionData,
             _,
+            _,
         )) = err.kind()
         {
             return Err("Migrating a program is not supported by the cluster".into());

compute-budget-instruction/src/compute_budget_instruction_details.rs

@@ -112,6 +112,7 @@ impl ComputeBudgetInstructionDetails {
                         index,
                         InstructionError::InvalidInstructionData,
                         None,
+                        None,
                     ));
                 }
             } else {
@@ -157,6 +158,7 @@ impl ComputeBudgetInstructionDetails {
         let invalid_instruction_data_error = TransactionError::InstructionError(
             index,
             InstructionError::InvalidInstructionData,
+            None,
             Some(instruction.program_id_index),
         );
         let duplicate_instruction_error = TransactionError::DuplicateInstruction(index);

storage-proto/proto/transaction_by_addr.proto

@@ -70,7 +70,8 @@ message InstructionError {
     uint32 index = 1;
     InstructionErrorType error = 2;
     CustomError custom = 3;
-    optional uint32 responsible_program_account_index = 4;
+    optional uint32 inner_instruction_index = 4;
+    optional uint32 responsible_program_account_index = 5;
 }
 
 message TransactionDetails {