fix: preserve error information in pinocchio ProgramError conversion

Author: ananas-block

program-libs/account-checks/src/account_info/pinocchio.rs

@@ -73,7 +73,7 @@ impl AccountInfoTrait for pinocchio::account_info::AccountInfo {
             pinocchio::pubkey::create_program_address(_seeds, &program_pubkey)
                 .map_err(|_| AccountError::InvalidSeeds)
         }
-        // Pinocchio does not support find_program_address outside of target_os solana.
+        // Pinocchio does not support create_program_address outside of target_os solana.
         #[cfg(all(not(target_os = "solana"), feature = "solana"))]
         {
             let program_pubkey = solana_pubkey::Pubkey::from(*_program_id);

program-libs/account-checks/src/error.rs

@@ -30,6 +30,8 @@ pub enum AccountError {
     ProgramNotExecutable,
     #[error("Account not zeroed.")]
     AccountNotZeroed,
+    #[error("Pinocchio program error with code: {0}")]
+    PinocchioProgramError(u32),
 }
 
 // TODO: reconfigure error codes
@@ -50,6 +52,7 @@ impl From<AccountError> for u32 {
             AccountError::InvalidProgramId => 12017,
             AccountError::ProgramNotExecutable => 12018,
             AccountError::AccountNotZeroed => 12019,
+            AccountError::PinocchioProgramError(code) => code,
         }
     }
 }
@@ -70,8 +73,30 @@ impl From<AccountError> for solana_program_error::ProgramError {
 
 #[cfg(feature = "pinocchio")]
 impl From<pinocchio::program_error::ProgramError> for AccountError {
-    fn from(_: pinocchio::program_error::ProgramError) -> Self {
-        AccountError::BorrowAccountDataFailed
+    fn from(error: pinocchio::program_error::ProgramError) -> Self {
+        match error {
+            pinocchio::program_error::ProgramError::Custom(code) => {
+                AccountError::PinocchioProgramError(code)
+            }
+            _ => {
+                // Convert other ProgramError variants to error codes
+                let error_code = match error {
+                    pinocchio::program_error::ProgramError::InvalidArgument => 1,
+                    pinocchio::program_error::ProgramError::InvalidInstructionData => 2,
+                    pinocchio::program_error::ProgramError::InvalidAccountData => 3,
+                    pinocchio::program_error::ProgramError::AccountDataTooSmall => 4,
+                    pinocchio::program_error::ProgramError::InsufficientFunds => 5,
+                    pinocchio::program_error::ProgramError::IncorrectProgramId => 6,
+                    pinocchio::program_error::ProgramError::MissingRequiredSignature => 7,
+                    pinocchio::program_error::ProgramError::AccountAlreadyInitialized => 8,
+                    pinocchio::program_error::ProgramError::UninitializedAccount => 9,
+                    pinocchio::program_error::ProgramError::NotEnoughAccountKeys => 10,
+                    pinocchio::program_error::ProgramError::AccountBorrowFailed => 11,
+                    _ => 0, // Unknown error
+                };
+                AccountError::PinocchioProgramError(error_code)
+            }
+        }
     }
 }
 

program-tests/account-compression-test/tests/merkle_tree_tests.rs

@@ -1407,7 +1407,7 @@ async fn insert_into_nullifier_queues<R: Rpc>(
         .iter()
         .map(|(pubkey, index)| (*pubkey, *index))
         .collect::<Vec<(Pubkey, u8)>>();
-    remaining_accounts.sort_by(|a, b| a.1.cmp(&b.1));
+    remaining_accounts.sort_by_key(|(_, idx)| *idx);
     let remaining_accounts = remaining_accounts
         .iter()
         .map(|(pubkey, _)| AccountMeta::new(*pubkey, false))

program-tests/utils/src/e2e_test_env.rs

@@ -3399,7 +3399,7 @@ pub fn to_account_metas_light(
         })
         .collect::<Vec<(AccountMeta, usize)>>();
     // hash maps are not sorted so we need to sort manually and collect into a vector again
-    remaining_accounts.sort_by(|a, b| a.1.cmp(&b.1));
+    remaining_accounts.sort_by_key(|(_, idx)| *idx);
     let remaining_accounts = remaining_accounts
         .iter()
         .map(|(k, _)| k.clone())

program-tests/utils/src/system_program.rs

@@ -665,7 +665,7 @@ pub fn create_invoke_instruction_data_and_remaining_accounts(
         .map(|(k, i)| (AccountMeta::new(*k, false), *i))
         .collect::<Vec<(AccountMeta, usize)>>();
     // hash maps are not sorted so we need to sort manually and collect into a vector again
-    remaining_accounts.sort_by(|a, b| a.1.cmp(&b.1));
+    remaining_accounts.sort_by_key(|(_, idx)| *idx);
     let remaining_accounts = remaining_accounts
         .iter()
         .map(|(k, _)| k.clone())

programs/compressed-token/src/process_transfer.rs

@@ -1098,7 +1098,7 @@ pub mod transfer_sdk {
             })
             .collect::<Vec<(AccountMeta, usize)>>();
         // hash maps are not sorted so we need to sort manually and collect into a vector again
-        remaining_accounts.sort_by(|a, b| a.1.cmp(&b.1));
+        remaining_accounts.sort_by_key(|(_, idx)| *idx);
         let remaining_accounts = remaining_accounts
             .iter()
             .map(|(k, _)| k.clone())