Bump platform tools version to v1.51 (#7409)

* Bump platform tools version

* Fix makefile

* Adjust C CU consumption

* Adjust Rust CU consumption

Author: LucasSte

platform-tools-sdk/cargo-build-sbf/src/toolchain.rs

@@ -14,7 +14,7 @@ use {
     tar::Archive,
 };
 
-pub(crate) const DEFAULT_PLATFORM_TOOLS_VERSION: &str = "v1.50";
+pub(crate) const DEFAULT_PLATFORM_TOOLS_VERSION: &str = "v1.51";
 pub(crate) const DEFAULT_RUST_VERSION: &str = "1.84.1";
 
 fn find_installed_platform_tools() -> Vec<String> {

platform-tools-sdk/cargo-build-sbf/tests/crates/package-metadata/Cargo.toml

@@ -10,7 +10,7 @@ edition = "2021"
 publish = false
 
 [package.metadata.solana]
-tools-version = "v1.50"
+tools-version = "v1.51"
 program-id = "MyProgram1111111111111111111111111111111111"
 
 [dependencies]

platform-tools-sdk/cargo-build-sbf/tests/crates/workspace-metadata/Cargo.toml

@@ -27,4 +27,4 @@ check-cfg = [
 [workspace]
 
 [workspace.metadata.solana]
-tools-version = "v1.50"
+tools-version = "v1.51"

platform-tools-sdk/sbf/scripts/install.sh

@@ -109,7 +109,7 @@ if [[ ! -e criterion-$version.md || ! -e criterion ]]; then
 fi
 
 # Install platform tools
-tools_version=v1.50
+tools_version=v1.51
 rust_version=1.84.1
 if [[ ! -e platform-tools-$tools_version.md || ! -e platform-tools ]]; then
   (

programs/sbf/Makefile

@@ -1,6 +1,7 @@
 SBF_SDK_PATH := ../../platform-tools-sdk/sbf
 SRC_DIR := c/src
 OUT_DIR := target/deploy
+TOOLCHAIN := 1.84.1-sbpf-solana-v1.51
 
 test-v3:
 	mkdir -p target/deploy ; \
@@ -30,11 +31,11 @@ test-version:
 	$(MAKE) test-all
 
 rust-v0:
-	cargo +1.84.1-sbpf-solana-v1.50 build --release --target sbpf-solana-solana --workspace ; \
+	cargo +$(TOOLCHAIN) build --release --target sbpf-solana-solana --workspace ; \
 	cp -r target/sbpf-solana-solana/release/* target/deploy
 
 rust-new:
-	RUSTFLAGS="-C instrument-coverage=no" cargo +1.84.1-sbpf-solana-v1.50 build --release --target sbpf$(VER)-solana-solana --workspace ; \
+	RUSTFLAGS="-C instrument-coverage=no" cargo +$(TOOLCHAIN) build --release --target sbpf$(VER)-solana-solana --workspace ; \
 	cp -r target/sbpf$(VER)-solana-solana/release/* target/deploy
 
 .PHONY: test-v3

programs/sbf/tests/programs.rs

@@ -1428,13 +1428,13 @@ fn assert_instruction_count() {
             ("alloc", 18572),
             ("sbf_to_sbf", 316),
             ("multiple_static", 210),
-            ("noop", 6),
-            ("noop++", 6),
+            ("noop", 5),
+            ("noop++", 5),
             ("relative_call", 212),
             ("return_data", 1026),
-            ("sanity", 2374),
-            ("sanity++", 2274),
-            ("secp256k1_recover", 25422),
+            ("sanity", 2371),
+            ("sanity++", 2271),
+            ("secp256k1_recover", 25421),
             ("sha", 1446),
             ("struct_pass", 108),
             ("struct_ret", 122),
@@ -1449,14 +1449,14 @@ fn assert_instruction_count() {
             ("solana_sbf_rust_dep_crate", 22),
             ("solana_sbf_rust_iter", 1414),
             ("solana_sbf_rust_many_args", 1287),
-            ("solana_sbf_rust_mem", 1298),
-            ("solana_sbf_rust_membuiltins", 330),
-            ("solana_sbf_rust_noop", 313),
+            ("solana_sbf_rust_mem", 1297),
+            ("solana_sbf_rust_membuiltins", 329),
+            ("solana_sbf_rust_noop", 312),
             ("solana_sbf_rust_param_passing", 109),
             ("solana_sbf_rust_rand", 276),
-            ("solana_sbf_rust_sanity", 18116),
-            ("solana_sbf_rust_secp256k1_recover", 89274),
-            ("solana_sbf_rust_sha", 22811),
+            ("solana_sbf_rust_sanity", 17902),
+            ("solana_sbf_rust_secp256k1_recover", 88670),
+            ("solana_sbf_rust_sha", 22175),
         ]);
     }
 
@@ -1857,7 +1857,7 @@ fn test_program_sbf_invoke_in_same_tx_as_deployment() {
                 // Asserting the instruction number as an upper bound, since the quantity of
                 // instructions depends on the program size, which in turn depends on the SBPF
                 // versions.
-                assert!(instr_no <= 41);
+                assert!(instr_no <= 40);
                 assert_eq!(ty, InstructionError::UnsupportedProgramId);
             } else {
                 panic!("Invalid error type");