Bump platform tools (#8784)

* Bump version and remove v3 from CI

* Tune Rust CU numbers

* Remove v3 from downstream tests

* Modify path

.github/workflows/downstream-project-spl.yml

@@ -14,8 +14,8 @@ on:
       - "rust-toolchain.toml"
       - "Cargo.toml"
       - "Cargo.lock"
-      - "cargo-build-sbf"
-      - "cargo-test-sbf"
+      - "platform-tools-sdk/cargo-build-sbf"
+      - "platform-tools-sdk/cargo-test-sbf"
       - "ci/downstream-projects/run-spl.sh"
       - ".github/workflows/downstream-project-spl.yml"
       - ".github/scripts/downstream-project-spl-common.sh"
@@ -171,12 +171,3 @@ jobs:
           rm -rf target/deploy target/sbpf*
           $CARGO_BUILD_SBF --arch v2 --manifest-path program/Cargo.toml
           RUSTFLAGS="-Awarnings" SBF_OUT_DIR="../target/deploy"  cargo test --features test-sbf --manifest-path program/Cargo.toml
-
-      - name: Test SBPFv3
-        shell: bash
-        run: |
-          source ci/downstream-projects/common.sh
-          cd "${{ matrix.programs }}"
-          rm -rf target/deploy target/sbpf*
-          $CARGO_BUILD_SBF --arch v3 --manifest-path program/Cargo.toml
-          RUSTFLAGS="-Awarnings" SBF_OUT_DIR="../target/deploy"  cargo test --features test-sbf --manifest-path program/Cargo.toml

ci/test-stable.sh

@@ -94,11 +94,6 @@ test-stable-sbf)
   _ make -C programs/sbf clean-all
   _ cargo_build_sbf_sanity "v2"
 
-  # SBPFv3 program tests
-  _ make -C programs/sbf clean-all test-v3
-  _ make -C programs/sbf clean-all
-  _ cargo_build_sbf_sanity "v3"
-
   exit 0
   ;;
 test-docs)

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

@@ -15,8 +15,8 @@ use {
     tar::Archive,
 };
 
-pub(crate) const DEFAULT_PLATFORM_TOOLS_VERSION: &str = "v1.51";
-pub(crate) const DEFAULT_RUST_VERSION: &str = "1.84.1";
+pub(crate) const DEFAULT_PLATFORM_TOOLS_VERSION: &str = "v1.52";
+pub(crate) const DEFAULT_RUST_VERSION: &str = "1.89.0";
 
 // Common headers used for Github API.
 const USER_AGENT_HEADER: (&str, &str) = ("User-Agent", "cargo-build-sbf");

platform-tools-sdk/cargo-build-sbf/tests/crates.rs

@@ -12,7 +12,7 @@ fn should_install_tools() -> bool {
     let toolchain_path = PathBuf::from(tools_path)
         .join(".cache")
         .join("solana")
-        .join("v1.51")
+        .join("v1.52")
         .join("platform-tools");
 
     let rust_path = toolchain_path.join("rust");
@@ -246,6 +246,7 @@ fn test_sbpfv2() {
 
 #[test]
 #[serial]
+#[ignore]
 fn test_sbpfv3() {
     let assert_v1 = build_noop_and_readelf("v3");
     assert_v1
@@ -258,6 +259,7 @@ fn test_sbpfv3() {
 
 #[test]
 #[serial]
+#[ignore]
 fn test_sbpfv4() {
     let assert_v1 = build_noop_and_readelf("v4");
     assert_v1

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.51"
+tools-version = "v1.52"
 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.51"
+tools-version = "v1.52"

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

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

programs/sbf/Makefile

@@ -1,12 +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 ; \
-	VER=v3 $(MAKE) rust-new ; \
-	$(MAKE) test-rust
+TOOLCHAIN := 1.89.0-sbpf-solana-v1.52
 
 test-v2:
 	VER=v2 $(MAKE) test-version
@@ -38,6 +33,6 @@ rust-new:
 	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
+.PHONY: test-v0
 
 include $(SBF_SDK_PATH)/c/sbf.mk

programs/sbf/tests/programs.rs

@@ -1588,20 +1588,20 @@ fn assert_instruction_count() {
     #[cfg(feature = "sbf_rust")]
     {
         programs.extend_from_slice(&[
-            ("solana_sbf_rust_128bit", 801),
-            ("solana_sbf_rust_alloc", 4983),
-            ("solana_sbf_rust_custom_heap", 339),
+            ("solana_sbf_rust_128bit", 784),
+            ("solana_sbf_rust_alloc", 4934),
+            ("solana_sbf_rust_custom_heap", 343),
             ("solana_sbf_rust_dep_crate", 22),
-            ("solana_sbf_rust_iter", 1414),
+            ("solana_sbf_rust_iter", 1514),
             ("solana_sbf_rust_many_args", 1287),
-            ("solana_sbf_rust_mem", 1322),
+            ("solana_sbf_rust_mem", 1326),
             ("solana_sbf_rust_membuiltins", 329),
-            ("solana_sbf_rust_noop", 334),
-            ("solana_sbf_rust_param_passing", 109),
-            ("solana_sbf_rust_rand", 312),
-            ("solana_sbf_rust_sanity", 17902),
-            ("solana_sbf_rust_secp256k1_recover", 88670),
-            ("solana_sbf_rust_sha", 22175),
+            ("solana_sbf_rust_noop", 342),
+            ("solana_sbf_rust_param_passing", 108),
+            ("solana_sbf_rust_rand", 315),
+            ("solana_sbf_rust_sanity", 14223),
+            ("solana_sbf_rust_secp256k1_recover", 88615),
+            ("solana_sbf_rust_sha", 21998),
         ]);
     }