Sanitize preflight

core/src/rpc.rs

@@ -3458,7 +3458,7 @@ pub mod tests {
         let ledger_path = get_tmp_ledger_path!();
         let blockstore = Arc::new(Blockstore::open(&ledger_path).unwrap());
         let block_commitment_cache = Arc::new(RwLock::new(BlockCommitmentCache::default()));
-        let bank_forks = new_bank_forks().0;
+        let (bank_forks, mint_keypair, ..) = new_bank_forks();
         let health = RpcHealth::stub();
 
         // Freeze bank 0 to prevent a panic in `run_transaction_simulation()`
@@ -3483,8 +3483,8 @@ pub mod tests {
         );
         SendTransactionService::new(tpu_address, &bank_forks, &exit, receiver);
 
-        let bad_transaction =
-            system_transaction::transfer(&Keypair::new(), &Pubkey::default(), 42, Hash::default());
+        let mut bad_transaction =
+            system_transaction::transfer(&mint_keypair, &Pubkey::new_rand(), 42, Hash::default());
 
         // sendTransaction will fail because the blockhash is invalid
         let req = format!(
@@ -3499,9 +3499,23 @@ pub mod tests {
             )
         );
 
+        // sendTransaction will fail due to insanity
+        bad_transaction.message.instructions[0].program_id_index = 255u8;
         let recent_blockhash = bank_forks.read().unwrap().root_bank().last_blockhash();
+        bad_transaction.sign(&[&mint_keypair], recent_blockhash);
+        let req = format!(
+            r#"{{"jsonrpc":"2.0","id":1,"method":"sendTransaction","params":["{}"]}}"#,
+            bs58::encode(serialize(&bad_transaction).unwrap()).into_string()
+        );
+        let res = io.handle_request_sync(&req, meta.clone());
+        assert_eq!(
+            res,
+            Some(
+                r#"{"jsonrpc":"2.0","error":{"code":-32002,"message":"Transaction simulation failed: Transaction failed to sanitize accounts offsets correctly"},"id":1}"#.to_string(),
+            )
+        );
         let mut bad_transaction =
-            system_transaction::transfer(&Keypair::new(), &Pubkey::default(), 42, recent_blockhash);
+            system_transaction::transfer(&mint_keypair, &Pubkey::new_rand(), 42, recent_blockhash);
 
         // sendTransaction will fail due to poor node health
         health.stub_set_health_status(Some(RpcHealthStatus::Behind));

runtime/src/accounts.rs

@@ -613,8 +613,7 @@ impl Accounts {
         use solana_sdk::sanitize::Sanitize;
         let keys: Vec<Result<_>> = OrderedIterator::new(txs, txs_iteration_order)
             .map(|tx| {
-                tx.sanitize()
-                    .map_err(|_| TransactionError::SanitizeFailure)?;
+                tx.sanitize().map_err(TransactionError::from)?;
 
                 if Self::has_duplicates(&tx.message.account_keys) {
                     return Err(TransactionError::AccountLoadedTwice);

runtime/src/bank.rs

@@ -47,6 +47,7 @@ use solana_sdk::{
     native_loader, nonce,
     program_utils::limited_deserialize,
     pubkey::Pubkey,
+    sanitize::Sanitize,
     signature::{Keypair, Signature},
     slot_hashes::SlotHashes,
     slot_history::SlotHistory,
@@ -1346,7 +1347,11 @@ impl Bank {
         &'a self,
         txs: &'b [Transaction],
     ) -> TransactionBatch<'a, 'b> {
-        let mut batch = TransactionBatch::new(vec![Ok(()); txs.len()], &self, txs, None);
+        let lock_results: Vec<_> = txs
+            .iter()
+            .map(|tx| tx.sanitize().map_err(|e| e.into()))
+            .collect();
+        let mut batch = TransactionBatch::new(lock_results, &self, txs, None);
         batch.needs_unlock = false;
         batch
     }

sdk/src/transaction.rs

@@ -90,6 +90,12 @@ pub enum TransactionError {
 
 pub type Result<T> = result::Result<T, TransactionError>;
 
+impl From<SanitizeError> for TransactionError {
+    fn from(_: SanitizeError) -> Self {
+        Self::SanitizeFailure
+    }
+}
+
 /// An atomic transaction
 #[frozen_abi(digest = "GoxM5ZMMjM2FSuY1VtuMhs1j8u9kMuYsH3dpYcSVVnTe")]
 #[derive(Debug, PartialEq, Default, Eq, Clone, Serialize, Deserialize, AbiExample)]