From 527b75b841e3be41c315af2174ab373bb85ab324 Mon Sep 17 00:00:00 2001
From: Yihau Chen <a122092487@gmail.com>
Date: Tue, 5 Mar 2024 15:20:01 +0800
Subject: [PATCH 1/2] v1.17: ignore mio audit report (#76)

ci: ignore mio audit
---
 ci/do-audit.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ci/do-audit.sh b/ci/do-audit.sh
index 039df6b63cb635..0118c84c5f0fec 100755
--- a/ci/do-audit.sh
+++ b/ci/do-audit.sh
@@ -30,6 +30,9 @@ cargo_audit_ignores=(
   --ignore RUSTSEC-2023-0001
 
   --ignore RUSTSEC-2022-0093
+
+  # mio
+  --ignore RUSTSEC-2024-0019
 )
 scripts/cargo-for-all-lock-files.sh audit "${cargo_audit_ignores[@]}" | $dep_tree_filter
 # we want the `cargo audit` exit code, not `$dep_tree_filter`'s

From 0c777573785f01043e322794b6076f5eeaba26d8 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Sat, 2 Mar 2024 20:29:42 -0600
Subject: [PATCH 2/2] v1.17: Remove unnecessary unwrap from
 `simulate_transaction_unchecked()` (backport of #35375)

Remove unnecessary unwrap from `simulate_transaction_unchecked()` (#35375)

Remove unnecessary unwrap from simulate_transaction_unchecked()

(cherry picked from commit cb260f10d1b05743391b9b442bf175c19d894931)

Co-authored-by: Pankaj Garg <pankaj@solana.com>
---
 runtime/src/bank.rs | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/runtime/src/bank.rs b/runtime/src/bank.rs
index 4f2260f72ea17c..9a3c25b4b8ee85 100644
--- a/runtime/src/bank.rs
+++ b/runtime/src/bank.rs
@@ -4384,9 +4384,7 @@ impl Bank {
         let post_simulation_accounts = loaded_transactions
             .into_iter()
             .next()
-            .unwrap()
-            .0
-            .ok()
+            .and_then(|(loaded_transactions_res, _)| loaded_transactions_res.ok())
             .map(|loaded_transaction| {
                 loaded_transaction
                     .accounts
@@ -4406,7 +4404,12 @@ impl Bank {
 
         debug!("simulate_transaction: {:?}", timings);
 
-        let execution_result = execution_results.pop().unwrap();
+        let execution_result =
+            execution_results
+                .pop()
+                .unwrap_or(TransactionExecutionResult::NotExecuted(
+                    TransactionError::InvalidProgramForExecution,
+                ));
         let flattened_result = execution_result.flattened_result();
         let (logs, return_data) = match execution_result {
             TransactionExecutionResult::Executed { details, .. } => {