[WIP] Backport InstructionError parsing fixes

cli-output/Cargo.toml

@@ -46,6 +46,7 @@ solana-sysvar = { workspace = true }
 solana-transaction = { workspace = true, features = ["verify"] }
 solana-transaction-error = { workspace = true }
 solana-transaction-status = { workspace = true }
+solana-transaction-status-client-types = { workspace = true }
 solana-vote-program = { workspace = true }
 spl-memo = { workspace = true, features = ["no-entrypoint"] }
 

cli-output/src/cli_output.rs

@@ -35,11 +35,11 @@ use {
     solana_stake_interface::state::{Authorized, Lockup},
     solana_sysvar::stake_history::StakeHistoryEntry,
     solana_transaction::{versioned::VersionedTransaction, Transaction},
-    solana_transaction_error::TransactionError,
     solana_transaction_status::{
         EncodedConfirmedBlock, EncodedTransaction, TransactionConfirmationStatus,
         UiTransactionStatusMeta,
     },
+    solana_transaction_status_client_types::UiTransactionError,
     solana_vote_program::{
         authorized_voters::AuthorizedVoters,
         vote_state::{BlockTimestamp, LandedVote, MAX_EPOCH_CREDITS_HISTORY, MAX_LOCKOUT_HISTORY},
@@ -876,7 +876,7 @@ impl fmt::Display for CliHistorySignature {
 pub struct CliHistoryVerbose {
     pub slot: Slot,
     pub block_time: Option<UnixTimestamp>,
-    pub err: Option<TransactionError>,
+    pub err: Option<UiTransactionError>,
     pub confirmation_status: Option<TransactionConfirmationStatus>,
     pub memo: Option<String>,
 }
@@ -2925,7 +2925,7 @@ pub struct CliTransactionConfirmation {
     #[serde(skip_serializing)]
     pub get_transaction_error: Option<String>,
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub err: Option<TransactionError>,
+    pub err: Option<UiTransactionError>,
 }
 
 impl QuietDisplay for CliTransactionConfirmation {}

cli-output/src/display.rs

@@ -15,10 +15,10 @@ use {
     solana_signature::Signature,
     solana_stake_interface as stake,
     solana_transaction::versioned::{TransactionVersion, VersionedTransaction},
-    solana_transaction_error::TransactionError,
     solana_transaction_status::{
         Rewards, UiReturnDataEncoding, UiTransactionReturnData, UiTransactionStatusMeta,
     },
+    solana_transaction_status_client_types::UiTransactionError,
     spl_memo::{id as spl_memo_id, v1::id as spl_memo_v1_id},
     std::{collections::HashMap, fmt, io, time::Duration},
 };
@@ -541,7 +541,7 @@ fn write_rewards<W: io::Write>(
 
 fn write_status<W: io::Write>(
     w: &mut W,
-    transaction_status: &Result<(), TransactionError>,
+    transaction_status: &Result<(), UiTransactionError>,
     prefix: &str,
 ) -> io::Result<()> {
     writeln!(

cli/Cargo.toml

@@ -92,6 +92,7 @@ solana-tpu-client = { workspace = true, features = ["default"] }
 solana-transaction = "=2.2.2"
 solana-transaction-error = "=2.2.1"
 solana-transaction-status = { workspace = true }
+solana-transaction-status-client-types = { workspace = true }
 solana-udp-client = { workspace = true }
 solana-version = { workspace = true }
 solana-vote-program = { workspace = true }

cli/src/wallet.rs

@@ -793,7 +793,7 @@ pub fn process_confirm(
                     confirmation_status: Some(transaction_status.confirmation_status()),
                     transaction,
                     get_transaction_error,
-                    err: transaction_status.err.clone(),
+                    err: transaction_status.err.clone().map(Into::into),
                 }
             } else {
                 CliTransactionConfirmation {

client/Cargo.toml

@@ -48,6 +48,7 @@ solana-time-utils = { workspace = true }
 solana-tpu-client = { workspace = true, features = ["default"] }
 solana-transaction = { workspace = true }
 solana-transaction-error = { workspace = true }
+solana-transaction-status-client-types = { workspace = true }
 solana-udp-client = { workspace = true }
 thiserror = { workspace = true }
 tokio = { workspace = true, features = ["full"] }

client/src/send_and_confirm_transactions_in_parallel.rs

@@ -284,32 +284,32 @@ async fn send_transaction_with_rpc_fallback(
                 ErrorKind::Io(_) | ErrorKind::Reqwest(_) => {
                     // fall through on io error, we will retry the transaction
                 }
-                ErrorKind::TransactionError(TransactionError::BlockhashNotFound)
-                | ErrorKind::RpcError(RpcError::RpcResponseError {
-                    data:
-                        RpcResponseErrorData::SendTransactionPreflightFailure(
-                            RpcSimulateTransactionResult {
-                                err: Some(TransactionError::BlockhashNotFound),
-                                ..
-                            },
-                        ),
-                    ..
-                }) => {
+                ErrorKind::TransactionError(TransactionError::BlockhashNotFound) => {
                     // fall through so that we will resend with another blockhash
                 }
-                ErrorKind::TransactionError(transaction_error)
-                | ErrorKind::RpcError(RpcError::RpcResponseError {
+                ErrorKind::TransactionError(transaction_error) => {
+                    // if we get other than blockhash not found error the transaction is invalid
+                    context.error_map.insert(index, transaction_error.clone());
+                }
+                ErrorKind::RpcError(RpcError::RpcResponseError {
                     data:
                         RpcResponseErrorData::SendTransactionPreflightFailure(
                             RpcSimulateTransactionResult {
-                                err: Some(transaction_error),
+                                err: Some(ui_transaction_error),
                                 ..
                             },
                         ),
                     ..
                 }) => {
-                    // if we get other than blockhash not found error the transaction is invalid
-                    context.error_map.insert(index, transaction_error.clone());
+                    match TransactionError::from(ui_transaction_error.clone()) {
+                        TransactionError::BlockhashNotFound => {
+                            // fall through so that we will resend with another blockhash
+                        }
+                        err => {
+                            // if we get other than blockhash not found error the transaction is invalid
+                            context.error_map.insert(index, err);
+                        }
+                    }
                 }
                 _ => {
                     return Err(TpuSenderError::from(e));

ledger-tool/src/bigtable.rs

@@ -519,7 +519,7 @@ async fn confirm(
         confirmation_status: Some(transaction_status.confirmation_status()),
         transaction,
         get_transaction_error,
-        err: transaction_status.err.clone(),
+        err: transaction_status.err.clone().map(Into::into),
     };
     println!("{}", output_format.formatted_string(&cli_transaction));
     Ok(())

rpc-client-api/src/client_error.rs

@@ -39,7 +39,7 @@ impl ErrorKind {
                         },
                     ),
                 ..
-            }) => Some(tx_err.clone()),
+            }) => Some(tx_err.clone().into()),
             Self::TransactionError(tx_err) => Some(tx_err.clone()),
             _ => None,
         }

rpc-client-types/src/response.rs

@@ -4,10 +4,10 @@ use {
     solana_clock::{Epoch, Slot, UnixTimestamp},
     solana_fee_calculator::{FeeCalculator, FeeRateGovernor},
     solana_inflation::Inflation,
-    solana_transaction_error::{TransactionError, TransactionResult as Result},
+    solana_transaction_error::TransactionResult as Result,
     solana_transaction_status_client_types::{
         ConfirmedTransactionStatusWithSignature, TransactionConfirmationStatus, UiConfirmedBlock,
-        UiInnerInstructions, UiTransactionReturnData,
+        UiInnerInstructions, UiTransactionError, UiTransactionReturnData,
     },
     std::{collections::HashMap, fmt, net::SocketAddr, str::FromStr},
     thiserror::Error,
@@ -240,14 +240,14 @@ pub enum RpcSignatureResult {
 #[serde(rename_all = "camelCase")]
 pub struct RpcLogsResponse {
     pub signature: String, // Signature as base58 string
-    pub err: Option<TransactionError>,
+    pub err: Option<UiTransactionError>,
     pub logs: Vec<String>,
 }
 
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq)]
 #[serde(rename_all = "camelCase")]
 pub struct ProcessedSignatureResult {
-    pub err: Option<TransactionError>,
+    pub err: Option<UiTransactionError>,
 }
 
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq)]
@@ -397,7 +397,7 @@ pub struct RpcSignatureConfirmation {
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq)]
 #[serde(rename_all = "camelCase")]
 pub struct RpcSimulateTransactionResult {
-    pub err: Option<TransactionError>,
+    pub err: Option<UiTransactionError>,
     pub logs: Option<Vec<String>>,
     pub accounts: Option<Vec<Option<UiAccount>>>,
     pub units_consumed: Option<u64>,
@@ -452,7 +452,7 @@ pub struct RpcTokenAccountBalance {
 pub struct RpcConfirmedTransactionStatusWithSignature {
     pub signature: String,
     pub slot: Slot,
-    pub err: Option<TransactionError>,
+    pub err: Option<UiTransactionError>,
     pub memo: Option<String>,
     pub block_time: Option<UnixTimestamp>,
     pub confirmation_status: Option<TransactionConfirmationStatus>,
@@ -507,7 +507,7 @@ impl From<ConfirmedTransactionStatusWithSignature> for RpcConfirmedTransactionSt
         Self {
             signature: signature.to_string(),
             slot,
-            err,
+            err: err.map(Into::into),
             memo,
             block_time,
             confirmation_status: None,

rpc/src/rpc.rs

@@ -3915,7 +3915,7 @@ pub mod rpc_full {
                     return Err(RpcCustomError::SendTransactionPreflightFailure {
                         message: format!("Transaction simulation failed: {err}"),
                         result: RpcSimulateTransactionResult {
-                            err: Some(err),
+                            err: Some(err.into()),
                             logs: Some(logs),
                             accounts: None,
                             units_consumed: Some(units_consumed),
@@ -4062,7 +4062,7 @@ pub mod rpc_full {
             Ok(new_response(
                 bank,
                 RpcSimulateTransactionResult {
-                    err: result.err(),
+                    err: result.err().map(Into::into),
                     logs: Some(logs),
                     accounts,
                     units_consumed: Some(units_consumed),
@@ -7265,17 +7265,17 @@ pub mod tests {
                     let meta = meta.unwrap();
                     assert_eq!(
                         meta.err,
-                        Some(TransactionError::InstructionError(
-                            0,
-                            InstructionError::Custom(1)
-                        ))
+                        Some(
+                            TransactionError::InstructionError(0, InstructionError::Custom(1))
+                                .into()
+                        )
                     );
                     assert_eq!(
                         meta.status,
-                        Err(TransactionError::InstructionError(
-                            0,
-                            InstructionError::Custom(1)
-                        ))
+                        Err(
+                            TransactionError::InstructionError(0, InstructionError::Custom(1))
+                                .into()
+                        ),
                     );
                 } else {
                     assert_eq!(meta, None);
@@ -7311,17 +7311,17 @@ pub mod tests {
                     let meta = meta.unwrap();
                     assert_eq!(
                         meta.err,
-                        Some(TransactionError::InstructionError(
-                            0,
-                            InstructionError::Custom(1)
-                        ))
+                        Some(
+                            TransactionError::InstructionError(0, InstructionError::Custom(1))
+                                .into()
+                        )
                     );
                     assert_eq!(
                         meta.status,
-                        Err(TransactionError::InstructionError(
-                            0,
-                            InstructionError::Custom(1)
-                        ))
+                        Err(
+                            TransactionError::InstructionError(0, InstructionError::Custom(1))
+                                .into()
+                        ),
                     );
                 } else {
                     assert_eq!(meta, None);
@@ -8522,7 +8522,7 @@ pub mod tests {
                 },
             ]);
         }
-        assert_eq!(result["result"]["value"]["data"], expected_value);
+        assert_eq!(result["result"]["value"]["data"], expected_value,);
 
         // Test Mint
         let req = format!(

rpc/src/rpc_subscriptions.rs

@@ -402,7 +402,9 @@ fn filter_signature_result(
 ) -> (Option<RpcSignatureResult>, Slot) {
     (
         result.map(|result| {
-            RpcSignatureResult::ProcessedSignature(ProcessedSignatureResult { err: result.err() })
+            RpcSignatureResult::ProcessedSignature(ProcessedSignatureResult {
+                err: result.err().map(Into::into),
+            })
         }),
         last_notified_slot,
     )
@@ -446,7 +448,7 @@ fn filter_logs_results(
 ) -> (impl Iterator<Item = RpcLogsResponse>, Slot) {
     let responses = logs.into_iter().flatten().map(|log| RpcLogsResponse {
         signature: log.signature.to_string(),
-        err: log.result.err(),
+        err: log.result.err().map(Into::into),
         logs: log.log_messages,
     });
     (responses, last_notified_slot)