From d48e9b3a7b140eaf5e1c4daa54025b25a1463e3c Mon Sep 17 00:00:00 2001
From: Dmitri Makarov <dmakarov@alumni.stanford.edu>
Date: Wed, 30 Mar 2022 10:19:04 -0700
Subject: [PATCH] Bump sbf-tools version to v1.24

(cherry picked from commit 689064a4f4d0a7122c9a24bef061712548663600)
---
 programs/bpf/tests/programs.rs  | 11 ++---------
 sdk/bpf/scripts/install.sh      |  2 +-
 sdk/cargo-build-bpf/src/main.rs |  2 +-
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/programs/bpf/tests/programs.rs b/programs/bpf/tests/programs.rs
index f2b37abd43..68bc9ec823 100644
--- a/programs/bpf/tests/programs.rs
+++ b/programs/bpf/tests/programs.rs
@@ -1443,17 +1443,10 @@ fn assert_instruction_count() {
             ("solana_bpf_rust_membuiltins", 1539),
             ("solana_bpf_rust_noop", 326),
             ("solana_bpf_rust_param_passing", 146),
-<<<<<<< HEAD
-            ("solana_bpf_rust_rand", 418),
-            ("solana_bpf_rust_sanity", 9128),
-            ("solana_bpf_rust_secp256k1_recover", 25707),
-            ("solana_bpf_rust_sha", 27033),
-=======
             ("solana_bpf_rust_rand", 429),
-            ("solana_bpf_rust_sanity", 9139),
+            ("solana_bpf_rust_sanity", 52290),
             ("solana_bpf_rust_secp256k1_recover", 25707),
-            ("solana_bpf_rust_sha", 26390),
->>>>>>> 03ed334eb (Double the chunk size for sending the program binary data in tx)
+            ("solana_bpf_rust_sha", 25251),
         ]);
     }
 
diff --git a/sdk/bpf/scripts/install.sh b/sdk/bpf/scripts/install.sh
index 46b0c3ceb5..f442820d6c 100755
--- a/sdk/bpf/scripts/install.sh
+++ b/sdk/bpf/scripts/install.sh
@@ -102,7 +102,7 @@ if [[ ! -e criterion-$version.md || ! -e criterion ]]; then
 fi
 
 # Install Rust-BPF
-version=v1.23
+version=v1.24
 if [[ ! -e bpf-tools-$version.md || ! -e bpf-tools ]]; then
   (
     set -e
diff --git a/sdk/cargo-build-bpf/src/main.rs b/sdk/cargo-build-bpf/src/main.rs
index a602f6715f..9341f2f6f7 100644
--- a/sdk/cargo-build-bpf/src/main.rs
+++ b/sdk/cargo-build-bpf/src/main.rs
@@ -710,7 +710,7 @@ fn main() {
 
     // The following line is scanned by CI configuration script to
     // separate cargo caches according to the version of sbf-tools.
-    let bpf_tools_version = "v1.23";
+    let bpf_tools_version = "v1.24";
     let version = format!("{}\nbpf-tools {}", crate_version!(), bpf_tools_version);
     let matches = clap::Command::new(crate_name!())
         .about(crate_description!())